Merge remote-tracking branch 'FasterXML/2.18'

release-notes/CREDITS-2.x

@@ -16,6 +16,9 @@ Authors:
 Contributors:
 
 # 2.18.0 (not yet released)
+
+WrongWrong (@k163377)
+* #817: Fixed nullability of convertValue function argument
 * #782: Organize deprecated contents
 * #542: Remove meaningless checks and properties in KNAI
 

release-notes/VERSION-2.x

@@ -18,6 +18,7 @@ Co-maintainers:
 
 2.18.0 (not yet released)
 
+#817: The convertValue extension function now accepts null
 #803: Kotlin has been upgraded to 1.8.10.
   The reason 1.8.22 is not used is to avoid KT-65156.
 #782: Content marked as deprecated has been reorganized.

src/main/kotlin/tools/jackson/module/kotlin/Extensions.kt

@@ -62,7 +62,7 @@ inline fun <reified T> ObjectMapper.readValue(src: InputStream): T = readValue(s
 inline fun <reified T> ObjectMapper.readValue(src: ByteArray): T = readValue(src, jacksonTypeRef<T>())
 
 inline fun <reified T> ObjectMapper.treeToValue(n: TreeNode): T = readValue(this.treeAsTokens(n), jacksonTypeRef<T>())
-inline fun <reified T> ObjectMapper.convertValue(from: Any): T = convertValue(from, jacksonTypeRef<T>())
+inline fun <reified T> ObjectMapper.convertValue(from: Any?): T = convertValue(from, jacksonTypeRef<T>())
 
 inline fun <reified T> ObjectReader.readValueTyped(jp: JsonParser): T = forType(jacksonTypeRef<T>()).readValue(jp)
 inline fun <reified T> ObjectReader.readValuesTyped(jp: JsonParser): Iterator<T> = readValues(jp, jacksonTypeRef<T>())

src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub757.kt

@@ -0,0 +1,22 @@
+package com.fasterxml.jackson.module.kotlin.test.github
+
+import com.fasterxml.jackson.databind.json.JsonMapper
+import com.fasterxml.jackson.module.kotlin.KotlinFeature
+import com.fasterxml.jackson.module.kotlin.KotlinModule
+import com.fasterxml.jackson.module.kotlin.convertValue
+import kotlin.test.Test
+import kotlin.test.assertNull
+
+class GitHub757 {
+    @Test
+    fun test() {
+        val kotlinModule = KotlinModule.Builder()
+            .enable(KotlinFeature.StrictNullChecks)
+            .build()
+        val mapper = JsonMapper.builder()
+            .addModule(kotlinModule)
+            .build()
+        val convertValue = mapper.convertValue<String?>(null)
+        assertNull(convertValue)
+    }
+}