Preserve exact variable template pattern to reconstruct URI templates later on (#3019)

Author: reta

rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java

@@ -471,6 +471,7 @@ private static final class Variable extends UriChunk {
         private static final Pattern VARIABLE_PATTERN = Pattern.compile("(\\w[-\\w\\.]*[ ]*)(\\:(.+))?");
         private String name;
         private Pattern pattern;
+        private String template;
 
         private Variable() {
             // empty constructor
@@ -488,14 +489,16 @@ public static Variable create(String uriChunk) {
                 return null;
             }
             if (CurlyBraceTokenizer.insideBraces(uriChunk)) {
-                uriChunk = CurlyBraceTokenizer.stripBraces(uriChunk).trim();
-                Matcher matcher = VARIABLE_PATTERN.matcher(uriChunk);
+                String trimmedUriChunk = CurlyBraceTokenizer.stripBraces(uriChunk).trim();
+                Matcher matcher = VARIABLE_PATTERN.matcher(trimmedUriChunk);
                 if (matcher.matches()) {
                     newVariable.name = matcher.group(1).trim();
                     if (matcher.group(2) != null && matcher.group(3) != null) {
                         String patternExpression = matcher.group(3).trim();
                         newVariable.pattern = Pattern.compile(patternExpression);
                     }
+                    // Store the exact variable template
+                    newVariable.template = uriChunk.trim();
                     return newVariable;
                 }
             }
@@ -526,10 +529,7 @@ public boolean matches(String value) {
 
         @Override
         public String getValue() {
-            if (pattern != null) {
-                return "{" + name + ":" + pattern + "}";
-            }
-            return "{" + name + "}";
+            return template;
         }
     }
 

rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java

@@ -436,6 +436,12 @@ public Response getTemplate() {
             return null;
         }
 
+        @GET
+        @Path("one/{name: [a-zA-Z][a-zA-Z_0-9]*}")
+        public Response getTemplateSpaces() {
+            return null;
+        }
+
         @GET
         @Path("bar")
         public Response getSubMethod() {
@@ -584,6 +590,21 @@ public void testGetMatchedResourceTemplateIncludesApplicationPathAndTemplateVari
         assertEquals("/foo/one/{name:[a-zA-Z][a-zA-Z_0-9]*}", u.getMatchedResourceTemplate());
     }
 
+    @Test
+    public void testGetMatchedResourceTemplatePreserveSpacesInTemplateVariables() throws Exception {
+        Message m = mockMessage("http://localhost:8080/app", "/foo/one/abc");
+        OperationResourceInfoStack oriStack = new OperationResourceInfoStack();
+        ClassResourceInfo cri = getCri(RootResource.class, true);
+        OperationResourceInfo ori = getOri(cri, "getTemplateSpaces");
+
+        MethodInvocationInfo miInfo = new MethodInvocationInfo(ori, RootResource.class, new ArrayList<String>());
+        oriStack.push(miInfo);
+        m.put(OperationResourceInfoStack.class, oriStack);
+
+        UriInfoImpl u = new UriInfoImpl(m);
+        assertEquals("/foo/one/{name: [a-zA-Z][a-zA-Z_0-9]*}", u.getMatchedResourceTemplate());
+    }
+
     @Test
     public void testGetMatchedResourceTemplateIgnoresPathBeforeApplicationPath() throws Exception {
         Message m = mockMessage("http://localhost:8080/context/service", "/foo/bar");