Merge branch 'master' into spliterator

Author: cowtowncoder

release-notes/VERSION

@@ -84,6 +84,7 @@ Versions: 3.x (for earlier see VERSION-2.x)
 #4820: Change JDK baseline for Jackson 3.0 from Java 8 to Java 17
 #4835: Remove dynamic work-arounds wrt accessing `Record` definition
 #4840: Increase minimum Android SDK required to 34 for Jackson 3.0
+#4869: Rename JsonNode method elements() as values() to unify naming in 3.0
 - Remove `MappingJsonFactory`
 - Add context parameter for `TypeSerializer` contextualization (`forProperty()`)
 - Default for `JsonNodeFeature.STRIP_TRAILING_BIGDECIMAL_ZEROES` changed to `false` for 3.0

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

@@ -971,12 +971,12 @@ public boolean hasNonNull(int index) {
      */
 
     /**
-     * Same as calling {@link #elements}; implemented so that
+     * Same as calling {@link #values()}; implemented so that
      * convenience "for-each" loop can be used for looping over elements
      * of JSON Array constructs.
      */
     @Override
-    public final Iterator<JsonNode> iterator() { return elements(); }
+    public final Iterator<JsonNode> iterator() { return values(); }
 
     /**
      * Same as calling {@link #elementsSpliterator()}.
@@ -990,7 +990,7 @@ public boolean hasNonNull(int index) {
      * field names (keys) are not included, only values.
      * For other types of nodes, returns empty iterator.
      */
-    public Iterator<JsonNode> elements() {
+    public Iterator<JsonNode> values() {
         return ClassUtil.emptyIterator();
     }
 
@@ -1088,7 +1088,7 @@ public void forEachEntry(BiConsumer<? super String, ? super JsonNode> action) {
      * If no matching field is found in this node or its descendants, returns null.
      *<p>
      * Note that traversal is done in document order (that is, order in which
-     * nodes are iterated if using {@link JsonNode#elements()})
+     * nodes are iterated if using {@link JsonNode#values()})
      *
      * @param fieldName Name of field to look for
      *

src/main/java/tools/jackson/databind/node/ArrayNode.java

@@ -225,7 +225,7 @@ public int size() {
      * (before was only generic {@link java.util.Iterator}).
      */
     @Override
-    public Iterator<JsonNode> elements() {
+    public Iterator<JsonNode> values() {
         return _children.listIterator();
     }
 

src/main/java/tools/jackson/databind/node/InternalNodeSerializer.java

@@ -72,7 +72,7 @@ protected void _serializeNonRecursive(JsonGenerator g, JsonNode node)
                 _serializeNonRecursive(g, new IteratorStack(), node.fields());
             } else if (node instanceof ArrayNode) {
                 g.writeStartArray(this, node.size());
-                _serializeNonRecursive(g, new IteratorStack(), node.elements());
+                _serializeNonRecursive(g, new IteratorStack(), node.values());
             } else {
                 node.serialize(g, _context);
             }
@@ -104,7 +104,7 @@ protected void _serializeNonRecursive(JsonGenerator g, IteratorStack stack,
                         g.writeStartObject(value, value.size());
                     } else if (value instanceof ArrayNode) {
                         stack.push(currIt);
-                        currIt = value.elements();
+                        currIt = value.values();
                         g.writeStartArray(value, value.size());
                     } else if (value instanceof POJONode) {
                         // [databind#3262] Problematic case, try to handle

src/main/java/tools/jackson/databind/node/NodeCursor.java

@@ -155,7 +155,7 @@ protected final static class ArrayCursor
 
         public ArrayCursor(JsonNode n, NodeCursor p) {
             super(TokenStreamContext.TYPE_ARRAY, p);
-            _contents = n.elements();
+            _contents = n.values();
         }
 
         @Override

src/main/java/tools/jackson/databind/node/ObjectNode.java

@@ -231,7 +231,7 @@ public int size() {
     public boolean isEmpty() { return _children.isEmpty(); }
 
     @Override
-    public Iterator<JsonNode> elements() {
+    public Iterator<JsonNode> values() {
         return _children.values().iterator();
     }
 

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

@@ -534,7 +534,7 @@ public Iterator<Entry<String, JsonNode>> fields() {
         }
 
         @Override
-        public Iterator<JsonNode> elements() {
+        public Iterator<JsonNode> values() {
             return Collections.emptyIterator();
         }
 
@@ -654,8 +654,8 @@ public int size() {
         }
 
         @Override
-        public Iterator<JsonNode> elements() {
-            return _delegate.elements();
+        public Iterator<JsonNode> values() {
+            return _delegate.values();
         }
 
         @Override

src/test/java/tools/jackson/databind/node/ArrayNodeTest.java

@@ -35,7 +35,7 @@ public void testDirectCreation() throws Exception
         assertFalse(n.canConvertToExactIntegral());
 
         assertStandardEquals(n);
-        assertFalse(n.elements().hasNext());
+        assertFalse(n.values().hasNext());
         assertEquals(0, n.elementsSpliterator().estimateSize());
         assertFalse(n.propertyNames().hasNext());
         assertEquals(0, n.propertyNamesSpliterator().estimateSize());
@@ -45,7 +45,7 @@ public void testDirectCreation() throws Exception
         assertEquals(1, n.size());
         assertFalse(n.isEmpty());
         assertNotEquals(0, n.hashCode());
-        assertTrue(n.elements().hasNext());
+        assertTrue(n.values().hasNext());
         // no field names for arrays
         assertFalse(n.propertyNames().hasNext());
         assertNull(n.get("x")); // not used with arrays

src/test/java/tools/jackson/databind/node/NullNodeTest.java

@@ -59,7 +59,7 @@ public void testBasicsWithNullNode() throws Exception
 
         assertEquals(0, n.size());
         assertTrue(n.isEmpty());
-        assertFalse(n.elements().hasNext());
+        assertFalse(n.values().hasNext());
         assertFalse(n.propertyNames().hasNext());
         // path is never null; but does point to missing node
         assertNotNull(n.path("xyz"));

src/test/java/tools/jackson/databind/node/ObjectNodeTest.java

@@ -143,7 +143,7 @@ public void testBasics()
         assertStandardEquals(n);
         assertTrue(n.isEmpty());
 
-        assertFalse(n.elements().hasNext());
+        assertFalse(n.values().hasNext());
         assertFalse(n.fields().hasNext());
         assertFalse(n.propertyNames().hasNext());
         assertNull(n.get("a"));
@@ -153,7 +153,7 @@ public void testBasics()
         assertSame(n, n.set("a", text));
 
         assertEquals(1, n.size());
-        assertTrue(n.elements().hasNext());
+        assertTrue(n.values().hasNext());
         assertTrue(n.fields().hasNext());
         assertTrue(n.propertyNames().hasNext());
         assertSame(text, n.get("a"));