Merge remote-tracking branch 'FasterXML/2.19'

Author: k163377

release-notes/CREDITS-2.x

@@ -18,6 +18,7 @@ Contributors:
 # 2.19.0 (not yet released)
 
 WrongWrong (@k163377)
+* #868: Added test case for FAIL_ON_NULL_FOR_PRIMITIVES
 * #866: Upgrade to JUnit5
 * #861: Update Kotlin to 1.9.24
 * #858: Refactor findDefaultCreator

src/test/kotlin/tools/jackson/module/kotlin/test/FailNullForPrimitiveTest.kt

@@ -4,30 +4,48 @@ import tools.jackson.databind.DeserializationFeature
 import tools.jackson.databind.exc.MismatchedInputException
 import tools.jackson.module.kotlin.jacksonMapperBuilder
 import tools.jackson.module.kotlin.readValue
- import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
 
 class FailNullForPrimitiveTest {
-    data class Dto(
+    val mapper = jacksonMapperBuilder()
+        .configure(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, true)
+        .build()
+
+    data class NoDefaultValue(
         val foo: Int,
         val bar: Int?
     )
 
     @Test
-    fun test() {
-        val mapper = jacksonMapperBuilder()
-            .configure(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, true)
-            .build()
+    fun noDefaultValueTest() {
+        // If no default value is set, it will fail if undefined or null is entered
+        assertThrows(MismatchedInputException::class.java) {
+            mapper.readValue<NoDefaultValue>("{}")
+        }
 
         assertThrows(MismatchedInputException::class.java) {
-            mapper.readValue<Dto>("{}")
+            mapper.readValue<NoDefaultValue>("""{"foo":null}""")
         }
 
+        assertEquals(NoDefaultValue(0, null), mapper.readValue<NoDefaultValue>("""{"foo":0}"""))
+    }
+
+    data class HasDefaultValue(
+        val foo: Int = -1,
+        val bar: Int? = -1
+    )
+
+    @Test
+    fun hasDefaultValueTest() {
+        // If a default value is set, an input of undefined will succeed, but null will fail
+        assertEquals(HasDefaultValue(-1, -1), mapper.readValue<HasDefaultValue>("{}"))
+
         assertThrows(MismatchedInputException::class.java) {
-            mapper.readValue<Dto>("""{"foo":null}""")
+            mapper.readValue<HasDefaultValue>("""{"foo":null}""")
         }
 
-        assertEquals(Dto(0, null), mapper.readValue<Dto>("""{"foo":0}"""))
+        assertEquals(HasDefaultValue(0, null), mapper.readValue<HasDefaultValue>("""{"foo":0, "bar":null}"""))
     }
 }