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

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -13,125 +13,118 @@ Authors:
 
 Contributors:
 
+# 2.13.NEXT
+
+Stefan Schmid (schmist@github)
+* #519: Contributed test for #518 (null should deserialize to _the_ Unit instance)
+
 wrongwrong (k163377@github)
 * #456: Refactor KNAI.findImplicitPropertyName()
 * #449: Refactor AnnotatedMethod.hasRequiredMarker()
-  (2.13.NEXT)
+* #521: Fixed lookup of instantiators
 
 Dmitri Domanine (novtor@github)
 * Contributed fix for #490: Missing value of type JsonNode? is deserialized as NullNode instead of null
-  (2.13.NEXT)
+
+# 2.13.0
 
 Fedor Bobin (Fuud@github)
 * #496, #45: Fix treeToValue extension function should not have type erasure
-  (2.13)
 
 Mikhael Sokolov (sokomishalov@github)
 * #489: JsonNode, ArrayNode and ObjectNode extension functions
-  (2.13)
 
 Max Wiechmann (MaxMello@github)
 * #494: ProGuard ProTips in the README
-  (2.13)
 
 Róbert Papp (TWiStErRob@github)
 * #477: KotlinFeature documentation & deprecation replacements
-  (2.13)
 
 wrongwrong (k163377@github)
 * #468: Improved support for value classes
-  (2.13)
 
 wrongwrong (k163377@github)
 * #460: Test for GitHub #451 (`-` in property name handling)
-  (2.13)
 
 wrongwrong (k163377@github)
 * #447: Fix edge case when dealing with sealed classes
-  (2.13)
 
 wrongwrong (k163377@github)
 * Contributed #438: Fixed mapping failure when `private` `companion object` is named
-  (2.13)
+
+# 2.12.5
 
 Marshall Pierce (marshallpierce@github)
 * #474: Reported disrespect for @JsonProperty on parent class
-  (2.12.5)
 
 Christopher Mason (masoncj@github)
 * #194: Contributed test case for @JsonIdentityInfo usage
-  (2.12.5)
 
 Martin Häusler (MartinHaeusler@github)
 * Reported #194: @JsonIdentityInfo bug
-  (2.12.5)
+
+# 2.12.2
 
 Eric Fenderbosch (efenderbosch@github)
 * Fixed #182: Serialize unsigned numbers
-  (2.12.2)
 
 Elisha Peterson (triathematician@github)
 * Reported #409: `module-info.java` missing "exports"
-  (2.12.2)
+
+# 2.12.1
 
 Wolfgang Jung (elektro-wolle@github)
 * Fixed inline class serialization
-  (2.12.1)
+
+# 2.12.0
 
 John Flynn (Neuman968@github)
 * Contributed extension methods for SimpleModule to add serializer and deserializer
   extension functions for KClass #322
-  (2.12.0)
 
 Mateusz Stefek (MateuszStefek@github)
 * Reported #321: Make MissingKotlinParameterException a descendant of MismatchedInputException
-  (2.12.0)
 
 Hideaki Tanabe (tanabe@github)
 * Brought README.md into the modern world of Gradle (compile -> implementation)
-  (2.12.0)
 
 Hidde Wieringa (hiddewie@github)
 * Contributed test case for issue 308
 * Contributed Kotlin DSL constructor
- (2.12.0)
 
 David Riggleman (DavidRigglemanININ@github)
 * Wrote strict null checking for collection values
- (2.12.0)
+
+# 2.11.0
 
 Drew Stephens (dinomite@github)
 * Contributed fix for #281: KotlinObjectSingletonDeserializer fails to deserialize
   previously serialized JSON as it doesn't delegate deserializeWithType
- (2.11.0)
+
+# 2.10.2
 
 Patrick Strawderman (kilink@github)
 * Reported #279: 2.10 introduces another binary compatibility issue in `KotlinModule`
   constructor
- (2.10.2)
 
 Vladimir Petrakovich (frost13it@github)
 * Contributed fix for #279: 2.10 introduces another binary compatibility issue in
   `KotlinModule` constructor
- (2.10.2)
+
+# 2.10.1
 
 Stéphane B (StephaneBg@github)
 * Submitted fix for #176: Version 2.9.7 breaks compatibility with Android minSdk < 24
- (2.10.1)
 
 Alain Lehmann (ciderale@github)
 * Contributed fix for #225: Don't instantiate new instances of Kotlin singleton objects
