ObjectNode does not implement Iterable

lukas-krecan · Nov 15, 2024 · 6d9aec4 · 6d9aec4
1 parent 3de51fd
commit 6d9aec4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/json-unit-core/src/main/java/net/javacrumbs/jsonunit/core/internal/GenericNodeBuilder.java b/json-unit-core/src/main/java/net/javacrumbs/jsonunit/core/internal/GenericNodeBuilder.java
@@ -24,7 +24,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.jetbrains.annotations.NotNull;
 
 class GenericNodeBuilder implements NodeBuilder {
     private static final GenericNodeBuilder INSTANCE = new GenericNodeBuilder();
@@ -276,7 +275,7 @@ public String toString() {
         }
     }
 
-    static final class ObjectNode extends NodeSkeleton implements Iterable<Node.KeyValue> {
+    static final class ObjectNode extends NodeSkeleton {
         private final Map<String, Object> jsonObject;
         private final NodeBuilder nodeBuilder;
 
@@ -317,11 +316,6 @@ public boolean isObject() {
             return true;
         }
 
-        @Override
-        public @NotNull Iterator<KeyValue> iterator() {
-            return fields();
-        }
-
         @Override
         public Node get(String key) {
             if (jsonObject.containsKey(key)) {
@@ -344,7 +338,7 @@ public NodeType getNodeType() {
         public String toString() {
             StringBuilder builder = new StringBuilder();
             builder.append("{");
-            Iterator<Node.KeyValue> entries = this.iterator();
+            Iterator<Node.KeyValue> entries = this.fields();
             while (entries.hasNext()) {
                 Node.KeyValue entry = entries.next();
                 builder.append('"')

diff --git a/...s/test-jsonorg/src/test/java/net/javacrumbs/jsonunit/test/jsonorg/JsonOrgAssertJTest.java b/...s/test-jsonorg/src/test/java/net/javacrumbs/jsonunit/test/jsonorg/JsonOrgAssertJTest.java
@@ -60,7 +60,6 @@ protected void shouldEqualNumberInObject() {
         // ignored, no support of object serialization neither
     }
 
-
     @Override
     @Test
     protected void objectFieldsShouldBeKeptInOrder() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,6 @@ protected void shouldEqualNumberInObject() { @@
             // ignored, no support of object serialization neither
         }
         @Override
         @Test
         protected void objectFieldsShouldBeKeptInOrder() {
@@ Expand Down @@