Update release notes wrt #3227

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1025,6 +1025,8 @@ João Guerra (joca-bt@github)
   * Reported #2770: JsonParser from MismatchedInputException cannot getText() for
     floating-point value
   (2.11.1)
+  * Reported #3227: Content `null` handling not working for root values
+  (2.13.0)
 
 Ryan Bohn (bohnman@github)
   * Reported #2475: `StringCollectionSerializer` calls `JsonGenerator.setCurrentValue(value)`,
@@ -1382,3 +1384,7 @@ Tanvesh Takawale (TanveshT@github)
   * Contributed implementation for #3238: Add PropertyNamingStrategies.UpperSnakeCaseStrategy
     (and UPPER_SNAKE_CASE constant)
    (2.13.0)
+
+Hyeonho Kim (proost@github)
+  * Contributed fix for #3227: Content `null` handling not working for root values
+   (2.13.0)

release-notes/VERSION-2.x

@@ -60,6 +60,9 @@ Project: jackson-databind
  (suggested by Nick B)
 #3217: `XMLGregorianCalendar` doesn't work with default typing
  (reported by Xinzhe Y)
+#3227: Content `null` handling not working for root values
+ (reported by João G)
+ (fix contributed by proost@github)
 #3238: Add PropertyNamingStrategies.UpperSnakeCaseStrategy (and UPPER_SNAKE_CASE constant)
  (requested by Kenneth J)
  (contributed by Tanvesh)

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

@@ -1885,9 +1885,10 @@ protected Nulls findContentNullStyle(DeserializationContext ctxt, BeanProperty p
         if (prop != null) {
             return prop.getMetadata().getContentNulls();
         }
-
-        DeserializationConfig config = ctxt.getConfig();
-        return config.getDefaultSetterInfo().getContentNulls();
+        // 24-Aug-2021, tatu: As per [databind#3227] root values also need
+        //     to be checked for content nulls
+        //  NOTE: will this work wrt type-specific overrides? Probably not...
+        return ctxt.getConfig().getDefaultSetterInfo().getContentNulls();
     }
 
     // @since 2.9

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

@@ -81,12 +81,16 @@ enum EnumMapTestEnum {
         A, B, C;
     }
 
-    private final ObjectMapper MAPPER = objectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
 
+    private final ObjectMapper CONTENT_NULL_FAIL_MAPPER = JsonMapper.builder()
+            .defaultSetterInfo(JsonSetter.Value.construct(Nulls.AS_EMPTY, Nulls.FAIL))
+            .build();
+    
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Test methods
-    /**********************************************************
+    /**********************************************************************
      */
 
     public void testNull() throws Exception
@@ -205,58 +209,73 @@ public void testPolymorphicDataNull() throws Exception
         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();
-
+    // Test for [databind#3227]
+    public void testContentsNullFailForMaps() throws Exception
+    {
         try {
-            objectMapper.readValue("{ \"field\": null, \"property\": '1' }", Map.class);
+            CONTENT_NULL_FAIL_MAPPER.readValue("{ \"field\": null, \"property\": 1 }", Map.class);
             fail("InvalidNullException expected");
         } catch (InvalidNullException e) {
+            verifyException(e, "Invalid `null` value encountered");
         }
 
         try {
-            objectMapper.readValue("{ \"A\": 1, \"B\": null }", new TypeReference<EnumMap<EnumMapTestEnum, Integer>>() {});
+            CONTENT_NULL_FAIL_MAPPER.readValue("{ \"A\": 1, \"B\": null }", new TypeReference<EnumMap<EnumMapTestEnum, Integer>>() {});
             fail("InvalidNullException expected");
         } catch (InvalidNullException e) {
+            verifyException(e, "Invalid `null` value encountered");
         }
+    }
 
+    // Test for [databind#3227]
+    public void testContentsNullFailForCollections() throws Exception
+    {
         try {
-            objectMapper.readValue("[null, {\"field\": 1}]", new TypeReference<List<Object>>() {});
+            CONTENT_NULL_FAIL_MAPPER.readValue("[null, {\"field\": 1}]",
+                    new TypeReference<List<Object>>() {});
             fail("InvalidNullException expected");
         } catch (InvalidNullException e) {
+            verifyException(e, "Invalid `null` value encountered");
         }
 
         try {
-            objectMapper.readValue("[{\"field\": 1}, null]", new TypeReference<Set<Object>>() {});
+            CONTENT_NULL_FAIL_MAPPER.readValue("[{\"field\": 1}, null]",
+                    new TypeReference<Set<Object>>() {});
             fail("InvalidNullException expected");
         } catch (InvalidNullException e) {
+            verifyException(e, "Invalid `null` value encountered");
         }
 
         try {
-            objectMapper.readValue("[null, {\"field\": 1}]", Object[].class);
+            CONTENT_NULL_FAIL_MAPPER.readValue("[\"foo\", null]", new TypeReference<List<String>>() {});
             fail("InvalidNullException expected");
         } catch (InvalidNullException e) {
+            verifyException(e, "Invalid `null` value encountered");
         }
 
         try {
-            objectMapper.readValue("[\"foo\", null]", new TypeReference<List<String>>() {});
+            CONTENT_NULL_FAIL_MAPPER.readValue("[\"foo\", null]", new TypeReference<Set<String>>() {});
             fail("InvalidNullException expected");
         } catch (InvalidNullException e) {
+            verifyException(e, "Invalid `null` value encountered");
         }
+    }
 
+    // Test for [databind#3227]
+    public void testContentsNullFailForArrays() throws Exception
+    {
         try {
-            objectMapper.readValue("[\"foo\", null]", new TypeReference<Set<String>>() {});
+            CONTENT_NULL_FAIL_MAPPER.readValue("[null, {\"field\": 1}]", Object[].class);
             fail("InvalidNullException expected");
         } catch (InvalidNullException e) {
+            verifyException(e, "Invalid `null` value encountered");
         }
 
         try {
-            objectMapper.readValue("[null, \"foo\"]", String[].class);
+            CONTENT_NULL_FAIL_MAPPER.readValue("[null, \"foo\"]", String[].class);
             fail("InvalidNullException expected");
         } catch (InvalidNullException e) {
+            verifyException(e, "Invalid `null` value encountered");
         }
     }
 }