Backport parts of #4869 in 2.19 (#4874)

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -40,6 +40,7 @@ Project: jackson-databind
   `forEachEntry()`
 #4867: Add `Optional<JsonNode> JsonNode.asOptional()` convenience method
  (fix by Joo-Hyuk K)
+#4869: Add `JsonNode.values()` to replace `elements()`
 
 2.18.3 (not yet released)
 

src/main/java/com/fasterxml/jackson/databind/JsonNode.java

@@ -1066,16 +1066,23 @@ public boolean hasNonNull(int index) {
     @Override
     public final Iterator<JsonNode> iterator() { return elements(); }
 
+    /**
+     * Alias for {@link #values()}.
+     */
+    public Iterator<JsonNode> elements() {
+        return ClassUtil.emptyIterator();
+    }
+
     /**
      * Method for accessing all value nodes of this Node, iff
      * this node is a JSON Array or Object node. In case of Object node,
      * field names (keys) are not included, only values.
      * For other types of nodes, returns empty iterator.
-     * <p>
-     * Note: In Jackson 3, this method will be renamed to {@code values()}.
+     *
+     * @since 2.19
      */
-    public Iterator<JsonNode> elements() {
-        return ClassUtil.emptyIterator();
+    public Iterator<JsonNode> values() {
+        return elements();
     }
 
     /**

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

@@ -246,15 +246,20 @@ public int size() {
     @Override // since 2.10
     public boolean isEmpty() { return _children.isEmpty(); }
 
+    @Override
+    public Iterator<JsonNode> elements() {
+        return _children.listIterator();
+    }
+
     /**
      * {@inheritDoc}
      *<p>
      * NOTE: actual underlying implementation returns {@link java.util.ListIterator}
      * from {@link java.util.List#listIterator()} that contains elements, since Jackson 2.18
      * (before was only generic {@link java.util.Iterator}).
      */
-    @Override
-    public Iterator<JsonNode> elements() {
+    @Override // @since 2.19
+    public Iterator<JsonNode> values() {
         return _children.listIterator();
     }
 

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

@@ -275,6 +275,11 @@ public Iterator<JsonNode> elements() {
         return _children.values().iterator();
     }
 
+    @Override // @since 2.19
+    public Iterator<JsonNode> values() {
+        return _children.values().iterator();
+    }
+
     @Override
     public JsonNode get(int index) { return null; }