* Improved Jdk11 client

* Cleanup

Author: aartiPl

build.gradle.kts

@@ -1,8 +1,8 @@
-val kotlinVersion: String = "1.8.22"
+val kotlinVersion = "2.1.21"
 
 plugins {
-    kotlin("jvm") version "1.8.22"
-    id("com.adarshr.test-logger") version "3.2.0"
+    kotlin("jvm") version "2.1.21"
+    id("com.adarshr.test-logger") version "4.0.0"
     `maven-publish`
     signing
     idea
@@ -17,7 +17,7 @@ repositories {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 
     withJavadocJar()
@@ -93,17 +93,17 @@ signing {
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
 
-    implementation("org.apache.commons:commons-lang3:3.12.0")
-    implementation("com.konghq:unirest-java:3.13.13")
-    implementation("com.google.code.gson:gson:2.10")
+    implementation("org.apache.commons:commons-lang3:3.17.0")
+    implementation("com.konghq:unirest-java:3.14.5")
+    implementation("com.google.code.gson:gson:2.13.1")
 
     testImplementation("org.junit.platform:junit-platform-suite-engine:1.9.0")
     testImplementation("org.junit.platform:junit-platform-suite-api:1.9.0")
     testImplementation("org.junit.platform:junit-platform-suite-commons:1.9.0")
     testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.0")
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.0")
-    testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.26.1")
-    testImplementation("io.mockk:mockk:1.13.2")
+    testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.28.1")
+    testImplementation("io.mockk:mockk:1.14.4")
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

src/main/kotlin/net/igsoft/funclient/FunClientJdk11.kt

@@ -1,13 +1,15 @@
 package net.igsoft.funclient
 
+import com.google.gson.Gson
 import net.igsoft.funclient.model.*
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
+import kotlin.io.path.Path
 
 //NOTE: Doesn't work with JDK8
 @Suppress("unused")
-class FunClientJdk11 {
+class FunClientJdk11(val gson: Gson) {
     private val client = HttpClient.newHttpClient()
 
     fun execute(request: Request): Response {
@@ -36,9 +38,11 @@ class FunClientJdk11 {
         return RawResponse(response.statusCode(), Headers(response.headers().map()), StringBody(response.body()))
     }
 
-    private fun resolveBody(request: Request) = when (request.body) {
+    private fun resolveBody(request: Request): HttpRequest.BodyPublisher = when (request.body) {
         is StringBody -> HttpRequest.BodyPublishers.ofString(request.body.string)
-        is EmptyBody -> HttpRequest.BodyPublishers.ofString("")
-        else -> TODO()
+        is EmptyBody -> HttpRequest.BodyPublishers.noBody()
+        is FileBody -> HttpRequest.BodyPublishers.ofFile(Path(request.body.file.path))
+        is ObjectBody<*> -> HttpRequest.BodyPublishers.ofString(gson.toJson(request.body.value))
+        else -> throw IllegalStateException("Unknown body type: ${request.body::class.simpleName}")
     }
 }

src/test/kotlin/net/igsoft/typeutils/globalcontext/GlobalContextTest.kt

@@ -0,0 +1,14 @@
+package net.igsoft.typeutils.property
+
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class FunClientTest {
+    @BeforeEach
+    fun setUp() {
+    }
+
+    @Test
+    fun `Assert that`() {
+    }
+}