Merge "Updated default URI template value regex pattern."

Author: Michal Gajdos

core-common/src/main/java/org/glassfish/jersey/uri/internal/UriTemplateParser.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -79,7 +79,10 @@ private static Set<Character> initReserved() {
         return s;
     }
 
-    private static final Pattern TEMPLATE_VALUE_PATTERN = Pattern.compile("[^/]+?");
+    /**
+     * Default URI template value regexp pattern.
+     */
+    public static final Pattern TEMPLATE_VALUE_PATTERN = Pattern.compile("[^/]+");
 
     private final String template;
     private final StringBuffer regex = new StringBuffer();

core-common/src/test/java/org/glassfish/jersey/uri/UriTemplateTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -49,6 +49,8 @@
 import java.util.Map;
 import java.util.regex.MatchResult;
 
+import org.glassfish.jersey.uri.internal.UriTemplateParser;
+
 import org.junit.Test;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertEquals;
@@ -217,7 +219,7 @@ public void testMatching() {
 
     @Test
     public void testTemplateRegexes() {
-        _testTemplateRegex("{a:}", "([^/]+?)");
+        _testTemplateRegex("{a:}", "(" + UriTemplateParser.TEMPLATE_VALUE_PATTERN.pattern() + ")");
         _testTemplateRegex("{a:.*}", "(.*)");
         _testTemplateRegex("{a:  .*}", "(.*)");
         _testTemplateRegex("{a:  .*  }", "(.*)");

core-server/src/test/java/org/glassfish/jersey/server/model/ResourceModelTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -37,7 +37,6 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-
 package org.glassfish.jersey.server.model;
 
 import java.util.List;
@@ -48,6 +47,8 @@
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 
+import org.glassfish.jersey.uri.internal.UriTemplateParser;
+
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -216,7 +217,7 @@ public static Resource getParentResource(RuntimeResource runtimeResource, String
     }
 
     private void testTemplate(List<RuntimeResource> runtimeResources) {
-        final String regexTemplate = "/([^/]+?)";
+        final String regexTemplate = "/(" + UriTemplateParser.TEMPLATE_VALUE_PATTERN.pattern() + ")";
         final RuntimeResource template = ResourceTestUtils.getRuntimeResource(runtimeResources, regexTemplate);
         ResourceTestUtils.containsExactMethods(template, false, "GET", "PUT", "POST");
         final List<RuntimeResource> templateChildResources = template.getChildRuntimeResources();

docs/src/main/docbook/jaxrs-resources.xml

@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -134,7 +134,7 @@ public class UserResource {
                 If it is required that a user name must only consist of
                 lower and upper case numeric characters then it is possible to declare a
                 particular regular expression, which overrides the default regular
-                expression, "[^/]+?", for example:
+                expression, "[^/]+", for example:
                 <programlisting language="java">@Path("users/{username: [a-zA-Z][a-zA-Z_0-9]*}")</programlisting>
                 In this type of example the username variable will only match user names that begin with one upper or lower case letter and zero or more alpha numeric characters and the underscore character. If a user name does not match that a 404 (Not Found) response will occur.
             </para>