Revert "fix: Remove kafka"

This reverts commit 0082305a5a.

.drone.yml

@@ -30,7 +30,6 @@ volumes:
 trigger:
   event:
     include:
-      - push
       - pull_request
       - custom
 
@@ -51,7 +50,7 @@ steps:
     image: alpine/git
     environment:
       SSH_KEY:
-        from_secret: ssh_key
+        from_secret: private_ssh_key
     commands:
       - mkdir $HOME/.ssh
       - echo "$SSH_KEY" > $HOME/.ssh/id_ed25519
@@ -69,7 +68,7 @@ steps:
       PASSWORD:
         from_secret: docker_password
       SSH_KEY:
-        from_secret: ssh_key
+        from_secret: private_ssh_key
     volumes:
       - name: cache
         path: /home/gradle/.gradle
@@ -88,10 +87,64 @@ volumes:
       path: /var/lib/drone/cache/.gradle
 
 trigger:
-  branches:
-    - main
   event:
     include:
-      - push
-      - custom
+      - tag
 
+---
+kind: pipeline
+name: deploy image
+type: docker
+
+platform:
+  os: linux
+  arch: arm64
+
+clone:
+  disable: true
+
+steps:
+  - name: clone
+    image: alpine/git
+    environment:
+      SSH_KEY:
+        from_secret: private_ssh_key
+    commands:
+      - mkdir $HOME/.ssh
+      - echo "$SSH_KEY" > $HOME/.ssh/id_ed25519
+      - chmod 600 $HOME/.ssh/id_ed25519
+      - 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 clone ssh://giteajim@git.2martens.de:22/2martens/cloud-configuration.git .
+      - git checkout main
+  - name: update image version
+    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
+  - name: save modified variable file
+    image: alpine/git
+    environment:
+      SSH_KEY:
+        from_secret: private_ssh_key
+    commands:
+      - mkdir $HOME/.ssh
+      - echo "$SSH_KEY" > $HOME/.ssh/id_ed25519
+      - chmod 600 $HOME/.ssh/id_ed25519
+      - 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 diff-index --quiet HEAD || git commit -m "[Drone] Changed wahlrecht_image_version to ${DRONE_SEMVER}"
+      - git push origin main
+
+trigger:
+  target:
+    - test
+  event:
+    include:
+      - promote
+      - rollback

.editorconfig

@@ -543,9 +543,9 @@ ij_html_space_inside_empty_tag = false
 ij_html_text_wrap = normal
 
 [{*.kt,*.kts}]
-indent_size = 4
-tab_width = 4
-ij_continuation_indent_size = 8
+indent_size = 2
+tab_width = 2
+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.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")
-    val directory = buildDir
+    outputs.file("${layout.buildDirectory}/version.properties")
+    val directory = layout.buildDirectory.asFile
     doLast {
-        Files.createDirectories(directory.toPath())
-        File("$buildDir/version.properties").writeText("VERSION=${project.version}\n")
+        Files.createDirectories(directory.get().toPath())
+        File("${layout.buildDirectory}/version.properties").writeText("VERSION=${project.version}\n")
     }
 }

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

