Add distinct objects when inserting with * wildcard

Author: fsteeg

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

@@ -248,13 +248,14 @@ private void removeNestedFrom(final Value value) {
 
     /*package-private*/ private Value insertInto(final Array array, final InsertMode mode, final Value newValue) {
         // basic idea: reuse findIn logic here? setIn(findIn(array), newValue)
+
         final String field = path[0];
         if (path.length == 1) {
             mode.apply(array, field, newValue);
         }
         else {
             if (ASTERISK.equals(field)) {
-                array.forEach(value -> insertInto(value, mode, newValue, field, tail(path)));
+                array.forEach(value -> insertInto(value, mode, newValue.copy(), field, tail(path)));
             }
             else if (isReference(field)) {
                 insertInto(getReferencedValue(array, field), mode, newValue, field, tail(path));

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

@@ -293,6 +293,14 @@ public String getPath() {
         this.path = path;
     }
 
+    /*package-private*/ Value copy() {
+        return extractType((m, c) -> m
+                .ifArray(oldArray -> c.accept(Value.newArray(newArray -> oldArray.forEach(v -> newArray.add(v)))))
+                .ifHash(oldHash -> c.accept(Value.newHash(newHash -> oldHash.forEach((k, v) -> newHash.put(k, v)))))
+                .ifString(s -> c.accept(new Value(s)))
+                .orElseThrow());
+    }
+
     enum Type {
         Array,
         Hash,

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

@@ -2059,7 +2059,6 @@ public void shouldCopyBindVarWithDollarAfterLookup() {
     }
 
     @Test
-    @MetafixToDo("Should insert into specific object, but inserts into all")
     public void shouldCopyToFieldWithIndexAndReservedFieldName() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "set_array('a[].*.test[]', 'test')",
@@ -2099,7 +2098,6 @@ public void shouldCopyToFieldWithIndexAndReservedFieldName() {
     }
 
     @Test
-    @MetafixToDo("Should insert into specific object, but inserts into all")
     public void shouldCopyToFieldWithTwoReservedFieldNames() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "set_array('a[].*.test[]', 'test')",