rename method to findAllParamsNotInUrlMappingKeywords and test it

Author: sdelamo

grails-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java

@@ -27,13 +27,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import grails.web.mapping.UrlMapping;
-import grails.web.servlet.mvc.GrailsParameterMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.groovy.control.CompilationFailedException;
 import grails.core.GrailsApplication;
-import grails.util.GrailsClassUtils;
 import org.grails.exceptions.reporting.DefaultStackTraceFilterer;
 import org.grails.core.exceptions.GrailsRuntimeException;
 import org.grails.exceptions.reporting.StackTraceFilterer;
@@ -43,7 +40,6 @@
 import org.grails.web.mapping.DefaultUrlMappingInfo;
 import org.grails.web.mapping.UrlMappingUtils;
 import grails.web.mapping.UrlMappingsHolder;
-import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.grails.web.util.GrailsApplicationAttributes;
 import org.grails.web.servlet.mvc.exceptions.GrailsMVCException;
 import org.grails.web.sitemesh.GrailsContentBufferingResponse;
@@ -170,7 +166,7 @@ protected ModelAndView resolveViewOrForward(Exception ex, UrlMappingsHolder urlM
             if ( requestInfo != null ) {
                 Map params = new HashMap();
                 params.putAll(requestInfo.getParameters());
-                params.putAll(UrlMappingUtils.collectParamsNotInUrlMappingKeywords(info.getParameters()));
+                params.putAll(UrlMappingUtils.findAllParamsNotInUrlMappingKeywords(info.getParameters()));
                 info = new DefaultUrlMappingInfo(info, params, grailsApplication);
             }
         }

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

@@ -64,7 +64,7 @@ private UrlMappingUtils() {
      *
      * @return a Map without entries whose key belongs to UrlMapping#KEYWORDS
      */
-    public static  Map<String, Object> collectParamsNotInUrlMappingKeywords(Map<String, Object> params) {
+    public static  Map<String, Object> findAllParamsNotInUrlMappingKeywords(Map<String, Object> params) {
         Map<String, Object> urlParams = new HashMap<>();
         if ( params != null ) {
             for (String key : params.keySet()) {

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

@@ -1,19 +1,18 @@
 package org.grails.web.mapping
 
-import grails.core.GrailsApplication
-import grails.web.mapping.UrlMappingData
-import grails.web.mapping.UrlMappingInfo
 import spock.lang.Specification
+import spock.lang.Unroll
 
 class UrlMappingUtilsSpec extends Specification {
 
+    @Unroll
     def "test buildDispatchUrlForMapping"() {
-        when:
-        UrlMappingData urlData = new ResponseCodeMappingData("500")
-        UrlMappingInfo info = new DefaultUrlMappingInfo([controller: 'error', action: 'logError'], urlData, null)
-        String dispatchUrl = UrlMappingUtils.buildDispatchUrlForMapping(info, true)
+        expect:
+        expected == UrlMappingUtils.findAllParamsNotInUrlMappingKeywords(params)
 
-        then:
-        dispatchUrl == 'fresa'
+        where:
+        params                      | expected
+        [id: 1, controller: 'home'] | [id: 1]
+        [id: 1, format: 'json']     | [id: 1, format: 'json']
     }
 }