oppgraderer ktor i bekreftelse-tjeneste

navikt · Dec 18, 2024 · 8c81d3c · 8c81d3c
1 parent 5eb6e2d
commit 8c81d3c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/apps/bekreftelse-tjeneste/build.gradle.kts b/apps/bekreftelse-tjeneste/build.gradle.kts
@@ -13,20 +13,20 @@ val image: String? by project
 dependencies {
     // Project
     implementation(project(":lib:hoplite-config"))
-    implementation(project(":lib:error-handling"))
+    implementation(project(":lib:error-handling-ktor3"))
     implementation(project(":lib:kafka-streams"))
-    implementation(project(":lib:kafka-key-generator-client"))
+    implementation(project(":lib:kafka-key-generator-client-ktor3"))
     implementation(project(":domain:main-avro-schema"))
     implementation(project(":domain:bekreftelse-interne-hendelser"))
     implementation(project(":domain:bekreftelse-paavegneav-avro-schema"))
     implementation(project(":domain:bekreftelsesmelding-avro-schema"))
 
     // Server
-    implementation(libs.bundles.ktorServerWithNettyAndMicrometer)
+    implementation(libs.bundles.ktor3ServerWithNettyAndMicrometer)
 
     // Serialization
-    implementation(libs.ktor.serialization.jackson)
-    implementation(libs.ktor.serialization.kotlinx.json)
+    implementation(libs.ktor3.serialization.jackson)
+    implementation(libs.ktor3.serialization.kotlinx.json)
     implementation(libs.jackson.datatypeJsr310)
 
     // Tooling
@@ -47,7 +47,7 @@ dependencies {
     implementation(libs.avro.kafkaStreamsSerde)
 
     // Testing
-    testImplementation(libs.ktor.server.testJvm)
+    testImplementation(libs.ktor3.server.test.host)
     testImplementation(libs.kafka.streams.test)
     testImplementation(libs.bundles.testLibsWithUnitTesting)
     testImplementation(project(":test:test-data-lib"))

diff --git a/...kreftelse-tjeneste/src/main/kotlin/no/nav/paw/bekreftelsetjeneste/plugins/KafkaStreams.kt b/...kreftelse-tjeneste/src/main/kotlin/no/nav/paw/bekreftelsetjeneste/plugins/KafkaStreams.kt
@@ -7,7 +7,7 @@ import io.ktor.server.application.ApplicationStopping
 import io.ktor.server.application.createApplicationPlugin
 import io.ktor.server.application.hooks.MonitoringEvent
 import io.ktor.server.application.log
-import io.ktor.util.KtorDsl
+import io.ktor.utils.io.KtorDsl
 import no.nav.paw.bekreftelsetjeneste.context.ApplicationContext
 import no.nav.paw.config.kafka.streams.KafkaStreamsFactory
 import no.nav.paw.error.handler.withApplicationTerminatingExceptionHandler