Handle explicit nulls for field with default value in json deserialization

api/docker-kotlin.api

@@ -4020,8 +4020,9 @@ public final class me/devnatan/dockerkt/resource/volume/VolumeResourceKt {
 	public static final fun remove (Lme/devnatan/dockerkt/resource/volume/VolumeResource;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class me/devnatan/dockerkt/util/JsonKt {
+public final synthetic class me/devnatan/dockerkt/util/JsonKt {
 	public static final fun fromJsonEncodedString (Ljava/lang/String;)Ljava/util/Map;
+	public static final fun getDockerKotlinJson ()Lkotlinx/serialization/json/Json;
 	public static final fun toJsonEncodedString (Ljava/lang/Object;)Ljava/lang/String;
 }
 

api/docker-kotlin.klib.api

@@ -4150,6 +4150,8 @@ final val me.devnatan.dockerkt.models.image/created // me.devnatan.dockerkt.mode
     final fun (me.devnatan.dockerkt.models.image/Image).<get-created>(): kotlin.time/Instant // me.devnatan.dockerkt.models.image/created.<get-created>|<get-created>@me.devnatan.dockerkt.models.image.Image(){}[0]
 final val me.devnatan.dockerkt.models.system/time // me.devnatan.dockerkt.models.system/time|@me.devnatan.dockerkt.models.system.Event{}time[0]
     final fun (me.devnatan.dockerkt.models.system/Event).<get-time>(): kotlin.time/Instant // me.devnatan.dockerkt.models.system/time.<get-time>|<get-time>@me.devnatan.dockerkt.models.system.Event(){}[0]
+final val me.devnatan.dockerkt.util/DockerKotlinJson // me.devnatan.dockerkt.util/DockerKotlinJson|{}DockerKotlinJson[0]
+    final fun <get-DockerKotlinJson>(): kotlinx.serialization.json/Json // me.devnatan.dockerkt.util/DockerKotlinJson.<get-DockerKotlinJson>|<get-DockerKotlinJson>(){}[0]
 
 final var me.devnatan.dockerkt.models.container/stopTimeout // me.devnatan.dockerkt.models.container/stopTimeout|@me.devnatan.dockerkt.models.container.ContainerCreateOptions{}stopTimeout[0]
     final fun (me.devnatan.dockerkt.models.container/ContainerCreateOptions).<get-stopTimeout>(): kotlin.time/Duration? // me.devnatan.dockerkt.models.container/stopTimeout.<get-stopTimeout>|<get-stopTimeout>@me.devnatan.dockerkt.models.container.ContainerCreateOptions(){}[0]

src/commonMain/kotlin/me/devnatan/dockerkt/util/Json.kt

@@ -1,15 +1,17 @@
+@file:JvmSynthetic
+
 package me.devnatan.dockerkt.util
 
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import kotlin.jvm.JvmSynthetic
 
-private val json: Json =
+public val DockerKotlinJson: Json =
     Json {
         ignoreUnknownKeys = true
-        isLenient = true
         allowStructuredMapKeys = true
+        coerceInputValues = true
     }
 
-public fun toJsonEncodedString(value: Any): String = json.encodeToString(value)
+public fun toJsonEncodedString(value: Any): String = DockerKotlinJson.encodeToString(value)
 
-public fun fromJsonEncodedString(value: String): Map<String, String?> = json.decodeFromString(value)
+public fun fromJsonEncodedString(value: String): Map<String, String?> = DockerKotlinJson.decodeFromString(value)

src/commonMain/kotlin/me/devnatan/dockerkt/util/ListAsMapToEmptyObjectsSerializer.kt

@@ -12,8 +12,8 @@ import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 
 internal open class ListAsMapToEmptyObjectsSerializer<T : Any>(
-    private val tSerializer: KSerializer<T>,
-) : JsonTransformingSerializer<List<T>>(ListSerializer(tSerializer)) {
+    serializer: KSerializer<T>,
+) : JsonTransformingSerializer<List<T>>(ListSerializer(serializer)) {
     override fun transformDeserialize(element: JsonElement): JsonElement =
         JsonArray(element.jsonObject.entries.map { JsonPrimitive(it.key) })
 

src/commonTest/kotlin/me/devnatan/dockerkt/util/JsonTest.kt

@@ -0,0 +1,24 @@
+package me.devnatan.dockerkt.util
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class JsonTest {
+    @Test
+    fun `deserialization of nullable api field with default value`() {
+        @Serializable
+        data class Entity(
+            @SerialName("Cmd") val command: List<String> = emptyList(),
+        )
+
+        val json = """{"Cmd": null}"""
+        val entity = DockerKotlinJson.decodeFromString<Entity>(json)
+
+        assertEquals(
+            expected = Entity(command = emptyList()),
+            actual = entity,
+        )
+    }
+}

src/jvmMain/kotlin/me/devnatan/dockerkt/DockerClient.jvm.kt

@@ -13,6 +13,7 @@ import me.devnatan.dockerkt.resource.network.NetworkResource
 import me.devnatan.dockerkt.resource.secret.SecretResource
 import me.devnatan.dockerkt.resource.system.SystemResource
 import me.devnatan.dockerkt.resource.volume.VolumeResource
+import me.devnatan.dockerkt.util.DockerKotlinJson
 import kotlin.coroutines.CoroutineContext
 
 public actual class DockerClient public actual constructor(
@@ -22,7 +23,7 @@ public actual class DockerClient public actual constructor(
 
     actual override val coroutineContext: CoroutineContext = SupervisorJob()
 
-    public actual val json: Json = Json { ignoreUnknownKeys = true }
+    public actual val json: Json get() = DockerKotlinJson
     public actual val httpClient: HttpClient = createHttpClient(this)
 
     @get:JvmName("images")

src/nativeMain/kotlin/me/devnatan/dockerkt/DockerClient.native.kt

@@ -13,6 +13,7 @@ import me.devnatan.dockerkt.resource.network.NetworkResource
 import me.devnatan.dockerkt.resource.secret.SecretResource
 import me.devnatan.dockerkt.resource.system.SystemResource
 import me.devnatan.dockerkt.resource.volume.VolumeResource
+import me.devnatan.dockerkt.util.DockerKotlinJson
 import kotlin.coroutines.CoroutineContext
 
 public actual class DockerClient public actual constructor(
@@ -21,7 +22,7 @@ public actual class DockerClient public actual constructor(
     Closeable {
     actual override val coroutineContext: CoroutineContext = SupervisorJob()
 
-    public actual val json: Json = Json { ignoreUnknownKeys = true }
+    public actual val json: Json get() = DockerKotlinJson
     public actual val httpClient: HttpClient = createHttpClient(this)
 
     public actual val images: ImageResource = ImageResource(httpClient, json)