Merge branch 'novtor/2.13' into 2.13

Author: dinomite

release-notes/CREDITS-2.x

@@ -42,6 +42,10 @@ wrongwrong (k163377@github)
 * Contributed #438: Fixed mapping failure when `private` `companion object` is named
   (2.13)
 
+Dmitri Domanine (novtor@github)
+* Contributed fix for #490: Missing value of type JsonNode? is deserialized as NullNode instead of null
+  (2.13)
+
 Marshall Pierce (marshallpierce@github)
 * #474: Reported disrespect for @JsonProperty on parent class
   (2.12.NEXT)

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

@@ -3,7 +3,13 @@ package com.fasterxml.jackson.module.kotlin
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.core.TreeNode
 import com.fasterxml.jackson.core.type.TypeReference
-import com.fasterxml.jackson.databind.*
+import com.fasterxml.jackson.databind.JsonDeserializer
+import com.fasterxml.jackson.databind.JsonMappingException
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.JsonSerializer
+import com.fasterxml.jackson.databind.MappingIterator
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.ObjectReader
 import com.fasterxml.jackson.databind.json.JsonMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.databind.node.ArrayNode

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

@@ -1,7 +1,11 @@
 package com.fasterxml.jackson.module.kotlin
 
 import com.fasterxml.jackson.core.JsonGenerator
-import com.fasterxml.jackson.databind.*
+import com.fasterxml.jackson.databind.BeanDescription
+import com.fasterxml.jackson.databind.JavaType
+import com.fasterxml.jackson.databind.JsonSerializer
+import com.fasterxml.jackson.databind.SerializationConfig
+import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.ser.Serializers
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
 

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

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.module.kotlin.KotlinFeature.NullToEmptyMap
 import com.fasterxml.jackson.module.kotlin.KotlinFeature.StrictNullChecks
 import com.fasterxml.jackson.module.kotlin.SingletonSupport.CANONICALIZE
 import com.fasterxml.jackson.module.kotlin.SingletonSupport.DISABLED
-import java.util.BitSet
+import java.util.*
 import kotlin.reflect.KClass
 
 private const val metadataFqName = "kotlin.Metadata"

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

@@ -14,7 +14,7 @@ import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector
 import com.fasterxml.jackson.databind.util.BeanUtil
 import java.lang.reflect.Constructor
 import java.lang.reflect.Method
-import java.util.Locale
+import java.util.*
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter

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

@@ -3,7 +3,11 @@
 package com.fasterxml.jackson.module.kotlin
 
 import com.fasterxml.jackson.core.JsonGenerator
-import com.fasterxml.jackson.databind.*
+import com.fasterxml.jackson.databind.BeanDescription
+import com.fasterxml.jackson.databind.JavaType
+import com.fasterxml.jackson.databind.JsonSerializer
+import com.fasterxml.jackson.databind.SerializationConfig
+import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.ser.Serializers
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
 import java.math.BigInteger

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

@@ -101,8 +101,13 @@ internal class KotlinValueInstantiator(
                 }
                 tempParamVal
             } else {
-                // trying to get suitable "missing" value provided by deserializer
-                jsonProp.valueDeserializer?.getNullValue(ctxt)
+                if(paramDef.type.isMarkedNullable) {
+                    // do not try to create any object if it is nullable and the value is missing
+                    null
+                } else {
+                    // to get suitable "missing" value provided by deserializer
+                    jsonProp.valueDeserializer?.getAbsentValue(ctxt)
+                }
             }
 
             if (paramVal == null && ((nullToEmptyCollection && jsonProp.type.isCollectionLikeType) || (nullToEmptyMap && jsonProp.type.isMapLikeType))) {

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

@@ -3,7 +3,13 @@ package com.fasterxml.jackson.module.kotlin.test
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.databind.node.JsonNodeFactory
-import com.fasterxml.jackson.module.kotlin.*
+import com.fasterxml.jackson.module.kotlin.contains
+import com.fasterxml.jackson.module.kotlin.convertValue
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.minusAssign
+import com.fasterxml.jackson.module.kotlin.plusAssign
+import com.fasterxml.jackson.module.kotlin.readValue
+import com.fasterxml.jackson.module.kotlin.treeToValue
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github490.kt

@@ -0,0 +1,81 @@
+package com.fasterxml.jackson.module.kotlin.test.github
+
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.node.NullNode
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+import org.hamcrest.CoreMatchers
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.Test
+
+class TestGithub490 {
+    val mapper = jacksonObjectMapper()
+    val value: DataClassWithAllNullableParams = mapper.readValue(
+        "{" +
+                "\"jsonNodeValueWithNullAsDefaultProvidedNull\":null, " +
+                "\"jsonNodeValueProvidedNull\":null}"
+    )
+
+    @Test
+    fun testKotlinDeserialization_intValue() {
+        assertThat(
+            "Nullable missing Int value should be deserialized as null",
+            value.intValue,
+            CoreMatchers.nullValue()
+        )
+    }
+
+    @Test
+    fun testKotlinDeserialization_stringValue() {
+        assertThat(
+            "Nullable missing String value should be deserialized as null",
+            value.stringValue,
+            CoreMatchers.nullValue()
+        )
+    }
+
+    @Test
+    fun testKotlinDeserialization_jsonNodeValue() {
+        assertThat(
+            "Nullable missing JsonNode value should be deserialized as null and not as NullNode",
+            value.jsonNodeValue,
+            CoreMatchers.nullValue()
+        )
+    }
+
+    @Test
+    fun testKotlinDeserialization_jsonNodeValueProvidedNull() {
+        assertThat(
+            "Nullable JsonNode value provided as null should be deserialized as NullNode",
+            value.jsonNodeValueProvidedNull,
+            CoreMatchers.equalTo(NullNode.instance)
+        )
+    }
+
+    @Test
+    fun testKotlinDeserialization_jsonNodeValueWithNullAsDefault() {
+        assertThat(
+            "Nullable by default missing JsonNode value should be deserialized as null and not as NullNode",
+            value.jsonNodeValueWithNullAsDefault,
+            CoreMatchers.nullValue()
+        )
+    }
+
+    @Test
+    fun testKotlinDeserialization_jsonNodeValueWithNullAsDefaultProvidedNull() {
+        assertThat(
+            "Nullable by default JsonNode with provided null value in payload should be deserialized as NullNode",
+            value.jsonNodeValueWithNullAsDefaultProvidedNull,
+            CoreMatchers.equalTo(NullNode.instance)
+        )
+    }
+}
+
+data class DataClassWithAllNullableParams(
+    val intValue: Int?,
+    val stringValue: String?,
+    val jsonNodeValue: JsonNode?,
+    val jsonNodeValueProvidedNull: JsonNode?,
+    val jsonNodeValueWithNullAsDefault: JsonNode? = null,
+    val jsonNodeValueWithNullAsDefaultProvidedNull: JsonNode? = null
+)