GH-182 Return mutable instances of empty lists and maps (Fix #182)

dzikoysk · Jun 19, 2024 · 51347de · 51347de
1 parent 5e32a9f
commit 51347de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cdn/src/main/java/net/dzikoysk/cdn/serdes/composers/ListComposer.java b/cdn/src/main/java/net/dzikoysk/cdn/serdes/composers/ListComposer.java
@@ -26,6 +26,8 @@
 import net.dzikoysk.cdn.reflect.TargetType;
 import panda.std.Result;
 import panda.std.stream.PandaStream;
+
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -42,7 +44,7 @@ public Result<List<Object>, Exception> deserialize(CdnSettings settings, Element
             Entry entry = (Entry) source;
 
             return CdnUtils.destringify(entry.getPieceValue()).trim().endsWith("[]")
-                ? ok(Collections.emptyList())
+                ? ok(new ArrayList<>())
                 : error(new UnsupportedOperationException("Cannot deserialize list of " + entry));
         }
 

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/serdes/composers/MapComposer.java b/cdn/src/main/java/net/dzikoysk/cdn/serdes/composers/MapComposer.java
@@ -30,10 +30,8 @@
 import panda.std.Result;
 import panda.std.stream.PandaStream;
 import panda.utilities.ObjectUtils;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.function.Function;
 
 import static net.dzikoysk.cdn.module.standard.StandardOperators.OBJECT_SEPARATOR;
@@ -92,7 +90,7 @@ public Result<Map<Object, Object>, Exception> deserialize(CdnSettings settings,
             String value = CdnUtils.destringify(entry.getPieceValue());
 
             return value.equals("[]")
-                    ? ok(Collections.emptyMap())
+                    ? ok(new HashMap<>())
                     : error(new CdnException("Cannot deserialize map of " + value));
         }