Added quotes around bootstrap server property

.drone.yml

@@ -158,10 +158,9 @@ volumes:
       path: /var/lib/drone/cache/.ansible
 
 trigger:
-#  target:
+  target:
-#    - production
+    - 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 = 4
+indent_size = 2
-tab_width = 4
+tab_width = 2
-ij_continuation_indent_size = 8
+ij_continuation_indent_size = 4
 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

@@ -1,20 +0,0 @@
-<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("${buildDir}/libs")
+    delete("${layout.buildDirectory}/libs")
 }
 
 tasks.build {

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

@@ -8,9 +8,6 @@ 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("$buildDir/version.properties")
+    outputs.file("${layout.buildDirectory}/version.properties")
-    val directory = buildDir
+    val directory = layout.buildDirectory.asFile
     doLast {
-        Files.createDirectories(directory.toPath())
+        Files.createDirectories(directory.get().toPath())
-        File("$buildDir/version.properties").writeText("VERSION=${project.version}\n")
+        File("${layout.buildDirectory}/version.properties").writeText("VERSION=${project.version}\n")
     }
 }

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

@@ -9,6 +9,7 @@ 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,7 +1,6 @@
 [versions]
 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"
@@ -18,8 +17,6 @@ keycloak = "22.0.1"
 kotlin-logging = "3.0.5"
 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"
