Merge pull request #793 from jamesrdf/issues/#792-dollar-sign

Fix #792: Encode dollar sign in repository template replacement

Author: Jeen Broekstra

core/repository/api/src/main/java/org/eclipse/rdf4j/repository/config/ConfigTemplate.java

@@ -75,7 +75,7 @@ private void parseTemplate() {
 			if (!variableMap.containsKey(var)) {
 				variableMap.put(var, tokens.subList(1, tokens.size()));
 				int start = matcher.start();
-				String before = template.substring(start - 3, start);
+				String before = template.substring(Math.max(start - 3, 0), start);
 				int end = matcher.end();
 				if (("'''".equals(before) || "\"\"\"".equals(before))
 						&& before.equals(template.substring(end, end + 3)))
@@ -105,7 +105,7 @@ public String render(Map<String, String> valueMap) {
 			if (!value.isEmpty() && multilineMap.containsKey(var)) {
 				value = escapeMultilineQuotes(multilineMap.get(var), value);
 			}
-			matcher.appendReplacement(result, value);
+			matcher.appendReplacement(result, Matcher.quoteReplacement(value));
 		}
 		matcher.appendTail(result);
 		return result.toString();

core/repository/api/src/test/java/org/eclipse/rdf4j/repository/config/TestConfigTemplate.java

@@ -9,6 +9,9 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import org.junit.Test;
 
 /**
@@ -47,4 +50,20 @@ public final void testNonEscapeOfShorterSequences() {
 	public final void testInvalidDelimiterThrowsException() {
 		ConfigTemplate.escapeMultilineQuotes("'", "any value");
 	}
+
+	@Test
+	public final void testSimpleCharacters() {
+		ConfigTemplate temp = new ConfigTemplate("{%value%}");
+		Map<String, String> map = new LinkedHashMap<String, String>();
+		map.put("value", "sob");
+		assertEquals("sob", temp.render(map));
+	}
+
+	@Test
+	public final void testSpecialCharacters() {
+		ConfigTemplate temp = new ConfigTemplate("{%value%}");
+		Map<String, String> map = new LinkedHashMap<String, String>();
+		map.put("value", "$0b");
+		assertEquals("$0b", temp.render(map));
+	}
 }