Add support for escape sequences in marker paths.

gk-brown · gk-brown · commit 8b4a11c8bd20 · 2020-11-08T12:47:45.000-05:00
diff --git a/httprpc-client/src/main/java/org/httprpc/io/JSONDecoder.java b/httprpc-client/src/main/java/org/httprpc/io/JSONDecoder.java
@@ -184,34 +184,65 @@ private String readString(Reader reader) throws IOException {
             if (c == '\\') {
                 c = reader.read();
 
-                if (c == 'b') {
-                    c = '\b';
-                } else if (c == 'f') {
-                    c = '\f';
-                } else if (c == 'r') {
-                    c = '\r';
-                } else if (c == 'n') {
-                    c = '\n';
-                } else if (c == 't') {
-                    c = '\t';
-                } else if (c == 'u') {
-                    StringBuilder characterBuilder = new StringBuilder();
+                switch (c) {
+                    case 'b': {
+                        c = '\b';
+                        break;
+                    }
+
+                    case 'f': {
+                        c = '\f';
+                        break;
+                    }
 
-                    while (c != EOF && characterBuilder.length() < 4) {
-                        c = reader.read();
+                    case 'r': {
+                        c = '\r';
+                        break;
+                    }
 
-                        characterBuilder.append((char)c);
+                    case 'n': {
+                        c = '\n';
+                        break;
                     }
 
-                    if (c == EOF) {
-                        throw new IOException("Invalid Unicode escape sequence.");
+                    case 't': {
+                        c = '\t';
+                        break;
                     }
 
-                    String unicodeValue = characterBuilder.toString();
+                    case 'u': {
+                        StringBuilder characterBuilder = new StringBuilder();
+
+                        while (c != EOF && characterBuilder.length() < 4) {
+                            c = reader.read();
+
+                            characterBuilder.append((char)c);
+                        }
+
+                        if (c == EOF) {
+                            throw new IOException("Incomplete Unicode escape sequence.");
+                        }
 
-                    c = (char)Integer.parseInt(unicodeValue, 16);
-                } else if (c != '"' && c != '\\' && c != '/') {
-                    throw new IOException("Unsupported escape sequence.");
+                        String unicodeValue = characterBuilder.toString();
+
+                        c = (char)Integer.parseInt(unicodeValue, 16);
+
+                        break;
+                    }
+
+                    case '"':
+                    case '\\':
+                    case '/': {
+                        break;
+                    }
+
+                    case EOF: {
+                        throw new IOException("Unterminated escape sequence.");
+                    }
+
+                    default: {
+                        throw new IOException("Invalid escape sequence.");
+                    }
                 }
             }
 
diff --git a/httprpc-client/src/main/java/org/httprpc/io/TemplateEncoder.java b/httprpc-client/src/main/java/org/httprpc/io/TemplateEncoder.java
@@ -815,14 +815,45 @@ private static Object getMarkerValue(Map<String, ?> dictionary, String name) {
         } else {
             Object value = dictionary;
 
-            String[] components = name.split("/");
+            StringBuilder keyBuilder = new StringBuilder();
 
-            for (int i = 0; i < components.length; i++) {
-                if (!(value instanceof Map<?, ?>)) {
-                    return null;
+            int i = 0;
+            int n = name.length();
+
+            while (i <= n) {
+                char c = (i < n) ? name.charAt(i) : 0;
+
+                if (c == 0 || c == '/') {
+                    if (!(value instanceof Map<?, ?>)) {
+                        return null;
+                    }
+
+                    String key = keyBuilder.toString();
+
+                    if (key.length() > 0) {
+                        value = ((Map<?, ?>)value).get(key);
+                    }
+
+                    keyBuilder.setLength(0);
+                } else {
+                    if (c == '\\') {
+                        i++;
+
+                        if (i == n) {
+                            throw new IllegalArgumentException("Unterminated escape sequence.");
+                        }
+
+                        c = name.charAt(i);
+
+                        if (c != '/') {
+                            throw new IllegalArgumentException("Invalid escape sequence.");
+                        }
+                    }
+
+                    keyBuilder.append(c);
                 }
 
-                value = ((Map<?, ?>)value).get(components[i]);
+                i++;
             }
 
             return value;
diff --git a/httprpc-client/src/test/java/org/httprpc/io/TemplateEncoderTest.java b/httprpc-client/src/test/java/org/httprpc/io/TemplateEncoderTest.java
@@ -75,7 +75,7 @@ public void testMap() throws IOException {
     }
 
     @Test
-    public void testConditionalSection() throws IOException {
+    public void testConditionalSection1() throws IOException {
         TemplateEncoder encoder = new TemplateEncoder(getClass().getResource("conditional.txt"));
 
         Map<String, ?> value = mapOf(
@@ -553,4 +553,23 @@ public void testUppercaseModifier() throws IOException {
 
         assertEquals("ABCDEFG", result);
     }
+
+    @Test
+    public void testEscape() throws IOException {
+        TemplateEncoder encoder = new TemplateEncoder(getClass().getResource("escape.txt"));
+
+        Map<String, ?> value = mapOf(
+            entry("a", mapOf(
+                entry("b/c", "A")
+            ))
+        );
+
+        String result;
+        try (StringWriter writer = new StringWriter()) {
+            encoder.write(value, writer);
+            result = writer.toString();
+        }
+
+        assertEquals("A", result);
+    }
 }
diff --git a/httprpc-client/src/test/resources/org/httprpc/io/escape.txt b/httprpc-client/src/test/resources/org/httprpc/io/escape.txt
@@ -0,0 +1 @@
+{{a/b\/c}}
