Merge branch '2.19'

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1904,3 +1904,8 @@ Konstantin Maliuga (@badoken)
 Lars Benedetto (@lbenedetto)
  * Contributed #4676: Support other enum naming strategies than camelCase
   (2.19.0)
+
+Floris Westerman (@FWest98)
+ * Reported #4934: `DeserializationContext.readTreeAsValue()` handles null nodes
+   differently from `ObjectMapper.treeToValue()`
+  (2.19.0)

release-notes/VERSION-2.x

@@ -43,6 +43,9 @@ Project: jackson-databind
 #4869: Add `JsonNode.values()` to replace `elements()`
 #4896: Coercion shouldn't be necessary for Enums specifying an empty string
  (reported by @joaocanaverde-blue)
+#4934: `DeserializationContext.readTreeAsValue()` handles null nodes
+  differently from `ObjectMapper.treeToValue()`
+ (reported by Floris W)
 
 2.18.3 (not yet released)
 

src/main/java/tools/jackson/databind/DeserializationContext.java

@@ -400,7 +400,19 @@ public <T> T readValue(JsonParser p, JavaType type) throws JacksonException {
             reportBadDefinition(type,
                     "Could not find `ValueDeserializer` for type "+ClassUtil.getTypeDescription(type));
         }
-        return (T) deser.deserialize(p, this);
+        return (T) _readValue(p, deser);
+    }
+
+    /**
+     * Helper method that should handle special cases for deserialization; most
+     * notably handling {@code null} (and possibly absent values).
+     */
+    private Object _readValue(JsonParser p, ValueDeserializer<Object> deser) throws JacksonException
+    {
+        if (p.hasToken(JsonToken.VALUE_NULL)) {
+             return deser.getNullValue(this);
+        }
+        return deser.deserialize(p, this);
     }
 
     /*
@@ -1106,7 +1118,7 @@ public <T> T readPropertyValue(JsonParser p, BeanProperty prop, JavaType type)
                     "Could not find `ValueDeserializer` for type %s (via property %s)",
                     ClassUtil.getTypeDescription(type), ClassUtil.nameOf(prop)));
         }
-        return (T) deser.deserialize(p, this);
+        return (T) _readValue(p, deser);
     }
 
     /**
@@ -1169,7 +1181,7 @@ private TreeTraversingParser _treeAsTokens(JsonNode n)
         p.nextToken();
         return p;
     }
-
+    
     /*
     /**********************************************************************
     /* Methods for problem handling

src/test/java/tools/jackson/databind/DeserializationContextTest.java

@@ -11,7 +11,10 @@
 
 public class DeserializationContextTest extends DatabindTestUtil
 {
-    private final ObjectMapper MAPPER = newJsonMapper();
+    // Not testing "no nulls for primitives", so
+    private final ObjectMapper MAPPER = jsonMapperBuilder()
+            .disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
+            .build();
 
     static class Bean4934 {
         public String value;
@@ -26,14 +29,10 @@ public void testTreeAsValueFromNulls() throws Exception
             DeserializationContext ctxt = MAPPER.readerFor(String.class)._deserializationContext(p);
 
             assertNull(ctxt.readTreeAsValue(nodeF.nullNode(), Boolean.class));
+            assertEquals(Boolean.FALSE, ctxt.readTreeAsValue(nodeF.nullNode(), Boolean.TYPE));
+            assertNull(ctxt.readTreeAsValue(nodeF.nullNode(), String.class));
 
-            // Fails on 3.0, investigate
-
-            //assertEquals(Boolean.FALSE, ctxt.readTreeAsValue(nodeF.nullNode(), Boolean.TYPE));
-
-            // Only fixed in 2.19:
-            //assertNull(ctxt.readTreeAsValue(nodeF.nullNode(), Bean4934.class));
-
+            assertNull(ctxt.readTreeAsValue(nodeF.nullNode(), Bean4934.class));
         }
     }
 
@@ -45,12 +44,12 @@ public void testTreeAsValueFromMissing() throws Exception
         try (JsonParser p = MAPPER.createParser("abc")) {
             DeserializationContext ctxt = MAPPER.readerFor(String.class)._deserializationContext(p);
 
-            assertNull(ctxt.readTreeAsValue(nodeF.missingNode(), Boolean.class));
             // Absent becomes `null` for now as well
+            assertNull(ctxt.readTreeAsValue(nodeF.missingNode(), Boolean.class));
             assertNull(ctxt.readTreeAsValue(nodeF.missingNode(), Boolean.TYPE));
+            assertNull(ctxt.readTreeAsValue(nodeF.missingNode(), String.class));
 
-            // Only fixed in 2.19:
-            //assertNull(ctxt.readTreeAsValue(nodeF.missingNode(), Bean4934.class));
+            assertNull(ctxt.readTreeAsValue(nodeF.missingNode(), Bean4934.class));
         }
     }
 }