Fix ERRAI-904: Incorrect processing of nested braces in @PathParam regexes

Author: csadilek

errai-jaxrs/errai-jaxrs-client/src/main/java/org/jboss/errai/enterprise/rebind/JaxrsProxyMethodGenerator.java

@@ -135,16 +135,16 @@ private Statement generateUrl(final JaxrsResourceMethodParameters params) {
     String path = resourceMethod.getPath();
     ContextualStatementBuilder pathValue = Stmt.loadLiteral(path);
 
-    for (String pathParamName : JaxrsResourceMethodParameters.getPathParameterNames(path)) {
-      String pathParamId = pathParamName;
-      if (pathParamName.contains(":")) {
-        pathParamId = pathParamName.split(":")[0];
+    for (String pathParamExpr : JaxrsResourceMethodParameters.getPathParameterExpressions(path)) {
+      String pathParamId = pathParamExpr;
+      if (pathParamExpr.contains(":")) {
+        pathParamId = pathParamExpr.split(":")[0];
       }
       Statement pathParam = marshal(params.getPathParameter(pathParamId));
       if (params.needsEncoding(pathParamId)) {
         pathParam = encodePath(pathParam);
       }
-      pathValue = pathValue.invoke("replace", "{" + pathParamName + "}", pathParam);
+      pathValue = pathValue.invoke("replace", "{" + pathParamExpr + "}", pathParam);
     }
 
     if (params.getMatrixParameters() != null) {

errai-jaxrs/errai-jaxrs-client/src/main/java/org/jboss/errai/enterprise/rebind/JaxrsResourceMethodParameters.java

@@ -62,13 +62,13 @@ public class JaxrsResourceMethodParameters {
   private Map<Class<? extends Annotation>, MultivaluedMap<String, Statement>> parameters;
 
   public static JaxrsResourceMethodParameters fromMethod(MetaMethod method) {
-    List<Parameter> defParams = DefParameters.from(method).getParameters();
+    final List<Parameter> defParams = DefParameters.from(method).getParameters();
     return fromMethod(method, defParams);
   }
 
   public static JaxrsResourceMethodParameters fromMethod(MetaMethod method, String parameterArrayVarName) {
-    List<Statement> params = new ArrayList<Statement>();
-    Parameter[] defParms = DefParameters.from(method).getParameters().toArray(new Parameter[0]);
+    final List<Statement> params = new ArrayList<Statement>();
+    final Parameter[] defParms = DefParameters.from(method).getParameters().toArray(new Parameter[0]);
     for (int i = 0; i < defParms.length; i++) {
       final MetaClass type = defParms[i].getType().asBoxed();
       final Statement s = Cast.to(type, Stmt.loadVariable(parameterArrayVarName, i));
@@ -89,11 +89,11 @@ public MetaClass getType() {
   }
 
   public static JaxrsResourceMethodParameters fromMethod(MetaMethod method, List<? extends Statement> parameterValues) {
-    JaxrsResourceMethodParameters params = new JaxrsResourceMethodParameters();
+    final JaxrsResourceMethodParameters params = new JaxrsResourceMethodParameters();
     int i = 0;
-    for (MetaParameter param : method.getParameters()) {
+    for (final MetaParameter param : method.getParameters()) {
 
-      Statement paramValue = parameterValues.get(i++);
+      final Statement paramValue = parameterValues.get(i++);
       Annotation a = param.getAnnotation(PathParam.class);
       if (a != null) {
         params.add(PathParam.class, ((PathParam) a).value(), paramValue);
@@ -222,7 +222,7 @@ private Statement getParameterByName(Class<? extends Annotation> type, String na
     Statement param = null;
 
     if (get(type) != null) {
-      List<Statement> params = get(type).get(name);
+      final List<Statement> params = get(type).get(name);
       if (params != null && !params.isEmpty()) {
         param = params.get(0);
       }
@@ -231,15 +231,18 @@ private Statement getParameterByName(Class<? extends Annotation> type, String na
     return param;
   }
 
-  public static List<String> getPathParameterNames(String path) {
-    List<String> pathParamNames = new ArrayList<String>();
-    Matcher matcher = PATH_PARAM_PATTERN.matcher(path);
-
+  public static List<String> getPathParameterExpressions(String path) {
+    final String pathWithNestedBracesRemoved = replaceNestedCurlyBraces(path);
+    final List<String> pathParamNames = new ArrayList<String>();
+    final Matcher matcher = PATH_PARAM_PATTERN.matcher(pathWithNestedBracesRemoved);
+    
     while (matcher.find()) {
-      String id = matcher.group(2);
-      String regex = matcher.group(3);
-      if (id != null)
-        pathParamNames.add(id + ((regex != null) ? regex : ""));
+      final String id = matcher.group(2);
+      final String regex = matcher.group(3);
+      if (id != null) {
+        final String pathParamExpr = recoverNestedCurlyBraces(id + ((regex != null) ? regex : ""));
+        pathParamNames.add(pathParamExpr);
+      }
     }
 
     return pathParamNames;
@@ -253,4 +256,31 @@ public boolean needsEncoding(String paramName) {
 
     return true;
   }
+  
+  private static final char openCurlyReplacement = 6;
+  private static final char closeCurlyReplacement = 7;
+  
+  private static String replaceNestedCurlyBraces(String str) {
+    final char[] chars = str.toCharArray();
+    int open = 0;
+    for (int i = 0; i < chars.length; i++) {
+      if (chars[i] == '{') {
+        if (open != 0)
+          chars[i] = openCurlyReplacement;
+        open++;
+      }
+      else if (chars[i] == '}') {
+        open--;
+        if (open != 0) {
+          chars[i] = closeCurlyReplacement;
+        }
+      }
+    }
+    return new String(chars);
+  }
+
+  private static String recoverNestedCurlyBraces(String str) {
+    return str.replace(openCurlyReplacement, '{').replace(closeCurlyReplacement, '}');
+  }
+
 }

errai-jaxrs/errai-jaxrs-client/src/test/java/org/jboss/errai/enterprise/jaxrs/client/shared/PathParamTestService.java

@@ -45,6 +45,10 @@ public interface PathParamTestService {
   @GET 
   @Path("/t1/{id:[0-9][0-9]*}")
   public long getWithPathParamRegex(@PathParam("id") long id);
+  
+  @GET 
+  @Path("/t1/{id:[0-9]{1}[0-9]{0,}}")
+  public long getWithPathParamRegexAndCurlyBracesQuantifier(@PathParam("id") long id);
 
   @GET 
   @Path("/t2/{id}")

errai-jaxrs/errai-jaxrs-client/src/test/java/org/jboss/errai/enterprise/jaxrs/client/test/AllJaxrsTests.java

@@ -39,6 +39,7 @@
     JacksonIntegrationTest.class,
     JaxrsResponseObjectIntegrationTest.class,
     MatrixParamIntegrationTest.class,
+    PathParamTest.class,
     PathParamIntegrationTest.class,
     PlainMethodIntegrationTest.class,
     QueryParamIntegrationTest.class })

errai-jaxrs/errai-jaxrs-client/src/test/java/org/jboss/errai/enterprise/jaxrs/client/test/PathParamIntegrationTest.java

@@ -50,17 +50,23 @@ public void testGetWithPathParamRegex() {
     call(PathParamTestService.class,
         new AssertionCallback<Long>("@GET with @PathParam using regex failed", 2l)).getWithPathParamRegex(2l);
   }
+  
+  @Test
+  public void testGetWithPathParamRegexAndCurlyBracesQuantifier() {
+    call(PathParamTestService.class,
+        new AssertionCallback<Long>("@GET with @PathParam using regex failed", 2l)).getWithPathParamRegexAndCurlyBracesQuantifier(2l);
+  }
 
   @Test
   public void testGetWithEncodedPathParam() {
-    String pathWithSpecialChars = "?<>!@#$%^\\&*()-+;:''\\/.,";
+    final String pathWithSpecialChars = "?<>!@#$%^\\&*()-+;:''\\/.,";
     call(PathParamTestService.class, new AssertionCallback<String>("@GET w/ encoded @PathParam failed",
         pathWithSpecialChars)).getWithStringPathParam(pathWithSpecialChars);
   }
 
   @Test
   public void testGetWithPathSegmentPathParam() {
-    PathSegment ps = new PathSegmentImpl("path;name=nameValue;author=authorValue;empty=");
+    final PathSegment ps = new PathSegmentImpl("path;name=nameValue;author=authorValue;empty=");
     assertEquals("path", ps.getPath());
     assertEquals("nameValue", ps.getMatrixParameters().getFirst("name"));
     assertEquals("authorValue", ps.getMatrixParameters().getFirst("author"));
@@ -73,8 +79,8 @@ public void testGetWithPathSegmentPathParam() {
   }
   @Test
   public void testGetWithDatePathParam() {
-    Date d = new Date();
-    String expected = d.toString();
+    final Date d = new Date();
+    final String expected = d.toString();
     call(PathParamTestService.class,
         new AssertionCallback<String>("@GET with @PathParams using java.util.Date failed", 
             expected)).getWithDatePathParam(d);

errai-jaxrs/errai-jaxrs-client/src/test/java/org/jboss/errai/enterprise/jaxrs/client/test/PathParamTest.java

@@ -0,0 +1,27 @@
+package org.jboss.errai.enterprise.jaxrs.client.test;
+
+import static org.jboss.errai.enterprise.rebind.JaxrsResourceMethodParameters.getPathParameterExpressions;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+
+public class PathParamTest {
+  
+  @Test
+  public void testMatchPathParamExpressions() {
+    final List<String> expected = Arrays.asList("isbn", "param", "name", "zip", "p", "many", "id", "nr");
+    
+    final String path = "/{isbn}/aaa{param}bbb/{name}-{zip}/aaa{p:b+}/{many:.*}/{id:[0-9]{1}[0-9]{0,}}/{nr:[0-9]*}";
+    final List<String> pathParamNames = getPathParameterExpressions(path)
+            .stream()
+            .map(s -> s.split(":")[0])
+            .collect(Collectors.toList());
+    
+    assertEquals(expected, pathParamNames);
+  }
+
+}

errai-jaxrs/errai-jaxrs-client/src/test/java/org/jboss/errai/enterprise/jaxrs/server/PathParamTestServiceImpl.java

@@ -39,6 +39,11 @@ public long getWithPathParamRegex(long id) {
     return id;
   }
 
+  @Override
+  public long getWithPathParamRegexAndCurlyBracesQuantifier(long id) {
+    return id;
+  }
+  
   @Override
   public String getWithStringPathParam(String id) {
     return id;
@@ -82,4 +87,5 @@ public String getWithPathSegmentPathParam(PathSegment id) {
   public String getWithDatePathParam(Date date) {
     return date.toString();
   }
+
 }

errai-jaxrs/pom.xml

@@ -67,14 +67,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>