@@ -34,12 +31,10 @@ 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" }
@@ -49,9 +44,8 @@ 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-openapi-starter = { module = "org.springdoc:springdoc-openapi-starter-common", version.ref = "spring-doc" }
+spring-sec = { 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 = { 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" }
 grpc-api = { module = "io.grpc:grpc-api", version.ref = "grpc" }
@@ -84,9 +78,6 @@ 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" }
@@ -121,14 +112,12 @@ spring-boot = [
 spring-boot-server = [
     "spring-boot-actuator",
     "spring-boot-log4j",
-    "spring-boot-mongo-reactive",
+    "spring-boot-mongo",
     "spring-boot-thymeleaf",
     "spring-boot-validation",
     "spring-boot-web",
-    "spring-boot-webflux",
     "spring-cloud-starter",
-    "spring-openapi-starter",
+    "spring-sec",
-    "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.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

module-deploy/deploy.gradle.kts

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

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

@@ -3,13 +3,11 @@ 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

@@ -0,0 +1,13 @@
+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/OpenApiConfiguration.kt

@@ -6,7 +6,6 @@ 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
@@ -36,7 +35,5 @@ 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/controller/v1/CalculationController.kt

@@ -18,7 +18,6 @@ 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"])
@@ -48,12 +47,12 @@ class CalculationController(private val service: CalculationService) {
     @SecurityRequirement(name = "oauth2")
     fun calculateResult(
         @RequestBody electionResult: ElectionResult
-    ): ResponseEntity<Mono<ElectedCandidates>> {
+    ): ResponseEntity<ElectedCandidates> {
         val result = electedCandidatesMapper.mapToExternal(
             service.determineElectedCandidates(electionResultMapper.mapToInternal(electionResult))
         )
         return ResponseEntity.ok()
             .contentType(MediaType.APPLICATION_JSON)
-            .body(Mono.just(result))
+            .body(result)
     }
 }

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

@@ -14,11 +14,10 @@ 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"])
@@ -28,7 +27,7 @@ class ElectionController(private val service: ElectionService) {
 
   @SecurityRequirement(name = "oauth2")
   @SecurityRequirement(name = "bearerAuth")
-  @GetMapping(value = ["/elections"])
+  @GetMapping(value = ["/elections"], produces = [MediaType.APPLICATION_JSON_VALUE])
   @Operation(
       summary = "Returns all stored elections",
       responses = [ApiResponse(
@@ -44,12 +43,13 @@ class ElectionController(private val service: ElectionService) {
           )]
       )]
   )
-  fun getElections(): Flux<Election> {
+  fun getElections(): ResponseEntity<Collection<Election>> {
-    val elections = service.getElections()
+    val elections = service.elections.asSequence()
-        .map {
+        .map { mapper.mapToExternal(it.value) }
-          mapper.mapToExternal(it)
+        .toList()
-        }
+    return ResponseEntity.ok()
-    return elections
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(elections)
   }
 
   @Operation(
@@ -64,11 +64,10 @@ 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
+      @PathVariable @Parameter(description = "the election name", example = "Bezirkswahl 2019") electionName: String?
-  ): ResponseEntity<Mono<Election>> {
+  ): ResponseEntity<Election> {
-    val election = service.findElectionByName(electionName)
+    val election = mapper.mapToExternal(service.elections[electionName]!!)
-        .map { mapper.mapToExternal(it) }
+    return ok()
-    return ResponseEntity.ok()
         .contentType(MediaType.APPLICATION_JSON)
         .body(election)
   }
@@ -87,22 +86,14 @@ class ElectionController(private val service: ElectionService) {
   @PutMapping("/election")
   @SecurityRequirement(name = "bearerAuth")
   @SecurityRequirement(name = "oauth2")
-  fun putElection(@RequestBody election: Election, uriComponentsBuilder: UriComponentsBuilder): Mono<ResponseEntity<Election>> {
+  fun putElection(@RequestBody election: Election?, uriComponentsBuilder: UriComponentsBuilder):
-    return service.storeElection(mapper.mapToDB(election))
+      ResponseEntity<Void> {
-        .map { tuple ->
+    val createdNew = service.storeElection(mapper.mapToDB(election!!))
-          Tuples.of(tuple.t1, mapper.mapToExternal(tuple.t2))
+    return if (createdNew) {
-        }
+      created(uriComponentsBuilder.path("/elections/{electionName}")
-        .map { tuple ->
+          .buildAndExpand(election.name).toUri())
-          if (tuple.t1) {
+          .build()
-            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)
-          }
     }
+    else ok().build()
   }
 }

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
@@ -42,23 +42,18 @@ class ElectionResultController(private val service: ElectionResultService) {
         )]
     )
     @GetMapping(
-      value = ["/electionResult/{electionName}"],
+        value = ["/electionResults/{electionName}"],
         produces = [MediaType.APPLICATION_JSON_VALUE]
     )
     @SecurityRequirement(name = "bearerAuth")
     @SecurityRequirement(name = "oauth2")
-  fun getElectionByName(
+    fun getElectionResultByElectionName(
         @PathVariable @Parameter(description = "the election name", example = "Bezirkswahl 2019") electionName: String
-  ): Mono<ResponseEntity<ElectionResult>> {
+    ): ResponseEntity<ElectionResult> {
-    return service.getElectionResult(electionName)
+        val result = mapper.mapToExternal(service.getElectionResult(electionName))
-        .map {
+        return ok()
-          mapper.mapToExternal(it)
-        }
-        .map {
-          ResponseEntity.ok()
             .contentType(MediaType.APPLICATION_JSON)
-              .body(it)
+            .body(result)
-        }
     }
 
     @Operation(
@@ -75,24 +70,14 @@ class ElectionResultController(private val service: ElectionResultService) {
     @PutMapping("/electionResult")
     @SecurityRequirement(name = "bearerAuth")
     @SecurityRequirement(name = "oauth2")
-  fun putElection(@RequestBody electionResult: ElectionResult,
+    fun putElection(@RequestBody electionResult: ElectionResult?,
-                  uriComponentsBuilder: UriComponentsBuilder): Mono<ResponseEntity<ElectionResult>> {
+                    uriComponentsBuilder: UriComponentsBuilder): ResponseEntity<Void> {
-    val storedElection = service.storeResult(mapper.mapToDB(electionResult))
+        val createdNew = service.storeResult(mapper.mapToDB(electionResult!!))
-    return storedElection
+        return if (createdNew) {
-        .map { tuple ->
+          created(uriComponentsBuilder.path("/electionResult/{electionName}")
-          Tuples.of(tuple.t1, mapper.mapToExternal(tuple.t2))
+              .buildAndExpand(electionResult.electionName).toUri())
-        }
+              .build()
-        .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)
-          }
         }
+        else ok().build()
     }
 }

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

@@ -20,9 +20,6 @@ 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"])
@@ -45,23 +42,26 @@ class PartyController(private val service: PartyService) {
           content = [Content(mediaType = "application/json", schema = Schema(implementation = ErrorMessage::class))]
       )]
   )
-  @GetMapping(value = ["/parties/by-election-name/{electionName}"], produces = [MediaType.APPLICATION_JSON_VALUE])
+  @GetMapping(value = ["/parties/{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<Flux<PartyInElection>> {
+  ): ResponseEntity<Collection<PartyInElection>> {
-    val parties = service.getPartiesByElectionName(electionName)
+    val parties = service.getPartiesByElectionName(electionName).stream()
-        .map { election: de.twomartens.wahlrecht.model.db.PartyInElection ->
+        .map { election: de.twomartens.wahlrecht.model.db.PartyInElection? ->
-          mapper.mapToExternal(election)
+          mapper.mapToExternal(
+              election!!
+          )
         }
+        .toList()
     return ok()
         .contentType(MediaType.APPLICATION_JSON)
         .body(parties)
   }
 
   @Operation(
-      summary = "Returns party stored for given election name and abbreviation",
+      summary = "Returns stored party for given election name and party abbreviation",
       responses = [ApiResponse(
           responseCode = "200",
           description = "Returns stored party",
@@ -81,11 +81,10 @@ 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<Mono<PartyInElection>> {
+  ): ResponseEntity<PartyInElection> {
-    val party = service.getPartyByElectionNameAndAbbreviation(electionName, abbreviation)
+    val party = mapper.mapToExternal(
-        .map { stored: de.twomartens.wahlrecht.model.db.PartyInElection ->
+        service.getPartyByElectionNameAndAbbreviation(electionName, abbreviation)
-          mapper.mapToExternal(stored)
+    )
-        }
     return ok()
         .contentType(MediaType.APPLICATION_JSON)
         .body(party)
@@ -104,24 +103,13 @@ class PartyController(private val service: PartyService) {
   @PutMapping("/party")
   @SecurityRequirement(name = "bearerAuth")
   @SecurityRequirement(name = "oauth2")
-  fun putParty(@RequestBody party: PartyInElection,
+  fun putParty(@RequestBody party: PartyInElection?,
-               uriComponentsBuilder: UriComponentsBuilder): Mono<ResponseEntity<PartyInElection>> {
+               uriComponentsBuilder: UriComponentsBuilder): ResponseEntity<Void> {
-    val storedParty = service.storeParty(mapper.mapToDB(party))
+    val createdNew = service.storeParty(mapper.mapToDB(party!!))
-    return storedParty
+    return if (createdNew) {
-        .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())
+          .buildAndExpand(party.electionName, party.abbreviation).toUri())
-                .contentType(MediaType.APPLICATION_JSON)
+          .build()
-                .body(tuple.t2)
+    } else ok().build()
-          } else {
-            ok()
-                .contentType(MediaType.APPLICATION_JSON)
-                .body(tuple.t2)
-          }
-        }
   }
 }

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

@@ -7,7 +7,6 @@ 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
@@ -29,8 +28,6 @@ class Nomination {
     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/repository/CandidateRepository.kt

@@ -1,31 +1,6 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.Candidate
-import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import org.springframework.data.mongodb.repository.MongoRepository
-import reactor.core.publisher.Flux
-import reactor.core.publisher.Mono
 
-interface CandidateRepository : ReactiveMongoRepository<Candidate, String> {
+interface CandidateRepository : MongoRepository<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,27 +1,6 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.Constituency
-import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import org.springframework.data.mongodb.repository.MongoRepository
-import reactor.core.publisher.Mono
 
-interface ConstituencyRepository : ReactiveMongoRepository<Constituency, String> {
+interface ConstituencyRepository : MongoRepository<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,27 +1,6 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.Election
-import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import org.springframework.data.mongodb.repository.MongoRepository
-import reactor.core.publisher.Mono
-import reactor.util.function.Tuple2
 
-interface ElectionRepository : ReactiveMongoRepository<Election, String> {
+interface ElectionRepository : MongoRepository<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,25 +1,6 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.ElectionResult
-import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import org.springframework.data.mongodb.repository.MongoRepository
-import reactor.core.publisher.Mono
-import reactor.util.function.Tuple2
 
-interface ElectionResultRepository : ReactiveMongoRepository<ElectionResult, String> {
+interface ElectionResultRepository : MongoRepository<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,31 +1,6 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.Nomination
-import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import org.springframework.data.mongodb.repository.MongoRepository
-import reactor.core.publisher.Mono
-import reactor.core.scheduler.Schedulers
 
-interface NominationRepository : ReactiveMongoRepository<Nomination, String> {
+interface NominationRepository : MongoRepository<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,30 +1,10 @@
 package de.twomartens.wahlrecht.repository
 
 import de.twomartens.wahlrecht.model.db.PartyInElection
-import org.springframework.data.mongodb.repository.ReactiveMongoRepository
+import org.springframework.data.mongodb.repository.MongoRepository
-import reactor.core.publisher.Flux
-import reactor.core.publisher.Mono
-import reactor.util.function.Tuple2
 
-interface PartyRepository : ReactiveMongoRepository<PartyInElection, String> {
+interface PartyRepository : MongoRepository<PartyInElection, String> {
+    fun findByElectionName(name: String): Collection<PartyInElection>
 
-  fun findByElectionName(name: String): Flux<PartyInElection>
+    fun findByElectionNameAndAbbreviation(electionName: String, abbreviation: String): 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/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).block()
+        val election = electionService.getElectionInternal(electionResult.electionName)
         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).block()
+        val nomination = nominationService.getNominationInternal(nominationId)
-        if (nomination!!.supportsVotesOnNomination()) {
+        if (nomination.supportsVotesOnNomination()) {
             val seatsByNomination = calculateSeatsByNominationOrder(votingResult, numberOfSeats)
             seatsByVoteOrder = numberOfSeats - seatsByNomination
             val candidates = nomination.getCandidates()

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

@@ -3,17 +3,33 @@ 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 {
-  fun storeCandidate(candidate: Candidate): Mono<Candidate> {
+        fetchCandidates()
-    return repository.findAndModify(candidate)
     }
 
-  fun storeCandidates(candidates: Collection<Candidate>): Flux<Candidate> {
+    fun storeCandidate(candidate: Candidate): Candidate {
-    return Flux.merge(candidates.map { storeCandidate(it) })
+        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
+    }
+
+    private fun fetchCandidates(): MutableMap<String, Candidate> {
+        return repository.findAll().asSequence()
+            .map { Pair(it.name, it) }
+            .toMap()
+            .toMutableMap()
     }
 }

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

@@ -1,14 +1,40 @@
 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 storeConstituencies(constituencies: Collection<Constituency>): Flux<Constituency> {
+    fun storeConstituency(constituency: Constituency): Constituency {
-    return Flux.merge(constituencies.map { repository.findAndModify(it) })
+        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()
     }
 }

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

@@ -5,20 +5,45 @@ 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 {
-  fun getElectionResult(electionName: String): Mono<ElectionResult> {
+        fetchResults()
-    return repository.findByElectionName(electionName)
+    }
-        .switchIfEmpty(Mono.error(
+    fun getElectionResult(electionName: String): ElectionResult {
-            ResponseStatusException(HttpStatus.NOT_FOUND, "no election result found for $electionName")
+        return electionResults[electionName]
-        ))
+            ?: throw ResponseStatusException(
+                HttpStatus.NOT_FOUND,
+                "no election result found for $electionName"
+            )
     }
 
-  fun storeResult(new: ElectionResult): Mono<Tuple2<Boolean, ElectionResult>> {
+    fun storeResult(electionResult: ElectionResult): Boolean {
-    return repository.findAndModify(new)
+        var result = electionResult
+
+        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()
     }
 }

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

@@ -1,35 +1,60 @@
 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 electionRepository: ElectionRepository,
+    private val constituencyService: ConstituencyService
 ) {
     private val electionMapper = Mappers.getMapper(ElectionMapper::class.java)
-
+    private val _elections: MutableMap<String, Election> by lazy {
-  fun getElections(): Flux<Election> {
+        fetchElections()
-    return electionRepository.findAll()
     }
 
-  fun findElectionByName(electionName: String): Mono<Election> {
+    val elections: Map<String, Election> = _elections
-    return electionRepository.findByName(electionName)
+
+    private fun getElection(electionName: String): Election? {
+        return elections[electionName]
     }
 
-  fun getElectionInternal(electionName: String): Mono<de.twomartens.wahlrecht.model.internal.Election> {
+    fun getElectionInternal(electionName: String): de.twomartens.wahlrecht.model.internal.Election {
-    return findElectionByName(electionName).map {
+        return electionMapper.mapToInternal(getElection(electionName)!!)
-      electionMapper.mapToInternal(it)
-    }
     }
 
-  fun storeElection(new: Election): Mono<Tuple2<Boolean, Election>> {
+    fun storeElection(election: Election): Boolean {
-    return electionRepository.findAndModify(new)
+        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()
     }
 }

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

@@ -1,41 +1,69 @@
 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 repository: NominationRepository,
+    private val candidateService: CandidateService
 ) {
     private val mapper = Mappers.getMapper(NominationMapper::class.java)
-
+    private val nominations: MutableMap<NominationId, Nomination> by lazy {
-  fun getNominationInternal(id: NominationId): Mono<de.twomartens.wahlrecht.model.internal.Nomination> {
+        fetchNominations()
-    return getNomination(id).map {
-      mapper.mapToInternal(it)
-    }
     }
 
-  fun storeNomination(new: Nomination?): Mono<Nomination> {
+    fun getNominationInternal(id: NominationId): de.twomartens.wahlrecht.model.internal.Nomination {
-    if (new == null) return Mono.empty()
+        return mapper.mapToInternal(getNomination(id)!!)
-
-    return repository.findAndModify(new)
     }
 
-  fun storeNominations(new: Collection<Nomination>): Flux<Nomination> {
+    fun storeNomination(nomination: Nomination?): Nomination? {
-    return Flux.merge(new.map { storeNomination(it) })
+        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
     }
 
-  private fun getNomination(id: NominationId): Mono<Nomination> {
+    private fun getNomination(id: NominationId): Nomination? {
-    return repository.findByElectionNameAndPartyAbbreviationAndName(
+        return nominations[id]
-        id.electionName,
+    }
-        id.partyAbbreviation,
+
-        id.name
+    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()
+    }
 }

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

@@ -1,32 +1,73 @@
 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 partyRepository: PartyRepository,
+    private val nominationService: NominationService
 ) {
 
-  fun getPartiesByElectionName(electionName: String): Flux<PartyInElection> {
+    private val parties: MutableMap<PartyId, PartyInElection> by lazy {
-    return partyRepository.findByElectionName(electionName)
+        fetchParties()
-        .switchIfEmpty(Flux.error(
-            ResponseStatusException(HttpStatus.NOT_FOUND, "no party found for $electionName")
-        ))
     }
 
   fun getPartyByElectionNameAndAbbreviation(electionName: String,
-                                            abbreviation: String): Mono<PartyInElection> {
+                                            abbreviation: String): PartyInElection {
     return partyRepository.findByElectionNameAndAbbreviation(electionName, abbreviation)
+        ?: throw ResponseStatusException(HttpStatus.NOT_FOUND,
+            "no party found for $electionName and $abbreviation")
   }
 
-  fun storeParty(new: PartyInElection): Mono<Tuple2<Boolean, PartyInElection>> {
+    fun getPartiesByElectionName(electionName: String): Collection<PartyInElection> {
-    return partyRepository.findAndModify(new)
+        val parties = partyRepository.findByElectionName(electionName)
+        if (parties.isEmpty()) {
+            throw ResponseStatusException(HttpStatus.NOT_FOUND, "no party found for $electionName")
+        }
+        return parties
+    }
+
+    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()
     }
 }

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

@@ -1,9 +1,5 @@
-server.port: 12000
-management.server.port: 12001
-
-
 spring:
   config:
     import:
       - "classpath:config/wahlrecht.yaml"
-      - "optional:configserver:http://localhost:8888/config"
+      - "optional:configserver:${CONFIGSERVER_SCHEME:http}://${CONFIGSERVER_HOST:configserver}:${CONFIGSERVER_PORT:8888}${CONFIGSERVER_PREFIX:/config}"

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

@@ -1,7 +1,7 @@
 spring:
   config:
     import:
-      - "configserver:http://configserver:8888/config"
+      - "configserver:${CONFIGSERVER_SCHEME:http}://${CONFIGSERVER_HOST:configserver}:${CONFIGSERVER_PORT:8888}${CONFIGSERVER_PREFIX:/config}"
   kafka:
     bootstrap-servers:
-      - kafka:9092
+      - "${KAFKA_HOST:kafka}:${KAFKA_PORT:9092}"

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

@@ -1,11 +1,12 @@
 server:
-  port: 12000
+  port: ${PORT:12000}
   shutdown: graceful
+  forward-headers-strategy: framework
 
 ### technical configurations ###
 management:
   # for security, don't use same port as application
-  server.port: 12001
+  server.port: ${ACTUATOR_PORT:12001}
   health:
     livenessState.enabled: true
     readinessState.enabled: true
@@ -37,7 +38,7 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: https://id.2martens.de/realms/2martens/protocol/openid-connect/certs
+          jwk-set-uri: ${KEYCLOAK_URL:https://id.2martens.de}/realms/${KEYCLOAK_REALM:2martens}/protocol/openid-connect/certs
   application:
     name: wahlrecht