Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec625fb7b5 | ||
|
|
c8e4474175 | ||
|
|
499c85ae49 | ||
|
|
e88d98efc1 | ||
|
|
8d545aa7fb | ||
|
|
a04094bc60 | ||
|
|
7d68612e57 | ||
|
|
64295db0e7 | ||
|
|
6dcd302ab7 |
@@ -1,4 +1,4 @@
|
||||
POST http://localhost:12000/wahlrecht/v1/calculate
|
||||
POST {{backend}}/wahlrecht/v1/calculate
|
||||
Content-Type: application/json
|
||||
|
||||
{
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
GET {{backend}}/wahlrecht/v1/elections
|
||||
Content-Type: application/json
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"dev": {
|
||||
"backend": "http://localhost:12000"
|
||||
},
|
||||
"prod" : {
|
||||
"backend": "https://api.2martens.de"
|
||||
}
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
server:
|
||||
port: 12000
|
||||
+2
-2
@@ -16,8 +16,8 @@ open class WebConfiguration(private val headerInterceptorRest: HeaderInterceptor
|
||||
override fun addCorsMappings(registry: CorsRegistry) {
|
||||
val registration = registry.addMapping("/**")
|
||||
registration.allowedMethods(
|
||||
HttpMethod.GET.name(), HttpMethod.POST.name(),
|
||||
HttpMethod.PUT.name(), HttpMethod.OPTIONS.name()
|
||||
HttpMethod.GET.name(), HttpMethod.POST.name(),
|
||||
HttpMethod.PUT.name(), HttpMethod.HEAD.name()
|
||||
)
|
||||
registration.allowCredentials(true)
|
||||
registration.allowedOrigins(
|
||||
|
||||
+4
-2
@@ -1,5 +1,6 @@
|
||||
package de.twomartens.wahlrecht.controller.v1
|
||||
|
||||
import de.twomartens.wahlrecht.property.ServiceProperties
|
||||
import io.swagger.v3.oas.annotations.Hidden
|
||||
import org.springframework.web.bind.annotation.GetMapping
|
||||
import org.springframework.web.bind.annotation.RequestMapping
|
||||
@@ -7,11 +8,12 @@ import org.springframework.web.bind.annotation.RestController
|
||||
|
||||
@RestController
|
||||
@RequestMapping(value = ["/wahlrecht/v1"])
|
||||
class HealthCheckController {
|
||||
class HealthCheckController(private val properties: ServiceProperties) {
|
||||
|
||||
|
||||
@Hidden
|
||||
@GetMapping("/healthCheck")
|
||||
fun healthCheck(message: String): String {
|
||||
return message
|
||||
return properties.greeting.format(message)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
spring:
|
||||
config:
|
||||
import:
|
||||
- "classpath:config/wahlrecht.yaml"
|
||||
- "optional:configserver:http://configserver:8888/config"
|
||||
@@ -24,7 +24,8 @@ management:
|
||||
|
||||
spring:
|
||||
config:
|
||||
import: "optional:configserver:http://127.0.0.1:8888/config"
|
||||
import:
|
||||
- "classpath:config/wahlrecht.yaml"
|
||||
main:
|
||||
banner-mode: off
|
||||
profiles:
|
||||
@@ -41,16 +42,6 @@ spring:
|
||||
name: wahlrecht
|
||||
|
||||
|
||||
# properties for application
|
||||
de.twomartens.wahlrecht:
|
||||
defaultTimeZone: Europe/Berlin
|
||||
greeting: "Hello %s"
|
||||
statusprobe:
|
||||
scheduleDuration: 60
|
||||
maxKafkaFailureDuration: 5
|
||||
maxBlobFailureCount: 5
|
||||
maxFailurePercent: 50
|
||||
|
||||
springdoc:
|
||||
swagger-ui:
|
||||
display-request-duration: true
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
de.twomartens.wahlrecht:
|
||||
greeting: "Moin %s"
|
||||
@@ -0,0 +1,8 @@
|
||||
de.twomartens.wahlrecht:
|
||||
defaultTimeZone: Europe/Berlin
|
||||
greeting: "Hello %s"
|
||||
statusprobe:
|
||||
scheduleDuration: 60
|
||||
maxKafkaFailureDuration: 5
|
||||
maxBlobFailureCount: 5
|
||||
maxFailurePercent: 50
|
||||
Reference in New Issue
Block a user