Wrap string value into array only on $prepend / $append (#127)

Author: fsteeg

metafix/src/main/java/org/metafacture/metafix/FixPath.java

@@ -301,13 +301,13 @@ private Value insertInto(final Value value, final InsertMode mode, final Value n
 
     private Value getContainerValue(final Hash hash, final String field, final String newPath, final String nextField) {
         Value result = hash.get(field);
+        final boolean isAddingToArray = nextField.equals(ReservedField.$prepend.name()) || nextField.equals(ReservedField.$append.name());
         if (result == null) {
-            result = (nextField.equals(ReservedField.$prepend.name()) || nextField.equals(ReservedField.$append.name()) ?
-                    Value.newArray() : Value.newHash()).withPathSet(newPath);
+            result = (isAddingToArray ? Value.newArray() : Value.newHash()).withPathSet(newPath);
             hash.put(field, result);
         }
         else {
-            if (result.isString()) {
+            if (isAddingToArray && result.isString()) {
                 final Value value = result;
                 result = Value.newArray(a -> a.add(value));
                 hash.put(field, result);

metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java

@@ -394,38 +394,21 @@ public void addWithPrependInImplicitArray() {
     }
 
     @Test
-    @MetafixToDo("See https://github.com/metafacture/metafacture-fix/issues/369")
-    public void addWithLastInImplicitArray() {
-        MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
-                "add_field('my.name.$last','patrick')",
-                "add_field('my.name.$last','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().endRecord();
-
-                o.get().startRecord("2");
-                o.get().startEntity("my");
-                o.get().literal("name", "nicolas");
-                o.get().endEntity();
-                o.get().endRecord();
-
-                o.get().startRecord("3");
-                o.get().endRecord();
-            }
+    public void addWithLastInNonArray() {
+        MetafixTestHelpers.assertExecutionException(IllegalStateException.class, "Expected Array or Hash, got String", () ->
+            MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
+                    "add_field('my.name.$last','patrick')"
+                ),
+                i -> {
+                    i.startRecord("1");
+                    i.startEntity("my");
+                    i.literal("name", "max");
+                    i.endEntity();
+                    i.endRecord();
+                },
+                o -> {
+                }
+            )
         );
     }