Merge pull request #10632 from grails/3.2.x-grails-issue-10583

Pass parameters in forward

Author: graemerocher

grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RequestForwarder.groovy

@@ -19,6 +19,7 @@ import grails.web.UrlConverter
 import grails.web.api.WebAttributes
 import grails.web.mapping.LinkGenerator
 import groovy.transform.CompileStatic
+import org.grails.web.mapping.UrlMappingUtils
 import org.grails.web.mapping.mvc.UrlMappingsHandlerMapping
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.grails.web.util.GrailsApplicationAttributes
@@ -89,6 +90,13 @@ trait RequestForwarder implements WebAttributes {
             if(params.plugin) {
                 params.plugin = params.plugin
             }
+
+            if ( !params.params ) {
+                params.params =  UrlMappingUtils.findAllParamsNotInKeys(
+                        UrlMappingUtils.findAllParamsNotInUrlMappingKeywords(webRequest.params),
+                        webRequest.originalParams.keySet()
+                )
+            }
         }
 
         Map model = params.model instanceof Map ? (Map)params.model : Collections.EMPTY_MAP

grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequest.java

@@ -247,13 +247,20 @@ public GrailsParameterMap getParams() {
     }
 
     /**
-     * Reset params by re-reading & initializing parameters from request
+     * @return The Grails params object
      */
-    public void resetParams() {
+    public GrailsParameterMap getOriginalParams() {
         if (originalParams == null) {
             originalParams = new GrailsParameterMap(getCurrentRequest());
         }
-        params = (GrailsParameterMap)originalParams.clone();
+        return originalParams;
+    }
+
+    /**
+     * Reset params by re-reading & initializing parameters from request
+     */
+    public void resetParams() {
+        params = (GrailsParameterMap)getOriginalParams().clone();
     }
 
     @SuppressWarnings("rawtypes")

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

@@ -17,9 +17,7 @@
 
 import grails.validation.ConstrainedProperty;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>Defines a URL mapping. A URL mapping is a mapping between a URI such as /book/list and
@@ -104,19 +102,21 @@ public interface UrlMapping extends Comparable, UrlCreator {
 
     String EXCEPTION = "exception";
 
-    List<String> KEYWORDS = Arrays.asList(CONTROLLER,
-            ACTION,
-            HTTP_METHOD,
-            REDIRECT_INFO,
-            VERSION,
-            URI,
-            PLUGIN,
-            NAMESPACE,
-            VIEW,
-            RESOURCES,
-            INCLUDES,
-            PERMANENT,
-            EXCEPTION);
+    Set<String> KEYWORDS = new HashSet<String>() {{
+        add(CONTROLLER);
+        add(ACTION);
+        add(HTTP_METHOD);
+        add(REDIRECT_INFO);
+        add(VERSION);
+        add(URI);
+        add(PLUGIN);
+        add(NAMESPACE);
+        add(VIEW);
+        add(RESOURCES);
+        add(INCLUDES);
+        add(PERMANENT);
+        add(EXCEPTION);
+    }};
 
     /**
      * Matches the given URI and returns an instance of the UrlMappingInfo interface or null

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

@@ -46,9 +46,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Utility methods for working with UrlMappings
@@ -64,11 +62,15 @@ private UrlMappingUtils() {
      *
      * @return a Map without entries whose key belongs to UrlMapping#KEYWORDS
      */
-    public static  Map<String, Object> findAllParamsNotInUrlMappingKeywords(Map<String, Object> params) {
-        Map<String, Object> urlParams = new HashMap<>();
-        if ( params != null ) {
-            for (String key : params.keySet()) {
-                if (!UrlMapping.KEYWORDS.contains(key)) {
+    public static  Map findAllParamsNotInUrlMappingKeywords(Map params) {
+        return findAllParamsNotInKeys(params, UrlMapping.KEYWORDS);
+    }
+
+    public static  Map findAllParamsNotInKeys(Map params, Set keys) {
+        Map urlParams = new HashMap<>();
+        if ( params != null && keys != null ) {
+            for (Object key : params.keySet()) {
+                if (!keys.contains(key)) {
                     urlParams.put(key, params.get(key));
                 }
             }