Merge branch '3.2.x' of github.com:grails/grails-core into 3.2.x

Author: graemerocher

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

@@ -15,6 +15,7 @@
  */
 package org.grails.web.mapping;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import grails.util.GrailsStringUtils;
@@ -100,24 +101,25 @@ private boolean isCacheable(Map attrs) {
     }
 
     // Based on DGM toMapString, but with StringBuilder instead of StringBuffer
-    private void appendMapKey(StringBuilder buffer, Map map) {
-        if (map==null || map.isEmpty()) {
+    private void appendMapKey(StringBuilder buffer, Map<String, Object> params) {
+        if (params==null || params.isEmpty()) {
             buffer.append(EMPTY_MAP_STRING);
-        }
-        final String requestControllerName = getRequestStateLookupStrategy().getControllerName();
-        if (map.get(UrlMapping.ACTION) != null && map.get(UrlMapping.CONTROLLER) == null) {
-            Object action = map.remove(UrlMapping.ACTION);
-            map.put(UrlMapping.CONTROLLER, requestControllerName);
-            map.put(UrlMapping.ACTION, action);
-        }
-        if (map.get(UrlMapping.NAMESPACE) == null && map.get(UrlMapping.CONTROLLER) == requestControllerName) {
-            String namespace = getRequestStateLookupStrategy().getControllerNamespace();
-            if (GrailsStringUtils.isNotEmpty(namespace)) {
-                map.put(UrlMapping.NAMESPACE, namespace);
+            buffer.append(OPENING_BRACKET);
+        } else {
+            buffer.append(OPENING_BRACKET);
+            Map map = new LinkedHashMap<>(params);
+            final String requestControllerName = getRequestStateLookupStrategy().getControllerName();
+            if (map.get(UrlMapping.ACTION) != null && map.get(UrlMapping.CONTROLLER) == null && map.get(RESOURCE_PREFIX) == null) {
+                Object action = map.remove(UrlMapping.ACTION);
+                map.put(UrlMapping.CONTROLLER, requestControllerName);
+                map.put(UrlMapping.ACTION, action);
+            }
+            if (map.get(UrlMapping.NAMESPACE) == null && map.get(UrlMapping.CONTROLLER) == requestControllerName) {
+                String namespace = getRequestStateLookupStrategy().getControllerNamespace();
+                if (GrailsStringUtils.isNotEmpty(namespace)) {
+                    map.put(UrlMapping.NAMESPACE, namespace);
+                }
             }
-        }
-        buffer.append(OPENING_BRACKET);
-        if (map != null) {
             boolean first = true;
             for (Object o : map.entrySet()) {
                 Map.Entry entry = (Map.Entry) o;

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

@@ -87,6 +87,19 @@ class CachingLinkGeneratorSpec extends Specification {
         key == "link[controller:foo, action:bar, namespace:fooParam]"
     }
 
+    void "test resource with action"() {
+        given:
+        String key
+
+        when: "the args are a resource and action"
+        request.setControllerNamespace("fooReq")
+        request.setControllerName("foo")
+        key = linkGenerator.makeKey([resource: new Resource(id: 1), action: "bar"])
+
+        then: "controller and namespace aren't in the key"
+        key == "link[resource:org.grails.web.mapping.CachingLinkGeneratorSpec\$Resource->1, action:bar]"
+    }
+
 
     class MyCachingLinkGenerator extends CachingLinkGenerator {
         public MyCachingLinkGenerator(String serverBaseURL) {
@@ -97,4 +110,12 @@ class CachingLinkGeneratorSpec extends Specification {
             super.makeKey(LINK_PREFIX, attrs)
         }
     }
+
+    class Resource {
+        Long id
+
+        Long ident() {
+            id
+        }
+    }
 }