databind #3227 - Raise Exception If contentNull is Fail and content is null (#3248)

Author: proost

src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java

@@ -1885,7 +1885,9 @@ protected Nulls findContentNullStyle(DeserializationContext ctxt, BeanProperty p
         if (prop != null) {
             return prop.getMetadata().getContentNulls();
         }
-        return null;
+
+        DeserializationConfig config = ctxt.getConfig();
+        return config.getDefaultSetterInfo().getContentNulls();
     }
 
     // @since 2.9

src/test/java/com/fasterxml/jackson/databind/deser/NullHandlingTest.java

@@ -1,17 +1,15 @@
 package com.fasterxml.jackson.databind.deser;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.exc.InvalidNullException;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
 public class NullHandlingTest extends BaseMapTest
@@ -78,6 +76,11 @@ public TypeB(String b) {
         }
     }
 
+    // [databind #3227]
+    enum EnumMapTestEnum {
+        A, B, C;
+    }
+
     private final ObjectMapper MAPPER = objectMapper();
 
     /*
@@ -201,4 +204,59 @@ public void testPolymorphicDataNull() throws Exception
         RootData typeBNullData = MAPPER.readValue(typeBNull, RootData.class);
         assertNull("Proxy should be null!", typeBNullData.proxy);
     }
+
+    // Test for databind #3227
+    public void testNullsFailIfContentValueIsNull() throws Exception {
+        ObjectMapper objectMapper = JsonMapper.builder()
+                .defaultSetterInfo(JsonSetter.Value.construct(Nulls.FAIL, Nulls.FAIL))
+                .build();
+
+        try {
+            objectMapper.readValue("{ \"field\": null, \"property\": '1' }", Map.class);
+            fail("InvalidNullException expected");
+        } catch (InvalidNullException e) {
+        }
+
+        try {
+            objectMapper.readValue("{ \"A\": 1, \"B\": null }", new TypeReference<EnumMap<EnumMapTestEnum, Integer>>() {});
+            fail("InvalidNullException expected");
+        } catch (InvalidNullException e) {
+        }
+
+        try {
+            objectMapper.readValue("[null, {\"field\": 1}]", new TypeReference<List<Object>>() {});
+            fail("InvalidNullException expected");
+        } catch (InvalidNullException e) {
+        }
+
+        try {
+            objectMapper.readValue("[{\"field\": 1}, null]", new TypeReference<Set<Object>>() {});
+            fail("InvalidNullException expected");
+        } catch (InvalidNullException e) {
+        }
+
+        try {
+            objectMapper.readValue("[null, {\"field\": 1}]", Object[].class);
+            fail("InvalidNullException expected");
+        } catch (InvalidNullException e) {
+        }
+
+        try {
+            objectMapper.readValue("[\"foo\", null]", new TypeReference<List<String>>() {});
+            fail("InvalidNullException expected");
+        } catch (InvalidNullException e) {
+        }
+
+        try {
+            objectMapper.readValue("[\"foo\", null]", new TypeReference<Set<String>>() {});
+            fail("InvalidNullException expected");
+        } catch (InvalidNullException e) {
+        }
+
+        try {
+            objectMapper.readValue("[null, \"foo\"]", String[].class);
+            fail("InvalidNullException expected");
+        } catch (InvalidNullException e) {
+        }
+    }
 }