Merge pull request #380 from metafacture/377-ignoreOldValuePath

Ignore old value's path in `copy_field` Fix function.
metafacture · Nov 29, 2024 · 22b6824 · 22b6824
2 parents d9b25ec + 99361dd
commit 22b6824
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/metafix/src/main/java/org/metafacture/metafix/FixMethod.java b/metafix/src/main/java/org/metafacture/metafix/FixMethod.java
@@ -197,7 +197,7 @@ public void apply(final Metafix metafix, final Record record, final List<String>
 
                 h.forEach((subField, value) -> {
                     record.addNested(field, new Value(subField));
-                    record.addNested(field, value);
+                    record.addNested(field, value.withPathSet(null));
                 });
             })));
         }
@@ -227,9 +227,9 @@ public void apply(final Metafix metafix, final Record record, final List<String>
                 oldValue.matchType()
                     .ifArray(a -> {
                         record.remove(newName);
-                        a.forEach(v -> record.addNested(newName, v));
+                        a.forEach(v -> record.addNested(newName, v.withPathSet(null)));
                     })
-                    .orElse(v -> record.set(newName, v));
+                    .orElse(v -> record.set(newName, v.withPathSet(null)));
             }
         }
     },

diff --git a/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java
@@ -2190,10 +2190,9 @@ public void inDoBindCopyFieldWithVarInSourceAndTarget() {
         );
     }
 
-    @Test
-    public void replaceAllWithWildcardAfterCopyFieldWithVarInSourceAndTarget() {
+    private void replaceAllWithWildcardAfterCopyFieldWithVarInSourceAndTarget(final boolean explicitArray) {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(
-                "set_array('RSWK[]')",
+                explicitArray ? "set_array('RSWK[]')" : "",
                 "do list(path: '650??', 'var': '$i')",
                 "  copy_field('$i.a', 'RSWK[].$append.subjectTopicName')",
                 "  copy_field('$i.v', 'RSWK[].$last.subjectGenre')",
@@ -2229,6 +2228,16 @@ public void replaceAllWithWildcardAfterCopyFieldWithVarInSourceAndTarget() {
         );
     }
 
+    @Test
+    public void replaceAllWithWildcardAfterCopyFieldWithVarInSourceAndTarget() {
+        replaceAllWithWildcardAfterCopyFieldWithVarInSourceAndTarget(true);
+    }
+
+    @Test
+    public void replaceAllWithWildcardAfterCopyFieldWithVarInSourceAndTargetImplicitArray() {
+        replaceAllWithWildcardAfterCopyFieldWithVarInSourceAndTarget(false);
+    }
+
     @Test
     public void multipleReplaceAllWithWildcardAfterCopyFieldWithVarInSourceAndTarget() {
         MetafixTestHelpers.assertFix(streamReceiver, Arrays.asList(

diff --git a/...l/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/todo.txt b/...l/toJson/replace_allInOptionalSubfieldOfRepeatedObjectsWithAsteriskImplicitArray/todo.txt