From 8c81d3cdd669d0d23c367a294403684456af4b46 Mon Sep 17 00:00:00 2001 From: robertkittilsen Date: Wed, 18 Dec 2024 10:06:11 +0100 Subject: [PATCH] oppgraderer ktor i bekreftelse-tjeneste --- apps/bekreftelse-tjeneste/build.gradle.kts | 12 ++++++------ .../paw/bekreftelsetjeneste/plugins/KafkaStreams.kt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/bekreftelse-tjeneste/build.gradle.kts b/apps/bekreftelse-tjeneste/build.gradle.kts index 9cbef3ae..a36733a2 100644 --- 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/apps/bekreftelse-tjeneste/src/main/kotlin/no/nav/paw/bekreftelsetjeneste/plugins/KafkaStreams.kt b/apps/bekreftelse-tjeneste/src/main/kotlin/no/nav/paw/bekreftelsetjeneste/plugins/KafkaStreams.kt index b3d4f8ba..2b561cd7 100644 --- a/apps/bekreftelse-tjeneste/src/main/kotlin/no/nav/paw/bekreftelsetjeneste/plugins/KafkaStreams.kt +++ b/apps/bekreftelse-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