fix: Remove kafka

.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
+      - tag
-      - custom
 
+---
+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
+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.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.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

@@ -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

http-requests/calculate-result.http

@@ -1,4 +1,4 @@
-POST http://localhost:12000/wahlrecht/v1/calculate
+POST {{backend}}/wahlrecht/v1/calculate
 Content-Type: application/json
 
 {

http-requests/get-elections.http

@@ -0,0 +1,2 @@
+GET {{backend}}/wahlrecht/v1/elections
+Content-Type: application/json

http-requests/http-client.env.json

@@ -0,0 +1,8 @@
+{
+  "dev": {
+    "backend": "http://localhost:12000"
+  },
+  "prod" : {
+    "backend": "https://api.2martens.de"
+  }
+}

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"
@@ -31,10 +31,8 @@ jib {
         }
     }
     container {
-        extraClasspath = listOf("/configmap")
+        mainClass = "de.twomartens.wahlrecht.MainApplicationKt"
-        mainClass = "de.twomartens.wahlrecht.MainApplication"
         jvmFlags = listOf("-XX:+UseContainerSupport",
-                "-XX:MaxRAMPercentage=75.0",
+                "-XX:MaxRAMPercentage=75.0")
-                "-Dlog4j.configurationFile=/configmap/log4j2.xml")
     }
 }

module-deploy/k8s/prod/application-prod.yaml

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

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/WebConfiguration.kt

@@ -17,9 +17,12 @@ open class WebConfiguration(private val headerInterceptorRest: HeaderInterceptor
         val registration = registry.addMapping("/**")
         registration.allowedMethods(
                 HttpMethod.GET.name(), HttpMethod.POST.name(),
-            HttpMethod.PUT.name(), HttpMethod.OPTIONS.name()
+                HttpMethod.PUT.name(), HttpMethod.HEAD.name()
         )
         registration.allowCredentials(true)
-        registration.allowedOrigins("http://localhost:4200")
+        registration.allowedOrigins(
+                "http://localhost:4200",
+                "https://wahlrecht.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,10 +12,12 @@ 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"])
@@ -58,14 +60,14 @@ class ElectionController(private val service: ElectionService) {
           content = [Content(mediaType = "application/json", schema = Schema(implementation = Election::class))]
       )]
   )
-    @GetMapping(value = ["/elections/by-name/{electionName}"], produces = [MediaType.APPLICATION_JSON_VALUE])
+  @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 ResponseEntity.ok()
+    return ok()
         .contentType(MediaType.APPLICATION_JSON)
         .body(election)
   }
@@ -84,8 +86,14 @@ class ElectionController(private val service: ElectionService) {
   @PutMapping("/election")
   @SecurityRequirement(name = "bearerAuth")
   @SecurityRequirement(name = "oauth2")
-    fun putElection(@RequestBody election: Election?): ResponseEntity<*> {
+  fun putElection(@RequestBody election: Election?, uriComponentsBuilder: UriComponentsBuilder):
+      ResponseEntity<Void> {
     val createdNew = service.storeElection(mapper.mapToDB(election!!))
-        return if (createdNew) ResponseEntity<Any>(HttpStatus.CREATED) else ResponseEntity<Any>(HttpStatus.OK)
+    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,17 +13,20 @@ 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(
@@ -39,7 +42,7 @@ 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(
@@ -52,11 +55,41 @@ class PartyController(private val service: PartyService) {
           )
         }
         .toList()
-        return ResponseEntity.ok()
+    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)
+    )
+    return ok()
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(party)
+  }
+
   @Operation(
       summary = "Stores a new party in an election",
       responses = [ApiResponse(
@@ -70,8 +103,13 @@ class PartyController(private val service: PartyService) {
   @PutMapping("/party")
   @SecurityRequirement(name = "bearerAuth")
   @SecurityRequirement(name = "oauth2")
-    fun putParty(@RequestBody party: PartyInElection?): ResponseEntity<*> {
+  fun putParty(@RequestBody party: PartyInElection?,
+               uriComponentsBuilder: UriComponentsBuilder): ResponseEntity<Void> {
     val createdNew = service.storeParty(mapper.mapToDB(party!!))
-        return if (createdNew) ResponseEntity<Any>(HttpStatus.CREATED) else ResponseEntity<Any>(HttpStatus.OK)
+    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
@@ -29,7 +30,9 @@ import java.time.Clock
 @Component
 class RestHealthIndicator(
         clock: Clock, interceptor: HeaderInterceptorRest,
-    serverProperties: ServerProperties, private val restTemplateRestHealthIndicator: RestTemplate
+        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,7 +46,7 @@ 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()

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

@@ -30,6 +30,7 @@ class SpringPolicyEnforcer(private val policyEnforcer: PolicyEnforcer,
 
   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)

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
+spring:
-management.server.port: 12001
+  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,4 @@
+spring:
+  config:
+    import:
+      - "configserver:${CONFIGSERVER_SCHEME:http}://${CONFIGSERVER_HOST:configserver}:${CONFIGSERVER_PORT:8888}${CONFIGSERVER_PREFIX:/config}"

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:
+  cloud:
     config:
-    import: "optional:configserver:http://localhost:8888/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