Merge pull request #219 from ktorio/nomisrev/fix-graalvm

Fix GraalVM breakage from 3.x.x with KotlinX IO

Author: nomisRev

graalvm/build.gradle.kts

@@ -2,7 +2,8 @@ plugins {
     application
     kotlin("jvm") version "2.1.20"
     id("io.ktor.plugin") version "3.1.2"
-    id("org.graalvm.buildtools.native") version "0.9.19"
+    id("org.graalvm.buildtools.native") version "0.10.6"
+    kotlin("plugin.serialization") version "2.1.0"
 }
 
 group = "io.ktor"
@@ -17,10 +18,12 @@ repositories {
 
 dependencies {
     implementation("ch.qos.logback:logback-classic:1.5.12")
-    implementation("io.ktor:ktor-server-core-jvm")
-    implementation("io.ktor:ktor-server-cio-jvm")
+    implementation("io.ktor:ktor-server-cio")
+    implementation("io.ktor:ktor-server-content-negotiation")
+    implementation("io.ktor:ktor-serialization-kotlinx-json")
 
-    testImplementation("io.ktor:ktor-server-test-host-jvm")
+    testImplementation("io.ktor:ktor-server-test-host")
+    testImplementation("io.ktor:ktor-client-content-negotiation")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
 
@@ -35,6 +38,15 @@ graalvmNative {
             buildArgs.add("--initialize-at-build-time=io.ktor,kotlin")
             buildArgs.add("--initialize-at-build-time=org.slf4j.LoggerFactory")
 
+            buildArgs.add("--initialize-at-build-time=org.slf4j.helpers.Reporter")
+            buildArgs.add("--initialize-at-build-time=kotlinx.io.bytestring.ByteString")
+            buildArgs.add("--initialize-at-build-time=kotlinx.io.SegmentPool")
+
+            buildArgs.add("--initialize-at-build-time=kotlinx.serialization.json.Json")
+            buildArgs.add("--initialize-at-build-time=kotlinx.serialization.json.JsonImpl")
+            buildArgs.add("--initialize-at-build-time=kotlinx.serialization.json.ClassDiscriminatorMode")
+            buildArgs.add("--initialize-at-build-time=kotlinx.serialization.modules.SerializersModuleKt")
+
             buildArgs.add("-H:+InstallExitHandlers")
             buildArgs.add("-H:+ReportUnsupportedElementsAtRuntime")
             buildArgs.add("-H:+ReportExceptionStackTraces")
@@ -50,6 +62,15 @@ graalvmNative {
             buildArgs.add("--initialize-at-build-time=io.ktor,kotlin")
             buildArgs.add("--initialize-at-build-time=org.slf4j.LoggerFactory")
 
+            buildArgs.add("--initialize-at-build-time=org.slf4j.helpers.Reporter")
+            buildArgs.add("--initialize-at-build-time=kotlinx.io.bytestring.ByteString")
+            buildArgs.add("--initialize-at-build-time=kotlinx.io.SegmentPool")
+
+            buildArgs.add("--initialize-at-build-time=kotlinx.serialization.json.Json")
+            buildArgs.add("--initialize-at-build-time=kotlinx.serialization.json.JsonImpl")
+            buildArgs.add("--initialize-at-build-time=kotlinx.serialization.json.ClassDiscriminatorMode")
+            buildArgs.add("--initialize-at-build-time=kotlinx.serialization.modules.SerializersModuleKt")
+
             buildArgs.add("-H:+InstallExitHandlers")
             buildArgs.add("-H:+ReportUnsupportedElementsAtRuntime")
             buildArgs.add("-H:+ReportExceptionStackTraces")
@@ -68,5 +89,4 @@ graalvmNative {
             events("passed", "skipped", "failed")
         }
     }
-
-}
+}

graalvm/src/main/kotlin/io/ktorgraal/Application.kt

@@ -1,11 +1,32 @@
 package io.ktorgraal
 
+import io.ktor.serialization.kotlinx.json.json
+import io.ktor.server.application.Application
+import io.ktor.server.application.install
 import io.ktor.server.engine.*
 import io.ktor.server.cio.*
-import io.ktorgraal.plugins.*
+import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.server.response.respond
+import io.ktor.server.routing.get
+import io.ktor.server.routing.routing
+import kotlinx.serialization.Serializable
+
+/**
+ * Generic wrapper to test KotlinX Serialization on GraalVM
+ */
+@Serializable
+data class JsonBody<A>(val body: A)
 
 fun main() {
-    embeddedServer(CIO, port = 8080, host = "0.0.0.0") {
-        configureRouting()
-    }.start(wait = true)
+    embeddedServer(CIO, port = 8080, host = "0.0.0.0", module = Application::module)
+        .start(wait = true)
+}
+
+fun Application.module() {
+    install(ContentNegotiation) { json() }
+    routing {
+        get("/") {
+            call.respond(JsonBody("Hello GraalVM!"))
+        }
+    }
 }

graalvm/src/main/kotlin/io/ktorgraal/plugins/Routing.kt

@@ -1,21 +1,23 @@
 package io.ktorgraal
 
+import io.ktor.client.call.body
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.request.*
-import io.ktor.client.statement.*
+import io.ktor.serialization.kotlinx.json.json
 import io.ktor.server.testing.*
-import io.ktorgraal.plugins.configureRouting
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class ConfigureRoutingTest {
 
     @Test
     fun testGetHi() = testApplication {
-        application {
-            configureRouting()
-        }
-        client.get("/").apply {
-            assertEquals("Hello GraalVM!", bodyAsText())
+        application { module() }
+        val client = createClient {
+            install(ContentNegotiation) { json() }
         }
+        val response = client.get("/")
+        val actual = response.body<JsonBody<String>>()
+        assertEquals(JsonBody("Hello GraalVM!"), actual)
     }
 }

graalvm/src/test/kotlin/io/ktorgraal/ConfigureRoutingTest.kt

@@ -35,7 +35,7 @@ dependencies {
     implementation("org.freemarker:freemarker:2.3.32")
     implementation("org.ehcache:ehcache:3.9.7")
     implementation("io.ktor:ktor-server-netty-jvm")
-    testImplementation("io.mockk:mockk:1.13.17")
+    testImplementation("io.mockk:mockk:1.14.0")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     testImplementation("io.ktor:ktor-server-test-host-jvm")
 }