Merge remote-tracking branch 'FasterXML/2.19'

Author: k163377

release-notes/CREDITS-2.x

@@ -21,6 +21,7 @@ Tatu Saloranta (@cowtowncoder)
 * #889: Upgrade kotlin dep to 1.9.25 (from 1.9.24)
 
 WrongWrong (@k163377)
+* #930: Add tests for #917
 * #929: Bug fixes to hasRequiredMarker and added isRequired considerations
 * #914: Add test case to serialize Nothing? (for #314)
 * #910: Add default KeyDeserializer for value class

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

@@ -0,0 +1,43 @@
+package tools.jackson.module.kotlin.test.github
+
+import com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.OptBoolean
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+import tools.jackson.databind.exc.InvalidNullException
+import tools.jackson.module.kotlin.jsonMapper
+import tools.jackson.module.kotlin.kotlinModule
+import tools.jackson.module.kotlin.readValue
+import kotlin.test.assertEquals
+
+class GitHub917 {
+    data class Failing<T>(val data: T)
+
+    val mapper = jsonMapper {
+        changeDefaultPropertyInclusion { it.withValueInclusion(JsonInclude.Include.NON_NULL) }
+        addModule(kotlinModule())
+    }
+
+    @Test
+    fun failing() {
+        val value = Failing<String?>(null)
+        val json = mapper.writeValueAsString(value)
+
+        assertThrows<InvalidNullException> {
+            val deserializedValue = mapper.readValue<Failing<String?>>(json)
+            assertEquals(value ,deserializedValue)
+        }
+    }
+
+    data class WorkAround<T>(@JsonProperty(isRequired = OptBoolean.FALSE) val data: T)
+
+    @Test
+    fun workAround() {
+        val value = WorkAround<String?>(null)
+        val json = mapper.writeValueAsString(value)
+
+        val deserializedValue = mapper.readValue<WorkAround<String?>>(json)
+        assertEquals(value ,deserializedValue)
+    }
+}