IS-2720: Ktor3 and other deps (#386)

navikt · Dec 18, 2024 · 5bf6a26 · 5bf6a26
1 parent 41e8317
commit 5bf6a26
Show file tree

Hide file tree

Showing 24 changed files with 3,258 additions and 3,287 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,28 +7,28 @@ val dialogmeldingVersion = "1.5d21db9"
 val fellesformat2Version = "1.0329dd1"
 val flywayVersion = "10.17.3"
 val hikariVersion = "5.1.0"
-val jacksonVersion = "2.17.2"
+val jacksonVersion = "2.18.2"
 val jaxbVersion = "2.3.1"
 val jsonVersion = "20240303"
 val kafkaVersion = "3.7.0"
 val kithApprecVersion = "2019.07.30-04-23-2a0d1388209441ec05d2e92a821eed4f796a3ae2"
 val kithHodemeldingVersion = "2019.07.30-12-26-5c924ef4f04022bbb850aaf299eb8e4464c1ca6a"
 val kluentVersion = "1.73"
-val ktorVersion = "2.3.12"
-val logbackVersion = "1.5.6"
+val ktorVersion = "3.0.2"
+val logbackVersion = "1.5.12"
 val logstashEncoderVersion = "7.4"
 val micrometerRegistryVersion = "1.12.7"
-val mockkVersion = "1.13.9"
+val mockkVersion = "1.13.13"
 val mqVersion = "9.3.4.1"
-val nimbusjosejwtVersion = "9.40"
+val nimbusjosejwtVersion = "9.47"
 val postgresVersion = "42.7.4"
-val postgresEmbeddedVersion = "2.0.7"
+val postgresEmbeddedVersion = "2.1.0"
 val spekVersion = "2.0.19"
 val syfotjenesterVersion = "1.2021.06.09-13.09-b3d30de9996e"
 
 plugins {
-    kotlin("jvm") version "2.0.20"
-    id("com.gradleup.shadow") version "8.3.2"
+    kotlin("jvm") version "2.1.0"
+    id("com.gradleup.shadow") version "8.3.5"
     id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
 }
 

diff --git a/src/main/kotlin/no/nav/syfo/App.kt b/src/main/kotlin/no/nav/syfo/App.kt
@@ -94,15 +94,22 @@ fun main() {
     lateinit var dialogmeldingToBehandlerService: DialogmeldingToBehandlerService
     lateinit var dialogmeldingStatusService: DialogmeldingStatusService
 
-    val applicationEngineEnvironment = applicationEngineEnvironment {
+    val applicationEngineEnvironment = applicationEnvironment {
         log = logger
         config = HoconApplicationConfig(ConfigFactory.load())
-
-        connector {
-            port = applicationPort
-        }
-
-        module {
+    }
+    val server = embeddedServer(
+        factory = Netty,
+        environment = applicationEngineEnvironment,
+        configure = {
+            connector {
+                port = applicationPort
+            }
+            connectionGroupSize = 8
+            workerGroupSize = 8
+            callGroupSize = 16
+        },
+        module = {
             databaseModule(environment = environment)
 
             behandlerService = BehandlerService(
@@ -130,91 +137,81 @@ fun main() {
                 dialogmeldingToBehandlerService = dialogmeldingToBehandlerService,
                 veilederTilgangskontrollClient = veilederTilgangskontrollClient,
             )
-        }
-    }
-
-    applicationEngineEnvironment.monitor.subscribe(ApplicationStarted) {
-        applicationState.ready = true
-        logger.info("Application is ready, running Java VM ${Runtime.version()}")
-        launchKafkaTaskDialogmeldingBestilling(
-            applicationState = applicationState,
-            applicationEnvironmentKafka = environment.kafka,
-            dialogmeldingToBehandlerService = dialogmeldingToBehandlerService,
-        )
-        val dialogmeldingService = DialogmeldingService(
-            pdlClient = pdlClient,
-            mqSender = mqSender,
-        )
-        cronjobModule(
-            applicationState = applicationState,
-            environment = environment,
-            dialogmeldingToBehandlerService = dialogmeldingToBehandlerService,
-            dialogmeldingService = dialogmeldingService,
-            dialogmeldingStatusService = dialogmeldingStatusService,
-            behandlerService = behandlerService,
-            partnerinfoClient = partnerinfoClient,
-            legeSuspensjonClient = legeSuspensjonClient,
-            fastlegeClient = fastlegeClient,
-            syfohelsenettproxyClient = syfohelsenettproxyClient,
-        )
-        launchKafkaTaskSykmelding(
-            applicationState = applicationState,
-            applicationEnvironmentKafka = environment.kafka,
-            behandlerService = behandlerService,
-        )
-        launchKafkaTaskDialogmeldingFromBehandler(
-            applicationState = applicationState,
-            applicationEnvironmentKafka = environment.kafka,
-            database = applicationDatabase,
-        )
-        launchBackgroundTask(
-            applicationState = applicationState,
-        ) {
-            val factory = connectionFactory(environment)
-
-            factory.createConnection(
-                environment.serviceuserUsername,
-                environment.serviceuserPassword,
-            ).use { connection ->
-                connection.start()
-                val session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE)
-                val inputconsumer = session.consumerForQueue(environment.apprecQueueName)
-                val apprecService = ApprecService(
+            monitor.subscribe(ApplicationStarted) {
+                applicationState.ready = true
+                logger.info("Application is ready, running Java VM ${Runtime.version()}")
+                launchKafkaTaskDialogmeldingBestilling(
+                    applicationState = applicationState,
+                    applicationEnvironmentKafka = environment.kafka,
+                    dialogmeldingToBehandlerService = dialogmeldingToBehandlerService,
+                )
+                val dialogmeldingService = DialogmeldingService(
+                    pdlClient = pdlClient,
+                    mqSender = mqSender,
+                )
+                cronjobModule(
+                    applicationState = applicationState,
+                    environment = environment,
+                    dialogmeldingToBehandlerService = dialogmeldingToBehandlerService,
+                    dialogmeldingService = dialogmeldingService,
+                    dialogmeldingStatusService = dialogmeldingStatusService,
+                    behandlerService = behandlerService,
+                    partnerinfoClient = partnerinfoClient,
+                    legeSuspensjonClient = legeSuspensjonClient,
+                    fastlegeClient = fastlegeClient,
+                    syfohelsenettproxyClient = syfohelsenettproxyClient,
+                )
+                launchKafkaTaskSykmelding(
+                    applicationState = applicationState,
+                    applicationEnvironmentKafka = environment.kafka,
+                    behandlerService = behandlerService,
+                )
+                launchKafkaTaskDialogmeldingFromBehandler(
+                    applicationState = applicationState,
+                    applicationEnvironmentKafka = environment.kafka,
                     database = applicationDatabase,
                 )
-                val blockingApplicationRunner = ApprecConsumer(
+                launchBackgroundTask(
                     applicationState = applicationState,
+                ) {
+                    val factory = connectionFactory(environment)
+
+                    factory.createConnection(
+                        environment.serviceuserUsername,
+                        environment.serviceuserPassword,
+                    ).use { connection ->
+                        connection.start()
+                        val session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE)
+                        val inputconsumer = session.consumerForQueue(environment.apprecQueueName)
+                        val apprecService = ApprecService(
+                            database = applicationDatabase,
+                        )
+                        val blockingApplicationRunner = ApprecConsumer(
+                            applicationState = applicationState,
+                            database = applicationDatabase,
+                            inputconsumer = inputconsumer,
+                            apprecService = apprecService,
+                            dialogmeldingToBehandlerService = dialogmeldingToBehandlerService,
+                        )
+                        blockingApplicationRunner.run()
+                    }
+                }
+                val identhendelseService = IdenthendelseService(
                     database = applicationDatabase,
-                    inputconsumer = inputconsumer,
-                    apprecService = apprecService,
-                    dialogmeldingToBehandlerService = dialogmeldingToBehandlerService,
+                    pdlClient = pdlClient,
+                )
+                val identhendelseConsumerService = IdenthendelseConsumerService(
+                    identhendelseService = identhendelseService,
+                )
+
+                launchKafkaTaskIdenthendelse(
+                    applicationState = applicationState,
+                    applicationEnvironmentKafka = environment.kafka,
+                    kafkaIdenthendelseConsumerService = identhendelseConsumerService,
                 )
-                blockingApplicationRunner.run()
             }
         }
-        val identhendelseService = IdenthendelseService(
-            database = applicationDatabase,
-            pdlClient = pdlClient,
-        )
-        val identhendelseConsumerService = IdenthendelseConsumerService(
-            identhendelseService = identhendelseService,
-        )
-
-        launchKafkaTaskIdenthendelse(
-            applicationState = applicationState,
-            applicationEnvironmentKafka = environment.kafka,
-            kafkaIdenthendelseConsumerService = identhendelseConsumerService,
-        )
-    }
-
-    val server = embeddedServer(
-        factory = Netty,
-        environment = applicationEngineEnvironment,
-    ) {
-        connectionGroupSize = 8
-        workerGroupSize = 8
-        callGroupSize = 16
-    }
+    )
 
     Runtime.getRuntime().addShutdownHook(
         Thread {

diff --git a/src/main/kotlin/no/nav/syfo/behandler/api/access/VeilederAPIAccessPipeline.kt b/src/main/kotlin/no/nav/syfo/behandler/api/access/VeilederAPIAccessPipeline.kt
@@ -1,13 +1,12 @@
 package no.nav.syfo.behandler.api.access
 
-import io.ktor.server.application.*
-import io.ktor.util.pipeline.*
+import io.ktor.server.routing.*
 import no.nav.syfo.client.veiledertilgang.VeilederTilgangskontrollClient
 import no.nav.syfo.domain.Personident
 import no.nav.syfo.util.getBearerHeader
 import no.nav.syfo.util.getCallId
 
-suspend fun PipelineContext<out Unit, ApplicationCall>.validateVeilederAccess(
+suspend fun RoutingContext.validateVeilederAccess(
     action: String,
     personidentToAccess: Personident,
     veilederTilgangskontrollClient: VeilederTilgangskontrollClient,

diff --git a/src/main/kotlin/no/nav/syfo/util/RequestUtil.kt b/src/main/kotlin/no/nav/syfo/util/RequestUtil.kt
@@ -2,13 +2,14 @@ package no.nav.syfo.util
 
 import io.ktor.server.application.*
 import io.ktor.http.*
+import io.ktor.server.routing.*
 import io.ktor.util.pipeline.*
 import net.logstash.logback.argument.StructuredArguments
 
 const val NAV_CALL_ID_HEADER = "Nav-Call-Id"
 const val NAV_PERSONIDENT_HEADER = "nav-personident"
 
-fun PipelineContext<out Unit, ApplicationCall>.getCallId(): String {
+fun RoutingContext.getCallId(): String {
     return this.call.getCallId()
 }
 fun ApplicationCall.getCallId(): String {
@@ -17,16 +18,16 @@ fun ApplicationCall.getCallId(): String {
 
 fun callIdArgument(callId: String) = StructuredArguments.keyValue("callId", callId)!!
 
-fun PipelineContext<out Unit, ApplicationCall>.getBearerHeader(): String? {
+fun RoutingContext.getBearerHeader(): String? {
     return this.call.request.headers[HttpHeaders.Authorization]?.removePrefix("Bearer ")
 }
 
-fun PipelineContext<out Unit, ApplicationCall>.getPersonidentHeader(): String? {
+fun RoutingContext.getPersonidentHeader(): String? {
     return this.call.request.headers[NAV_PERSONIDENT_HEADER]
 }
 
-suspend fun PipelineContext<out Unit, ApplicationCall>.withValidToken(
-    block: suspend PipelineContext<out Unit, ApplicationCall>.() -> Unit
+suspend fun RoutingContext.withValidToken(
+    block: suspend RoutingContext.() -> Unit
 ) {
     if (getBearerHeader() != null) {
         block()