Use unmodifiableSet for JsonMap

lukas-krecan · Jul 1, 2024 · 203d575 · 203d575
1 parent f6d5e6d
commit 203d575
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/json-unit-core/src/main/java/net/javacrumbs/jsonunit/core/internal/Node.java b/json-unit-core/src/main/java/net/javacrumbs/jsonunit/core/internal/Node.java
@@ -15,8 +15,8 @@
  */
 package net.javacrumbs.jsonunit.core.internal;
 
-
 import org.jetbrains.annotations.NotNull;
+
 import java.math.BigDecimal;
 import java.util.AbstractMap;
 import java.util.Collections;
@@ -27,8 +27,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import static net.javacrumbs.jsonunit.core.internal.JsonUtils.prettyPrint;
-
+import static java.util.Collections.unmodifiableSet;
 import static net.javacrumbs.jsonunit.core.internal.JsonUtils.prettyPrint;
 
 
@@ -225,17 +224,23 @@ interface ValueExtractor {
     class JsonMap extends AbstractMap<String, Object> implements NodeWrapper {
         private final Node wrappedNode;
 
+        private Set<Entry<String, Object>> entrySet;
+
         JsonMap(Node node) {
             wrappedNode = node;
         }
 
         @NotNull
         @Override
         public Set<Entry<String, Object>> entrySet() {
-            Iterator<KeyValue> fields = wrappedNode.fields();
-            return StreamSupport.stream(Spliterators.spliteratorUnknownSize(fields, 0), false)
-                .map(keyValue -> new SimpleEntry<>(keyValue.getKey(), keyValue.getValue().getValue()))
-                .collect(Collectors.toSet());
+            if (entrySet == null) {
+                Iterator<KeyValue> fields = wrappedNode.fields();
+                entrySet = unmodifiableSet(StreamSupport.stream(Spliterators.spliteratorUnknownSize(fields, 0), false)
+                        .map(keyValue -> new SimpleEntry<>(
+                                keyValue.getKey(), keyValue.getValue().getValue()))
+                        .collect(Collectors.toSet()));
+            }
+            return entrySet;
         }
 
         @Override