Merge pull request #9489 from driverpt/3.0.x

Backported support for Nested Grouped UrlMappings from master

Author: graemerocher

grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingEvaluator.java

@@ -157,7 +157,7 @@ private List<UrlMapping> evaluateMappings(GroovyObject go, Closure<?> mappings,
 
     @SuppressWarnings("rawtypes")
     public List<UrlMapping> evaluateMappings(Closure closure) {
-        UrlMappingBuilder builder = new UrlMappingBuilder(null);
+        UrlMappingBuilder builder = new UrlMappingBuilder((Binding) null);
         closure.setDelegate(builder);
         closure.setResolveStrategy(Closure.DELEGATE_FIRST);
         if (closure.getParameterTypes().length == 0) {
@@ -233,6 +233,19 @@ public UrlMappingBuilder(Binding binding) {
             this.binding = binding;
         }
 
+        protected UrlMappingBuilder(UrlMappingBuilder parent) {
+            this(parent.binding);
+            urlDefiningMode = parent.urlDefiningMode;
+            previousConstraints = parent.previousConstraints;
+            inGroupConstraints = parent.inGroupConstraints;
+            urlMappings = parent.urlMappings;
+            parameterValues = parent.parameterValues;
+            exception = parent.exception;
+            parseRequest = parent.parseRequest;
+            parentResources = parent.parentResources;
+            mappingInfoDeque = parent.mappingInfoDeque;
+        }
+
         public List<UrlMapping> getUrlMappings() {
             return urlMappings;
         }
@@ -342,8 +355,12 @@ public void name(Map<String, UrlMapping> m) {
         public void group(String uri, Closure mappings) {
 
             try {
-                parentResources.push(new ParentResource(null, uri, true, true));
+                ParentResource parentResource = new ParentResource(null, uri, true, true);
+                parentResources.push(parentResource);
                 pushNewMetaMappingInfo();
+                UrlGroupMappingRecursionBuilder builder = new UrlGroupMappingRecursionBuilder(this, parentResource);
+                mappings.setDelegate(builder);
+                mappings.setResolveStrategy(Closure.DELEGATE_FIRST);
                 mappings.call();
                 inGroupConstraints = false;
             } finally {
@@ -505,6 +522,7 @@ private Object _invoke(String methodName, Object arg, Object delegate) {
 
                         Closure callable = (Closure) args[0];
                         callable.setDelegate(builder);
+                        callable.setResolveStrategy(Closure.DELEGATE_FIRST);
                         for (ConstrainedProperty constrainedProperty : currentConstraints) {
                             builder.getConstrainedProperties().put(constrainedProperty.getPropertyName(), constrainedProperty);
                         }
@@ -1026,4 +1044,22 @@ class ParentResource {
             }
         }
     }
+
+    class UrlGroupMappingRecursionBuilder extends UrlMappingBuilder {
+        private ParentResource parentResource;
+
+        public UrlGroupMappingRecursionBuilder(UrlMappingBuilder parent, ParentResource parentResource) {
+            super(parent);
+
+            this.parentResource = parentResource;
+        }
+
+        @Override
+        public void group(String uri, Closure mappings) {
+            if (parentResource != null) {
+                uri = parentResource.uri.concat(uri);
+            }
+            super.group(uri, mappings);
+        }
+    }
 }

grails-web-url-mappings/src/test/groovy/org/codehaus/groovy/grails/web/mapping/GroupedUrlMappingSpec.groovy

@@ -84,6 +84,25 @@ class GroupedUrlMappingSpec extends AbstractUrlMappingsSpec {
         linkGenerator.link(controller: "test", action: 'show', id: 1, params: [alias: 'foo']) == 'http://localhost/events/foo/orders/1'
     }
 
+
+    @Issue('#9394')
+    void "Test that nested group parameters are supported"() {
+        given: "A link generator with a dynamic URL mapping"
+        def linkGenerator = getLinkGenerator {
+            group "/events/$alias", {
+                group "/orders", {
+                    "/$id"(controller: 'test', action: 'show')
+                }
+
+                "/"(controller: 'test', action: 'index')
+            }
+        }
+
+        expect:
+        linkGenerator.link(controller: "test", action: 'show', id: 1, params: [alias: 'foo']) == 'http://localhost/events/foo/orders/1'
+        linkGenerator.link(controller: "test", action: 'index', params: [alias: 'foo']) == 'http://localhost/events/foo'
+    }
+
     @Issue('#9426')
     void "Test that constraints embedded within groups are properly respected"() {
         given: "A group with a child URL that contains a constraint"