Merged fix for GRAILS-5811 "Webflow end states don't support dynamic URLs, redirects fail"

Author: graemerocher

src/java/org/codehaus/groovy/grails/commons/metaclass/PropertyExpression.groovy

@@ -26,7 +26,7 @@ package org.codehaus.groovy.grails.commons.metaclass
  * 
  * Created: Jul 22, 2008
  */
-class PropertyExpression {
+class PropertyExpression implements Cloneable {
 
     private StringBuffer propertyExpression
 
@@ -43,4 +43,4 @@ class PropertyExpression {
         return this
     }
 
-}
+}

src/java/org/codehaus/groovy/grails/web/mapping/DefaultUrlCreator.java

@@ -67,8 +67,10 @@ private String createURLWithWebRequest(Map parameterValues, GrailsWebRequest web
         HttpServletRequest request = webRequest.getCurrentRequest();
 
         String id = null;
-        if(parameterValues.containsKey(ARGUMENT_ID)) {
-            id = parameterValues.get(ARGUMENT_ID).toString();
+        if    (parameterValues.containsKey(ARGUMENT_ID)) {
+            Object o = parameterValues.get(ARGUMENT_ID);
+            if(o != null)
+                id = o.toString();
         }
 
 

src/java/org/codehaus/groovy/grails/webflow/engine/builder/RuntimeRedirectAction.groovy

@@ -48,12 +48,13 @@ class RuntimeRedirectAction extends AbstractAction{
         if(!urlMapper) throw new IllegalStateException("Cannot redirect without an instance of [org.codehaus.groovy.grails.web.mapping.UrlMappingsHolder] within the ApplicationContext")
 
         def delegate = new ExpressionDelegate(context)
-        controller = resolveExpression(delegate, controller)
-        action = resolveExpression(delegate, action)
+        def controller = resolveExpression(delegate, controller)
+        def action = resolveExpression(delegate, action)
+        Map params = this.params.clone() 
         resolveExpressionsInParams(delegate, params)
 
         UrlCreator creator = urlMapper.getReverseMapping(controller, action, params)
-        def url = creator.createRelativeURL(controller, action, params, 'utf-8')
+         def url = creator.createRelativeURL(controller, action, params, 'utf-8')
 
         context.getExternalContext().requestExternalRedirect("contextRelative:$url");
         return success();
@@ -68,4 +69,4 @@ class ExpressionDelegate extends AbstractDelegate {
         super(context);
     }
 
-}
+}

src/test/org/codehaus/groovy/grails/webflow/engine/builder/RuntimeRedirectActionTests.groovy

@@ -0,0 +1,45 @@
+package org.codehaus.groovy.grails.webflow.engine.builder
+
+import org.codehaus.groovy.grails.commons.metaclass.PropertyExpression
+import org.codehaus.groovy.grails.web.mapping.DefaultUrlMappingsHolder
+import org.springframework.webflow.test.MockRequestContext
+import org.springframework.webflow.test.MockExternalContext
+import grails.util.GrailsWebUtil
+import org.springframework.web.context.request.RequestContextHolder
+
+/**
+ *
+ */
+class RuntimeRedirectActionTests extends GroovyTestCase{
+
+    void testRedirectWithPropertyExpression() {
+        GrailsWebUtil.bindMockWebRequest()
+
+        try {
+            def action   = new RuntimeRedirectAction()
+            action.controller = "book"
+            action.action = "show"
+            action.params = [id: new PropertyExpression("flow.id")]
+            action.urlMapper = new DefaultUrlMappingsHolder([])
+            def ext = new MockExternalContext()
+            def context = new MockRequestContext()
+            context.setExternalContext(ext)
+            context.getFlowScope().put("id", "1")
+            action.execute(context)
+            assert "contextRelative:/book/show/1" == ext.getExternalRedirectUrl()
+
+            context.getFlowScope().put("id", "2")
+            action.execute(context)
+            assert "contextRelative:/book/show/2" == ext.getExternalRedirectUrl()
+
+
+        }
+        finally {
+            RequestContextHolder.setRequestAttributes null
+        }
+
+
+
+
+    }
+}