@@ -62,7 +62,7 @@ tasks.named("buildAll") {
 
 val formatter: DateTimeFormatter = ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
 
-tasks.bootJar {
+tasks.jar {
     manifest {
         attributes["Implementation-Title"] = rootProject.name
         attributes["Implementation-Version"] = archiveVersion.get()

gradle/libs.versions.toml

@@ -1,21 +1,21 @@
 [versions]
-spring-boot = "3.1.2"
-spring-doc = "2.1.0"
-spring-cloud = "2022.0.4"
+spring-boot = "3.2.3"
+spring-doc = "2.3.0"
+spring-cloud = "2023.0.0"
 spring-grpc = "2.14.0.RELEASE"
 grpc = "1.57.0"
 tomcat-annotations = "6.0.53"
-httpclient = "5.2.1"
-slf4j = "2.0.7"
-log4j = "2.20.0"
-log4j-ecs = "1.5.0"
+httpclient = "5.3.1"
+slf4j = "2.0.12"
+log4j = "2.23.0"
+log4j-ecs = "1.6.0"
 mapstruct = "1.5.5.Final"
-junit = "5.10.0"
-assertj = "3.24.2"
-mockito = "5.4.0"
-keycloak = "22.0.1"
+junit = "5.10.2"
+assertj = "3.25.3"
+mockito = "5.11.0"
+keycloak = "24.0.1"
 kotlin-logging = "3.0.5"
-kotlin-reflect = "1.9.0"
+kotlin-reflect = "1.9.22"
 kotlin-lombok = "1.9.0"
 plugin-nebula-release = "17.2.2"
 plugin-lombok = "8.0.1"
@@ -38,6 +38,7 @@ spring-boot-oauth2-resource-server = { module = "org.springframework.boot:spring
 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" }
+spring-cloud-starter-bus-kafka = { module = "org.springframework.cloud:spring-cloud-starter-bus-kafka" }
 spring-cloud-starter-config = { module = "org.springframework.cloud:spring-cloud-starter-config" }
 spring-cloud-config-server = { module = "org.springframework.cloud:spring-cloud-config-server" }
 spring-boot-starter = { module = "org.springframework.boot:spring-boot-starter" }

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-deploy/k8s/prod/application-prod.yaml

@@ -1,2 +0,0 @@
-server:
-  port: 12000

module-server/server.gradle.kts

@@ -10,4 +10,5 @@ dependencies {
     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/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/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,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/VersionHtmlController.kt

@@ -32,14 +32,16 @@ class VersionHtmlController {
     }
 
     private fun getTitle(): String {
-        val title = VersionHtmlController::class.java.getPackage().implementationTitle
+        val title = VersionHtmlController::class.java.`package`.implementationTitle
+                ?: return "application"
         return title.ifBlank {
             "application"
         }
     }
 
     private fun getVersion(): String {
-        val version = VersionHtmlController::class.java.getPackage().implementationVersion
+        val version = VersionHtmlController::class.java.`package`.implementationVersion
+                ?: return "DEVELOPER"
         return version.ifBlank {
             "DEVELOPER"
         }

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

@@ -12,80 +12,88 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.security.SecurityRequirement
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.mapstruct.factory.Mappers
-import org.springframework.http.HttpStatus
 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
 
 @RestController
 @RequestMapping(value = ["/wahlrecht/v1"])
 @Tag(name = "Elections", description = "all requests relating to elections")
 class ElectionController(private val service: ElectionService) {
-    private val mapper = Mappers.getMapper(ElectionMapper::class.java)
+  private val mapper = Mappers.getMapper(ElectionMapper::class.java)
 
-    @SecurityRequirement(name = "oauth2")
-    @SecurityRequirement(name = "bearerAuth")
-    @GetMapping(value = ["/elections"], produces = [MediaType.APPLICATION_JSON_VALUE])
-    @Operation(
-        summary = "Returns all stored elections",
-        responses = [ApiResponse(
-            responseCode = "200",
-            description = "Returns all stored elections",
-            content = [Content(
-                mediaType = "application/json",
-                array = ArraySchema(
-                    schema = Schema(
-                        implementation = Election::class
-                    )
-                )
-            )]
-        )]
-    )
-    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)
-        }
+  @SecurityRequirement(name = "oauth2")
+  @SecurityRequirement(name = "bearerAuth")
+  @GetMapping(value = ["/elections"], produces = [MediaType.APPLICATION_JSON_VALUE])
+  @Operation(
+      summary = "Returns all stored elections",
+      responses = [ApiResponse(
+          responseCode = "200",
+          description = "Returns all stored elections",
+          content = [Content(
+              mediaType = "application/json",
+              array = ArraySchema(
+                  schema = Schema(
+                      implementation = Election::class
+                  )
+              )
+          )]
+      )]
+  )
+  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)
+  }
 
-    @Operation(
-        summary = "Returns election matching provided name",
-        responses = [ApiResponse(
-            responseCode = "200",
-            description = "Returns matching election",
-            content = [Content(mediaType = "application/json", schema = Schema(implementation = Election::class))]
-        )]
-    )
-    @GetMapping(value = ["/elections/by-name/{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?
-    ): ResponseEntity<Election> {
-        val election = mapper.mapToExternal(service.elections[electionName]!!)
-        return ResponseEntity.ok()
-            .contentType(MediaType.APPLICATION_JSON)
-            .body(election)
-    }
-
-    @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("/election")
-    @SecurityRequirement(name = "bearerAuth")
-    @SecurityRequirement(name = "oauth2")
-    fun putElection(@RequestBody election: Election?): ResponseEntity<*> {
-        val createdNew = service.storeElection(mapper.mapToDB(election!!))
-        return if (createdNew) ResponseEntity<Any>(HttpStatus.CREATED) else ResponseEntity<Any>(HttpStatus.OK)
+  @Operation(
+      summary = "Returns election matching provided name",
+      responses = [ApiResponse(
+          responseCode = "200",
+          description = "Returns matching election",
+          content = [Content(mediaType = "application/json", schema = Schema(implementation = Election::class))]
+      )]
+  )
+  @GetMapping(value = ["/elections/{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?
+  ): ResponseEntity<Election> {
+    val election = mapper.mapToExternal(service.elections[electionName]!!)
+    return ok()
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(election)
+  }
+
+  @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("/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()
+  }
 }

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

@@ -14,10 +14,12 @@ import io.swagger.v3.oas.annotations.tags.Tag
 import lombok.RequiredArgsConstructor
 import lombok.extern.slf4j.Slf4j
 import org.mapstruct.factory.Mappers
-import org.springframework.http.HttpStatus
 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
 
 @Slf4j
 @RestController
@@ -40,16 +42,16 @@ class ElectionResultController(private val service: ElectionResultService) {
         )]
     )
     @GetMapping(
-        value = ["/electionResult/by-election-name/{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
     ): ResponseEntity<ElectionResult> {
         val result = mapper.mapToExternal(service.getElectionResult(electionName))
-        return ResponseEntity.ok()
+        return ok()
             .contentType(MediaType.APPLICATION_JSON)
             .body(result)
     }
@@ -68,8 +70,14 @@ class ElectionResultController(private val service: ElectionResultService) {
     @PutMapping("/electionResult")
     @SecurityRequirement(name = "bearerAuth")
     @SecurityRequirement(name = "oauth2")
-    fun putElection(@RequestBody electionResult: ElectionResult?): ResponseEntity<*> {
+    fun putElection(@RequestBody electionResult: ElectionResult?,
+                    uriComponentsBuilder: UriComponentsBuilder): ResponseEntity<Void> {
         val createdNew = service.storeResult(mapper.mapToDB(electionResult!!))
-        return if (createdNew) ResponseEntity<Any>(HttpStatus.CREATED) else ResponseEntity<Any>(HttpStatus.OK)
+        return if (createdNew) {
+          created(uriComponentsBuilder.path("/electionResult/{electionName}")
+              .buildAndExpand(electionResult.electionName).toUri())
+              .build()
+        }
+        else ok().build()
     }
 }

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

@@ -1,5 +1,6 @@
 package de.twomartens.wahlrecht.controller.v1
 
+import de.twomartens.wahlrecht.property.ServiceProperties
 import io.swagger.v3.oas.annotations.Hidden
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
@@ -7,11 +8,12 @@ import org.springframework.web.bind.annotation.RestController
 
 @RestController
 @RequestMapping(value = ["/wahlrecht/v1"])
-class HealthCheckController {
+class HealthCheckController(private val properties: ServiceProperties) {
+
 
     @Hidden
     @GetMapping("/healthCheck")
     fun healthCheck(message: String): String {
-        return message
+        return properties.greeting.format(message)
     }
 }

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

@@ -13,65 +13,103 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.security.SecurityRequirement
 import io.swagger.v3.oas.annotations.tags.Tag
 import org.mapstruct.factory.Mappers
-import org.springframework.http.HttpStatus
 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.stereotype.Controller
 import org.springframework.web.bind.annotation.*
+import org.springframework.web.util.UriComponentsBuilder
 
 @Controller
 @RequestMapping(value = ["/wahlrecht/v1"])
 @Tag(name = "Parties", description = "all requests relating to parties")
 class PartyController(private val service: PartyService) {
-    private val mapper = Mappers.getMapper(PartyInElectionMapper::class.java)
-    @Operation(
-        summary = "Returns all stored parties for given election name",
-        responses = [ApiResponse(
-            responseCode = "200",
-            description = "Returns all stored parties",
-            content = [Content(
-                mediaType = "application/json",
-                array = ArraySchema(schema = Schema(implementation = PartyInElection::class))
-            )]
-        ), ApiResponse(
-            responseCode = "404",
-            description = "No parties found",
-            content = [Content(mediaType = "application/json", schema = Schema(implementation = ErrorMessage::class))]
-        )]
-    )
-    @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!!
-                )
-            }
-            .toList()
-        return ResponseEntity.ok()
-            .contentType(MediaType.APPLICATION_JSON)
-            .body(parties)
-    }
+  private val mapper = Mappers.getMapper(PartyInElectionMapper::class.java)
 
-    @Operation(
-        summary = "Stores a new party in an election",
-        responses = [ApiResponse(
-            responseCode = "201",
-            description = "Party was created"
-        ), ApiResponse(responseCode = "200", description = "Party was modified"), ApiResponse(
-            responseCode = "401",
-            description = "Unauthorized"
-        )]
+  @Operation(
+      summary = "Returns all stored parties for given election name",
+      responses = [ApiResponse(
+          responseCode = "200",
+          description = "Returns all stored parties",
+          content = [Content(
+              mediaType = "application/json",
+              array = ArraySchema(schema = Schema(implementation = PartyInElection::class))
+          )]
+      ), ApiResponse(
+          responseCode = "404",
+          description = "No parties found",
+          content = [Content(mediaType = "application/json", schema = Schema(implementation = ErrorMessage::class))]
+      )]
+  )
+  @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<Collection<PartyInElection>> {
+    val parties = service.getPartiesByElectionName(electionName).stream()
+        .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",
+      responses = [ApiResponse(
+          responseCode = "200",
+          description = "Returns stored party",
+          content = [Content(
+              mediaType = "application/json",
+              schema = Schema(implementation = PartyInElection::class)
+          )]
+      ), ApiResponse(
+          responseCode = "404",
+          description = "No party found",
+          content = [Content(mediaType = "application/json", schema = Schema(implementation = ErrorMessage::class))]
+      )]
+  )
+  @GetMapping(value = ["/parties/{electionName}/{abbreviation}"], produces = [MediaType.APPLICATION_JSON_VALUE])
+  @SecurityRequirement(name = "bearerAuth")
+  @SecurityRequirement(name = "oauth2")
+  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)
     )
-    @PutMapping("/party")
-    @SecurityRequirement(name = "bearerAuth")
-    @SecurityRequirement(name = "oauth2")
-    fun putParty(@RequestBody party: PartyInElection?): ResponseEntity<*> {
-        val createdNew = service.storeParty(mapper.mapToDB(party!!))
-        return if (createdNew) ResponseEntity<Any>(HttpStatus.CREATED) else ResponseEntity<Any>(HttpStatus.OK)
-    }
+    return ok()
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(party)
+  }
+
+  @Operation(
+      summary = "Stores a new party in an election",
+      responses = [ApiResponse(
+          responseCode = "201",
+          description = "Party was created"
+      ), ApiResponse(responseCode = "200", description = "Party was modified"), ApiResponse(
+          responseCode = "401",
+          description = "Unauthorized"
+      )]
+  )
+  @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()
+  }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/monitoring/actuator/RestHealthIndicator.kt

@@ -1,6 +1,7 @@
 package de.twomartens.wahlrecht.monitoring.actuator
 
 import de.twomartens.wahlrecht.interceptor.HeaderInterceptorRest
+import de.twomartens.wahlrecht.property.ServiceProperties
 import org.springframework.boot.actuate.health.Health
 import org.springframework.boot.actuate.health.HealthIndicator
 import org.springframework.boot.actuate.health.Status
@@ -28,8 +29,10 @@ import java.time.Clock
  */
 @Component
 class RestHealthIndicator(
-    clock: Clock, interceptor: HeaderInterceptorRest,
-    serverProperties: ServerProperties, private val restTemplateRestHealthIndicator: RestTemplate
+        clock: Clock, interceptor: HeaderInterceptorRest,
+        serverProperties: ServerProperties,
+        private val restTemplateRestHealthIndicator: RestTemplate,
+        private val serviceProperties: ServiceProperties
 ) : AbstractHealthIndicator(clock, Preparable { interceptor.markAsHealthCheck() }), HealthIndicator {
     private val randomizer = SecureRandom()
     private val urlPrefix: String = (HTTP_PREFIX + HOST + HOST_PORT_SEPARATOR
@@ -43,10 +46,10 @@ class RestHealthIndicator(
         val random = randomizer.nextInt(100000, 999999).toString()
         val url = "$urlPrefix{random}"
         val response = restTemplateRestHealthIndicator.getForEntity(url, String::class.java, random)
-        val status = if (response.body == random) Status.UP else Status.DOWN
+        val status = if (response.body == serviceProperties.greeting.format(random)) Status.UP else Status.DOWN
         return Health.status(status)
-            .withDetail(DETAIL_ENDPOINT_KEY, url)
-            .build()
+                .withDetail(DETAIL_ENDPOINT_KEY, url)
+                .build()
     }
 
     companion object {

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

@@ -2,11 +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/repository/PartyRepository.kt

@@ -5,4 +5,6 @@ import org.springframework.data.mongodb.repository.MongoRepository
 
 interface PartyRepository : MongoRepository<PartyInElection, String> {
     fun findByElectionName(name: String): Collection<PartyInElection>
+
+    fun findByElectionNameAndAbbreviation(electionName: String, abbreviation: String): PartyInElection?
 }

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

@@ -13,53 +13,54 @@ 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)
-        }
-        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
+  fun enforce(request: HttpRequest, response: HttpResponse): AuthorizationContext {
+    if (log.isDebugEnabled) {
+      log.debug("Policy enforcement is enabled. Enforcing policy decisions for path [{}].", request.uri)
     }
-
-    private fun authorize(request: HttpRequest, response: HttpResponse): AuthorizationContext {
-        val enforcementMode = policyEnforcerConfig.enforcementMode
-        return if (EnforcementMode.DISABLED == enforcementMode) {
-            createAuthorizedContext()
-        } else policyEnforcer.enforce(request, response)
+    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
+  }
 
-    private fun createAuthorizedContext(): AuthorizationContext {
-        return object : ClientAuthorizationContext(policyEnforcer.authzClient) {
-            override fun hasPermission(resourceName: String, scopeName: String): Boolean {
-                return true
-            }
+  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)
+  }
 
-            override fun hasResourcePermission(resourceName: 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 hasScopePermission(scopeName: String): Boolean {
-                return true
-            }
+      override fun hasResourcePermission(resourceName: String): Boolean {
+        return true
+      }
 
-            override fun getPermissions(): List<Permission> {
-                return emptyList()
-            }
+      override fun hasScopePermission(scopeName: String): Boolean {
+        return true
+      }
 
-            override fun isGranted(): Boolean {
-                return true
-            }
-        }
+      override fun getPermissions(): List<Permission> {
+        return emptyList()
+      }
+
+      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,18 +12,15 @@ 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 = getOrCreatePolicyEnforcer(httpRequest)
+        val policyEnforcer = createPolicyEnforcer(httpRequest)
         val authzContext = policyEnforcer.enforce(httpRequest, ServletHttpResponse(response))
         request.setAttribute(AuthorizationContext::class.java.name, authzContext)
         if (authzContext.isGranted) {
@@ -53,8 +50,8 @@ class SpringPolicyEnforcerFilter(private val configResolver: ConfigurationResolv
         return null
     }
 
-    private fun getOrCreatePolicyEnforcer(request: HttpRequest): SpringPolicyEnforcer {
-        return policyEnforcer.computeIfAbsent(configResolver.resolve(request)) { createPolicyEnforcer(it) }
+    private fun createPolicyEnforcer(request: HttpRequest): SpringPolicyEnforcer {
+        return createPolicyEnforcer(configResolver.resolve(request))
     }
 
     private fun createPolicyEnforcer(enforcerConfig: PolicyEnforcerConfig): SpringPolicyEnforcer {

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

@@ -18,6 +18,13 @@ class PartyService(
         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): Collection<PartyInElection> {
         val parties = partyRepository.findByElectionName(electionName)
         if (parties.isEmpty()) {

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

@@ -1,41 +0,0 @@
-package de.twomartens.wahlrecht.service
-
-import mu.KotlinLogging
-import org.apache.logging.log4j.message.StringMapMessage
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.cloud.context.refresh.ContextRefresher
-import org.springframework.scheduling.annotation.Scheduled
-import org.springframework.stereotype.Service
-import java.util.concurrent.TimeUnit
-
-/**
- * automatically reloads application*.yaml. reload can also be triggered manually by doing a post
- * request on http://localhost:12001/actuator/refresh
- */
-@Service
-class PropertyReloadService(@Qualifier("configDataContextRefresher") private val contextRefresher: ContextRefresher) {
-    @Scheduled(
-        fixedDelay = REFRESH_SECONDS.toLong(),
-        initialDelay = REFRESH_SECONDS.toLong(),
-        timeUnit = TimeUnit.SECONDS
-    )
-    fun refresh() {
-        val properties = contextRefresher.refresh()
-        if (properties.isNotEmpty()) {
-            log.info(
-                StringMapMessage()
-                    .with(PARAM_MESSAGE, "properties changed")
-                    .with(PARAM_PROPERTIES, properties.joinToString("\n"))
-                    .asString()
-            )
-        }
-    }
-
-    companion object {
-        const val REFRESH_SECONDS = 60
-        const val PARAM_MESSAGE = "message"
-        const val PARAM_PROPERTIES = "labels.properties"
-
-        private val log = KotlinLogging.logger {}
-    }
-}

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

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

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

@@ -0,0 +1,7 @@
+spring:
+  config:
+    import:
+      - "configserver:${CONFIGSERVER_SCHEME:http}://${CONFIGSERVER_HOST:configserver}:${CONFIGSERVER_PORT:8888}${CONFIGSERVER_PREFIX:/config}"
+  kafka:
+    bootstrap-servers:
+      - "${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
@@ -23,8 +24,9 @@ management:
     http.server.requests: true
 
 spring:
-  config:
-    import: "optional:configserver:http://configserver:8888/config"
+  cloud:
+    config:
+      name: wahlrecht
   main:
     banner-mode: off
   profiles:
@@ -36,21 +38,10 @@ 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
 
-
-# properties for application
-de.twomartens.wahlrecht:
-  defaultTimeZone: Europe/Berlin
-  greeting: "Hello %s"
-  statusprobe:
-    scheduleDuration: 60
-    maxKafkaFailureDuration: 5
-    maxBlobFailureCount: 5
-    maxFailurePercent: 50
-
 springdoc:
   swagger-ui:
     display-request-duration: true

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