Added spring doc webflux support and kotlin coroutines

.drone.yml

@@ -118,13 +118,10 @@ steps:
       - ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
       - git clone ssh://giteajim@git.2martens.de:22/2martens/cloud-configuration.git .
       - git checkout main
-  - name: update image version
+  - name: modify deployed image
     image: alpine
     commands:
-      - mkdir $HOME/bin
-      - wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 -O $HOME/bin/yq && chmod +x $HOME/bin/yq
-      - sed -i -r "s/(tag:).*/\1\ \"${DRONE_SEMVER}\"/" argocd/wahlrecht/${DRONE_DEPLOY_TO}/overwrite_values.yaml
-      - cd argocd/wahlrecht/${DRONE_DEPLOY_TO} && $HOME/bin/yq '. *= load("overwrite_values.yaml")' default_values.yaml > values.yaml
+      - sed -i -r "s/(wahlrecht_image_version:).*/\1\ ${DRONE_SEMVER}/" ansible/inventories/host_vars/api-server/public.yaml
   - name: save modified variable file
     image: alpine/git
     environment:
@@ -137,14 +134,34 @@ steps:
       - touch $HOME/.ssh/known_hosts
       - chmod 600 $HOME/.ssh/known_hosts
       - ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
-      - git add argocd/wahlrecht/${DRONE_DEPLOY_TO}/*
+      - git add ansible/inventories/host_vars/api-server/public.yaml
       - git diff-index --quiet HEAD || git commit -m "[Drone] Changed wahlrecht_image_version to ${DRONE_SEMVER}"
       - git push origin main
+  - name: deploy image
+    image: plugins/ansible:latest
+    volumes:
+      - name: cache
+        path: /root/.ansible
+    settings:
+      playbook: ansible/deploy_spring.yaml
+      inventory: ansible/inventories/production
+      galaxy: ansible/requirements.yaml
+      galaxy_force: false
+      private_key:
+        from_secret: private_ssh_key
+      vault_password:
+        from_secret: vault_password
+
+volumes:
+  - name: cache
+    host:
+      path: /var/lib/drone/cache/.ansible
 
 trigger:
-  target:
-    - test
+#  target:
+#    - production
   event:
     include:
       - promote
       - rollback
+      - custom

.editorconfig

@@ -543,9 +543,9 @@ ij_html_space_inside_empty_tag = false
 ij_html_text_wrap = normal
 
 [{*.kt,*.kts}]
-indent_size = 2
-tab_width = 2
-ij_continuation_indent_size = 4
+indent_size = 4
+tab_width = 4
+ij_continuation_indent_size = 8
 ij_kotlin_align_in_columns_case_branch = false
 ij_kotlin_align_multiline_binary_operation = false
 ij_kotlin_align_multiline_extends_list = false

.run/MainApplication.run.xml

@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="MainApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <module name="wahlrecht.server.main" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="de.twomartens.wahlrecht.MainApplication" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="true" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+        <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".env" />
+      </ENTRIES>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

buildSrc/src/main/kotlin/twomartens.java.gradle.kts

@@ -54,7 +54,7 @@ normalization.runtimeClasspath.metaInf {
 }
 
 tasks.register("cleanLibs") {
-    delete("${layout.buildDirectory}/libs")
+    delete("${buildDir}/libs")
 }
 
 tasks.build {

buildSrc/src/main/kotlin/twomartens.kotlin.gradle.kts

@@ -8,6 +8,9 @@ val libs = the<LibrariesForLibs>()
 
 dependencies {
     implementation(libs.kotlin.logging)
+    implementation(libs.kotlin.reactor)
+    implementation(libs.kotlin.coroutines)
+    implementation(libs.kotlin.coroutines.reactor)
     implementation(kotlin("reflect"))
 }
 

buildSrc/src/main/kotlin/twomartens.nebula-release.gradle.kts

@@ -9,10 +9,10 @@ apply(plugin="com.netflix.nebula.release")
 tasks.register("writeVersionProperties") {
     group = "version"
     mustRunAfter("release")
-    outputs.file("${layout.buildDirectory}/version.properties")
-    val directory = layout.buildDirectory.asFile
+    outputs.file("$buildDir/version.properties")
+    val directory = buildDir
     doLast {
-        Files.createDirectories(directory.get().toPath())
-        File("${layout.buildDirectory}/version.properties").writeText("VERSION=${project.version}\n")
+        Files.createDirectories(directory.toPath())
+        File("$buildDir/version.properties").writeText("VERSION=${project.version}\n")
     }
 }

buildSrc/src/main/kotlin/twomartens.spring-boot-cloud.gradle.kts

@@ -9,7 +9,6 @@ val libs = the<LibrariesForLibs>()
 dependencies {
     implementation(platform(libs.spring.cloud))
     implementation(libs.bundles.spring.boot.server)
-    implementation(libs.spring.openapi)
 
     implementation(libs.httpclient)
     implementation(libs.prometheus)

gradle/libs.versions.toml

@@ -1,23 +1,25 @@
 [versions]
-spring-boot = "3.5.4"
-spring-doc = "2.8.9"
-spring-cloud = "2025.0.0"
+spring-boot = "3.1.2"
+spring-doc = "2.1.0"
+spring-doc-webflux = "1.7.0"
+spring-cloud = "2022.0.4"
 spring-grpc = "2.14.0.RELEASE"
 grpc = "1.57.0"
 tomcat-annotations = "6.0.53"
-httpclient = "5.5"
-slf4j = "2.0.17"
-log4j = "2.25.1"
-log4j-ecs = "1.7.0"
-mapstruct = "1.6.3"
-junit = "5.13.4"
-assertj = "3.27.3"
-mockito = "5.18.0"
-keycloak = "26.3.2"
-keycloak-policy-enforcer = "26.0.6"
+httpclient = "5.2.1"
+slf4j = "2.0.7"
+log4j = "2.20.0"
+log4j-ecs = "1.5.0"
+mapstruct = "1.5.5.Final"
+junit = "5.10.0"
+assertj = "3.24.2"
+mockito = "5.4.0"
+keycloak = "22.0.1"
 kotlin-logging = "3.0.5"
-kotlin-reflect = "2.2.0"
+kotlin-reflect = "1.9.0"
 kotlin-lombok = "1.9.0"
+kotlin-reactor = "1.2.2"
+kotlin-coroutines = "1.7.3"
 plugin-nebula-release = "17.2.2"
 plugin-lombok = "8.0.1"
 plugin-gradle-versions = "0.46.0"
@@ -32,10 +34,12 @@ spring-boot-web = { module = "org.springframework.boot:spring-boot-starter-web"
 spring-boot-log4j = { module = "org.springframework.boot:spring-boot-starter-log4j2" }
 spring-boot-thymeleaf = { module = "org.springframework.boot:spring-boot-starter-thymeleaf" }
 spring-boot-mongo = { module = "org.springframework.boot:spring-boot-starter-data-mongodb" }
+spring-boot-mongo-reactive = { module = "org.springframework.boot:spring-boot-starter-data-mongodb-reactive" }
 spring-boot-validation = { module = "org.springframework.boot:spring-boot-starter-validation" }
 spring-boot-test = { module = "org.springframework.boot:spring-boot-starter-test" }
 spring-boot-security = { module = "org.springframework.boot:spring-boot-starter-security" }
 spring-boot-oauth2-resource-server = { module = "org.springframework.boot:spring-boot-starter-oauth2-resource-server" }
+spring-boot-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux" }
 spring-boot-config = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "spring-boot" }
 spring-cloud = { module = "org.springframework.cloud:spring-cloud-dependencies", version.ref = "spring-cloud" }
 spring-cloud-starter = { module = "org.springframework.cloud:spring-cloud-starter" }
@@ -45,10 +49,11 @@ spring-cloud-config-server = { module = "org.springframework.cloud:spring-cloud-
 spring-boot-starter = { module = "org.springframework.boot:spring-boot-starter" }
 spring-grpc = { module = "net.devh:grpc-spring-boot-starter", version.ref = "spring-grpc" }
 spring-ui = { module = "org.springdoc:springdoc-openapi-starter-webmvc-ui", version.ref = "spring-doc" }
-spring-sec = { module = "org.springdoc:springdoc-openapi-starter-common", version.ref = "spring-doc" }
-spring-openapi = { module = "org.springdoc:springdoc-openapi-starter-webmvc-api", version.ref = "spring-doc" }
+spring-openapi-starter = { module = "org.springdoc:springdoc-openapi-starter-common", version.ref = "spring-doc" }
+spring-openapi-webmvc = { module = "org.springdoc:springdoc-openapi-starter-webmvc-api", version.ref = "spring-doc" }
+spring-openapi-webflux = { module = "org.springdoc:springdoc-openapi-webflux-ui", version.ref = "spring-doc-webflux" }
 keycloak-core = { module = "org.keycloak:keycloak-core", version.ref = "keycloak" }
-keycloak-policy-enforcer = { module = "org.keycloak:keycloak-policy-enforcer", version.ref = "keycloak-policy-enforcer" }
+keycloak-policy-enforcer = { module = "org.keycloak:keycloak-policy-enforcer", version.ref = "keycloak" }
 grpc-api = { module = "io.grpc:grpc-api", version.ref = "grpc" }
 grpc-context = { module = "io.grpc:grpc-context", version.ref = "grpc" }
 grpc-core = { module = "io.grpc:grpc-core", version.ref = "grpc" }
@@ -79,6 +84,9 @@ mockito-inline = "org.mockito:mockito-inline:5.2.0"
 mockito-junit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
 kotlin-logging = { module = "io.github.microutils:kotlin-logging-jvm", version.ref = "kotlin-logging" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin-reflect" }
+kotlin-reactor = { module = "io.projectreactor.kotlin:reactor-kotlin-extensions", version.ref = "kotlin-reactor" }
+kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlin-coroutines-core", version.ref = "kotlin-coroutines" }
+kotlin-coroutines-reactor = { module = "org.jetbrains.kotlinx:kotlin-coroutines-reactor", version.ref = "kotlin-coroutines" }
 plugin-nebula-release = { module = "com.netflix.nebula:nebula-release-plugin", version.ref = "plugin-nebula-release" }
 plugin-springboot = { module = "org.springframework.boot:spring-boot-gradle-plugin", version.ref = "spring-boot" }
 plugin-lombok = { module = "io.freefair.gradle:lombok-plugin", version.ref = "plugin-lombok" }
@@ -113,12 +121,14 @@ spring-boot = [
 spring-boot-server = [
     "spring-boot-actuator",
     "spring-boot-log4j",
-    "spring-boot-mongo",
+    "spring-boot-mongo-reactive",
     "spring-boot-thymeleaf",
     "spring-boot-validation",
     "spring-boot-web",
+    "spring-boot-webflux",
     "spring-cloud-starter",
-    "spring-sec",
+    "spring-openapi-starter",
+    "spring-openapi-webflux",
     "spring-ui",
 ]
 spring-boot-security = [

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

http-requests/put-election.http

@@ -1,60 +0,0 @@
-PUT http://localhost:12000/wahlrecht/v1/election
-Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJkalp3QzZGZEZ4eHl4R0RfX3JRYVhIMzNCc0Fxa29fYXZoelRlX19IYUxRIn0.eyJleHAiOjE3MTQ5ODE3NDUsImlhdCI6MTcxNDk4MDg0NSwiYXV0aF90aW1lIjoxNzE0OTc5Njk1LCJqdGkiOiIyMzcwNTU4My1mYTE2LTQ4NWYtODNlMC0xMWIyZjg0ODEyM2YiLCJpc3MiOiJodHRwczovL2lkLjJtYXJ0ZW5zLmRlL3JlYWxtcy8ybWFydGVucyIsImF1ZCI6WyJ0c3ctdGltZXRhYmxlLWZyb250ZW5kIiwiYWNjb3VudCIsInRpbWV0YWJsZSJdLCJzdWIiOiJkOTRiMzU3My05ZjdhLTRjYmMtYTg5MS1kZGRjYWQ1MjE0YjMiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJ3YWhscmVjaHQiLCJzZXNzaW9uX3N0YXRlIjoiZGIxNmVmNzItZTUyMi00ZWE4LThjNjAtYjRjYmRiMTEzNjEyIiwiYWNyIjoiMCIsImFsbG93ZWQtb3JpZ2lucyI6WyJodHRwczovL2FwaS4ybWFydGVucy5kZSIsImh0dHA6Ly9sb2NhbGhvc3Q6MTIwMDAiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwiQ09SRV9FTEVDVElPTl9EQVRBX0NPTlRSSUJVVE9SIiwiZGVmYXVsdC1yb2xlcy13YWhscmVjaHQiLCJBRE1JTiIsInVtYV9hdXRob3JpemF0aW9uIiwiVVNFUiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7InRzdy10aW1ldGFibGUtZnJvbnRlbmQiOnsicm9sZXMiOlsiQUNUSVZFX1BMQU4iLCJQRVJTT05BTF9QTEFOIiwiRlJFRV9QTEFOIl19LCJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX0sInRpbWV0YWJsZSI6eyJyb2xlcyI6WyJBRE1JTiIsIlBFUlNPTkFMX1BMQU4iLCJGUkVFX1BMQU4iXX19LCJzY29wZSI6InByb2ZpbGUgZW1haWwiLCJzaWQiOiJkYjE2ZWY3Mi1lNTIyLTRlYTgtOGM2MC1iNGNiZGIxMTM2MTIiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwibmFtZSI6IkppbSBNYXJ0ZW5zIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiZ2l0aHViQDJtYXJ0ZW5zLmRlIiwiZ2l2ZW5fbmFtZSI6IkppbSIsImxvY2FsZSI6ImVuIiwiZmFtaWx5X25hbWUiOiJNYXJ0ZW5zIiwiZW1haWwiOiJnaXRodWJAMm1hcnRlbnMuZGUifQ.VWDniNAGZOdBbQ3rIia81VqchT9fL0PbT4TS8ORpueRTVe8j2gatwDEPz3ocIFNevNh5hv0gQpjcYT8XGh5rk8oNbHrFg48uJZC5SfINzEEq9JYUQCLf_LGiXmfCODwKaRZc6EVFYU34t7d-SXrN0qNcFooFnV7erD57GJB--19nVOAv1zsQKDV_lJYz6SHGlPZol0PBOHwRaREjgsS1zw8kNOBZYFiuaAbHCOl3rrZb0YZevB1_qtPWtdCOCEjCIlGURIU6Wn6xTNUG1MkE2yytArJS1yGUfBnDDg1mAck5q_fl0a9T7lucyhakSNjauFGUWIsJP4ADdJZhn8CDVQ
-Content-Type: application/json
-
-{
-    "name": "Bezirkswahl 2024",
-    "day": "2024-06-09",
-    "votingThreshold": "THREE",
-    "totalNumberOfSeats": 51,
-    "constituencies": [
-      {
-        "electionName": "Bezirkswahl 2024",
-        "number": 5,
-        "name": "Niendorf",
-        "numberOfSeats": 5
-      },
-      {
-        "electionName": "Bezirkswahl 2024",
-        "number": 6,
-        "name": "Schnelsen",
-        "numberOfSeats": 3
-      },
-      {
-        "electionName": "Bezirkswahl 2024",
-        "number": 7,
-        "name": "Eidelstedt",
-        "numberOfSeats": 4
-      },
-      {
-        "electionName": "Bezirkswahl 2024",
-        "number": 8,
-        "name": "Stellingen",
-        "numberOfSeats": 3
-      },
-      {
-        "electionName": "Bezirkswahl 2024",
-        "number": 4,
-        "name": "Lokstedt",
-        "numberOfSeats": 3
-      },
-      {
-        "electionName": "Bezirkswahl 2024",
-        "number": 3,
-        "name": "Rotherbaum/Harvestehude",
-        "numberOfSeats": 4
-      },
-      {
-        "electionName": "Bezirkswahl 2024",
-        "number": 1,
-        "name": "Eimsbüttel-Nord",
-        "numberOfSeats": 3
-      },
-      {
-        "electionName": "Bezirkswahl 2024",
-        "number": 2,
-        "name": "Eimsbüttel-Süd/Hoheluft-West",
-"numberOfSeats": 5
-}
-]
-}

module-deploy/deploy.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
 
 jib {
     from {
-        image = "amazoncorretto:" + properties["projectSourceCompatibility"] + "-alpine"
+        image = "amazoncorretto:" + properties["projectSourceCompatibility"]
         platforms {
             platform {
                 architecture = "amd64"

module-server/server.gradle.kts

@@ -9,4 +9,6 @@ dependencies {
     implementation(libs.bundles.spring.boot.security)
     annotationProcessor(libs.mapstruct.processor)
     kapt(libs.mapstruct.processor)
+    implementation(libs.spring.cloud.starter.config)
+    implementation(libs.spring.cloud.starter.bus.kafka)
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/MainApplication.kt

@@ -3,11 +3,13 @@ package de.twomartens.wahlrecht
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 import org.springframework.data.mongodb.config.EnableMongoAuditing
+import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories
 import org.springframework.scheduling.annotation.EnableScheduling
 
 @EnableMongoAuditing
 @EnableScheduling
 @SpringBootApplication
+@EnableReactiveMongoRepositories
 open class MainApplication
 
 fun main(args: Array<String>) {

module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/FilterConfiguration.kt

@@ -1,13 +0,0 @@
-package de.twomartens.wahlrecht.configuration
-
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.web.filter.ForwardedHeaderFilter
-
-@Configuration
-open class FilterConfiguration {
-  @Bean
-  open fun forwardedFilter(): ForwardedHeaderFilter {
-    return ForwardedHeaderFilter()
-  }
-}

module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/InterceptorConfiguration.kt

@@ -8,13 +8,13 @@ import java.time.Clock
 
 @Configuration
 open class InterceptorConfiguration {
-  @Bean
-  open fun loggingInterceptorRest(clock: Clock): LoggingInterceptorRest {
-    return LoggingInterceptorRest(clock)
-  }
+    @Bean
+    open fun loggingInterceptorRest(clock: Clock): LoggingInterceptorRest {
+        return LoggingInterceptorRest(clock)
+    }
 
-  @Bean
-  open fun headerInterceptorRest(): HeaderInterceptorRest {
-    return HeaderInterceptorRest()
-  }
+    @Bean
+    open fun headerInterceptorRest(): HeaderInterceptorRest {
+        return HeaderInterceptorRest()
+    }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/OpenApiConfiguration.kt

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.security.OAuthFlows
 import io.swagger.v3.oas.annotations.security.SecurityScheme
 import io.swagger.v3.oas.models.OpenAPI
 import io.swagger.v3.oas.models.info.Info
+import io.swagger.v3.oas.models.servers.Server
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -15,9 +16,9 @@ import org.springframework.context.annotation.Configuration
     name = "oauth2",
     type = SecuritySchemeType.OAUTH2,
     flows = OAuthFlows(
-        authorizationCode = OAuthFlow(
-            authorizationUrl = "https://id.2martens.de/realms/twomartens/protocol/openid-connect/auth",
-            tokenUrl = "https://id.2martens.de/realms/twomartens/protocol/openid-connect/token"
+        implicit = OAuthFlow(
+            authorizationUrl = "https://id.2martens.de/realms/2martens/protocol/openid-connect/auth",
+            tokenUrl = "https://id.2martens.de/realms/2martens/protocol/openid-connect/token"
         )
     )
 )
@@ -35,5 +36,7 @@ open class OpenApiConfiguration {
                     .version(apiVersion)
                     .description(apiDescription)
             )
+            .addServersItem(Server().url("http://localhost:12000"))
+            .addServersItem(Server().url("https://api.2martens.de"))
     }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/WebSecurityConfiguration.kt

@@ -11,10 +11,13 @@ import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpMethod
+import org.springframework.security.config.Customizer
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
+import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer
 import org.springframework.security.oauth2.jwt.JwtDecoder
 import org.springframework.security.oauth2.jwt.NimbusJwtDecoder
+import org.springframework.security.oauth2.server.resource.web.authentication.BearerTokenAuthenticationFilter
 import org.springframework.security.web.SecurityFilterChain
 import java.io.IOException
 
@@ -35,6 +38,8 @@ open class WebSecurityConfiguration {
             .authorizeHttpRequests { it.requestMatchers(*PERMITTED_PATHS.toTypedArray<String>()).permitAll() }
             .authorizeHttpRequests { it.requestMatchers(HttpMethod.OPTIONS).permitAll() }
             .authorizeHttpRequests { it.anyRequest().authenticated() }
+            .oauth2ResourceServer { obj: OAuth2ResourceServerConfigurer<HttpSecurity?> -> obj.jwt(Customizer.withDefaults()) }
+            .addFilterAfter(createPolicyEnforcerFilter(), BearerTokenAuthenticationFilter::class.java)
         return http.build()
     }
 

module-server/src/main/kotlin/de/twomartens/wahlrecht/controller/v1/CalculationController.kt

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
+import reactor.core.publisher.Mono
 
 @RestController
 @RequestMapping(value = ["/wahlrecht/v1"])
@@ -47,12 +48,12 @@ class CalculationController(private val service: CalculationService) {
     @SecurityRequirement(name = "oauth2")
     fun calculateResult(
         @RequestBody electionResult: ElectionResult
-    ): ResponseEntity<ElectedCandidates> {
+    ): ResponseEntity<Mono<ElectedCandidates>> {
         val result = electedCandidatesMapper.mapToExternal(
             service.determineElectedCandidates(electionResultMapper.mapToInternal(electionResult))
         )
         return ResponseEntity.ok()
             .contentType(MediaType.APPLICATION_JSON)
-            .body(result)
+            .body(Mono.just(result))
     }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/controller/v1/ElectionController.kt

@@ -14,10 +14,11 @@ import io.swagger.v3.oas.annotations.tags.Tag
 import org.mapstruct.factory.Mappers
 import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
-import org.springframework.http.ResponseEntity.created
-import org.springframework.http.ResponseEntity.ok
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.util.UriComponentsBuilder
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+import reactor.util.function.Tuples
 
 @RestController
 @RequestMapping(value = ["/wahlrecht/v1"])
@@ -27,7 +28,7 @@ class ElectionController(private val service: ElectionService) {
 
   @SecurityRequirement(name = "oauth2")
   @SecurityRequirement(name = "bearerAuth")
-  @GetMapping(value = ["/elections"], produces = [MediaType.APPLICATION_JSON_VALUE])
+  @GetMapping(value = ["/elections"])
   @Operation(
       summary = "Returns all stored elections",
       responses = [ApiResponse(
@@ -43,13 +44,12 @@ class ElectionController(private val service: ElectionService) {
           )]
       )]
   )
-  fun getElections(): ResponseEntity<Collection<Election>> {
-    val elections = service.elections.asSequence()
-        .map { mapper.mapToExternal(it.value) }
-        .toList()
-    return ResponseEntity.ok()
-        .contentType(MediaType.APPLICATION_JSON)
-        .body(elections)
+  fun getElections(): Flux<Election> {
+    val elections = service.getElections()
+        .map {
+          mapper.mapToExternal(it)
+        }
+    return elections
   }
 
   @Operation(
@@ -64,10 +64,11 @@ class ElectionController(private val service: ElectionService) {
   @SecurityRequirement(name = "bearerAuth")
   @SecurityRequirement(name = "oauth2")
   fun getElectionByName(
-      @PathVariable @Parameter(description = "the election name", example = "Bezirkswahl 2019") electionName: String?
-  ): ResponseEntity<Election> {
-    val election = mapper.mapToExternal(service.elections[electionName]!!)
-    return ok()
+      @PathVariable @Parameter(description = "the election name", example = "Bezirkswahl 2019") electionName: String
+  ): ResponseEntity<Mono<Election>> {
+    val election = service.findElectionByName(electionName)
+        .map { mapper.mapToExternal(it) }
+    return ResponseEntity.ok()
         .contentType(MediaType.APPLICATION_JSON)
         .body(election)
   }
@@ -86,14 +87,22 @@ class ElectionController(private val service: ElectionService) {
   @PutMapping("/election")
   @SecurityRequirement(name = "bearerAuth")
   @SecurityRequirement(name = "oauth2")
-  fun putElection(@RequestBody election: Election?, uriComponentsBuilder: UriComponentsBuilder):
-      ResponseEntity<Void> {
-    val createdNew = service.storeElection(mapper.mapToDB(election!!))
-    return if (createdNew) {
-      created(uriComponentsBuilder.path("/elections/{electionName}")
-          .buildAndExpand(election.name).toUri())
-          .build()
-    }
-    else ok().build()
+  fun putElection(@RequestBody election: Election, uriComponentsBuilder: UriComponentsBuilder): Mono<ResponseEntity<Election>> {
+    return service.storeElection(mapper.mapToDB(election))
+        .map { tuple ->
+          Tuples.of(tuple.t1, mapper.mapToExternal(tuple.t2))
+        }
+        .map { tuple ->
+          if (tuple.t1) {
+            ResponseEntity.created(uriComponentsBuilder.path("/elections/{electionName}")
+                .buildAndExpand(tuple.t2.name).toUri())
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(tuple.t2)
+          } else {
+            ResponseEntity.ok()
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(tuple.t2)
+          }
+        }
   }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/controller/v1/ElectionResultController.kt

@@ -16,10 +16,10 @@ import lombok.extern.slf4j.Slf4j
 import org.mapstruct.factory.Mappers
 import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
-import org.springframework.http.ResponseEntity.created
-import org.springframework.http.ResponseEntity.ok
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.util.UriComponentsBuilder
+import reactor.core.publisher.Mono
+import reactor.util.function.Tuples
 
 @Slf4j
 @RestController
@@ -27,57 +27,72 @@ import org.springframework.web.util.UriComponentsBuilder
 @RequestMapping(value = ["/wahlrecht/v1"])
 @Tag(name = "ElectionResults", description = "all requests relating to election results")
 class ElectionResultController(private val service: ElectionResultService) {
-    private val mapper = Mappers.getMapper(ElectionResultMapper::class.java)
+  private val mapper = Mappers.getMapper(ElectionResultMapper::class.java)
 
-    @Operation(
-        summary = "Returns election result for given election name",
-        responses = [ApiResponse(
-            responseCode = "200",
-            description = "Returns stored election result for given election name",
-            content = [Content(mediaType = "application/json", schema = Schema(implementation = ElectionResult::class))]
-        ), ApiResponse(
-            responseCode = "404",
-            description = "No election result found",
-            content = [Content(mediaType = "application/json", schema = Schema(implementation = ErrorMessage::class))]
-        )]
-    )
-    @GetMapping(
-        value = ["/electionResults/{electionName}"],
-        produces = [MediaType.APPLICATION_JSON_VALUE]
-    )
-    @SecurityRequirement(name = "bearerAuth")
-    @SecurityRequirement(name = "oauth2")
-    fun getElectionResultByElectionName(
-        @PathVariable @Parameter(description = "the election name", example = "Bezirkswahl 2019") electionName: String
-    ): ResponseEntity<ElectionResult> {
-        val result = mapper.mapToExternal(service.getElectionResult(electionName))
-        return ok()
-            .contentType(MediaType.APPLICATION_JSON)
-            .body(result)
-    }
-
-    @Operation(
-        summary = "Stores a new election",
-        responses = [ApiResponse(
-            responseCode = "201",
-            description = "Election was created"
-        ), ApiResponse(responseCode = "200", description = "Election was modified"), ApiResponse(
-            responseCode = "401",
-            description = "Unauthorized",
-            content = [Content(mediaType = "plain/text")]
-        )]
-    )
-    @PutMapping("/electionResult")
-    @SecurityRequirement(name = "bearerAuth")
-    @SecurityRequirement(name = "oauth2")
-    fun putElection(@RequestBody electionResult: ElectionResult?,
-                    uriComponentsBuilder: UriComponentsBuilder): ResponseEntity<Void> {
-        val createdNew = service.storeResult(mapper.mapToDB(electionResult!!))
-        return if (createdNew) {
-          created(uriComponentsBuilder.path("/electionResult/{electionName}")
-              .buildAndExpand(electionResult.electionName).toUri())
-              .build()
+  @Operation(
+      summary = "Returns election result for given election name",
+      responses = [ApiResponse(
+          responseCode = "200",
+          description = "Returns stored election result for given election name",
+          content = [Content(mediaType = "application/json", schema = Schema(implementation = ElectionResult::class))]
+      ), ApiResponse(
+          responseCode = "404",
+          description = "No election result found",
+          content = [Content(mediaType = "application/json", schema = Schema(implementation = ErrorMessage::class))]
+      )]
+  )
+  @GetMapping(
+      value = ["/electionResult/{electionName}"],
+      produces = [MediaType.APPLICATION_JSON_VALUE]
+  )
+  @SecurityRequirement(name = "bearerAuth")
+  @SecurityRequirement(name = "oauth2")
+  fun getElectionByName(
+      @PathVariable @Parameter(description = "the election name", example = "Bezirkswahl 2019") electionName: String
+  ): Mono<ResponseEntity<ElectionResult>> {
+    return service.getElectionResult(electionName)
+        .map {
+          mapper.mapToExternal(it)
         }
-        else ok().build()
-    }
+        .map {
+          ResponseEntity.ok()
+              .contentType(MediaType.APPLICATION_JSON)
+              .body(it)
+        }
+  }
+
+  @Operation(
+      summary = "Stores a new election",
+      responses = [ApiResponse(
+          responseCode = "201",
+          description = "Election was created"
+      ), ApiResponse(responseCode = "200", description = "Election was modified"), ApiResponse(
+          responseCode = "401",
+          description = "Unauthorized",
+          content = [Content(mediaType = "plain/text")]
+      )]
+  )
+  @PutMapping("/electionResult")
+  @SecurityRequirement(name = "bearerAuth")
+  @SecurityRequirement(name = "oauth2")
+  fun putElection(@RequestBody electionResult: ElectionResult,
+                  uriComponentsBuilder: UriComponentsBuilder): Mono<ResponseEntity<ElectionResult>> {
+    val storedElection = service.storeResult(mapper.mapToDB(electionResult))
+    return storedElection
+        .map { tuple ->
+          Tuples.of(tuple.t1, mapper.mapToExternal(tuple.t2))
+        }
+        .map { tuple ->
+          if (tuple.t1) {
+            ResponseEntity.created(uriComponentsBuilder.path("/electionResult/{electionName}")
+                .buildAndExpand(tuple.t2.electionName).toUri())
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(tuple.t2)
+          } else {
+            ResponseEntity.ok()
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(tuple.t2)
+          }
+        }
+  }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/controller/v1/PartyController.kt

@@ -20,6 +20,9 @@ import org.springframework.http.ResponseEntity.ok
 import org.springframework.stereotype.Controller
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.util.UriComponentsBuilder
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+import reactor.util.function.Tuples
 
 @Controller
 @RequestMapping(value = ["/wahlrecht/v1"])
@@ -42,26 +45,23 @@ class PartyController(private val service: PartyService) {
           content = [Content(mediaType = "application/json", schema = Schema(implementation = ErrorMessage::class))]
       )]
   )
-  @GetMapping(value = ["/parties/{electionName}"], produces = [MediaType.APPLICATION_JSON_VALUE])
+  @GetMapping(value = ["/parties/by-election-name/{electionName}"], produces = [MediaType.APPLICATION_JSON_VALUE])
   @SecurityRequirement(name = "bearerAuth")
   @SecurityRequirement(name = "oauth2")
   fun getPartiesByElectionName(
       @PathVariable @Parameter(description = "the election name", example = "Bezirkswahl 2019") electionName: String
-  ): ResponseEntity<Collection<PartyInElection>> {
-    val parties = service.getPartiesByElectionName(electionName).stream()
-        .map { election: de.twomartens.wahlrecht.model.db.PartyInElection? ->
-          mapper.mapToExternal(
-              election!!
-          )
+  ): ResponseEntity<Flux<PartyInElection>> {
+    val parties = service.getPartiesByElectionName(electionName)
+        .map { election: de.twomartens.wahlrecht.model.db.PartyInElection ->
+          mapper.mapToExternal(election)
         }
-        .toList()
     return ok()
         .contentType(MediaType.APPLICATION_JSON)
         .body(parties)
   }
 
   @Operation(
-      summary = "Returns stored party for given election name and party abbreviation",
+      summary = "Returns party stored for given election name and abbreviation",
       responses = [ApiResponse(
           responseCode = "200",
           description = "Returns stored party",
@@ -81,10 +81,11 @@ class PartyController(private val service: PartyService) {
   fun getPartyByElectionNameAndAbbreviation(
       @PathVariable @Parameter(description = "the election name", example = "Bezirkswahl 2019") electionName: String,
       @PathVariable @Parameter(description = "the party abbreviation", example = "SPD") abbreviation: String
-  ): ResponseEntity<PartyInElection> {
-    val party = mapper.mapToExternal(
-        service.getPartyByElectionNameAndAbbreviation(electionName, abbreviation)
-    )
+  ): ResponseEntity<Mono<PartyInElection>> {
+    val party = service.getPartyByElectionNameAndAbbreviation(electionName, abbreviation)
+        .map { stored: de.twomartens.wahlrecht.model.db.PartyInElection ->
+          mapper.mapToExternal(stored)
+        }
     return ok()
         .contentType(MediaType.APPLICATION_JSON)
         .body(party)
@@ -103,13 +104,24 @@ class PartyController(private val service: PartyService) {
   @PutMapping("/party")
   @SecurityRequirement(name = "bearerAuth")
   @SecurityRequirement(name = "oauth2")
-  fun putParty(@RequestBody party: PartyInElection?,
-               uriComponentsBuilder: UriComponentsBuilder): ResponseEntity<Void> {
-    val createdNew = service.storeParty(mapper.mapToDB(party!!))
-    return if (createdNew) {
-      created(uriComponentsBuilder.path("/parties/{electionName}/{abbreviation}")
-          .buildAndExpand(party.electionName, party.abbreviation).toUri())
-          .build()
-    } else ok().build()
+  fun putParty(@RequestBody party: PartyInElection,
+               uriComponentsBuilder: UriComponentsBuilder): Mono<ResponseEntity<PartyInElection>> {
+    val storedParty = service.storeParty(mapper.mapToDB(party))
+    return storedParty
+        .map { tuple ->
+          Tuples.of(tuple.t1, mapper.mapToExternal(tuple.t2))
+        }
+        .map { tuple ->
+          if (tuple.t1) {
+            created(uriComponentsBuilder.path("/parties/{electionName}/{abbreviation}")
+                .buildAndExpand(tuple.t2.electionName, tuple.t2.abbreviation).toUri())
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(tuple.t2)
+          } else {
+            ok()
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(tuple.t2)
+          }
+        }
   }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/model/db/Nomination.kt

@@ -7,27 +7,30 @@ import org.springframework.data.annotation.Id
 import org.springframework.data.annotation.LastModifiedDate
 import org.springframework.data.mongodb.core.index.CompoundIndex
 import org.springframework.data.mongodb.core.mapping.Document
+import org.springframework.data.mongodb.core.mapping.DocumentReference
 import java.time.Instant
 
 @Document
 @EqualsAndHashCode
 @CompoundIndex(def = "{'name': 1, 'partyAbbreviation': 1, 'electionName': 1}")
 class Nomination {
-    @EqualsAndHashCode.Exclude
-    @Id
-    var id: ObjectId? = null
+  @EqualsAndHashCode.Exclude
+  @Id
+  var id: ObjectId? = null
 
-    @EqualsAndHashCode.Exclude
-    @CreatedDate
-    var created: Instant? = null
+  @EqualsAndHashCode.Exclude
+  @CreatedDate
+  var created: Instant? = null
 
-    @EqualsAndHashCode.Exclude
-    @LastModifiedDate
-    var lastModified: Instant? = null
+  @EqualsAndHashCode.Exclude
+  @LastModifiedDate
+  var lastModified: Instant? = null
 
-    var name: String = ""
-    var partyAbbreviation: String = ""
-    var electionName: String = ""
-    var candidates: Collection<Candidate> = emptyList()
-    var supportVotesOnNomination = false
+  var name: String = ""
+  var partyAbbreviation: String = ""
+  var electionName: String = ""
+
+  @DocumentReference
+  var candidates: Collection<Candidate> = emptyList()
+  var supportVotesOnNomination = false
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/property/ServiceProperties.kt

@@ -2,12 +2,13 @@ package de.twomartens.wahlrecht.property
 
 import io.swagger.v3.oas.annotations.media.Schema
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.bind.ConstructorBinding
+import org.springframework.cloud.context.config.annotation.RefreshScope
 import java.time.ZoneId
 
+@RefreshScope
 @ConfigurationProperties(prefix = "de.twomartens.wahlrecht")
 @Schema(description = "Properties, to configure this Application")
-data class ServiceProperties @ConstructorBinding constructor(
-    val defaultTimeZone: ZoneId,
-    val greeting: String
-)
+class ServiceProperties {
+    lateinit var defaultTimeZone: ZoneId
+    lateinit var greeting: String
+}

module-server/src/main/kotlin/de/twomartens/wahlrecht/property/StatusProbeProperties.kt

@@ -4,9 +4,11 @@ import io.swagger.v3.oas.annotations.media.Schema
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.bind.ConstructorBinding
 import org.springframework.boot.convert.DurationUnit
+import org.springframework.cloud.context.config.annotation.RefreshScope
 import java.time.Duration
 import java.time.temporal.ChronoUnit
 
+@RefreshScope
 @ConfigurationProperties(prefix = "de.twomartens.wahlrecht.statusprobe")
 @Schema(description = "Properties, to configure this Application")
 data class StatusProbeProperties @ConstructorBinding constructor(

module-server/src/main/kotlin/de/twomartens/wahlrecht/repository/CandidateRepository.kt

@@ -1,6 +1,31 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.Candidate
-import org.springframework.data.mongodb.repository.MongoRepository
+import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
 
-interface CandidateRepository : MongoRepository<Candidate, String>
+interface CandidateRepository : ReactiveMongoRepository<Candidate, String> {
+  fun findByName(name: String): Mono<Candidate>
+
+  fun findAndModify(new: Candidate): Mono<Candidate> {
+    val existing = findByName(new.name)
+    return existing.hasElement().flatMap { hasElement ->
+      if (hasElement) {
+        existing.flatMap { old ->
+          old.profession = new.profession
+          save(old)
+        }
+      } else {
+        save(new)
+      }
+    }
+  }
+
+  fun findAllAndModify(new: Collection<Candidate>): Flux<Candidate> {
+    val existing = new.map {
+      findAndModify(it)
+    }
+    return Flux.merge(existing)
+  }
+}

module-server/src/main/kotlin/de/twomartens/wahlrecht/repository/ConstituencyRepository.kt

@@ -1,6 +1,27 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.Constituency
-import org.springframework.data.mongodb.repository.MongoRepository
+import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import reactor.core.publisher.Mono
 
-interface ConstituencyRepository : MongoRepository<Constituency, String>
+interface ConstituencyRepository : ReactiveMongoRepository<Constituency, String> {
+  fun findByElectionNameAndNumber(electionName: String, number: Int): Mono<Constituency>
+
+  fun findAndModify(new: Constituency): Mono<Constituency> {
+    val existing = findByElectionNameAndNumber(
+        new.electionName,
+        new.number)
+
+    return existing.hasElement().flatMap { hasElement ->
+      if (hasElement) {
+        existing.flatMap { old ->
+          old.name = new.name
+          old.numberOfSeats = new.numberOfSeats
+          save(old)
+        }
+      } else {
+        save(new)
+      }
+    }
+  }
+}

module-server/src/main/kotlin/de/twomartens/wahlrecht/repository/ElectionRepository.kt

@@ -1,6 +1,27 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.Election
-import org.springframework.data.mongodb.repository.MongoRepository
+import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import reactor.core.publisher.Mono
+import reactor.util.function.Tuple2
 
-interface ElectionRepository : MongoRepository<Election, String>
+interface ElectionRepository : ReactiveMongoRepository<Election, String> {
+  fun findByName(name: String): Mono<Election>
+
+  fun findAndModify(new: Election): Mono<Tuple2<Boolean, Election>> {
+    val electionName = new.name
+    val existing = findByName(electionName)
+    return existing.hasElement().flatMap { hasElement ->
+      if (hasElement) {
+        existing.flatMap { old ->
+          old.constituencies = new.constituencies
+          old.totalNumberOfSeats = new.totalNumberOfSeats
+          old.votingThreshold = new.votingThreshold
+          Mono.just(false).zipWith(save(old))
+        }
+      } else {
+        Mono.just(true).zipWith(save(new))
+      }
+    }
+  }
+}

module-server/src/main/kotlin/de/twomartens/wahlrecht/repository/ElectionResultRepository.kt

@@ -1,6 +1,25 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.ElectionResult
-import org.springframework.data.mongodb.repository.MongoRepository
+import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import reactor.core.publisher.Mono
+import reactor.util.function.Tuple2
 
-interface ElectionResultRepository : MongoRepository<ElectionResult, String>
+interface ElectionResultRepository : ReactiveMongoRepository<ElectionResult, String> {
+  fun findByElectionName(electionName: String): Mono<ElectionResult>
+
+  fun findAndModify(new: ElectionResult): Mono<Tuple2<Boolean, ElectionResult>> {
+    val existing = findByElectionName(new.electionName)
+    return existing.hasElement().flatMap { hasElement ->
+      if (hasElement) {
+        existing.flatMap { old ->
+          old.overallResults = new.overallResults
+          old.constituencyResults = new.constituencyResults
+          Mono.just(false).zipWith(save(old))
+        }
+      } else {
+        Mono.just(true).zipWith(save(new))
+      }
+    }
+  }
+}

module-server/src/main/kotlin/de/twomartens/wahlrecht/repository/NominationRepository.kt

@@ -1,6 +1,31 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.Nomination
-import org.springframework.data.mongodb.repository.MongoRepository
+import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import reactor.core.publisher.Mono
+import reactor.core.scheduler.Schedulers
 
-interface NominationRepository : MongoRepository<Nomination, String>
+interface NominationRepository : ReactiveMongoRepository<Nomination, String> {
+  fun findByElectionNameAndPartyAbbreviationAndName(electionName: String,
+                                                             abbreviation: String,
+                                                             name: String): Mono<Nomination>
+
+  fun findAndModify(new: Nomination): Mono<Nomination> {
+    val existing = findByElectionNameAndPartyAbbreviationAndName(
+        new.electionName,
+        new.partyAbbreviation,
+        new.name
+    )
+    return existing.hasElement().flatMap { hasElement ->
+      if (hasElement) {
+        existing.publishOn(Schedulers.boundedElastic()).publishOn(Schedulers.boundedElastic()).flatMap { old ->
+          old.supportVotesOnNomination = new.supportVotesOnNomination
+          old.candidates = new.candidates
+          save(old)
+        }
+      } else {
+        save(new)
+      }
+    }
+  }
+}

module-server/src/main/kotlin/de/twomartens/wahlrecht/repository/PartyRepository.kt

@@ -1,10 +1,30 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.PartyInElection
-import org.springframework.data.mongodb.repository.MongoRepository
+import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+import reactor.util.function.Tuple2
 
-interface PartyRepository : MongoRepository<PartyInElection, String> {
-    fun findByElectionName(name: String): Collection<PartyInElection>
+interface PartyRepository : ReactiveMongoRepository<PartyInElection, String> {
 
-    fun findByElectionNameAndAbbreviation(electionName: String, abbreviation: String): PartyInElection?
+  fun findByElectionName(name: String): Flux<PartyInElection>
+
+  fun findByElectionNameAndAbbreviation(electionName: String, abbreviation: String): Mono<PartyInElection>
+
+  fun findAndModify(party: PartyInElection): Mono<Tuple2<Boolean, PartyInElection>> {
+    val existing = findByElectionNameAndAbbreviation(party.electionName, party.abbreviation)
+    return existing.hasElement().flatMap { hasElement ->
+      if (hasElement) {
+        existing.flatMap { old ->
+          old.name = party.name
+          old.overallNomination = party.overallNomination
+          old.constituencyNominations = party.constituencyNominations
+          Mono.just(false).zipWith(save(old))
+        }
+      } else {
+        Mono.just(true).zipWith(save(party))
+      }
+    }
+  }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/security/SpringPolicyEnforcer.kt

@@ -13,54 +13,53 @@ import org.keycloak.representations.idm.authorization.Permission
 class SpringPolicyEnforcer(private val policyEnforcer: PolicyEnforcer,
                            private val policyEnforcerConfig: PolicyEnforcerConfig) {
 
-  fun enforce(request: HttpRequest, response: HttpResponse): AuthorizationContext {
-    if (log.isDebugEnabled) {
-      log.debug("Policy enforcement is enabled. Enforcing policy decisions for path [{}].", request.uri)
+    fun enforce(request: HttpRequest, response: HttpResponse): AuthorizationContext {
+        if (log.isDebugEnabled) {
+            log.debug("Policy enforcement is enabled. Enforcing policy decisions for path [{}].", request.uri)
+        }
+        val context = authorize(request, response)
+        if (log.isDebugEnabled) {
+            log.debug("Policy enforcement result for path [{}] is : {}", request.uri, if (context.isGranted) "GRANTED" else "DENIED")
+            log.debug("Returning authorization context with permissions:")
+            for (permission in context.permissions) {
+                log.debug(permission.toString())
+            }
+        }
+        return context
     }
-    val context = authorize(request, response)
-    if (log.isDebugEnabled) {
-      log.debug("Policy enforcement result for path [{}] is : {}", request.uri, if (context.isGranted) "GRANTED" else "DENIED")
-      log.debug("Returning authorization context with permissions:")
-      for (permission in context.permissions) {
-        log.debug(permission.toString())
-      }
+
+    private fun authorize(request: HttpRequest, response: HttpResponse): AuthorizationContext {
+        val enforcementMode = policyEnforcerConfig.enforcementMode
+        return if (EnforcementMode.DISABLED == enforcementMode) {
+            createAuthorizedContext()
+        } else policyEnforcer.enforce(request, response)
     }
-    return context
-  }
 
-  private fun authorize(request: HttpRequest, response: HttpResponse): AuthorizationContext {
-    val enforcementMode = policyEnforcerConfig.enforcementMode
-    log.debug("Authorize with enforcement mode: [{}]", enforcementMode)
-    return if (EnforcementMode.DISABLED == enforcementMode) {
-      createAuthorizedContext()
-    } else policyEnforcer.enforce(request, response)
-  }
+    private fun createAuthorizedContext(): AuthorizationContext {
+        return object : ClientAuthorizationContext(policyEnforcer.authzClient) {
+            override fun hasPermission(resourceName: String, scopeName: String): Boolean {
+                return true
+            }
 
-  private fun createAuthorizedContext(): AuthorizationContext {
-    return object : ClientAuthorizationContext(policyEnforcer.authzClient) {
-      override fun hasPermission(resourceName: String, scopeName: String): Boolean {
-        return true
-      }
+            override fun hasResourcePermission(resourceName: String): Boolean {
+                return true
+            }
 
-      override fun hasResourcePermission(resourceName: String): Boolean {
-        return true
-      }
+            override fun hasScopePermission(scopeName: String): Boolean {
+                return true
+            }
 
-      override fun hasScopePermission(scopeName: String): Boolean {
-        return true
-      }
+            override fun getPermissions(): List<Permission> {
+                return emptyList()
+            }
 
-      override fun getPermissions(): List<Permission> {
-        return emptyList()
-      }
-
-      override fun isGranted(): Boolean {
-        return true
-      }
+            override fun isGranted(): Boolean {
+                return true
+            }
+        }
     }
-  }
 
-  companion object {
-    private val log = KotlinLogging.logger {}
-  }
+    companion object {
+        private val log = KotlinLogging.logger {}
+    }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/security/SpringPolicyEnforcerFilter.kt

@@ -12,15 +12,18 @@ import org.keycloak.adapters.authorization.spi.ConfigurationResolver
 import org.keycloak.adapters.authorization.spi.HttpRequest
 import org.keycloak.representations.adapters.config.PolicyEnforcerConfig
 import java.io.IOException
+import java.util.concurrent.ConcurrentHashMap
 
 
 class SpringPolicyEnforcerFilter(private val configResolver: ConfigurationResolver) : Filter {
+    private val policyEnforcer: MutableMap<PolicyEnforcerConfig, SpringPolicyEnforcer> = ConcurrentHashMap()
+
     @Throws(IOException::class, ServletException::class)
     override fun doFilter(servletRequest: ServletRequest, servletResponse: ServletResponse?, filterChain: FilterChain) {
         val request = servletRequest as HttpServletRequest
         val response = servletResponse as HttpServletResponse?
         val httpRequest = ServletHttpRequest(request) { extractBearerToken(request) }
-        val policyEnforcer = createPolicyEnforcer(httpRequest)
+        val policyEnforcer = getOrCreatePolicyEnforcer(httpRequest)
         val authzContext = policyEnforcer.enforce(httpRequest, ServletHttpResponse(response))
         request.setAttribute(AuthorizationContext::class.java.name, authzContext)
         if (authzContext.isGranted) {
@@ -50,8 +53,8 @@ class SpringPolicyEnforcerFilter(private val configResolver: ConfigurationResolv
         return null
     }
 
-    private fun createPolicyEnforcer(request: HttpRequest): SpringPolicyEnforcer {
-        return createPolicyEnforcer(configResolver.resolve(request))
+    private fun getOrCreatePolicyEnforcer(request: HttpRequest): SpringPolicyEnforcer {
+        return policyEnforcer.computeIfAbsent(configResolver.resolve(request)) { createPolicyEnforcer(it) }
     }
 
     private fun createPolicyEnforcer(enforcerConfig: PolicyEnforcerConfig): SpringPolicyEnforcer {

module-server/src/main/kotlin/de/twomartens/wahlrecht/service/CalculationService.kt

@@ -17,9 +17,9 @@ class CalculationService(
         log.info("Calculate election result for election {}", electionResult.electionName)
         val stopWatch = StopWatch()
         stopWatch.start("determineElectedCandidates")
-        val election = electionService.getElectionInternal(electionResult.electionName)
+        val election = electionService.getElectionInternal(electionResult.electionName).block()
         val seatResult = calculateOverallSeatDistribution(
-            election,
+            election!!,
             electionResult.overallResults
         )
         val constituencyResults: MutableMap<Int, ElectedResult> = HashMap()
@@ -192,8 +192,8 @@ class CalculationService(
             .toMap()
             .toMutableMap()
         val nominationId = votingResult.nominationId
-        val nomination = nominationService.getNominationInternal(nominationId)
-        if (nomination.supportsVotesOnNomination()) {
+        val nomination = nominationService.getNominationInternal(nominationId).block()
+        if (nomination!!.supportsVotesOnNomination()) {
             val seatsByNomination = calculateSeatsByNominationOrder(votingResult, numberOfSeats)
             seatsByVoteOrder = numberOfSeats - seatsByNomination
             val candidates = nomination.getCandidates()
@@ -247,7 +247,6 @@ class CalculationService(
         var assignedSeats: Long
         var assignedSeatsPerVotingResult: Map<VotingResult, Int>
         log.debug("Calculate assigned seats with initial election number {}", electionNumber)
-        var numberOfAttempts = 5
         do {
             electionNumberHistory.add(electionNumber)
             val seatsPerVotingResult: MutableMap<VotingResult, Double> = mutableMapOf()
@@ -278,11 +277,7 @@ class CalculationService(
                 )
                 log.debug("Calculated higher election number {}", electionNumber)
             }
-            numberOfAttempts--
-        } while (assignedSeats != numberOfSeats.toLong() && numberOfAttempts > 0)
-        if (numberOfAttempts == 0 && assignedSeats != numberOfSeats.toLong()) {
-          log.error("With the given result, the solution can never be calculated")
-        }
+        } while (assignedSeats != numberOfSeats.toLong())
         return assignedSeatsPerVotingResult
     }
 

module-server/src/main/kotlin/de/twomartens/wahlrecht/service/CandidateService.kt

@@ -3,33 +3,17 @@ package de.twomartens.wahlrecht.service
 import de.twomartens.wahlrecht.model.db.Candidate
 import de.twomartens.wahlrecht.repository.CandidateRepository
 import org.springframework.stereotype.Service
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
 
 @Service
 class CandidateService(private val repository: CandidateRepository) {
-    private val candidates: MutableMap<String, Candidate> by lazy {
-        fetchCandidates()
-    }
 
-    fun storeCandidate(candidate: Candidate): Candidate {
-        var result = candidate
-        val existing = candidates[candidate.name]
-        val needsUpdate = candidate != existing
-        if (!needsUpdate && existing != null) {
-            return existing
-        }
-        if (existing != null) {
-            existing.profession = candidate.profession
-            result = existing
-        }
-        result = repository.save(result)
-        candidates[candidate.name] = candidate
-        return result
-    }
+  fun storeCandidate(candidate: Candidate): Mono<Candidate> {
+    return repository.findAndModify(candidate)
+  }
 
-    private fun fetchCandidates(): MutableMap<String, Candidate> {
-        return repository.findAll().asSequence()
-            .map { Pair(it.name, it) }
-            .toMap()
-            .toMutableMap()
-    }
+  fun storeCandidates(candidates: Collection<Candidate>): Flux<Candidate> {
+    return Flux.merge(candidates.map { storeCandidate(it) })
+  }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/service/ConstituencyService.kt

@@ -1,40 +1,14 @@
 package de.twomartens.wahlrecht.service
 
 import de.twomartens.wahlrecht.model.db.Constituency
-import de.twomartens.wahlrecht.model.internal.ConstituencyId
 import de.twomartens.wahlrecht.repository.ConstituencyRepository
 import org.springframework.stereotype.Service
+import reactor.core.publisher.Flux
 
 @Service
 class ConstituencyService(private val repository: ConstituencyRepository) {
-    private val constituencies: MutableMap<ConstituencyId, Constituency> by lazy {
-        fetchConstituencies()
-    }
 
-    fun storeConstituency(constituency: Constituency): Constituency {
-        var result = constituency
-        val constituencyId = ConstituencyId(
-            constituency.electionName,
-            constituency.number
-        )
-        val existing = constituencies[constituencyId]
-        if (constituency == existing) {
-            return existing
-        }
-        if (existing != null) {
-            existing.numberOfSeats = constituency.numberOfSeats
-            existing.name = constituency.name
-            result = existing
-        }
-        val stored = repository.save(result)
-        constituencies[constituencyId] = stored
-        return stored
-    }
-
-    private fun fetchConstituencies(): MutableMap<ConstituencyId, Constituency> {
-        return repository.findAll().asSequence()
-            .map { Pair(ConstituencyId(electionName = it.electionName, number = it.number), it) }
-            .toMap()
-            .toMutableMap()
-    }
+  fun storeConstituencies(constituencies: Collection<Constituency>): Flux<Constituency> {
+    return Flux.merge(constituencies.map { repository.findAndModify(it) })
+  }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/service/ElectionResultService.kt

@@ -5,45 +5,20 @@ import de.twomartens.wahlrecht.repository.ElectionResultRepository
 import org.springframework.http.HttpStatus
 import org.springframework.stereotype.Service
 import org.springframework.web.server.ResponseStatusException
+import reactor.core.publisher.Mono
+import reactor.util.function.Tuple2
 
 @Service
 class ElectionResultService(private val repository: ElectionResultRepository) {
-    private val electionResults: MutableMap<String, ElectionResult> by lazy {
-        fetchResults()
-    }
-    fun getElectionResult(electionName: String): ElectionResult {
-        return electionResults[electionName]
-            ?: throw ResponseStatusException(
-                HttpStatus.NOT_FOUND,
-                "no election result found for $electionName"
-            )
-    }
 
-    fun storeResult(electionResult: ElectionResult): Boolean {
-        var result = electionResult
+  fun getElectionResult(electionName: String): Mono<ElectionResult> {
+    return repository.findByElectionName(electionName)
+        .switchIfEmpty(Mono.error(
+            ResponseStatusException(HttpStatus.NOT_FOUND, "no election result found for $electionName")
+        ))
+  }
 
-        val id = result.electionName
-        val existing = electionResults[id]
-        val needsUpdate = result != existing
-        if (!needsUpdate) {
-            return false
-        }
-        var createdNew = true
-        if (existing != null) {
-            existing.overallResults = result.overallResults
-            existing.constituencyResults = result.constituencyResults
-            result = existing
-            createdNew = false
-        }
-        val stored = repository.save(result)
-        electionResults[id] = stored
-        return createdNew
-    }
-
-    private fun fetchResults(): MutableMap<String, ElectionResult> {
-        return repository.findAll().asSequence()
-            .map { Pair(it.electionName, it) }
-            .toMap()
-            .toMutableMap()
-    }
+  fun storeResult(new: ElectionResult): Mono<Tuple2<Boolean, ElectionResult>> {
+    return repository.findAndModify(new)
+  }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/service/ElectionService.kt

@@ -1,60 +1,35 @@
 package de.twomartens.wahlrecht.service
 
 import de.twomartens.wahlrecht.mapper.v1.ElectionMapper
-import de.twomartens.wahlrecht.model.db.Constituency
 import de.twomartens.wahlrecht.model.db.Election
 import de.twomartens.wahlrecht.repository.ElectionRepository
 import org.mapstruct.factory.Mappers
 import org.springframework.stereotype.Service
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+import reactor.util.function.Tuple2
 
 @Service
 class ElectionService(
-    private val electionRepository: ElectionRepository,
-    private val constituencyService: ConstituencyService
+    private val electionRepository: ElectionRepository
 ) {
-    private val electionMapper = Mappers.getMapper(ElectionMapper::class.java)
-    private val _elections: MutableMap<String, Election> by lazy {
-        fetchElections()
-    }
+  private val electionMapper = Mappers.getMapper(ElectionMapper::class.java)
 
-    val elections: Map<String, Election> = _elections
+  fun getElections(): Flux<Election> {
+    return electionRepository.findAll()
+  }
 
-    private fun getElection(electionName: String): Election? {
-        return elections[electionName]
-    }
+  fun findElectionByName(electionName: String): Mono<Election> {
+    return electionRepository.findByName(electionName)
+  }
 
-    fun getElectionInternal(electionName: String): de.twomartens.wahlrecht.model.internal.Election {
-        return electionMapper.mapToInternal(getElection(electionName)!!)
+  fun getElectionInternal(electionName: String): Mono<de.twomartens.wahlrecht.model.internal.Election> {
+    return findElectionByName(electionName).map {
+      electionMapper.mapToInternal(it)
     }
+  }
 
-    fun storeElection(election: Election): Boolean {
-        var result = election
-        var createdNew = true
-        val electionName = election.name
-        val existing = elections[electionName]
-        if (election == existing) {
-            return false
-        }
-        val constituencies: MutableCollection<Constituency> = mutableListOf()
-        result.constituencies
-            .forEach { constituencies.add(constituencyService.storeConstituency(it)) }
-        if (existing != null) {
-            existing.day = election.day
-            existing.totalNumberOfSeats = election.totalNumberOfSeats
-            existing.votingThreshold = election.votingThreshold
-            result = existing
-            createdNew = false
-        }
-        result.constituencies = constituencies
-        val stored = electionRepository.save(result)
-        _elections[electionName] = stored
-        return createdNew
-    }
-
-    private fun fetchElections(): MutableMap<String, Election> {
-        return electionRepository.findAll().asSequence()
-            .map { Pair(it.name, it) }
-            .toMap()
-            .toMutableMap()
-    }
+  fun storeElection(new: Election): Mono<Tuple2<Boolean, Election>> {
+    return electionRepository.findAndModify(new)
+  }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/service/NominationService.kt

@@ -1,69 +1,41 @@
 package de.twomartens.wahlrecht.service
 
 import de.twomartens.wahlrecht.mapper.v1.NominationMapper
-import de.twomartens.wahlrecht.model.db.Candidate
 import de.twomartens.wahlrecht.model.db.Nomination
 import de.twomartens.wahlrecht.model.internal.NominationId
 import de.twomartens.wahlrecht.repository.NominationRepository
 import org.mapstruct.factory.Mappers
 import org.springframework.stereotype.Service
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
 
 @Service
 class NominationService(
-    private val repository: NominationRepository,
-    private val candidateService: CandidateService
+    private val repository: NominationRepository
 ) {
-    private val mapper = Mappers.getMapper(NominationMapper::class.java)
-    private val nominations: MutableMap<NominationId, Nomination> by lazy {
-        fetchNominations()
-    }
+  private val mapper = Mappers.getMapper(NominationMapper::class.java)
 
-    fun getNominationInternal(id: NominationId): de.twomartens.wahlrecht.model.internal.Nomination {
-        return mapper.mapToInternal(getNomination(id)!!)
+  fun getNominationInternal(id: NominationId): Mono<de.twomartens.wahlrecht.model.internal.Nomination> {
+    return getNomination(id).map {
+      mapper.mapToInternal(it)
     }
+  }
 
-    fun storeNomination(nomination: Nomination?): Nomination? {
-        if (nomination == null) return null
-        val nominationId = NominationId(
-            nomination.electionName,
-            nomination.partyAbbreviation,
-            nomination.name
-        )
-        val existing = nominations[nominationId]
-        val needsUpdate = nomination != existing
-        if (!needsUpdate) {
-            return existing
-        }
-        var result: Nomination = nomination
-        val candidates: MutableCollection<Candidate> = ArrayList()
-        result.candidates
-            .forEach { candidates.add(candidateService.storeCandidate(it)) }
-        if (existing != null) {
-            result = existing
-        }
-        result.candidates = candidates
-        result = repository.save(nomination)
-        nominations[nominationId] = result
-        return result
-    }
+  fun storeNomination(new: Nomination?): Mono<Nomination> {
+    if (new == null) return Mono.empty()
 
-    private fun getNomination(id: NominationId): Nomination? {
-        return nominations[id]
-    }
+    return repository.findAndModify(new)
+  }
 
-    private fun fetchNominations(): MutableMap<NominationId, Nomination> {
-        return repository.findAll().asSequence()
-            .map {
-                Pair(
-                    NominationId(
-                        electionName = it.electionName,
-                        partyAbbreviation = it.partyAbbreviation,
-                        name = it.name
-                    ),
-                    it
-                )
-            }
-            .toMap()
-            .toMutableMap()
-    }
+  fun storeNominations(new: Collection<Nomination>): Flux<Nomination> {
+    return Flux.merge(new.map { storeNomination(it) })
+  }
+
+  private fun getNomination(id: NominationId): Mono<Nomination> {
+    return repository.findByElectionNameAndPartyAbbreviationAndName(
+        id.electionName,
+        id.partyAbbreviation,
+        id.name
+    )
+  }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/service/PartyService.kt

@@ -1,73 +1,32 @@
 package de.twomartens.wahlrecht.service
 
-import de.twomartens.wahlrecht.model.db.Nomination
 import de.twomartens.wahlrecht.model.db.PartyInElection
-import de.twomartens.wahlrecht.model.internal.PartyId
 import de.twomartens.wahlrecht.repository.PartyRepository
 import org.springframework.http.HttpStatus
 import org.springframework.stereotype.Service
 import org.springframework.web.server.ResponseStatusException
+import reactor.core.publisher.Flux
+import reactor.core.publisher.Mono
+import reactor.util.function.Tuple2
 
 @Service
 class PartyService(
-    private val partyRepository: PartyRepository,
-    private val nominationService: NominationService
+    private val partyRepository: PartyRepository
 ) {
 
-    private val parties: MutableMap<PartyId, PartyInElection> by lazy {
-        fetchParties()
-    }
-
-  fun getPartyByElectionNameAndAbbreviation(electionName: String,
-                                            abbreviation: String): PartyInElection {
-    return partyRepository.findByElectionNameAndAbbreviation(electionName, abbreviation)
-        ?: throw ResponseStatusException(HttpStatus.NOT_FOUND,
-            "no party found for $electionName and $abbreviation")
+  fun getPartiesByElectionName(electionName: String): Flux<PartyInElection> {
+    return partyRepository.findByElectionName(electionName)
+        .switchIfEmpty(Flux.error(
+            ResponseStatusException(HttpStatus.NOT_FOUND, "no party found for $electionName")
+        ))
   }
 
-    fun getPartiesByElectionName(electionName: String): Collection<PartyInElection> {
-        val parties = partyRepository.findByElectionName(electionName)
-        if (parties.isEmpty()) {
-            throw ResponseStatusException(HttpStatus.NOT_FOUND, "no party found for $electionName")
-        }
-        return parties
-    }
+  fun getPartyByElectionNameAndAbbreviation(electionName: String,
+                                            abbreviation: String): Mono<PartyInElection> {
+    return partyRepository.findByElectionNameAndAbbreviation(electionName, abbreviation)
+  }
 
-    fun storeParty(partyInElection: PartyInElection): Boolean {
-        var result = partyInElection
-        var createdNew = true
-        val partyId = PartyId(
-            partyInElection.electionName,
-            partyInElection.abbreviation
-        )
-        val existing = parties[partyId]
-        val needsUpdate = partyInElection != existing
-        if (!needsUpdate) {
-            return false
-        }
-        val constituencyNominations: MutableMap<Int, Nomination> = mutableMapOf()
-        result.constituencyNominations
-            .forEach { constituencyNominations[it.key] = nominationService.storeNomination(it.value)!! }
-        if (existing != null) {
-            existing.name = partyInElection.name
-            if (constituencyNominations.isEmpty()) {
-                constituencyNominations.putAll(existing.constituencyNominations)
-            }
-            result = existing
-            createdNew = false
-        }
-        partyInElection.constituencyNominations = constituencyNominations
-        partyInElection.overallNomination = nominationService.storeNomination(partyInElection.overallNomination)!!
-        result = partyRepository.save(result)
-        parties[partyId] = result
-        return createdNew
-    }
-
-    private fun fetchParties(): MutableMap<PartyId, PartyInElection> {
-        val allParties = partyRepository.findAll()
-        return allParties.asSequence()
-            .map { Pair(PartyId(electionName = it.electionName, abbreviation = it.abbreviation), it) }
-            .toMap()
-            .toMutableMap()
-    }
+  fun storeParty(new: PartyInElection): Mono<Tuple2<Boolean, PartyInElection>> {
+    return partyRepository.findAndModify(new)
+  }
 }

module-server/src/main/resources/application-dev.yaml

@@ -0,0 +1,9 @@
+server.port: 12000
+management.server.port: 12001
+
+
+spring:
+  config:
+    import:
+      - "classpath:config/wahlrecht.yaml"
+      - "optional:configserver:http://localhost:8888/config"

module-server/src/main/resources/application-prod.yaml

@@ -0,0 +1,7 @@
+spring:
+  config:
+    import:
+      - "configserver:http://configserver:8888/config"
+  kafka:
+    bootstrap-servers:
+      - kafka:9092

module-server/src/main/resources/application.yaml

@@ -1,12 +1,11 @@
 server:
-  port: ${PORT:12000}
+  port: 12000
   shutdown: graceful
-  forward-headers-strategy: framework
 
 ### technical configurations ###
 management:
   # for security, don't use same port as application
-  server.port: ${ACTUATOR_PORT:12001}
+  server.port: 12001
   health:
     livenessState.enabled: true
     readinessState.enabled: true
@@ -24,6 +23,9 @@ management:
     http.server.requests: true
 
 spring:
+  cloud:
+    config:
+      name: wahlrecht
   main:
     banner-mode: off
   profiles:
@@ -35,7 +37,7 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: ${KEYCLOAK_URL:https://id.2martens.de}/realms/${KEYCLOAK_REALM:twomartens}/protocol/openid-connect/certs
+          jwk-set-uri: https://id.2martens.de/realms/2martens/protocol/openid-connect/certs
   application:
     name: wahlrecht
 
@@ -84,12 +86,3 @@ resttemplate:
     connectionRestHealthIndicatorTimeoutInMillis: 5000
     readTimeoutRestTemplateInMillis: 5000
     connectionRestTemplateTimeoutInMillis: 5000
-
-de.twomartens.wahlrecht:
-  defaultTimeZone: Europe/Berlin
-  greeting: "Hello %s, on millenium"
-  statusprobe:
-    scheduleDuration: 60
-    maxKafkaFailureDuration: 5
-    maxBlobFailureCount: 5
-    maxFailurePercent: 50

module-server/src/main/resources/config/wahlrecht-prod.yaml

@@ -0,0 +1,2 @@
+de.twomartens.wahlrecht:
+  greeting: "Moin %s, you are test"

module-server/src/main/resources/config/wahlrecht.yaml

@@ -0,0 +1,8 @@
+de.twomartens.wahlrecht:
+  defaultTimeZone: Europe/Berlin
+  greeting: "Hello %s, on millenium"
+  statusprobe:
+    scheduleDuration: 60
+    maxKafkaFailureDuration: 5
+    maxBlobFailureCount: 5
+    maxFailurePercent: 50

module-server/src/main/resources/policy-enforcer.json

@@ -1,5 +1,5 @@
 {
-  "realm": "twomartens",
+  "realm": "2martens",
   "auth-server-url": "https://id.2martens.de",
   "resource": "wahlrecht",
   "http-method-as-scope": true