Replace reserved fields in path with pattern, in single step (#218)

Co-authored-by: Jens Wille <[email protected]>

Author: fsteeg

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

@@ -22,6 +22,8 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * Our goal here is something like https://metacpan.org/pod/Catmandu::Path::simple
@@ -33,6 +35,8 @@
  */
 /*package-private*/ class FixPath {
 
+    /*package-private*/ static final Pattern RESERVED_FIELD_PATTERN = Pattern.compile(String.format("(?:%s)",
+            Arrays.stream(ReservedField.values()).map(f -> Pattern.quote(f.name())).collect(Collectors.joining("|"))));
     private static final String ASTERISK = "*";
     private String[] path;
 
@@ -299,7 +303,7 @@ private String[] tail(final String[] fields) {
         return Arrays.copyOfRange(fields, 1, fields.length);
     }
 
-    /*package-private*/ enum ReservedField {
+    private enum ReservedField {
         $append, $first, $last;
 
         private static final Map<String, ReservedField> STRING_TO_ENUM = new HashMap<>();

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

@@ -17,7 +17,6 @@
 package org.metafacture.metafix;
 
 import org.metafacture.commons.tries.SimpleRegexTrie;
-import org.metafacture.metafix.FixPath.ReservedField;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -209,10 +208,7 @@ public Value asList(final Consumer<Array> consumer) {
 
     /*package-private*/ Value updatePathRename(final String newName) {
         if (path != null) {
-            final String basePath = split(path)[0];
-            for (final ReservedField rf : ReservedField.values()) {
-                path = newName.replace(rf.name(), basePath);
-            }
+            path = FixPath.RESERVED_FIELD_PATTERN.matcher(newName).replaceAll(Matcher.quoteReplacement(split(path)[0]));
         }
         return this;
     }