fixes #494 Allow escaping '}' character in ${} expression. e.g. ${num in {1, 2, 3\}}

Author: harawata

src/main/java/org/apache/ibatis/parsing/GenericTokenParser.java

@@ -31,26 +31,42 @@ public GenericTokenParser(String openToken, String closeToken, TokenHandler hand
   }
 
   public String parse(String text) {
-    StringBuilder builder = new StringBuilder();
+    final StringBuilder builder = new StringBuilder();
+    final StringBuilder expression = new StringBuilder();
     if (text != null && text.length() > 0) {
       char[] src = text.toCharArray();
       int offset = 0;
+      // search open token
       int start = text.indexOf(openToken, offset);
       while (start > -1) {
         if (start > 0 && src[start - 1] == '\\') {
-          // the variable is escaped. remove the backslash.
+          // this open token is escaped. remove the backslash and continue.
           builder.append(src, offset, start - offset - 1).append(openToken);
           offset = start + openToken.length();
         } else {
-          int end = text.indexOf(closeToken, start);
+          // found open token. let's search close token.
+          expression.setLength(0);
+          builder.append(src, offset, start - offset);
+          offset = start + openToken.length();
+          int end = text.indexOf(closeToken, offset);
+          while (end > -1) {
+            if (end > offset && src[end - 1] == '\\') {
+              // this close token is escaped. remove the backslash and continue.
+              expression.append(src, offset, end - offset - 1).append(closeToken);
+              offset = end + closeToken.length();
+              end = text.indexOf(closeToken, offset);
+            } else {
+              expression.append(src, offset, end - offset);
+              offset = end + closeToken.length();
+              break;
+            }
+          }
           if (end == -1) {
-            builder.append(src, offset, src.length - offset);
+            // close token was not found.
+            builder.append(src, start, src.length - start);
             offset = src.length;
           } else {
-            builder.append(src, offset, start - offset);
-            offset = start + openToken.length();
-            String content = new String(src, offset, end - offset);
-            builder.append(handler.handleToken(content));
+            builder.append(handler.handleToken(expression.toString()));
             offset = end + closeToken.length();
           }
         }
@@ -62,5 +78,4 @@ public String parse(String text) {
     }
     return builder.toString();
   }
-
 }

src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java

@@ -317,6 +317,17 @@ public void shouldIterateOnceForEachItemInCollection() throws Exception {
     assertEquals("__frch_item_2", boundSql.getParameterMappings().get(2).getProperty());
   }
 
+  @Test
+  public void shouldHandleOgnlExpression() throws Exception {
+    final HashMap<String, String> parameterObject = new HashMap<String, String>() {{
+      put("name", "Steve");
+    }};
+    final String expected = "Expression test: 3 / yes.";
+    DynamicSqlSource source = createDynamicSqlSource(new TextSqlNode("Expression test: ${name.indexOf('v')} / ${name in {'Bob', 'Steve'\\} ? 'yes' : 'no'}."));
+    BoundSql boundSql = source.getBoundSql(parameterObject);
+    assertEquals(expected, boundSql.getSql());
+  }
+
   @Test
   public void shouldSkipForEachWhenCollectionIsEmpty() throws Exception {
     final HashMap<String, Integer[]> parameterObject = new HashMap<String, Integer[]>() {{

src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java

@@ -43,6 +43,7 @@ public void shouldDemonstrateGenericTokenReplacement() {
         put("first_name", "James");
         put("initial", "T");
         put("last_name", "Kirk");
+        put("var{with}brace", "Hiya");
         put("", "");
       }
     }));
@@ -62,6 +63,9 @@ public void shouldDemonstrateGenericTokenReplacement() {
 
     assertEquals("{$$something}JamesTKirk", parser.parse("{$$something}${first_name}${initial}${last_name}"));
     assertEquals("${", parser.parse("${"));
+    assertEquals("${\\}", parser.parse("${\\}"));
+    assertEquals("Hiya", parser.parse("${var{with\\}brace}"));
+    assertEquals("", parser.parse("${}"));
     assertEquals("}", parser.parse("}"));
     assertEquals("Hello ${ this is a test.", parser.parse("Hello ${ this is a test."));
     assertEquals("Hello } this is a test.", parser.parse("Hello } this is a test."));