Simplified poly creation (#35)

unidev-polydata · Apr 6, 2024 · 3a00c4a · 3a00c4a
1 parent 94220ad
commit 3a00c4a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/polydata-model/src/main/java/com/unidev/polydata4/domain/BasicPoly.java b/polydata-model/src/main/java/com/unidev/polydata4/domain/BasicPoly.java
@@ -24,6 +24,11 @@ public class BasicPoly implements Poly, Serializable {
     @Setter
     protected Map<String, Object> metadata;
 
+    public BasicPoly(Map<String, Object> data) {
+        this.data = data;
+        this.metadata = new ConcurrentHashMap<>();
+    }
+
     public BasicPoly(Map<String, Object> data, Map<String, Object> metadata) {
         this.data = data;
         this.metadata = metadata;

diff --git a/polydata-model/src/main/java/com/unidev/polydata4/domain/BasicPolyList.java b/polydata-model/src/main/java/com/unidev/polydata4/domain/BasicPolyList.java
@@ -26,17 +26,21 @@ public class BasicPolyList implements PolyList<BasicPoly>, Serializable {
     @Setter
     protected Map<String, Object> metadata;
 
-    public BasicPolyList(Map<String, Object> metadata, List<BasicPoly> list) {
+    public BasicPolyList(List<BasicPoly> list) {
+        this(list, new ConcurrentHashMap<>());
+    }
+
+    public BasicPolyList(List<BasicPoly> list, Map<String, Object> metadata) {
         this.list = list;
         this.metadata = metadata;
     }
 
     public BasicPolyList() {
-        this(new ConcurrentHashMap<>(), new CopyOnWriteArrayList<>());
+        this(new CopyOnWriteArrayList<>(), new ConcurrentHashMap<>());
     }
 
     public BasicPolyList(Collection<BasicPoly> source) {
-        this(new ConcurrentHashMap<>(), new CopyOnWriteArrayList<>(source));
+        this(new CopyOnWriteArrayList<>(source), new ConcurrentHashMap<>());
     }
 
     public static BasicPolyList newList() {

diff --git a/polydata-model/src/main/java/com/unidev/polydata4/domain/BasicPolyMap.java b/polydata-model/src/main/java/com/unidev/polydata4/domain/BasicPolyMap.java
@@ -22,6 +22,12 @@ public class BasicPolyMap implements PolyMap<BasicPoly>, Serializable {
     @Setter
     private Map<String, Object> metadata;
 
+
+    public BasicPolyMap(Map<String, BasicPoly> map, Map<String, Object> metadata) {
+        this.map = map;
+        this.metadata = metadata;
+    }
+
     public BasicPolyMap() {
         super();
         map = new ConcurrentHashMap<>();