support after bumping version. actually ktor

Author: AlexMcGil

activators/caila/src/main/kotlin/com/justai/jaicf/activator/caila/client/CailaKtorClient.kt

@@ -5,11 +5,15 @@ import com.justai.jaicf.activator.caila.JSON
 import com.justai.jaicf.activator.caila.dto.*
 import com.justai.jaicf.helpers.logging.WithLogger
 import io.ktor.client.*
+import io.ktor.client.call.body
 import io.ktor.client.engine.*
 import io.ktor.client.engine.cio.*
-import io.ktor.client.features.json.*
-import io.ktor.client.features.json.serializer.*
-import io.ktor.client.features.logging.*
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.serialization.kotlinx.json.*
+import io.ktor.client.plugins.logging.DEFAULT
+import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.client.plugins.logging.Logger
+import io.ktor.client.plugins.logging.Logging
 import io.ktor.client.request.*
 import io.ktor.http.*
 import kotlinx.coroutines.runBlocking
@@ -30,8 +34,8 @@ class CailaKtorClient(
             logger = Logger.DEFAULT
             level = logLevel
         }
-        install(JsonFeature) {
-            serializer = KotlinxSerializer()
+        install(ContentNegotiation) {
+            json(JSON)
         }
     }
 
@@ -45,9 +49,9 @@ class CailaKtorClient(
     }
 
     private suspend fun simpleInferenceAsync(query: String): CailaInferenceResultData? {
-        val response = client.get<String>(inferenceUrl) {
+        val response: String = client.get(inferenceUrl) {
             parameter("query", query)
-        }
+        }.body()
         logger.info(response)
         JSON.parseToJsonElement(response).jsonObject["intent"] ?: return null
         return JSON.decodeFromString(CailaInferenceResultData.serializer(), response)
@@ -63,10 +67,10 @@ class CailaKtorClient(
     }
 
     private suspend fun entitiesLookupAsync(query: String, showAll: Boolean = true): CailaEntitiesLookupResults {
-        val response = client.get<String>(entitiesLookupUrl) {
+        val response: String = client.get(entitiesLookupUrl) {
             parameter("query", query)
             parameter("showAll", showAll)
-        }
+        }.body()
         logger.info(response)
         return JSON.decodeFromString(CailaEntitiesLookupResults.serializer(), response)
     }
@@ -91,10 +95,10 @@ class CailaKtorClient(
     }
 
     private suspend fun analyzeAsync(requestData: CailaAnalyzeRequestData): CailaAnalyzeResponseData {
-        val response = client.post<String>(analyzeUrl) {
+        val response: String = client.post(analyzeUrl) {
             contentType(ContentType.Application.Json)
-            body = requestData
-        }
+            setBody(requestData)
+        }.body()
         logger.info(response)
         return JSON.decodeFromString(CailaAnalyzeResponseData.serializer(), response)
     }

activators/rasa/src/main/kotlin/com/justai/jaicf/activator/rasa/api/RasaApi.kt

@@ -3,14 +3,17 @@ package com.justai.jaicf.activator.rasa.api
 import com.justai.jaicf.helpers.http.toUrl
 import com.justai.jaicf.helpers.logging.WithLogger
 import io.ktor.client.HttpClient
+import io.ktor.client.call.body
 import io.ktor.client.engine.HttpClientEngine
 import io.ktor.client.engine.cio.CIO
-import io.ktor.client.features.json.JsonFeature
-import io.ktor.client.features.json.serializer.KotlinxSerializer
-import io.ktor.client.features.logging.*
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.client.plugins.logging.Logging
 import io.ktor.client.request.post
+import io.ktor.client.request.setBody
 import io.ktor.http.ContentType
 import io.ktor.http.contentType
+import io.ktor.serialization.kotlinx.json.json
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.Json
 
@@ -25,8 +28,8 @@ class RasaApi(
     private val client = HttpClient(httpClient) {
         expectSuccess = true
 
-        install(JsonFeature) {
-            serializer = KotlinxSerializer(Json)
+        install(ContentNegotiation) {
+            json(Json)
         }
 
         install(Logging) {
@@ -36,10 +39,10 @@ class RasaApi(
 
     fun parseMessage(request: RasaParseMessageRequest): String? = runBlocking {
         try {
-            client.post<String>("$uri/model/parse".toUrl()) {
+            client.post("$uri/model/parse".toUrl()) {
                 contentType(ContentType.Application.Json)
-                body = request
-            }
+                setBody(request)
+            }.body()
         } catch (e: Exception) {
             logger.error("Cannot parse $request", e)
             null

buildSrc/src/main/kotlin/Dependencies.kt

@@ -2,10 +2,3 @@ import org.gradle.kotlin.dsl.DependencyHandlerScope
 import org.gradle.kotlin.dsl.project
 
 fun DependencyHandlerScope.core() = "implementation"(project(":core"))
-fun DependencyHandlerScope.ktor(module: String): String = "io.ktor:$module" version { ktor }
-fun DependencyHandlerScope.jackson(): String = "com.fasterxml.jackson.module:jackson-module-kotlin" version { jackson }
-fun DependencyHandlerScope.slf4j(module: String): String = "org.slf4j:$module" version { slf4j }
-fun DependencyHandlerScope.`coroutines-core`(): String = "org.jetbrains.kotlinx:kotlinx-coroutines-core" version { coroutinesCore }
-fun DependencyHandlerScope.kotlinx(module: String): String = "org.jetbrains.kotlinx:$module"
-fun DependencyHandlerScope.`tomcat-servlet`(): String = "org.apache.tomcat:servlet-api" version { tomcatServletApi }
-fun DependencyHandlerScope.okHttp(module: String): String = "com.squareup.okhttp3:$module" version { okHttp }

buildSrc/src/main/kotlin/plugins/github/JaicfGithubReleasePlugin.kt

@@ -34,11 +34,11 @@ class JaicfGithubRelease(project: Project) : PluginAdapter(project) {
     override fun Project.afterEvaluated() {
         configure<GithubReleaseExtension> {
             setToken(githubToken)
-            setOwner(githubOwner)
-            setRepo(githubRepo)
-            setTagName(githubTagName)
-            setReleaseName(githubReleaseName)
-            setOverwrite(true)
+            owner.set(githubOwner)
+            repo.set(githubRepo)
+            tagName.set(githubTagName)
+            releaseName.set(githubReleaseName)
+            overwrite.set(true)
         }
     }
 }

buildSrc/src/main/kotlin/plugins/publish/CentralPublishPlugin.kt

@@ -43,7 +43,7 @@ private const val MAVEN_CENTRAL = "MavenCentral"
 
 class CentralPublishPlugin : Plugin<Project> by apply<CentralPublish>()
 
-@Suppress("DuplicatedCode", "UnstableApiUsage")
+@Suppress("DuplicatedCode")
 class CentralPublish(project: Project) : PluginAdapter(project) {
     private val properties by lazy { loadLocalProperties() }
     private val secKey by lazy { properties.getProperty(SIGNING_KEY) }
@@ -62,7 +62,7 @@ class CentralPublish(project: Project) : PluginAdapter(project) {
             val dokkaJavadoc = tasks.getByName("dokkaJavadoc", DokkaTask::class) {
                 dokkaSourceSets {
                     configureEach {
-                        outputDirectory.set(File("$buildDir/javadoc"))
+                        outputDirectory.set(File("${layout.buildDirectory.get()}/javadoc"))
                         noStdlibLink.set(true)
                         noJdkLink.set(true)
                     }
@@ -139,7 +139,7 @@ private val Project.isMavenCentralPublication: Boolean
 private fun Project.extraProperty(name: String) =
     project.extra.properties[name] as? String ?: error("No $name defined")
 
-@Suppress("UnstableApiUsage", "DuplicatedCode")
+@Suppress("DuplicatedCode")
 private fun MavenPublication.configurePom(
     pomName: String,
     pomDescription: String

channels/jaicp/src/main/kotlin/com/justai/jaicf/channel/jaicp/JaicpConnector.kt

@@ -10,6 +10,7 @@ import com.justai.jaicf.channel.jaicp.http.ChatAdapterConnector
 import com.justai.jaicf.helpers.http.toUrl
 import com.justai.jaicf.helpers.logging.WithLogger
 import io.ktor.client.*
+import java.util.Locale
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 
@@ -106,10 +107,10 @@ abstract class JaicpConnector(
     abstract fun getRunningChannels(): Map<String, JaicpBotChannel>
 
     protected fun getChannelProxyUrl(config: ChannelConfig) =
-        "$proxyUrl/${config.channel}/${config.channelType.toLowerCase()}".toUrl()
+        "$proxyUrl/${config.channel}/${config.channelType.lowercase(Locale.getDefault())}".toUrl()
 
     private fun getApiProxyUrl(config: ChannelConfig) =
-        "$apiProxyUrl/${config.channel}/${config.channelType.toLowerCase()}".toUrl()
+        "$apiProxyUrl/${config.channel}/${config.channelType.lowercase(Locale.getDefault())}".toUrl()
 
     protected open fun processJaicpRequest(request: JaicpBotRequest, channel: JaicpBotChannel): JaicpResponse =
         jaicpExecutor.executeSync(request, channel)

channels/jaicp/src/main/kotlin/com/justai/jaicf/channel/jaicp/JaicpPollingConnector.kt

@@ -7,7 +7,7 @@ import com.justai.jaicf.channel.jaicp.http.HttpClientFactory
 import com.justai.jaicf.channel.jaicp.polling.Dispatcher
 import com.justai.jaicf.helpers.logging.WithLogger
 import io.ktor.client.*
-import io.ktor.client.features.logging.*
+import io.ktor.client.plugins.logging.LogLevel
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 

channels/jaicp/src/main/kotlin/com/justai/jaicf/channel/jaicp/JaicpServer.kt

@@ -6,9 +6,9 @@ import com.justai.jaicf.channel.jaicp.channels.JaicpNativeBotChannel
 import com.justai.jaicf.channel.jaicp.endpoints.ktor.channelCheckEndpoint
 import com.justai.jaicf.channel.jaicp.endpoints.ktor.healthCheckEndpoint
 import com.justai.jaicf.channel.jaicp.endpoints.ktor.reloadConfigEndpoint
-import io.ktor.routing.*
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
+import io.ktor.server.routing.routing
 
 
 /**

channels/jaicp/src/main/kotlin/com/justai/jaicf/channel/jaicp/JaicpServlet.kt

@@ -5,8 +5,8 @@ import com.justai.jaicf.channel.http.HttpBotChannelServlet
 import com.justai.jaicf.channel.jaicp.endpoints.CHANNEL_CHECK_URL
 import com.justai.jaicf.channel.jaicp.endpoints.HEALTH_CHECK_URL
 import com.justai.jaicf.channel.jaicp.endpoints.RELOAD_CONFIGS_URL
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
 
 /**
  * HttpServlet implementation that processes POST through the [HttpBotChannel] and creates service endpoints for JAICP.
@@ -37,13 +37,13 @@ open class JaicpServlet(private val connector: JaicpWebhookConnector) : HttpBotC
     }
 
     private fun HttpServletResponse.ok() {
-        setStatus(HttpServletResponse.SC_OK)
+        status = HttpServletResponse.SC_OK
         writer.write("OK")
         writer.flush()
     }
 
     private fun HttpServletResponse.notFound(message: String) {
-        setStatus(HttpServletResponse.SC_NOT_FOUND)
+        status = HttpServletResponse.SC_NOT_FOUND
         writer.write(message)
         writer.flush()
     }

channels/jaicp/src/main/kotlin/com/justai/jaicf/channel/jaicp/JaicpWebhookConnector.kt

@@ -17,7 +17,7 @@ import com.justai.jaicf.channel.jaicp.endpoints.ktor.reloadConfigEndpoint
 import com.justai.jaicf.channel.jaicp.http.HttpClientFactory
 import com.justai.jaicf.helpers.logging.WithLogger
 import io.ktor.client.*
-import io.ktor.client.features.logging.*
+import io.ktor.client.plugins.logging.LogLevel
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors