chore: bumped ktor to 3.0.1 (#135)

Author: MikAoJk

build.gradle.kts

@@ -10,7 +10,7 @@ val jaxbApiVersion = "2.4.0-b180830.0359"
 val jaxbVersion = "2.3.0.1"
 val kafkaVersion = "3.8.0"
 val syfoXmlCodegenVersion = "2.0.1"
-val ktorVersion = "2.3.12"
+val ktorVersion = "3.0.1"
 val logbackVersion = "1.5.8"
 val logstashEncoderVersion = "8.0"
 val prometheusVersion = "0.16.0"

src/main/kotlin/no/nav/syfo/application/ApplicationEngine.kt

@@ -1,14 +1,13 @@
 package no.nav.syfo.application
 
-import io.ktor.server.engine.ApplicationEngine
-import io.ktor.server.engine.embeddedServer
-import io.ktor.server.netty.Netty
+import io.ktor.server.engine.*
+import io.ktor.server.netty.*
 import io.ktor.server.routing.routing
 import no.nav.syfo.Environment
 import no.nav.syfo.application.api.registerNaisApi
 
 fun createApplicationEngine(
     env: Environment,
     applicationState: ApplicationState,
-): ApplicationEngine =
+): EmbeddedServer<NettyApplicationEngine, NettyApplicationEngine.Configuration> =
     embeddedServer(Netty, env.applicationPort) { routing { registerNaisApi(applicationState) } }

src/main/kotlin/no/nav/syfo/application/ApplicationServer.kt

@@ -1,10 +1,12 @@
 package no.nav.syfo.application
 
-import io.ktor.server.engine.ApplicationEngine
+import io.ktor.server.engine.*
+import io.ktor.server.netty.*
 import java.util.concurrent.TimeUnit
 
 class ApplicationServer(
-    private val applicationServer: ApplicationEngine,
+    private val applicationServer:
+        EmbeddedServer<NettyApplicationEngine, NettyApplicationEngine.Configuration>,
     private val applicationState: ApplicationState,
 ) {
 

src/test/kotlin/no/nav/syfo/SelfTest.kt

@@ -1,82 +1,80 @@
 package no.nav.syfo
 
-import io.ktor.http.HttpMethod
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.routing.routing
-import io.ktor.server.testing.TestApplicationEngine
-import io.ktor.server.testing.handleRequest
-import io.ktor.util.InternalAPI
+import io.ktor.server.testing.*
 import no.nav.syfo.application.ApplicationState
 import no.nav.syfo.application.api.registerNaisApi
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 internal class SelfTest {
 
-    @InternalAPI
     @Test
     internal fun `Successfull liveness and readyness tests Returns ok on is_alive`() {
-        with(TestApplicationEngine()) {
-            start()
-            val applicationState = ApplicationState()
-            applicationState.ready = true
-            applicationState.alive = true
-            application.routing { registerNaisApi(applicationState) }
-
-            with(handleRequest(HttpMethod.Get, "/internal/is_alive")) {
-                assertEquals(HttpStatusCode.OK, response.status())
-                assertEquals("I'm alive! :)", response.content)
+        testApplication {
+            application {
+                val applicationState = ApplicationState()
+                applicationState.ready = true
+                applicationState.alive = true
+                routing { registerNaisApi(applicationState) }
             }
+
+            val response = client.get("/internal/is_alive")
+
+            assertEquals(HttpStatusCode.OK, response.status)
+            assertEquals("I'm alive! :)", response.bodyAsText())
         }
     }
 
-    @InternalAPI
     @Test
     internal fun `Successfull liveness and readyness tests returns ok in is_ready`() {
-        with(TestApplicationEngine()) {
-            start()
-            val applicationState = ApplicationState()
-            applicationState.ready = true
-            applicationState.alive = true
-            application.routing { registerNaisApi(applicationState) }
-
-            with(handleRequest(HttpMethod.Get, "/internal/is_ready")) {
-                assertEquals(HttpStatusCode.OK, response.status())
-                assertEquals("I'm ready! :)", response.content)
+        testApplication {
+            application {
+                val applicationState = ApplicationState()
+                applicationState.ready = true
+                applicationState.alive = true
+                routing { registerNaisApi(applicationState) }
             }
+
+            val response = client.get("/internal/is_ready")
+
+            assertEquals(HttpStatusCode.OK, response.status)
+            assertEquals("I'm ready! :)", response.bodyAsText())
         }
     }
 
-    @InternalAPI
     @Test
     internal fun `Unsuccessful liveness and readyness returns internal server error when liveness check fails`() {
-        with(TestApplicationEngine()) {
-            start()
-            val applicationState = ApplicationState()
-            applicationState.ready = false
-            applicationState.alive = false
-            application.routing { registerNaisApi(applicationState) }
-
-            with(handleRequest(HttpMethod.Get, "/internal/is_alive")) {
-                assertEquals(HttpStatusCode.InternalServerError, response.status())
-                assertEquals("I'm dead x_x", response.content)
+        testApplication {
+            application {
+                val applicationState = ApplicationState()
+                applicationState.ready = false
+                applicationState.alive = false
+                routing { registerNaisApi(applicationState) }
             }
+            val response = client.get("/internal/is_alive")
+
+            assertEquals(HttpStatusCode.InternalServerError, response.status)
+            assertEquals("I'm dead x_x", response.bodyAsText())
         }
     }
 
-    @InternalAPI
     @Test
     internal fun `Unsuccessful liveness and readyness returns internal server error when readyness check fails`() {
-        with(TestApplicationEngine()) {
-            start()
-            val applicationState = ApplicationState()
-            applicationState.ready = false
-            applicationState.alive = false
-            application.routing { registerNaisApi(applicationState) }
-            with(handleRequest(HttpMethod.Get, "/internal/is_ready")) {
-                assertEquals(HttpStatusCode.InternalServerError, response.status())
-                assertEquals("Please wait! I'm not ready :(", response.content)
+        testApplication {
+            application {
+                val applicationState = ApplicationState()
+                applicationState.ready = false
+                applicationState.alive = false
+                routing { registerNaisApi(applicationState) }
             }
+            val response = client.get("/internal/is_ready")
+
+            assertEquals(HttpStatusCode.InternalServerError, response.status)
+            assertEquals("Please wait! I'm not ready :(", response.bodyAsText())
         }
     }
 }