Merge pull request #74 from MarshallWace/upgrades

mw-lb · web-flow · commit 610a5a70b71f · 2025-10-02T12:31:02.000+01:00
Upgrades
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/sbt.xml b/.idea/sbt.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,8 @@
  *
  */
 
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("com.diffplug.spotless")
     kotlin("plugin.serialization")
@@ -14,16 +16,22 @@ subprojects {
     spotless {
         kotlin {
             trimTrailingWhitespace()
-            indentWithSpaces()
+            leadingTabsToSpaces()
             endWithNewline()
             licenseHeaderFile(rootProject.file("license-header.kt"))
         }
         kotlinGradle {
             target("*.gradle.kts")
             trimTrailingWhitespace()
-            indentWithSpaces()
+            leadingTabsToSpaces()
             endWithNewline()
             licenseHeaderFile(rootProject.file("license-header.kt"), "/\\* do not remove or change")
         }
     }
+
+    tasks.withType<KotlinCompile>().configureEach {
+        compilerOptions {
+            freeCompilerArgs.add("-opt-in=kotlin.time.ExperimentalTime")
+        }
+    }
 }
diff --git a/buildSrc/src/main/kotlin/buildlogic.kotlin-application-common-conventions.gradle.kts b/buildSrc/src/main/kotlin/buildlogic.kotlin-application-common-conventions.gradle.kts
@@ -4,6 +4,7 @@
  */
 
 val ktor_version: String by project
+val ktor_openapi_version: String by project
 val logback_version: String by project
 val prometheus_version: String by project
 val koin_version: String by project
