Update path when adding, rename on copy/move field (#102, #170)

metafacture · Apr 1, 2022 · ca1cba1 · ca1cba1
1 parent 1d495ab
commit ca1cba1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/metafix/src/main/java/org/metafacture/metafix/FixMethod.java b/metafix/src/main/java/org/metafacture/metafix/FixMethod.java
@@ -122,7 +122,10 @@ public void apply(final Metafix metafix, final Record record, final List<String>
         public void apply(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options) {
             final String oldName = params.get(0);
             final String newName = params.get(1);
-            Value.asList(record.get(oldName), a -> a.forEach(v -> record.add(newName, v)));
+            Value.asList(record.get(oldName), a -> a.forEach(newValue -> {
+                record.add(newName, newValue);
+                newValue.updatePathRename(newName);
+            }));
         }
     },
     format {
@@ -151,12 +154,8 @@ public void apply(final Metafix metafix, final Record record, final List<String>
     move_field {
         @Override
         public void apply(final Metafix metafix, final Record record, final List<String> params, final Map<String, String> options) {
-            final String oldName = params.get(0);
-            final String newName = params.get(1);
-            Value.asList(record.get(oldName), a -> a.forEach(v -> {
-                record.add(newName, v);
-                record.remove(oldName);
-            }));
+            FixMethod.copy_field.apply(metafix, record, params, options);
+            record.remove(params.get(0));
         }
     },
     parse_text {

diff --git a/metafix/src/main/java/org/metafacture/metafix/FixPath.java b/metafix/src/main/java/org/metafacture/metafix/FixPath.java
@@ -299,6 +299,7 @@ private Value processRef(final Value referencedValue, final InsertMode mode, fin
             final String[] tail) {
         if (referencedValue != null) {
             final FixPath fixPath = new FixPath(tail);
+            newValue.updatePathAddBase(referencedValue, field);
             return referencedValue.extractType((m, c) -> m
                     .ifArray(a -> c.accept(fixPath.insertInto(referencedValue.asArray(), mode, newValue)))
                     .ifHash(h -> c.accept(fixPath.insertInto(referencedValue.asHash(), mode, newValue)))
@@ -345,6 +346,7 @@ private Value getReferencedValue(final Array array, final String field) {
             case $append:
                 referencedValue = Value.newHash(); // TODO: append non-hash?
                 array.add(referencedValue);
+                referencedValue.updatePathAppend(String.valueOf(array.size()), "");
                 break;
             default:
                 break;

diff --git a/metafix/src/main/java/org/metafacture/metafix/Metafix.java b/metafix/src/main/java/org/metafacture/metafix/Metafix.java
@@ -226,7 +226,7 @@ private void addValue(final String name, final Value value) {
         else {
             final Value entity = entities.get(index);
             entity.matchType()
-                .ifArray(a -> a.add(value))
+                .ifArray(a -> a.add(value.updatePathAddBase(entity, name)))
                 .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
@@ -203,6 +203,13 @@ public Value asList(final Consumer<Array> consumer) {
         }
     }
 
+    /*package-private*/ Value updatePathRename(final String newName) {
+        if (path != null) {
+            path = newName.replaceAll("\\$[^.]+", split(path)[0]);
+        }
+        return this;
+    }
+
     /*package-private*/ Value updatePathAddBase(final Value container, final String fallback) {
         if (container.path != null) {
             final String[] pathSegments = split(path != null ? path : fallback);
@@ -212,7 +219,7 @@ public Value asList(final Consumer<Array> consumer) {
         return this;
     }
 
-    private Value updatePathAppend(final String suffix, final String fallback) {
+    /*package-private*/ Value updatePathAppend(final String suffix, final String fallback) {
         if (path != null) {
             path = path + suffix;
         }

diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java
@@ -1448,7 +1448,6 @@ public void inDoBindCopyFieldWithVarInSourceAndTarget() {
     }
 
     @Test
-    @MetafixToDo("See https://github.com/metafacture/metafacture-fix/pull/170")
     public void replaceAllWithWildcardAfterCopyFieldWithVarInSourceAndTarget() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
                 "set_array('RSWK[]')",

diff --git a/...method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/todo.txt b/...method/fromXml/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsterisk/todo.txt