Complete #4869 change wrt return type change (#4876)

Author: cowtowncoder

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

@@ -1029,7 +1029,7 @@ public boolean hasNonNull(int index) {
      * of JSON Array constructs.
      */
     @Override
-    public final Iterator<JsonNode> iterator() { return values(); }
+    public final Iterator<JsonNode> iterator() { return values().iterator(); }
 
     /**
      * Same as calling {@link #valueSpliterator()}.
@@ -1043,8 +1043,8 @@ public boolean hasNonNull(int index) {
      * field names (keys) are not included, only values.
      * For other types of nodes, returns empty iterator.
      */
-    public Iterator<JsonNode> values() {
-        return ClassUtil.emptyIterator();
+    public Collection<JsonNode> values() {
+        return Collections.emptyList();
     }
 
     /**
@@ -1056,7 +1056,7 @@ public Iterator<JsonNode> values() {
      * @since 3.0
      */
     public Spliterator<JsonNode> valueSpliterator() {
-        return Spliterators.spliteratorUnknownSize(values(), Spliterator.ORDERED);
+        return values().spliterator();
     }
 
     /**

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

@@ -261,8 +261,8 @@ public JsonNode required(int index) {
      * (before was only generic {@link java.util.Iterator}).
      */
     @Override
-    public Iterator<JsonNode> values() {
-        return _children.listIterator();
+    public Collection<JsonNode> values() {
+        return _children;
     }
 
     @Override

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.properties().iterator());
             } else if (node instanceof ArrayNode) {
                 g.writeStartArray(this, node.size());
-                _serializeNonRecursive(g, new IteratorStack(), node.values());
+                _serializeNonRecursive(g, new IteratorStack(), node.iterator());
             } 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.values();
+                        currIt = value.iterator();
                         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.values();
+            _contents = n.values().iterator();
         }
 
         @Override

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

@@ -274,8 +274,8 @@ public JsonNode required(String propertyName) {
      */
 
     @Override
-    public Iterator<JsonNode> values() {
-        return _children.values().iterator();
+    public Collection<JsonNode> values() {
+        return _children.values();
     }
 
     @Override

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

@@ -532,8 +532,8 @@ public Set<Map.Entry<String, JsonNode>> properties() {
         }
 
         @Override
-        public Iterator<JsonNode> values() {
-            return Collections.emptyIterator();
+        public Collection<JsonNode> values() {
+            return Collections.emptyList();
         }
 
         @Override
@@ -652,7 +652,7 @@ public int size() {
         }
 
         @Override
-        public Iterator<JsonNode> values() {
+        public Collection<JsonNode> values() {
             return _delegate.values();
         }
 

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.values().hasNext());
+        assertFalse(n.values().iterator().hasNext());
         assertEquals(0, n.valueSpliterator().estimateSize());
         assertFalse(n.propertyNames().hasNext());
         assertNotNull(n.propertyNameSpliterator());
@@ -45,7 +45,7 @@ public void testDirectCreation() throws Exception
         assertEquals(1, n.size());
         assertFalse(n.isEmpty());
         assertNotEquals(0, n.hashCode());
-        assertTrue(n.values().hasNext());
+        assertTrue(n.values().iterator().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.values().hasNext());
+        assertTrue(n.values().isEmpty());
         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.values().hasNext());
+        assertTrue(n.values().isEmpty());
         assertTrue(n.properties().isEmpty());
         assertFalse(n.propertyNames().hasNext());
         assertNull(n.get("a"));
@@ -154,9 +154,9 @@ public void testBasics()
         assertSame(n, n.set("a", text));
 
         assertEquals(1, n.size());
-        assertTrue(n.values().hasNext());
         assertFalse(n.properties().isEmpty());
         assertTrue(n.propertyNames().hasNext());
+        assertFalse(n.values().isEmpty());
         assertSame(text, n.get("a"));
         assertSame(text, n.path("a"));
         assertNull(n.get("b"));

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

@@ -41,7 +41,7 @@ public void testSimple() throws Exception
 
             ObjectNode main = (ObjectNode) result;
             assertEquals("Image", main.propertyNames().next());
-            JsonNode ob = main.values().next();
+            JsonNode ob = main.values().iterator().next();
             assertType(ob, ObjectNode.class);
             ObjectNode imageMap = (ObjectNode) ob;
 
@@ -75,7 +75,7 @@ public void testSimple() throws Exception
             assertTrue(ob.isArray());
             ArrayNode idList = (ArrayNode) ob;
             assertEquals(4, idList.size());
-            assertEquals(4, calcLength(idList.values()));
+            assertEquals(4, idList.values().size());
             assertEquals(4, calcLength(idList.iterator()));
             {
                 int[] values = new int[] {