@@ -22,7 +23,8 @@ dependencies {
     implementation("io.ktor:ktor-server-auth-jwt-jvm:$ktor_version")
     implementation("io.ktor:ktor-server-webjars-jvm:$ktor_version")
     implementation("org.webjars:jquery:3.2.1")
-    implementation("io.github.smiley4:ktor-swagger-ui:2.9.0")
+    implementation("io.github.smiley4:ktor-openapi:${ktor_openapi_version}")
+    implementation("io.github.smiley4:ktor-swagger-ui:$ktor_openapi_version")
     implementation("io.ktor:ktor-server-compression-jvm:$ktor_version")
     implementation("io.ktor:ktor-server-cors-jvm:$ktor_version")
     implementation("io.ktor:ktor-server-metrics-micrometer-jvm:$ktor_version")
diff --git a/buildSrc/src/main/kotlin/buildlogic.kotlin-common-conventions.gradle.kts b/buildSrc/src/main/kotlin/buildlogic.kotlin-common-conventions.gradle.kts
@@ -5,7 +5,11 @@
 
 val kotlin_version: String by project
 val kotlinx_coroutines_version: String by project
+val kotlinx_serialization_json_version: String by project
+val kotlinx_datetime_version: String by project
 val kotlin_logging_version: String by project
+val junit_jupyter_version: String by project
+val arrow_version: String by project
 
 plugins {
     // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
@@ -18,24 +22,22 @@ repositories {
 }
 
 dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:$kotlin_version")
 
     constraints {
         // Define dependency versions as constraints
         implementation("org.apache.commons:commons-text:1.12.0")
     }
 
-    implementation("io.arrow-kt:arrow-core:1.2.4")
-    implementation("io.arrow-kt:arrow-fx-coroutines:1.2.4")
+    implementation("io.arrow-kt:arrow-core:$arrow_version")
+    implementation("io.arrow-kt:arrow-fx-coroutines:$arrow_version")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:$kotlinx_coroutines_version")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_json_version")
     implementation("io.github.oshai:kotlin-logging-jvm:$kotlin_logging_version")
 
     // Use JUnit Jupiter for testing.
-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.3")
-
+    testImplementation("org.junit.jupiter:junit-jupiter:$junit_jupyter_version")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,18 @@
-spotless_version=7.0.0.BETA2
+spotless_version=8.0.0
 kotlin.code.style=official
-ktor_version=2.3.12
-kotlin_version=2.0.21
-kotlinx_coroutines_version=1.9.0
-kotlin_logging_version=7.0.0
-logback_version=1.4.14
-prometheus_version=1.6.13
-koin_version=3.5.6
-hoplite_version=2.7.5
-kotlin_kafka_version=0.4.0
-kafka_version=3.8.0
-plugin_serialization_version=2.0.21
+ktor_version=3.3.0
+ktor_openapi_version=5.3.0
+kotlin_version=2.2.20
+kotlinx_coroutines_version=1.10.2
+kotlinx_serialization_json_version=1.9.0
+kotlinx_datetime_version=0.7.1
+kotlin_logging_version=7.0.13
+logback_version=1.5.18
+prometheus_version=1.15.4
+koin_version=4.1.1
+hoplite_version=2.9.0
+kotlin_kafka_version=0.4.1
+kafka_version=4.1.0
+plugin_serialization_version=2.2.20
+junit_jupyter_version=6.0.0
+arrow_version=2.1.2
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
 
 [versions]
-kotlin-gradle-plugin = "2.0.21"
+kotlin-gradle-plugin = "2.2.20"
 
 [libraries]
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-gradle-plugin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/kafkakewl-common/src/main/kotlin/com/mwam/kafkakewl/common/plugins/Configure.kt b/kafkakewl-common/src/main/kotlin/com/mwam/kafkakewl/common/plugins/Configure.kt
@@ -9,7 +9,7 @@ package com.mwam.kafkakewl.common.plugins
 import com.auth0.jwt.JWT
 import com.auth0.jwt.algorithms.Algorithm
 import com.mwam.kafkakewl.common.metrics.metricsName
-import io.github.smiley4.ktorswaggerui.dsl.*
+import io.github.smiley4.ktoropenapi.*
 import io.ktor.http.*
 import io.ktor.serialization.JsonConvertException
 import io.ktor.serialization.kotlinx.json.json
@@ -18,8 +18,8 @@ import io.ktor.server.auth.*
 import io.ktor.server.auth.jwt.*
 import io.ktor.server.metrics.micrometer.*
 import io.ktor.server.plugins.BadRequestException
-import io.ktor.server.plugins.callloging.CallLogging
-import io.ktor.server.plugins.callloging.processingTimeMillis
+import io.ktor.server.plugins.calllogging.CallLogging
+import io.ktor.server.plugins.calllogging.processingTimeMillis
 import io.ktor.server.plugins.compression.*
 import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.plugins.cors.routing.*
@@ -32,7 +32,8 @@ import io.micrometer.core.instrument.Gauge
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.Tag
 import io.micrometer.core.instrument.config.MeterFilter
-import io.micrometer.prometheus.*
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
+import io.micrometer.prometheusmetrics.PrometheusConfig
 import kotlinx.serialization.json.Json
 import org.koin.core.module.Module
 import org.koin.dsl.module
@@ -76,6 +77,7 @@ fun Application.configureMonitoring() {
         registry = meterRegistry
         // ...
     }
+
     routing {
         get("/metrics", {
             hidden = true
diff --git a/kafkakewl-deploy/src/main/kotlin/com/mwam/kafkakewl/deploy/Application.kt b/kafkakewl-deploy/src/main/kotlin/com/mwam/kafkakewl/deploy/Application.kt
@@ -30,11 +30,11 @@ fun Application.module(config: Config) {
     configureMonitoring()
     configureCoreMetrics(config.kafkaCluster.name)
 
-    environment.monitor.subscribe(ApplicationStopped) { application ->
+    monitor.subscribe(ApplicationStopped) { application ->
         application.environment.log.info("Ktor server has stopped")
         // TODO can this be done in a better way?
         // TODO this is where we can close AutoCloseable services or do any kind of clean-up tasks
-        application.environment.monitor.unsubscribe(ApplicationStopped) {}
+        application.monitor.unsubscribe(ApplicationStopped) {}
     }
 
     configureRouting()
diff --git a/kafkakewl-deploy/src/main/kotlin/com/mwam/kafkakewl/deploy/plugins/Routing.kt b/kafkakewl-deploy/src/main/kotlin/com/mwam/kafkakewl/deploy/plugins/Routing.kt
@@ -11,10 +11,10 @@ import com.mwam.kafkakewl.common.plugins.receiveWithDeserializationError
 import com.mwam.kafkakewl.deploy.services.*
 import com.mwam.kafkakewl.domain.*
 import io.github.oshai.kotlinlogging.withLoggingContext
-import io.github.smiley4.ktorswaggerui.SwaggerUI
-import io.github.smiley4.ktorswaggerui.dsl.*
+import io.github.smiley4.ktoropenapi.*
+import io.github.smiley4.ktoropenapi.config.RequestConfig
+import io.github.smiley4.ktorswaggerui.swaggerUI
 import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.application.Application
 import io.ktor.server.application.install
 import io.ktor.server.request.*
@@ -33,7 +33,7 @@ fun ApplicationRequest.extractTopologyDeploymentQuery(): TopologyDeploymentQuery
 }
 
 /** describes the filter/offset/limit query parameters for an OpenApi request */
-fun OpenApiRequest.queryParametersForTopologyDeploymentQuery() {
+fun RequestConfig.queryParametersForTopologyDeploymentQuery() {
     queryParameter<String?>("filter") {
         description = "An optional regular expression filter for the topology id"
     }
@@ -49,23 +49,17 @@ fun Application.configureRouting() {
     install(Webjars) {
         path = "/webjars" //defaults to /webjars
     }
-    install(SwaggerUI) {
-        swagger {
-            swaggerUrl = "swagger-ui"
-            forwardRoot = true
-        }
-        info {
-            title = "kafkakewl API"
-            version = "latest"
-            description = "kafkakewl API"
+    install(OpenApi)
+
+    routing {
+        route("api.json") {
+            openApi()
         }
-        server {
-            // TODO the service url and description for swagger should come from config
-            url = "http://localhost:8080"
-            description = "Development Server"
+        route("swagger") {
+            swaggerUI("/api.json") {
+            }
         }
-    }
-    routing {
+
         val topologyDeploymentsService by inject<TopologyDeploymentsService>()
 
         route("/api/v1") {
diff --git a/kafkakewl-deploy/src/main/kotlin/com/mwam/kafkakewl/deploy/services/TopologyDeploymentsService.kt b/kafkakewl-deploy/src/main/kotlin/com/mwam/kafkakewl/deploy/services/TopologyDeploymentsService.kt
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicReference
 
 interface TopologyDeploymentsService {
     suspend fun deploy(deployments: Deployments): Either<PostDeploymentsFailure, DeploymentsSuccess>
-    fun getTopologyDeployments(topologyDeploymentQuery: TopologyDeploymentQuery): List<TopologyDeployment>
+    fun getTopologyDeployments(query: TopologyDeploymentQuery): List<TopologyDeployment>
     fun getTopologyDeployment(id: TopologyId): TopologyDeployment?
 }
 
diff --git a/kafkakewl-deploy/src/test/kotlin/com/mwam/kafkakewl/deploy/ApplicationTest.kt b/kafkakewl-deploy/src/test/kotlin/com/mwam/kafkakewl/deploy/ApplicationTest.kt
@@ -11,9 +11,11 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.server.testing.*
+import org.junit.jupiter.api.Disabled
 import kotlin.test.*
 
 class ApplicationTest {
+    @Disabled("This is just an example to test an http end-point, does not actually work")
     @Test
     fun testRoot() = testApplication {
         application {
diff --git a/kafkakewl-metrics/src/main/kotlin/com/mwam/kafkakewl/metrics/Application.kt b/kafkakewl-metrics/src/main/kotlin/com/mwam/kafkakewl/metrics/Application.kt
@@ -36,11 +36,11 @@ fun Application.module(config: Config) {
     val kafkaTopicInfoSource by inject<KafkaTopicInfoSource>()
     kafkaTopicInfoSource.startPublishing()
 
-    environment.monitor.subscribe(ApplicationStopped) { application ->
+    monitor.subscribe(ApplicationStopped) { application ->
         application.environment.log.info("Ktor server has stopped")
         // TODO can this be done in a better way?
         kafkaTopicInfoSource.close()
-        application.environment.monitor.unsubscribe(ApplicationStopped) {}
+        application.monitor.unsubscribe(ApplicationStopped) {}
     }
 
     configureRouting()
diff --git a/kafkakewl-metrics/src/main/kotlin/com/mwam/kafkakewl/metrics/domain/KafkaTopicPartitionInfo.kt b/kafkakewl-metrics/src/main/kotlin/com/mwam/kafkakewl/metrics/domain/KafkaTopicPartitionInfo.kt
@@ -8,7 +8,7 @@ package com.mwam.kafkakewl.metrics.domain
 
 import kotlinx.serialization.Serializable
 import org.apache.kafka.common.TopicPartition
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 
 @Serializable
 data class KafkaTopicPartition(val topic: String, val partition: Int) {
diff --git a/kafkakewl-metrics/src/main/kotlin/com/mwam/kafkakewl/metrics/plugins/Routing.kt b/kafkakewl-metrics/src/main/kotlin/com/mwam/kafkakewl/metrics/plugins/Routing.kt
@@ -10,10 +10,9 @@ import com.mwam.kafkakewl.domain.*
 import com.mwam.kafkakewl.metrics.domain.*
 import com.mwam.kafkakewl.metrics.services.*
 import io.github.oshai.kotlinlogging.withLoggingContext
-import io.github.smiley4.ktorswaggerui.SwaggerUI
-import io.github.smiley4.ktorswaggerui.dsl.*
+import io.github.smiley4.ktoropenapi.*
+import io.github.smiley4.ktorswaggerui.swaggerUI
 import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.application.Application
 import io.ktor.server.application.install
 import io.ktor.server.response.*
@@ -26,23 +25,17 @@ fun Application.configureRouting() {
     install(Webjars) {
         path = "/webjars" //defaults to /webjars
     }
-    install(SwaggerUI) {
-        swagger {
-            swaggerUrl = "swagger-ui"
-            forwardRoot = true
-        }
-        info {
-            title = "kafkakewl metrics API"
-            version = "latest"
-            description = "kafkakewl metrics API"
+    install(OpenApi)
+
+    routing {
+        route("api.json") {
+            openApi()
         }
-        server {
-            // TODO the service url and description for swagger should come from config
-            url = "http://localhost:8080"
-            description = "Development Server"
+        route("swagger") {
+            swaggerUI("/api.json") {
+            }
         }
-    }
-    routing {
+
         val kafkaTopicInfoCache by inject<KafkaTopicInfoCache>()
         route("/api/v1") {
             get("/topic/{topic}", {
diff --git a/kafkakewl-metrics/src/main/kotlin/com/mwam/kafkakewl/metrics/services/KafkaTopicInfoSource.kt b/kafkakewl-metrics/src/main/kotlin/com/mwam/kafkakewl/metrics/services/KafkaTopicInfoSource.kt
@@ -20,11 +20,12 @@ import com.mwam.kafkakewl.utils.toEither
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
-import kotlinx.datetime.Clock
 import org.apache.kafka.clients.consumer.KafkaConsumer
 import org.apache.kafka.common.TopicPartition
 import org.apache.kafka.common.serialization.BytesDeserializer
 import org.apache.kafka.common.utils.Bytes
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 import kotlin.time.toJavaDuration
 
diff --git a/kafkakewl-metrics/src/test/kotlin/com/mwam/kafkakewl/metrics/ApplicationTest.kt b/kafkakewl-metrics/src/test/kotlin/com/mwam/kafkakewl/metrics/ApplicationTest.kt
@@ -11,9 +11,11 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.server.testing.*
+import org.junit.jupiter.api.Disabled
 import kotlin.test.*
 
 class ApplicationTest {
+    @Disabled("This is just an example to test an http end-point, does not actually work")
     @Test
     fun testRoot() = testApplication {
         application {
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -11,7 +11,6 @@ pluginManagement {
     val plugin_serialization_version: String by settings
     val spotless_version: String by settings
     plugins {
-        id("io.ktor.plugin") version ktor_version
         id("io.ktor.plugin") version ktor_version
         id("org.jetbrains.kotlin.plugin.serialization") version plugin_serialization_version
         id("com.diffplug.spotless") version spotless_version
