fix: Remove config server and kafka

This reverts commit 0082305a5a.

gradle/libs.versions.toml

@@ -1,21 +1,22 @@
 [versions]
-spring-boot = "3.2.3"
+spring-boot = "3.5.4"
-spring-doc = "2.3.0"
+spring-doc = "2.8.9"
-spring-cloud = "2023.0.0"
+spring-cloud = "2025.0.0"
 spring-grpc = "2.14.0.RELEASE"
 grpc = "1.57.0"
 tomcat-annotations = "6.0.53"
-httpclient = "5.3.1"
+httpclient = "5.5"
-slf4j = "2.0.12"
+slf4j = "2.0.17"
-log4j = "2.23.0"
+log4j = "2.25.1"
-log4j-ecs = "1.6.0"
+log4j-ecs = "1.7.0"
-mapstruct = "1.5.5.Final"
+mapstruct = "1.6.3"
-junit = "5.10.2"
+junit = "5.13.4"
-assertj = "3.25.3"
+assertj = "3.27.3"
-mockito = "5.11.0"
+mockito = "5.18.0"
-keycloak = "24.0.1"
+keycloak = "26.3.2"
+keycloak-policy-enforcer = "26.0.6"
 kotlin-logging = "3.0.5"
-kotlin-reflect = "1.9.22"
+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" }

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-server/server.gradle.kts

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

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

@@ -8,7 +8,7 @@ import java.time.ZoneId
 @RefreshScope
 @ConfigurationProperties(prefix = "de.twomartens.wahlrecht")
 @Schema(description = "Properties, to configure this Application")
-class ServiceProperties {
+open class ServiceProperties {
     lateinit var defaultTimeZone: ZoneId
     lateinit var greeting: String
 }

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 {
+    private fun createPolicyEnforcer(request: HttpRequest): SpringPolicyEnforcer {
-        return policyEnforcer.computeIfAbsent(configResolver.resolve(request)) { createPolicyEnforcer(it) }
+        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/resources/application-dev.yaml

@@ -1,5 +0,0 @@
-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

@@ -1,4 +0,0 @@
-spring:
-  config:
-    import:
-      - "configserver:${CONFIGSERVER_SCHEME:http}://${CONFIGSERVER_HOST:configserver}:${CONFIGSERVER_PORT:8888}${CONFIGSERVER_PREFIX:/config}"

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

@@ -24,9 +24,6 @@ management:
     http.server.requests: true
 
 spring:
-  cloud:
-    config:
-      name: wahlrecht
   main:
     banner-mode: off
   profiles:
@@ -38,7 +35,7 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: ${KEYCLOAK_URL:https://id.2martens.de}/realms/${KEYCLOAK_REALM: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,4 +83,13 @@ resttemplate:
     readTimeoutRestHealthIndicatorInMillis: 5000
     connectionRestHealthIndicatorTimeoutInMillis: 5000
     readTimeoutRestTemplateInMillis: 5000
-    connectionRestTemplateTimeoutInMillis: 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