GRAILS-10500 - fix url mapping support for parameters that include a dot

Only exclude dots from url elements if the element is immediately followed by a dot. This is related to grails@20aa322#diff-fc4e5a151130dd0c3eaaf8838e48664fR198
tombujok · Oct 9, 2013 · c92d322 · c92d322
1 parent 8e2b99e
commit c92d322
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/...-url-mappings/src/main/groovy/org/codehaus/groovy/grails/web/mapping/RegexUrlMapping.java b/...-url-mappings/src/main/groovy/org/codehaus/groovy/grails/web/mapping/RegexUrlMapping.java
@@ -232,7 +232,7 @@ protected Pattern convertToRegex(String url) {
                                 .replaceAll("([^\\*])\\*([^\\*])", "$1[^/]+$2")
                                 .replaceAll("([^\\*])\\*$", "$1[^/]+")
                                 .replaceAll("\\*\\*", ".*")
-//                                .replaceAll("\\(\\[\\^\\/\\]\\+\\)\\\\\\.", "([^/.]+)\\\\.")
+                                .replaceAll("\\(\\[\\^\\/\\]\\+\\)\\\\\\.", "([^/.]+)\\\\.")
                                 .replaceAll("\\(\\[\\^\\/\\]\\+\\)\\?\\\\\\.", "([^/.]+)\\?\\\\.")
                                 ;
 

diff --git a/...groovy/org/codehaus/groovy/grails/web/mapping/UrlMappingsWithOptionalExtensionSpec.groovy b/...groovy/org/codehaus/groovy/grails/web/mapping/UrlMappingsWithOptionalExtensionSpec.groovy
@@ -34,7 +34,7 @@ class UrlMappingRsWithOptionalExtensionSpec extends AbstractUrlMappingsSpec {
 
     }
 
-    void "Test that dynamic URL mappings can be specified with an optional extension"() {
+    void "Test that dynamic URL mappings can be specified with an optional parameter and an optional extension"() {
         given:"A URL mapping with an optional extension"
             def urlMappingsHolder = getUrlMappingsHolder {
                 "/$controller/$action?(.$format)?"()
@@ -46,8 +46,19 @@ class UrlMappingRsWithOptionalExtensionSpec extends AbstractUrlMappingsSpec {
             urlMappingsHolder.match('/book')
             urlMappingsHolder.match('/book/list')
             urlMappingsHolder.match('/book/list').parameters.format == null
+    }
 
-
+    void "Test that dynamic URL mappings can be specified with a required parameter and an optional extension"() {
+        given:"A URL mapping with an optional extension"
+            def urlMappingsHolder = getUrlMappingsHolder {
+                "/$controller/$action(.$format)?"()
+            }
+
+        expect:"URLs with and without the format specified match"
+            urlMappingsHolder.match('/book/list.xml')
+            urlMappingsHolder.match('/book/list.xml').parameters.format == 'xml'
+            urlMappingsHolder.match('/book/list')
+            urlMappingsHolder.match('/book/list').parameters.format == null
     }
 
     void "Test deep dynamic URL mappings can be specified with an optional extension"() {