- (2.10.1)
 
 Andrey Lipatov (LipatovAndrey@github)
 * Contributed fix for #80: Boolean property name starting with 'is' not serialized /
   deserialized properly
- (2.10.1)
 
 Konstantin Volivach (kostya05983@github)
 * Contributed fix for #254: Add serializers for Sequences
- (2.10.1)
 
 Laimonas Turauskas (Laimiux@github)
 * Contributed fix for #180: handle nullable method parameters correctly (for creator methods)
- (2.10.1)

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

@@ -1,5 +1,3 @@
-@file:Suppress("EXPERIMENTAL_API_USAGE")
-
 package com.fasterxml.jackson.module.kotlin
 
 import com.fasterxml.jackson.core.JsonParser

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

@@ -0,0 +1,72 @@
+package com.fasterxml.jackson.module.kotlin
+
+import com.fasterxml.jackson.core.JsonToken
+import com.fasterxml.jackson.core.exc.InputCoercionException
+import com.fasterxml.jackson.databind.*
+import com.fasterxml.jackson.databind.deser.std.StdKeyDeserializer
+import com.fasterxml.jackson.databind.deser.std.StdKeyDeserializers
+
+// The reason why key is treated as nullable is to match the tentative behavior of StdKeyDeserializer.
+// If StdKeyDeserializer is modified, need to modify this too.
+
+internal object UByteKeyDeserializer : StdKeyDeserializer(TYPE_SHORT, UByte::class.java) {
+    override fun deserializeKey(key: String?, ctxt: DeserializationContext): UByte? = super.deserializeKey(key, ctxt)
+        ?.let {
+            (it as Short).asUByte() ?: throw InputCoercionException(
+                null,
+                "Numeric value (${key}) out of range of UByte (0 - ${UByte.MAX_VALUE}).",
+                JsonToken.VALUE_NUMBER_INT,
+                UByte::class.java
+            )
+        }
+}
+
+internal object UShortKeyDeserializer : StdKeyDeserializer(TYPE_INT, UShort::class.java) {
+    override fun deserializeKey(key: String?, ctxt: DeserializationContext): UShort? = super.deserializeKey(key, ctxt)
+        ?.let {
+            (it as Int).asUShort() ?: throw InputCoercionException(
+                null,
+                "Numeric value (${key}) out of range of UShort (0 - ${UShort.MAX_VALUE}).",
+                JsonToken.VALUE_NUMBER_INT,
+                UShort::class.java
+            )
+        }
+}
+
+internal object UIntKeyDeserializer : StdKeyDeserializer(TYPE_LONG, UInt::class.java) {
+    override fun deserializeKey(key: String?, ctxt: DeserializationContext): UInt? = super.deserializeKey(key, ctxt)
+        ?.let {
+            (it as Long).asUInt() ?: throw InputCoercionException(
+                null,
+                "Numeric value (${key}) out of range of UInt (0 - ${UInt.MAX_VALUE}).",
+                JsonToken.VALUE_NUMBER_INT,
+                UInt::class.java
+            )
+        }
+}
+
+// kind parameter is dummy.
+internal object ULongKeyDeserializer : StdKeyDeserializer(TYPE_LONG, ULong::class.java) {
+    override fun deserializeKey(key: String?, ctxt: DeserializationContext): ULong? = key?.let {
+        it.toBigInteger().asULong() ?: throw InputCoercionException(
+            null,
+            "Numeric value (${key}) out of range of ULong (0 - ${ULong.MAX_VALUE}).",
+            JsonToken.VALUE_NUMBER_INT,
+            ULong::class.java
+        )
+    }
+}
+
+internal object KotlinKeyDeserializers : StdKeyDeserializers() {
+    override fun findKeyDeserializer(
+        type: JavaType,
+        config: DeserializationConfig?,
+        beanDesc: BeanDescription?
+    ): KeyDeserializer? = when (type.rawClass) {
+        UByte::class.java -> UByteKeyDeserializer
+        UShort::class.java -> UShortKeyDeserializer
+        UInt::class.java -> UIntKeyDeserializer
+        ULong::class.java -> ULongKeyDeserializer
+        else -> null
+    }
+}

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

