ci: Add workflow to build container

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
@@ -91,7 +90,6 @@ trigger:
   event:
     include:
       - tag
-      - custom
 
 ---
 kind: pipeline
@@ -110,7 +108,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
@@ -120,15 +118,18 @@ steps:
       - ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
       - git clone ssh://giteajim@git.2martens.de:22/2martens/cloud-configuration.git .
       - git checkout main
-  - name: modify deployed image
+  - name: update image version
     image: alpine
     commands:
-      - sed -i -r "s/(wahlrecht_image_version:).*/\1\ ${DRONE_SEMVER}/" ansible/inventories/host_vars/api-server/public.yaml
+      - 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: ssh_key
+        from_secret: private_ssh_key
     commands:
       - mkdir $HOME/.ssh
       - echo "$SSH_KEY" > $HOME/.ssh/id_ed25519
@@ -136,22 +137,13 @@ steps:
       - touch $HOME/.ssh/known_hosts
       - chmod 600 $HOME/.ssh/known_hosts
       - ssh-keyscan -H git.2martens.de > $HOME/.ssh/known_hosts 2>/dev/null
-      - git add ansible/inventories/host_vars/api-server/public.yaml
-      - git commit -m "[Drone] Changed wahlrecht_image_version to ${DRONE_SEMVER}"
+      - 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
-  - name: deploy image
-    image: plugins/ansible:latest
-    settings:
-      playbook: ansible/deploy_spring.yaml
-      inventory: ansible/inventories/production
-      private_key:
-        from_secret: ssh_key
-      vault_password:
-        from_secret: vault_password
 
 trigger:
   target:
-    - production
+    - test
   event:
     include:
       - promote

.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

.github/workflows/build.yaml

@@ -0,0 +1,28 @@
+name: Build image
+on:
+  push:
+    tags:
+      - '*'
+  workflow_dispatch:
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build and push container
+        run: ./gradlew -Prelease.useLastTag=true final jib
+        env:
+          USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}

.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")
     }
 }

gradle/libs.versions.toml

@@ -1,21 +1,22 @@
 [versions]
-spring-boot = "3.1.2"
-spring-doc = "2.1.0"
-spring-cloud = "2022.0.4"
+spring-boot = "3.5.4"
+spring-doc = "2.8.9"
+spring-cloud = "2025.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"
-mapstruct = "1.5.5.Final"
-junit = "5.10.0"
-assertj = "3.24.2"
-mockito = "5.4.0"
-keycloak = "22.0.1"
+httpclient = "5.5"
+slf4j = "2.0.17"
+log4j = "2.25.1"
+log4j-ecs = "1.7.0"
+mapstruct = "1.6.3"
+junit = "5.13.4"
+assertj = "3.27.3"
+mockito = "5.18.0"
+keycloak = "26.3.2"
+keycloak-policy-enforcer = "26.0.6"
 kotlin-logging = "3.0.5"
-kotlin-reflect = "1.9.0"
+kotlin-reflect = "2.2.0"
 kotlin-lombok = "1.9.0"
 plugin-nebula-release = "17.2.2"
 plugin-lombok = "8.0.1"
@@ -47,7 +48,7 @@ spring-ui = { module = "org.springdoc:springdoc-openapi-starter-webmvc-ui", vers
 spring-sec = { module = "org.springdoc:springdoc-openapi-starter-common", version.ref = "spring-doc" }
 spring-openapi = { module = "org.springdoc:springdoc-openapi-starter-webmvc-api", version.ref = "spring-doc" }
 keycloak-core = { module = "org.keycloak:keycloak-core", version.ref = "keycloak" }
-keycloak-policy-enforcer = { module = "org.keycloak:keycloak-policy-enforcer", version.ref = "keycloak" }
+keycloak-policy-enforcer = { module = "org.keycloak:keycloak-policy-enforcer", version.ref = "keycloak-policy-enforcer" }
 grpc-api = { module = "io.grpc:grpc-api", version.ref = "grpc" }
 grpc-context = { module = "io.grpc:grpc-context", version.ref = "grpc" }
 grpc-core = { module = "io.grpc:grpc-core", version.ref = "grpc" }

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/put-election.http

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

module-deploy/deploy.gradle.kts

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

module-server/server.gradle.kts

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

module-server/src/main/kotlin/de/twomartens/wahlrecht/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
@@ -16,9 +15,9 @@ import org.springframework.context.annotation.Configuration
     name = "oauth2",
     type = SecuritySchemeType.OAUTH2,
     flows = OAuthFlows(
-        implicit = OAuthFlow(
-            authorizationUrl = "https://id.2martens.de/realms/2martens/protocol/openid-connect/auth",
-            tokenUrl = "https://id.2martens.de/realms/2martens/protocol/openid-connect/token"
+        authorizationCode = OAuthFlow(
+            authorizationUrl = "https://id.2martens.de/realms/twomartens/protocol/openid-connect/auth",
+            tokenUrl = "https://id.2martens.de/realms/twomartens/protocol/openid-connect/token"
         )
     )
 )
@@ -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/configuration/WebSecurityConfiguration.kt

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

module-server/src/main/kotlin/de/twomartens/wahlrecht/controller/v1/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/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/property/ServiceProperties.kt

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

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

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

module-server/src/main/kotlin/de/twomartens/wahlrecht/repository/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/CalculationService.kt

@@ -247,6 +247,7 @@ class CalculationService(
         var assignedSeats: Long
         var assignedSeatsPerVotingResult: Map<VotingResult, Int>
         log.debug("Calculate assigned seats with initial election number {}", electionNumber)
+        var numberOfAttempts = 5
         do {
             electionNumberHistory.add(electionNumber)
             val seatsPerVotingResult: MutableMap<VotingResult, Double> = mutableMapOf()
@@ -277,7 +278,11 @@ class CalculationService(
                 )
                 log.debug("Calculated higher election number {}", electionNumber)
             }
-        } while (assignedSeats != numberOfSeats.toLong())
+            numberOfAttempts--
+        } while (assignedSeats != numberOfSeats.toLong() && numberOfAttempts > 0)
+        if (numberOfAttempts == 0 && assignedSeats != numberOfSeats.toLong()) {
+          log.error("With the given result, the solution can never be calculated")
+        }
         return assignedSeatsPerVotingResult
     }
 

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/resources/application-dev.yaml

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

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

@@ -1,7 +0,0 @@
-spring:
-  config:
-    import:
-      - "configserver:http://configserver:8888/config"
-  kafka:
-    bootstrap-servers:
-      - kafka: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,9 +24,6 @@ management:
     http.server.requests: true
 
 spring:
-  cloud:
-    config:
-      name: wahlrecht
   main:
     banner-mode: off
   profiles:
@@ -37,7 +35,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:twomartens}/protocol/openid-connect/certs
   application:
     name: wahlrecht
 
@@ -86,3 +84,12 @@ resttemplate:
     connectionRestHealthIndicatorTimeoutInMillis: 5000
     readTimeoutRestTemplateInMillis: 5000
     connectionRestTemplateTimeoutInMillis: 5000
+
+de.twomartens.wahlrecht:
+  defaultTimeZone: Europe/Berlin
+  greeting: "Hello %s, on millenium"
+  statusprobe:
+    scheduleDuration: 60
+    maxKafkaFailureDuration: 5
+    maxBlobFailureCount: 5
+    maxFailurePercent: 50

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

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

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

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

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

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