fix for GRAILS-10820 "Group UrlMappings Producing null Params"

grails · Nov 28, 2013 · efc0b05 · efc0b05
1 parent 7ee51f6
commit efc0b05
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/...gs/src/main/groovy/org/codehaus/groovy/grails/web/mapping/DefaultUrlMappingEvaluator.java b/...gs/src/main/groovy/org/codehaus/groovy/grails/web/mapping/DefaultUrlMappingEvaluator.java
@@ -414,7 +414,9 @@ private Object _invoke(String methodName, Object arg, Object delegate) {
                 parameterValues = new HashMap<String, Object>();
                 Map variables = binding != null ? binding.getVariables() : null;
                 try {
-                    urlDefiningMode = false;
+                    if( parentResources.isEmpty() ) {
+                        urlDefiningMode = false;
+                    }
                     args = args != null && args.length > 0 ? args : new Object[]{Collections.EMPTY_MAP};
                     if (args[0] instanceof Closure) {
                         UrlMappingData urlData = createUrlMappingData(mappedURI, isResponseCode);

diff --git a/.../src/test/groovy/org/codehaus/groovy/grails/web/mapping/RestfulResourceMappingSpec.groovy b/.../src/test/groovy/org/codehaus/groovy/grails/web/mapping/RestfulResourceMappingSpec.groovy
@@ -14,6 +14,39 @@ import spock.lang.Specification
  */
 class RestfulResourceMappingSpec extends Specification{
 
+    @Issue('GRAILS-10820')
+    void 'Test that grouped params with dynamic variables product the correct mappings'() {
+        given: 'A resource mapping with child mappings'
+            def urlMappingsHolder = getUrlMappingsHolder {
+                "/report"(controller: 'blah', action: 'report')
+                group "/foo", {
+                    "/blah/$foo/$action?"(controller: 'blah')
+                    "/$foo/$action?"(controller: 'blah')
+                }
+                "/$foo?"(controller: 'blah', action: 'index')
+            }
+
+        when:"The URL mappings are obtained"
+            def urlMappings = urlMappingsHolder.urlMappings
+
+        then:"There are eight of them in total"
+            urlMappings.size() == 4
+
+        expect:
+            urlMappingsHolder.matchAll('/report', 'GET')[0].controllerName == 'blah'
+            urlMappingsHolder.matchAll('/report', 'GET')[0].actionName == 'report'
+            urlMappingsHolder.matchAll('/foo/blah/stuff/go', 'GET')[0].controllerName == 'blah'
+            urlMappingsHolder.matchAll('/foo/blah/stuff/go', 'GET')[0].parameters.action == 'go'
+            urlMappingsHolder.matchAll('/foo/blah/stuff/go', 'GET')[0].parameters.foo == 'stuff'
+
+            urlMappingsHolder.matchAll('/foo/stuff/go', 'GET')[0].controllerName == 'blah'
+            urlMappingsHolder.matchAll('/foo/stuff/go', 'GET')[0].parameters.action == 'go'
+            urlMappingsHolder.matchAll('/foo/stuff/go', 'GET')[0].parameters.foo == 'stuff'
+
+            urlMappingsHolder.matchAll('/home', 'GET')[0].controllerName == 'blah'
+            urlMappingsHolder.matchAll('/home', 'GET')[0].actionName == 'index'
+
+    }
     @Issue('GRAILS-10835')
     void 'Test multiple nested mappings have correct constrained properties'() {
         given: 'A resource mapping with child mappings'