@@ -122,6 +122,7 @@ class KotlinModule @Deprecated(
         context.appendAnnotationIntrospector(KotlinNamesAnnotationIntrospector(this, cache, ignoredClassesForImplyingJsonCreator))
 
         context.addDeserializers(KotlinDeserializers())
+        context.addKeyDeserializers(KotlinKeyDeserializers)
         context.addSerializers(KotlinSerializers())
         context.addKeySerializers(KotlinKeySerializers())
 

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

@@ -1,5 +1,3 @@
-@file:Suppress("EXPERIMENTAL_API_USAGE")
-
 package com.fasterxml.jackson.module.kotlin
 
 import com.fasterxml.jackson.core.JsonGenerator
@@ -57,7 +55,6 @@ object ValueClassUnboxSerializer : StdSerializer<Any>(Any::class.java) {
     }
 }
 
-@Suppress("EXPERIMENTAL_API_USAGE")
 internal class KotlinSerializers : Serializers.Base() {
     override fun findSerializer(
         config: SerializationConfig?,

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

@@ -201,8 +201,15 @@ internal class KotlinInstantiators(
         defaultInstantiator: ValueInstantiator
     ): ValueInstantiator {
         return if (beanDescriptor.beanClass.isKotlinClass()) {
-            if (defaultInstantiator is StdValueInstantiator) {
-                KotlinValueInstantiator(defaultInstantiator, cache, nullToEmptyCollection, nullToEmptyMap, nullIsSameAsDefault, strictNullChecks)
+            if (defaultInstantiator::class == StdValueInstantiator::class) {
+                KotlinValueInstantiator(
+                    defaultInstantiator as StdValueInstantiator,
+                    cache,
+                    nullToEmptyCollection,
+                    nullToEmptyMap,
+                    nullIsSameAsDefault,
+                    strictNullChecks
+                )
             } else {
                 // TODO: return defaultInstantiator and let default method parameters and nullability go unused?  or die with exception:
                 throw IllegalStateException("KotlinValueInstantiator requires that the default ValueInstantiator is StdValueInstantiator")

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

@@ -1,5 +1,3 @@
-@file:Suppress("EXPERIMENTAL_API_USAGE")
-
 package com.fasterxml.jackson.module.kotlin
 
 import java.math.BigInteger

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

@@ -0,0 +1,65 @@
+package com.fasterxml.jackson.module.kotlin
+
+import com.fasterxml.jackson.databind.deser.std.StdValueInstantiator
+import org.junit.Assert.*
+import org.junit.Test
+
+class KotlinInstantiatorsTest {
+    private val mapper = jacksonObjectMapper()
+    private val deserConfig = mapper.deserializationConfig
+
+    private val kotlinInstantiators = KotlinInstantiators(
+        ReflectionCache(10),
+        nullToEmptyCollection = false,
+        nullToEmptyMap = false,
+        nullIsSameAsDefault = false,
+        strictNullChecks = false
+    )
+
+    @Test
+    fun `Provides default instantiator for Java class`() {
+        val javaType = mapper.constructType(String::class.java)
+        val defaultInstantiator = StdValueInstantiator(deserConfig, javaType)
+        val instantiator = kotlinInstantiators.findValueInstantiator(
+            deserConfig,
+            deserConfig.introspect(javaType),
+            defaultInstantiator
+        )
+
+        assertEquals(defaultInstantiator, instantiator)
+    }
+
+    @Test
+    fun `Provides KotlinValueInstantiator for Kotlin class`() {
+        class TestClass
+
+        val javaType = mapper.constructType(TestClass::class.java)
+        val instantiator = kotlinInstantiators.findValueInstantiator(
+            deserConfig,
+            deserConfig.introspect(javaType),
+            StdValueInstantiator(deserConfig, javaType)
+        )
+
+        assertTrue(instantiator is StdValueInstantiator)
+        assertTrue(instantiator::class == KotlinValueInstantiator::class)
+    }
+
+    @Test
+    fun `Throws for Kotlin class when default instantiator isn't StdValueInstantiator`() {
+        class TestClass
+        class DefaultClass
+
+        val subClassInstantiator = object : StdValueInstantiator(
+            deserConfig,
+            mapper.constructType(DefaultClass::class.java)
+        ) {}
+
+        assertThrows(IllegalStateException::class.java) {
+            kotlinInstantiators.findValueInstantiator(
+                deserConfig,
+                deserConfig.introspect(mapper.constructType(TestClass::class.java)),
+                subClassInstantiator
+            )
+        }
+    }
+}