Merge branch '2.19' of github.com:FasterXML/jackson-module-kotlin into 2.19

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -17,6 +17,9 @@ Contributors:
 
 # 2.19.1 (not yet released)
 
+WrongWrong (@k163377)
+* #986: Optimize imports
+
 # 2.19.0 (24-Apr-2025)
 
 WrongWrong (@k163377)

src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt

@@ -2,13 +2,13 @@ package com.fasterxml.jackson.module.kotlin
 
 import com.fasterxml.jackson.databind.MapperFeature
 import com.fasterxml.jackson.databind.module.SimpleModule
+import com.fasterxml.jackson.module.kotlin.KotlinFeature.KotlinPropertyNameAsImplicitName
+import com.fasterxml.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullIsSameAsDefault
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullToEmptyCollection
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullToEmptyMap
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.SingletonSupport
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.StrictNullChecks
-import com.fasterxml.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks
-import com.fasterxml.jackson.module.kotlin.KotlinFeature.KotlinPropertyNameAsImplicitName
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.UseJavaDurationConversion
 import java.util.*
 

src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinNamesAnnotationIntrospector.kt

@@ -14,7 +14,6 @@ import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector
 import com.fasterxml.jackson.databind.introspect.PotentialCreator
 import java.lang.reflect.Constructor
 import java.util.Locale
-import kotlin.collections.getOrNull
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter

src/test/kotlin/com/fasterxml/jackson/module/kotlin/ArgumentBucketTest.kt

@@ -2,10 +2,10 @@ package com.fasterxml.jackson.module.kotlin
 
 import com.fasterxml.jackson.annotation.JsonCreator
 import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.functions
 import kotlin.reflect.full.hasAnnotation
-import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue

src/test/kotlin/com/fasterxml/jackson/module/kotlin/DslTest.kt

@@ -2,11 +2,11 @@ package com.fasterxml.jackson.module.kotlin
 
 import com.fasterxml.jackson.core.json.JsonReadFeature
 import com.fasterxml.jackson.core.json.JsonWriteFeature
+import com.fasterxml.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullIsSameAsDefault
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullToEmptyCollection
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullToEmptyMap
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.SingletonSupport
-import com.fasterxml.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals

src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinInstantiatorsTest.kt

