fix issue with FAIL_ON_NULL_CREATOR_PROPERTIES for collections

Author: pjfanning

src/main/scala/tools/jackson/module/scala/deser/GenericFactoryDeserializerResolver.scala

@@ -145,7 +145,12 @@ abstract class GenericFactoryDeserializerResolver[CC[_], CF[X[_]]](config: Scala
       bw.builder.result().asInstanceOf[Object]
     }
 
-    override def getNullValue(ctxt: DeserializationContext): Object = getEmptyValue(ctxt)
+    override def getNullValue(ctxt: DeserializationContext): Object = {
+      if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES))
+        super.getNullValue(ctxt)
+      else
+        getEmptyValue(ctxt)
+    }
 
     private def newBuilderWrapper(ctxt: DeserializationContext): BuilderWrapper[AnyRef] = {
       containerDeserializer.getValueInstantiator.createUsingDefault(ctxt).asInstanceOf[BuilderWrapper[AnyRef]]

src/main/scala/tools/jackson/module/scala/deser/GenericMapFactoryDeserializerResolver.scala

@@ -166,7 +166,12 @@ abstract class GenericMapFactoryDeserializerResolver[CC[K, V], CF[X[_, _]]](conf
       bw.builder.result().asInstanceOf[Object]
     }
 
-    override def getNullValue(ctxt: DeserializationContext): Object = getEmptyValue(ctxt)
+    override def getNullValue(ctxt: DeserializationContext): Object = {
+      if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES))
+        super.getNullValue(ctxt)
+      else
+        getEmptyValue(ctxt)
+    }
 
     private def newBuilderWrapper(ctxt: DeserializationContext): BuilderWrapper[AnyRef, AnyRef] = {
       containerDeserializer.getValueInstantiator.createUsingDefault(ctxt).asInstanceOf[BuilderWrapper[AnyRef, AnyRef]]

src/test/scala/tools/jackson/module/scala/deser/CaseClassDeserializerTest.scala

@@ -210,6 +210,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]])
@@ -240,4 +248,12 @@ class CaseClassDeserializerTest extends DeserializerTest {
     val result = deserialize(input, classOf[AnnotatedMapHolder[Int, String]])
     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]])
+    }
+  }
 }