Support implicit array creation on $append (#127)

metafacture · Sep 24, 2024 · 0de7fb9 · 0de7fb9
1 parent 19bbe2c
commit 0de7fb9
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 12 deletions.
diff --git a/metafix/src/main/java/org/metafacture/metafix/FixPath.java b/metafix/src/main/java/org/metafacture/metafix/FixPath.java
@@ -276,9 +276,18 @@ else if (isReference(field)) {
         }
         else {
             if (!hash.containsField(field)) {
-                hash.put(field, Value.newHash().withPathSet(newValue.getPath()));
+                if (ReservedField.$append.name().equals(tail(path)[0])) {
+                    hash.put(field, Value.newArray().withPathSet(newValue.getPath()));
+                }
+                else {
+                    hash.put(field, Value.newHash().withPathSet(newValue.getPath()));
+                }
+            }
+            final Value value = hash.get(field);
+            if (value.isString()) {
+                hash.put(field, Value.newArray(a -> a.add(value)));
             }
-            insertInto(hash.get(field), mode, newValue, field, tail(path));
+            insertInto(value, mode, newValue, field, tail(path));
         }
 
         return new Value(hash);

diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java
@@ -303,6 +303,51 @@ public void addWithAppendInNewArray() {
         );
     }
 
+    @Test
+    public void addWithAppendInImplicitArray() {
+        MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
+                "add_field('my.name.$append','patrick')",
+                "add_field('my.name.$append','nicolas')"
+            ),
+            i -> {
+                i.startRecord("1");
+                i.endRecord();
+
+                i.startRecord("2");
+                i.startEntity("my");
+                i.literal("name", "max");
+                i.endEntity();
+                i.endRecord();
+
+                i.startRecord("3");
+                i.endRecord();
+            },
+            o -> {
+                o.get().startRecord("1");
+                o.get().startEntity("my");
+                o.get().literal("name", "patrick");
+                o.get().literal("name", "nicolas");
+                o.get().endEntity();
+                o.get().endRecord();
+
+                o.get().startRecord("2");
+                o.get().startEntity("my");
+                o.get().literal("name", "max");
+                o.get().literal("name", "patrick");
+                o.get().literal("name", "nicolas");
+                o.get().endEntity();
+                o.get().endRecord();
+
+                o.get().startRecord("3");
+                o.get().startEntity("my");
+                o.get().literal("name", "patrick");
+                o.get().literal("name", "nicolas");
+                o.get().endEntity();
+                o.get().endRecord();
+            }
+        );
+    }
+
     @Test
     public void addWithAppendInArray() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(

diff --git a/...etafix/integration/record/fromJson/toJson/add_fieldAppendAndCreateArrayOfObjects/todo.txt b/...etafix/integration/record/fromJson/toJson/add_fieldAppendAndCreateArrayOfObjects/todo.txt
diff --git a/...on/record/fromJson/toJson/add_fieldAppendAndCreateArrayOfObjectsInArrayOfObjects/todo.txt b/...on/record/fromJson/toJson/add_fieldAppendAndCreateArrayOfObjectsInArrayOfObjects/todo.txt
diff --git a/...etafix/integration/record/fromJson/toJson/add_fieldAppendAndCreateArrayOfStrings/todo.txt b/...etafix/integration/record/fromJson/toJson/add_fieldAppendAndCreateArrayOfStrings/todo.txt
diff --git a/...on/record/fromJson/toJson/add_fieldAppendAndCreateArrayOfStringsInArrayOfObjects/todo.txt b/...on/record/fromJson/toJson/add_fieldAppendAndCreateArrayOfStringsInArrayOfObjects/todo.txt
diff --git a/.../integration/record/fromJson/toJson/add_fieldAppendAndCreateNestedArrayOfStrings/todo.txt b/.../integration/record/fromJson/toJson/add_fieldAppendAndCreateNestedArrayOfStrings/todo.txt
diff --git a/...tafix/integration/record/fromJson/toJson/copy_fieldAppendAndCreateArrayOfStrings/todo.txt b/...tafix/integration/record/fromJson/toJson/copy_fieldAppendAndCreateArrayOfStrings/todo.txt
diff --git a/...n/record/fromJson/toJson/copy_fieldAppendAndCreateArrayOfStringsInArrayOfObjects/todo.txt b/...n/record/fromJson/toJson/copy_fieldAppendAndCreateArrayOfStringsInArrayOfObjects/todo.txt
diff --git a/...tafix/integration/record/fromJson/toJson/move_fieldAppendAndCreateArrayOfStrings/todo.txt b/...tafix/integration/record/fromJson/toJson/move_fieldAppendAndCreateArrayOfStrings/todo.txt
diff --git a/...n/record/fromJson/toJson/move_fieldAppendAndCreateArrayOfStringsInArrayOfObjects/todo.txt b/...n/record/fromJson/toJson/move_fieldAppendAndCreateArrayOfStringsInArrayOfObjects/todo.txt
diff --git a/...integration/record/fromJson/toJson/move_fieldAppendAndCreateNestedArrayOfStrings/todo.txt b/...integration/record/fromJson/toJson/move_fieldAppendAndCreateNestedArrayOfStrings/todo.txt