@@ -5,8 +5,7 @@ import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 
 class KotlinInstantiatorsTest {
-    private val mapper = jacksonObjectMapper()
-    private val deserConfig = mapper.deserializationConfig
+    private val deserConfig = defaultMapper.deserializationConfig
 
     private val kotlinInstantiators = KotlinInstantiators(
         ReflectionCache(10),
@@ -18,7 +17,7 @@ class KotlinInstantiatorsTest {
 
     @Test
     fun `Provides default instantiator for Java class`() {
-        val javaType = mapper.constructType(String::class.java)
+        val javaType = defaultMapper.constructType(String::class.java)
         val defaultInstantiator = StdValueInstantiator(deserConfig, javaType)
         val instantiator = kotlinInstantiators.findValueInstantiator(
             deserConfig,
@@ -33,7 +32,7 @@ class KotlinInstantiatorsTest {
     fun `Provides KotlinValueInstantiator for Kotlin class`() {
         class TestClass
 
-        val javaType = mapper.constructType(TestClass::class.java)
+        val javaType = defaultMapper.constructType(TestClass::class.java)
         val instantiator = kotlinInstantiators.findValueInstantiator(
             deserConfig,
             deserConfig.introspect(javaType),
@@ -51,15 +50,15 @@ class KotlinInstantiatorsTest {
 
         val subClassInstantiator = object : StdValueInstantiator(
             deserConfig,
-            mapper.constructType(DefaultClass::class.java)
+            defaultMapper.constructType(DefaultClass::class.java)
         ) {}
 
         assertThrows(IllegalStateException::class.java) {
             kotlinInstantiators.findValueInstantiator(
                 deserConfig,
-                deserConfig.introspect(mapper.constructType(TestClass::class.java)),
+                deserConfig.introspect(defaultMapper.constructType(TestClass::class.java)),
                 subClassInstantiator
             )
         }
     }
-}
+}

src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/JacksonInjectTest.kt

@@ -26,29 +26,51 @@ class JacksonInjectTest {
         @get:JacksonInject("noNNn")
         val noNNn: NullableObject?,
         @get:JacksonInject("noNN")
-        val noNN: NullableObject?
+        val noNN: NullableObject?,
+        @get:JacksonInject("npNnNn")
+        val npNnNn: NullablePrimitive,
+        @get:JacksonInject("npNnN")
+        val npNnN: NullablePrimitive,
+        @get:JacksonInject("npNNn")
+        val npNNn: NullablePrimitive?,
+        @get:JacksonInject("npNN")
+        val npNN: NullablePrimitive?,
+        @get:JacksonInject("tupNn")
+        val tupNn: TwoUnitPrimitive,
+        @get:JacksonInject("tupN")
+        val tupN: TwoUnitPrimitive?
     )
 
     @Test
     fun test() {
-        val injectables = InjectableValues.Std(
-            mapOf(
-                "pNn" to Primitive(0),
-                "pN" to Primitive(1),
-                "nnoNn" to NonNullObject("nnoNn"),
-                "nnoN" to NonNullObject("nnoN"),
-                "noNnNn" to NullableObject("noNnNn"),
-                "noNnN" to NullableObject(null),
-                "noNNn" to NullableObject("noNNn"),
-                "noNN" to NullableObject(null)
-            )
+        val injectables = mapOf(
+            "pNn" to Primitive(0),
+            "pN" to Primitive(1),
+            "nnoNn" to NonNullObject("nnoNn"),
+            "nnoN" to NonNullObject("nnoN"),
+            "noNnNn" to NullableObject("noNnNn"),
+            "noNnN" to NullableObject(null),
+            "noNNn" to NullableObject("noNNn"),
+            "noNN" to NullableObject(null),
+            "npNnNn" to NullablePrimitive(0),
+            "npNnN" to NullablePrimitive(null),
+            "npNNn" to NullablePrimitive(1),
+            "npNN" to NullablePrimitive(null),
+            "tupNn" to TwoUnitPrimitive(3),
+            "tupN" to TwoUnitPrimitive(4)
         )
 
         val reader = jacksonObjectMapper()
             .readerFor(Dto::class.java)
-            .with(injectables)
+            .with(InjectableValues.Std(injectables))
+
+        val result = reader.readValue<Dto>("{}")
+        val expected = ::Dto.let { ctor ->
+            val args = ctor.parameters.associateWith { injectables[it.name] }
+            ctor.callBy(args)
+        }
 
-        println(reader.readValue<Dto>("{}"))
+        assertEquals(expected, result)
     }
 
     data class DataBind4218FailingDto(

src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt

@@ -7,12 +7,12 @@ import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
 import com.fasterxml.jackson.module.kotlin.WrapsNullableValueClassDeserializer
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.defaultMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
+import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
 
 class NullableObjectEdgeCases {
     @JvmInline
@@ -38,7 +38,7 @@ class NullableObjectEdgeCases {
 
     @Test
     fun nullValueIsUsedPreferentially() {
-        val result = jacksonObjectMapper().readValue<NullValue>("""{"nn":null,"n":null}""")
+        val result = defaultMapper.readValue<NullValue>("""{"nn":null,"n":null}""")
         assertEquals(NullValue(NullValueDeserializer.nv, NullValueDeserializer.nv), result)
     }
 
@@ -62,7 +62,7 @@ class NullableObjectEdgeCases {
     @Test
     fun `Nulls_SKIP works`() {
         assertThrows<KotlinReflectionInternalError>("#761(KT-57357) fixed") {
-            val result = jacksonObjectMapper().readValue<NullsSkip>("""{"nn":null,"n":null}""")
+            val result = defaultMapper.readValue<NullsSkip>("""{"nn":null,"n":null}""")
             assertEquals(NullValue(VC("skip"), VC("skip")), result)
         }
     }

src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/ValueClasses.kt

@@ -42,3 +42,29 @@ value class NullableObject(val v: String?) {
         override fun deserializeKey(key: String, ctxt: DeserializationContext) = NullableObject("$key-deser")
     }
 }
+
+@JvmInline
+value class NullablePrimitive(val v: Int?) {
+    class DeserializerWrapsNullable : WrapsNullableValueClassDeserializer<NullablePrimitive>(NullablePrimitive::class) {
+        override fun deserialize(p: JsonParser, ctxt: DeserializationContext) = NullablePrimitive(
+            p.intValue + 100
+        )
+
+        override fun getBoxedNullValue(): NullablePrimitive = NullablePrimitive(null)
+    }
+
+    class KeyDeserializer : JacksonKeyDeserializer() {
+        override fun deserializeKey(key: String, ctxt: DeserializationContext) = NullablePrimitive(key.toInt() + 100)
+    }
+}
+
+@JvmInline
+value class TwoUnitPrimitive(val v: Long) {
+    class Deserializer : StdDeserializer<TwoUnitPrimitive>(TwoUnitPrimitive::class.java) {
+        override fun deserialize(p: JsonParser, ctxt: DeserializationContext): TwoUnitPrimitive = TwoUnitPrimitive(p.longValue + 100)
+    }
+
+    class KeyDeserializer : JacksonKeyDeserializer() {
+        override fun deserializeKey(key: String, ctxt: DeserializationContext) = TwoUnitPrimitive(key.toLong() + 100)
+    }
+}

src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt

@@ -1,19 +1,17 @@
 package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass
 
 import com.fasterxml.jackson.module.kotlin.defaultMapper
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Nested
-import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
 import java.lang.reflect.InvocationTargetException
 import kotlin.test.assertNotEquals
 
 class WithoutCustomDeserializeMethodTest {
     companion object {
-        val mapper = jacksonObjectMapper()
         val throwable = IllegalArgumentException("test")
     }
 
@@ -47,6 +45,29 @@ class WithoutCustomDeserializeMethodTest {
                 assertNotEquals(NullableObject(null), result, "kogera #209 has been fixed.")
             }
         }
+
+        @Suppress("ClassName")
+        @Nested
+        inner class NullablePrimitive_ {
+            @Test
+            fun value() {
+                val result = defaultMapper.readValue<NullablePrimitive>("1")
+                assertEquals(NullablePrimitive(1), result)
+            }
+
+            // failing
+            @Test
+            fun nullString() {
+                val result = defaultMapper.readValue<NullablePrimitive?>("null")
+                assertNotEquals(NullablePrimitive(null), result, "#209 has been fixed.")
+            }
+        }
+
+        @Test
+        fun twoUnitPrimitive() {
+            val result = defaultMapper.readValue<TwoUnitPrimitive>("1")
+            assertEquals(TwoUnitPrimitive(1), result)
+        }
     }
 
     data class Dst(
@@ -55,7 +76,11 @@ class WithoutCustomDeserializeMethodTest {
         val nnoNn: NonNullObject,
         val nnoN: NonNullObject?,
         val noNn: NullableObject,
-        val noN: NullableObject?
+        val noN: NullableObject?,
+        val npNn: NullablePrimitive,
+        val npN: NullablePrimitive?,
+        val tupNn: TwoUnitPrimitive,
+        val tupN: TwoUnitPrimitive?
     )
 
     @Test
@@ -66,10 +91,14 @@ class WithoutCustomDeserializeMethodTest {
             NonNullObject("foo"),
             NonNullObject("bar"),
             NullableObject("baz"),
-            NullableObject("qux")
+            NullableObject("qux"),
+            NullablePrimitive(1),
+            NullablePrimitive(2),
+            TwoUnitPrimitive(3),
+            TwoUnitPrimitive(4)
         )
-        val src = mapper.writeValueAsString(expected)
-        val result = mapper.readValue<Dst>(src)
+        val src = defaultMapper.writeValueAsString(expected)
+        val result = defaultMapper.readValue<Dst>(src)
 
         assertEquals(expected, result)
     }
@@ -82,10 +111,14 @@ class WithoutCustomDeserializeMethodTest {
             NonNullObject("foo"),
             null,
             NullableObject(null),
+            null,
+            NullablePrimitive(null),
+            null,
+            TwoUnitPrimitive(3),
             null
         )
-        val src = mapper.writeValueAsString(expected)
-        val result = mapper.readValue<Dst>(src)
+        val src = defaultMapper.writeValueAsString(expected)
+        val result = defaultMapper.readValue<Dst>(src)
 
         assertEquals(expected, result)
     }