Merge pull request #8 from JPL-Devin/devin/1776587436-upgrade-deps-kotlin-ktor-kotest

Upgrade Gradle 8.14, Kotlin 2.3.20, Ktor 3.4.2, Kotest 6.1.11, kotlinx-serialization 1.9.0

Author: dlamoris

Dockerfile-Test

@@ -1,4 +1,4 @@
-FROM openjdk:17.0.2-jdk-slim as build
+FROM eclipse-temurin:21-jdk as build
 WORKDIR application
 ENV FLEXO_MMS_ROOT_CONTEXT http://layer1-service
 ENV FLEXO_MMS_QUERY_URL http://quad-server:3030/ds/sparql

build.gradle.kts

@@ -3,8 +3,8 @@ import java.net.URI
 
 plugins {
     application
-    kotlin("jvm") version "2.1.21"
-    kotlin("plugin.serialization") version "2.1.21"
+    kotlin("jvm") version "2.3.20"
+    kotlin("plugin.serialization") version "2.3.20"
     jacoco
     id("org.sonarqube") version "6.2.0.5505"
 }
@@ -41,7 +41,7 @@ val testFuseki: Configuration by configurations.creating
 dependencies {
     implementation(kotlin("stdlib"))
 
-    val kotestVersion = "5.9.1"
+    val kotestVersion = "6.1.11"
     testImplementation("io.kotest:kotest-runner-junit5:$kotestVersion")
     testImplementation("io.kotest:kotest-assertions-core:$kotestVersion")
     testImplementation("io.kotest:kotest-assertions-json-jvm:$kotestVersion")
@@ -50,15 +50,15 @@ dependencies {
     val commonsCliVersion = "1.9.0"
     implementation("commons-cli:commons-cli:$commonsCliVersion")
 
-    val kotlinxJsonVersion = "1.8.1"
+    val kotlinxJsonVersion = "1.9.0"
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxJsonVersion")
 
     val jenaVersion = "6.0.0"
     implementation("org.apache.jena:jena-arq:${jenaVersion}")
     testImplementation("org.apache.jena:jena-rdfconnection:${jenaVersion}");
     testFuseki("org.apache.jena:jena-fuseki-server:$jenaVersion")
 
-    val ktorVersion = "2.3.4"
+    val ktorVersion = "3.4.2"
     implementation("io.ktor:ktor-client-core:${ktorVersion}")
     implementation("io.ktor:ktor-client-content-negotiation:${ktorVersion}")
     implementation("io.ktor:ktor-client-cio:${ktorVersion}")
@@ -71,11 +71,10 @@ dependencies {
     implementation("io.ktor:ktor-server-default-headers:$ktorVersion")
     implementation("io.ktor:ktor-server-forwarded-header:$ktorVersion")
     implementation("io.ktor:ktor-server-host-common:$ktorVersion")
-    implementation("io.ktor:ktor-server-locations:$ktorVersion")
     implementation("io.ktor:ktor-server-netty:$ktorVersion")
     implementation("io.ktor:ktor-server-status-pages:$ktorVersion")
-    testImplementation("io.ktor:ktor-server-tests:$ktorVersion")
-    testImplementation("io.kotest.extensions:kotest-assertions-ktor:2.0.0")
+    testImplementation("io.ktor:ktor-server-test-host:$ktorVersion")
+    testImplementation("io.kotest:kotest-assertions-ktor:$kotestVersion")
 
     val logbackVersion = "1.5.18"
     implementation("ch.qos.logback:logback-classic:$logbackVersion")
@@ -123,7 +122,7 @@ tasks.jacocoTestReport {
     }
 }
 tasks.register("generateBuildInfo") {
-    val buildInfoFile = file("$buildDir/resources/main/build-info.properties")
+    val buildInfoFile = layout.buildDirectory.file("resources/main/build-info.properties").get().asFile
     outputs.file(buildInfoFile)
     doLast {
         buildInfoFile.writeText(
@@ -138,6 +137,10 @@ tasks.named("processResources") {
     finalizedBy("generateBuildInfo")
 }
 
+tasks.named("jar") {
+    dependsOn("generateBuildInfo")
+}
+
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.compilerOptions {
     freeCompilerArgs.add("-Xdebug")

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -9,7 +9,7 @@ fun main(args: Array<String>): Unit = io.ktor.server.netty.EngineMain.main(args)
 
 @Suppress("unused")
 fun Application.module() {
-    configureAuthentication(environment)
+    configureAuthentication()
     configureHTTP()
     configureRouting()
 }

gradlew

@@ -320,7 +320,6 @@ class Layer1Context<TRequestContext: GenericRequest, out TResponseContext: Gener
     /**
      * Execute a SPARQL Query string against Layer 0
      */
-    @OptIn(InternalAPI::class)
     suspend fun executeSparqlQuery(pattern: String, acceptType: ContentType, setup: (SparqlParameterizer.() -> Unit)?=null): String {
         // apply the optional parameterizer setup, default to using the built-in prefixes
         val params = SparqlParameterizer(pattern).apply {
@@ -347,7 +346,7 @@ class Layer1Context<TRequestContext: GenericRequest, out TResponseContext: Gener
                 append(HttpHeaders.Accept, acceptType)
             }
             contentType(RdfContentTypes.SparqlQuery)
-            body=sparql
+            setBody(sparql)
         })
     }
 
@@ -368,7 +367,6 @@ class Layer1Context<TRequestContext: GenericRequest, out TResponseContext: Gener
     /**
      * Execute a SPARQL Update string against Layer 0
      */
-    @OptIn(InternalAPI::class)
     suspend fun executeSparqlUpdate(pattern: String, setup: (SparqlParameterizer.() -> SparqlParameterizer)?=null): String {
         var sparql = SparqlParameterizer(pattern.trimIndent()).apply {
             if (setup != null) setup()
@@ -385,7 +383,7 @@ class Layer1Context<TRequestContext: GenericRequest, out TResponseContext: Gener
                 append(HttpHeaders.Accept, ContentType.Any)
             }
             contentType(RdfContentTypes.SparqlUpdate)
-            body=sparql
+            setBody(sparql)
         })
     }
 

gradlew.bat

@@ -101,6 +101,7 @@ fun serializePairs(node: Resource): String {
 abstract class SparqlBuilder<out Instance: SparqlBuilder<Instance>>(private val indentLevel: Int=1) {
     protected val sparqlString = StringBuilder()
 
+    @Suppress("UNCHECKED_CAST")
     fun raw(vararg sparql: String): Instance {
         sparqlString.append(sparql.joinToString("\n") { it.trimIndent()+"\n" })
 
@@ -309,7 +310,7 @@ class InsertBuilder(
 
     fun subtxn(subTxnId: String, extras: Map<String, String>?=null, setup: (TxnBuilder.() -> Unit)?=null): InsertBuilder {
         val properties = extras?.toMutableMap()?: mutableMapOf()
-        if(null != layer1.userId) properties["mms:user"] = "mu:"
+        properties["mms:user"] = "mu:"
         if(null != layer1.orgId) properties["mms:org"] = "mo:"
         if(null != layer1.repoId) properties["mms:repo"] = "mor:"
         if(null != layer1.branchId) properties["mms:branch"] = "morb:"
@@ -550,7 +551,7 @@ class UpdateBuilder(
             // prefixes(mms.prefixes)
 
             literal(
-                "_userId" to (layer1.userId?: ""),
+                "_userId" to layer1.userId,
                 "_orgId" to (layer1.orgId?: ""),
                 "_repoId" to (layer1.repoId?: ""),
                 "_branchId" to (layer1.branchId?: ""),

src/main/kotlin/org/openmbee/flexo/mms/Application.kt

@@ -86,7 +86,7 @@ suspend fun <TRequestContext: GenericRequest> Layer1Context<TRequestContext, Sto
                     }
                 }
             }
-            val bytes = response.readBytes()
+            val bytes = response.readRawBytes()
             DecodedArtifact(contentType, bodyBinary = bytes)
         }
         else -> {