Merge branch '2.16' into 2.17

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -22,6 +22,9 @@ Project: jackson-databind
 #4216: Primitive array deserializer cannot being captured by `DeserializerModifier`
  (reported by @SakuraKoi)
  (fix contributed by Joo-Hyuk K)
+#4229 JsonNode findValues and findParents missing expected values in 2.16.0
+ (reported by @gcookemoto)
+ (fix contributed by Joo-Hyuk K)
 
 2.16.0 (15-Nov-2023)
 

src/main/java/com/fasterxml/jackson/databind/node/ObjectNode.java

@@ -382,37 +382,32 @@ public JsonNode findValue(String propertyName)
     @Override
     public List<JsonNode> findValues(String propertyName, List<JsonNode> foundSoFar)
     {
-        JsonNode jsonNode = _children.get(propertyName);
-        if (jsonNode != null) {
-            if (foundSoFar == null) {
-                foundSoFar = new ArrayList<>();
+        for (Map.Entry<String, JsonNode> entry : _children.entrySet()) {
+            if (propertyName.equals(entry.getKey())) {
+                if (foundSoFar == null) {
+                    foundSoFar = new ArrayList<JsonNode>();
+                }
+                foundSoFar.add(entry.getValue());
+            } else { // only add children if parent not added
+                foundSoFar = entry.getValue().findValues(propertyName, foundSoFar);
             }
-            foundSoFar.add(jsonNode);
-            return foundSoFar;
-        }
-
-        // only add children if parent not added
-        for (JsonNode child : _children.values()) {
-            foundSoFar = child.findValues(propertyName, foundSoFar);
         }
         return foundSoFar;
     }
 
     @Override
     public List<String> findValuesAsText(String propertyName, List<String> foundSoFar)
     {
-        JsonNode jsonNode = _children.get(propertyName);
-        if (jsonNode != null) {
-            if (foundSoFar == null) {
-                foundSoFar = new ArrayList<>();
+        for (Map.Entry<String, JsonNode> entry : _children.entrySet()) {
+            if (propertyName.equals(entry.getKey())) {
+                if (foundSoFar == null) {
+                    foundSoFar = new ArrayList<String>();
+                }
+                foundSoFar.add(entry.getValue().asText());
+            } else { // only add children if parent not added
+                foundSoFar = entry.getValue().findValuesAsText(propertyName,
+                    foundSoFar);
             }
-            foundSoFar.add(jsonNode.asText());
-            return foundSoFar;
-        }
-
-        // only add children if parent not added
-        for (JsonNode child : _children.values()) {
-            foundSoFar = child.findValuesAsText(propertyName, foundSoFar);
         }
         return foundSoFar;
     }
@@ -436,18 +431,16 @@ public ObjectNode findParent(String propertyName)
     @Override
     public List<JsonNode> findParents(String propertyName, List<JsonNode> foundSoFar)
     {
-        JsonNode jsonNode = _children.get(propertyName);
-        if (jsonNode != null) {
-            if (foundSoFar == null) {
-                foundSoFar = new ArrayList<>();
+        for (Map.Entry<String, JsonNode> entry : _children.entrySet()) {
+            if (propertyName.equals(entry.getKey())) {
+                if (foundSoFar == null) {
+                    foundSoFar = new ArrayList<JsonNode>();
+                }
+                foundSoFar.add(this);
+            } else { // only add children if parent not added
+                foundSoFar = entry.getValue()
+                    .findParents(propertyName, foundSoFar);
             }
-            foundSoFar.add(this);
-            return foundSoFar;
-        }
-
-        // only add children if parent not added
-        for (JsonNode child : _children.values()) {
-            foundSoFar = child.findParents(propertyName, foundSoFar);
         }
         return foundSoFar;
     }

src/test/java/com/fasterxml/jackson/databind/node/TestFindMethods.java

@@ -4,13 +4,32 @@
 
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class TestFindMethods
     extends BaseMapTest
 {
+    private final String JSON_SAMPLE = "{ \"a\" : { \"value\" : 3 },"
+            +"\"array\" : [ { \"b\" : 3 }, {\"value\" : 42}, { \"other\" : true } ]"
+            +"}";
+    
+    private final String JSON_4229 = a2q("{"
+            + "    'target': 'target1'," // Found in <= 2.15.3 and 2.16.0
+            + "    'object1': {"
+            + "        'target': 'target2' " // Found in <= 2.15.3, but not in 2.16.0
+            + "    },"
+            + "    'object2': {"
+            + "        'target': { " // Found in <= 2.15.3, but not in 2.16.0
+            + "            'target': 'ignoredAsParentIsTarget'" // Expect not to be found (as sub-tree search ends when parent is found)
+            + "        }"
+            + "    }"
+            + "}");
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+
     public void testNonMatching() throws Exception
     {
-        JsonNode root = _buildTree();
+        JsonNode root = MAPPER.readTree(JSON_SAMPLE);
 
         assertNull(root.findValue("boogaboo"));
         assertNull(root.findParent("boogaboo"));
@@ -24,7 +43,7 @@ public void testNonMatching() throws Exception
 
     public void testMatchingSingle() throws Exception
     {
-        JsonNode root = _buildTree();
+        JsonNode root = MAPPER.readTree(JSON_SAMPLE);
 
         JsonNode node = root.findValue("b");
         assertNotNull(node);
@@ -38,7 +57,7 @@ public void testMatchingSingle() throws Exception
 
     public void testMatchingMultiple() throws Exception
     {
-        JsonNode root = _buildTree();
+        JsonNode root = MAPPER.readTree(JSON_SAMPLE);
 
         List<JsonNode> nodes = root.findValues("value");
         assertEquals(2, nodes.size());
@@ -61,11 +80,25 @@ public void testMatchingMultiple() throws Exception
         assertEquals("42", values.get(1));
     }
 
-    private JsonNode _buildTree() throws Exception
+    // [databind#4229]: regression in 2.16.0
+    public void testFindValues4229() throws Exception
     {
-        final String SAMPLE = "{ \"a\" : { \"value\" : 3 },"
-            +"\"array\" : [ { \"b\" : 3 }, {\"value\" : 42}, { \"other\" : true } ]"
-            +"}";
-        return objectMapper().readTree(SAMPLE);
+        JsonNode rootNode = MAPPER.readTree(JSON_4229);
+        assertEquals(Arrays.asList(
+                rootNode.at("/target"),
+                rootNode.at("/object1/target"),
+                rootNode.at("/object2/target")),
+                rootNode.findValues("target"));
+    }
+
+    // [databind#4229]: regression in 2.16.0
+    public void testFindParents4229() throws Exception
+    {
+        JsonNode rootNode = MAPPER.readTree(JSON_4229);
+        assertEquals(Arrays.asList(
+                rootNode,
+                rootNode.at("/object1"),
+                rootNode.at("/object2")),
+            rootNode.findParents("target"));
     }
 }