Adopt solution by @blackwinter for @ feedback issue

See: f4dc31d metafacture/metafacture-core#343 metafacture/metafacture-core#344
metafacture · Dec 1, 2020 · e1117dc · e1117dc
1 parent d961bde
commit e1117dc
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metamorph/Metafix.java b/org.metafacture.fix/src/main/java/org/metafacture/metamorph/Metafix.java
@@ -57,7 +57,6 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Deque;
@@ -91,12 +90,6 @@ public class Metafix implements StreamPipe<StreamReceiver>, NamedValuePipe, Maps
     private static final InterceptorFactory NULL_INTERCEPTOR_FACTORY = new NullInterceptorFactory();
     private static final Map<String, String> NO_VARS = Collections.emptyMap();
 
-    // See https://www.w3.org/TR/json-ld11/#keywords
-    private static final List<String> JSONLD_KEYWORDS = Arrays.asList(
-            "@base", "@container", "@context", "@direction", "@graph", "@id", "@import", "@included", "@index", "@json",
-            "@language", "@list", "@nest", "@none", "@prefix", "@propagate", "@protected", "@reverse", "@set", "@type",
-            "@value", "@version", "@vocab");
-
     // warning: auxiliary class WildcardRegistry in WildcardDataRegistry.java should not be accessed from outside its own source file
     //private final Registry<NamedValueReceiver> dataRegistry = new WildcardRegistry<>();
     private final Registry<NamedValueReceiver> dataRegistry = new Registry<NamedValueReceiver>() {
@@ -372,11 +365,11 @@ else if (fallback != null) {
                             elseNestedEntityStarted = true;
                         }
 
-                        send(currentLiteralName, value, fallback);
+                        send(escapeFeedbackChar(currentLiteralName), value, fallback);
                     }
                 }
                 else {
-                    send(path, value, fallback);
+                    send(escapeFeedbackChar(path), value, fallback);
                 }
             }
         }
@@ -417,9 +410,8 @@ public void receive(final String name, final String value, final NamedValueSourc
             throw new IllegalArgumentException(
                     "encountered literal with name='null'. This indicates a bug in a function or a collector.");
         }
-        final int end = Math.min(name.indexOf(flattener.getEntityMarker()), name.indexOf(FixBuilder.ARRAY_MARKER));
-        final String firstNameSegment = end == -1 ? name : name.substring(0, end);
-        if (name.length() != 0 && name.charAt(0) == FEEDBACK_CHAR && !JSONLD_KEYWORDS.contains(firstNameSegment)) {
+
+        if (startsWithFeedbackChar(name)) {
             dispatch(name, value, null, false);
             return;
         }
@@ -436,6 +428,14 @@ public void receive(final String name, final String value, final NamedValueSourc
         outputStreamReceiver.literal(unescapedName, value);
     }
 
+    private boolean startsWithFeedbackChar(final String name) {
+        return name.length() != 0 && name.charAt(0) == FEEDBACK_CHAR;
+    }
+
+    private String escapeFeedbackChar(final String name) {
+        return name == null ? null : (startsWithFeedbackChar(name) ? ESCAPE_CHAR : "") + name;
+    }
+
     @Override
     public Map<String, String> getMap(final String mapName) {
         return maps.getOrDefault(mapName, Collections.emptyMap());