fix issue with FAIL_ON_NULL_CREATOR_PROPERTIES for collections

Author: pjfanning

src/main/java/com/fasterxml/jackson/module/scala/deser/ContainerDeserializerWithNullValueAsEmpty.java

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.module.scala.deser;
 
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.deser.std.ContainerDeserializerBase;
@@ -16,6 +17,10 @@ protected ContainerDeserializerWithNullValueAsEmpty(JavaType selfType) {
 
     @Override
     public T getNullValue(DeserializationContext ctxt) throws JsonMappingException {
-        return (T) getEmptyValue(ctxt);
+        if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES)) {
+            return super.getNullValue(ctxt);
+        } else {
+            return (T) getEmptyValue(ctxt);
+        }
     }
 }

src/test/scala/com/fasterxml/jackson/module/scala/deser/CaseClassDeserializerTest.scala

@@ -206,6 +206,14 @@ class CaseClassDeserializerTest extends DeserializerTest {
     result.list shouldBe List.empty
   }
 
+  it should "fail when deserializing null input for list if FAIL_ON_NULL_CREATOR_PROPERTIES enabled" in {
+    val input = """{}"""
+    val mapper = newBuilder.enable(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES).build()
+    intercept[com.fasterxml.jackson.databind.exc.MismatchedInputException] {
+      mapper.readValue(input, classOf[ListHolder[String]])
+    }
+  }
+
   it should "support deserializing null input for list as empty list (JsonSetter annotation)" in {
     val input = """{}"""
     val result = deserialize(input, classOf[AnnotatedListHolder[String]])
@@ -218,4 +226,13 @@ class CaseClassDeserializerTest extends DeserializerTest {
     // result.map used to be null until v2.19.0
     result.map shouldBe Map.empty
   }
+
+  it should "fail when deserializing null input for map if FAIL_ON_NULL_CREATOR_PROPERTIES enabled" in {
+    val input = """{}"""
+    val mapper = newBuilder.enable(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES).build()
+    intercept[com.fasterxml.jackson.databind.exc.MismatchedInputException] {
+      mapper.readValue(input, classOf[MapHolder[Int, String]])
+    }
+  }
+
 }