Ensure parent constraints are added before nested contraints. Fixes #10246

Author: graemerocher

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

@@ -777,7 +777,6 @@ private String establishFullURI(String uri, List<ConstrainedProperty> constraine
 
                     if(!isInCollection) {
                         uriBuilder.append(SLASH).append(CAPTURING_WILD_CARD);
-                        constrainedList.add(new ConstrainedProperty(UrlMapping.class, parentResource.controllerName + "Id", String.class));
                     }
                 }
             }
@@ -1199,6 +1198,12 @@ protected MetaMappingInfo pushNewMetaMappingInfo() {
                 if (parentMappingConstraints != null) {
                     mappingInfo.getConstraints().addAll(parentMappingConstraints);
                 }
+                ParentResource parentResource = parentResources.peek();
+                if(parentResource != null && !parentResource.isSingle) {
+                    if(!isInCollection) {
+                        mappingInfo.getConstraints().add(new ConstrainedProperty(UrlMapping.class, parentResource.controllerName + "Id", String.class));
+                    }
+                }
             }
             if (previousConstraints.size() > 0) {
                 mappingInfo.getConstraints().addAll(previousConstraints);

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

@@ -0,0 +1,27 @@
+package org.grails.web.mapping
+
+import org.codehaus.groovy.grails.web.mapping.AbstractUrlMappingsSpec
+import spock.lang.Issue
+
+/**
+ * Created by graemerocher on 25/10/16.
+ */
+class NestedMappingWithinGroupSpec extends AbstractUrlMappingsSpec {
+
+    @Issue('https://github.com/grails/grails-core/issues/10246')
+    void "test nested mapping within group"() {
+        given:"A link generator with nested mappings withihn a group"
+        def linkGenerator = getLinkGenerator {
+            group("/api") {
+                "/customer-stores"(resources: 'store') {
+                    "/catalogs"(controller: 'catalog', action: 'index', method: 'GET')
+                    "/catalogs/$catalogId/items"(controller: 'catalog', action: 'getItems', method: 'GET')
+                }
+            }
+        }
+
+        expect:"The generated links to be correct"
+        linkGenerator.link(controller:"catalog", action:"index", method:"GET", params:[storeId:'1']) == 'http://localhost/api/customer-stores/1/catalogs'
+        linkGenerator.link(controller:"catalog", action:"getItems", method:"GET", params:[storeId:'1', catalogId:'2']) == 'http://localhost/api/customer-stores/1/catalogs/2/items'
+    }
+}