Update path for repeated fields to indexed array (#102, #170)

metafacture · Apr 1, 2022 · 4324378 · 4324378
1 parent f4c4faf
commit 4324378
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/metafix/src/main/java/org/metafacture/metafix/Metafix.java b/metafix/src/main/java/org/metafacture/metafix/Metafix.java
@@ -224,9 +224,10 @@ private void addValue(final String name, final Value value) {
             currentRecord.add(name, value);
         }
         else {
-            entities.get(index).matchType()
+            final Value entity = entities.get(index);
+            entity.matchType()
                 .ifArray(a -> a.add(value))
-                .ifHash(h -> h.add(name, value))
+                .ifHash(h -> h.add(name, value.updatePathAddBase(entity, name)))
                 .orElseThrow();
         }
     }

diff --git a/metafix/src/main/java/org/metafacture/metafix/Value.java b/metafix/src/main/java/org/metafacture/metafix/Value.java
@@ -49,7 +49,7 @@ public class Value {
 
     private final Type type;
 
-    private final String path;
+    private String path;
 
     public Value(final Array array) {
         type = array != null ? Type.Array : null;
@@ -203,6 +203,25 @@ public Value asList(final Consumer<Array> consumer) {
         }
     }
 
+    /*package-private*/ Value updatePathAddBase(final Value container, final String fallback) {
+        if (container.path != null) {
+            final String[] pathSegments = split(path != null ? path : fallback);
+            final String lastSegment = pathSegments[pathSegments.length - 1];
+            this.path = container.path + "." + lastSegment;
+        }
+        return this;
+    }
+
+    private Value updatePathAppend(final String suffix, final String fallback) {
+        if (path != null) {
+            path = path + suffix;
+        }
+        else {
+            path = fallback + suffix;
+        }
+        return this;
+    }
+
     public TypeMatcher matchType() {
         return new TypeMatcher(this);
     }
@@ -557,7 +576,19 @@ public void addAll(final Hash hash) {
          */
         public void add(final String field, final Value newValue) {
             final Value oldValue = new FixPath(field).findIn(this);
-            put(field, oldValue == null ? newValue : oldValue.asList(oldVals -> newValue.asList(newVals -> newVals.forEach(oldVals::add))));
+            if (oldValue == null) {
+                put(field, newValue);
+            }
+            else {
+                if (!oldValue.isArray()) { // repeated field: convert single val to first in array
+                    oldValue.updatePathAppend(".1", field);
+                }
+                put(field, oldValue.asList(oldVals -> newValue.asList(newVals -> {
+                    for (int i = 0; i < newVals.size(); ++i) {
+                        oldVals.add(newVals.get(i).updatePathAppend("." + (i + 1 + oldVals.size()), field));
+                    }
+                })));
+            }
         }
 
         /**

diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java
@@ -1349,7 +1349,6 @@ public void shouldNotInsertOptionalArraySubFieldWithAsteriskInReplaceAll() {
     }
 
     @Test
-    @MetafixToDo("See https://github.com/metafacture/metafacture-fix/pull/170")
     public void shouldNotInsertOptionalRepeatedHashSubFieldWithAsteriskInReplaceAll() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "replace_all('coll.*.b', 'x', 'y')"