GRAILS-1270 - bindData( target, GrailsParameterMap, excludes) failed to bind anything

git-svn-id: https://svn.codehaus.org/grails/trunk@4604 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: marcpalmer

src/web/org/codehaus/groovy/grails/web/metaclass/BindDynamicMethod.java

@@ -15,17 +15,18 @@
 package org.codehaus.groovy.grails.web.metaclass;
 
 import groovy.lang.MissingMethodException;
+import org.apache.commons.collections.CollectionUtils;
 import org.codehaus.groovy.grails.commons.metaclass.AbstractDynamicMethodInvocation;
 import org.codehaus.groovy.grails.web.binding.GrailsDataBinder;
 import org.codehaus.groovy.grails.web.servlet.mvc.GrailsParameterMap;
 import org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequest;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValues;
 import org.springframework.web.context.request.RequestContextHolder;
-import org.apache.commons.collections.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -59,7 +60,7 @@ public Object invoke(Object target, String methodName, Object[] arguments) {
         Object targetObject = arguments[0];
         Object bindParams = arguments[1];
         List disallowed = null;
-        String filter = "";
+        String filter = null;
         switch(arguments.length){
             case 3:
                 if(arguments[2] instanceof String){

test/groovy/org/codehaus/groovy/grails/web/servlet/BindDataMethodTests.groovy

@@ -17,6 +17,7 @@ package org.codehaus.groovy.grails.web.servlet;
 
 import org.codehaus.groovy.grails.web.metaclass.BindDynamicMethod
 import org.codehaus.groovy.grails.web.servlet.mvc.AbstractGrailsControllerTests
+import org.codehaus.groovy.grails.web.servlet.mvc.GrailsParameterMap
 
 /**
  * Tests for the bindData method
@@ -69,7 +70,27 @@ class BindDataMethodTests extends AbstractGrailsControllerTests {
         }
 	}
 
-     void testBindDataWithPrefixFilterAndDisallowed() {
+    void testBindDataWithDisallowedWithGrailsParameterMap() {
+        runTest() {
+            mockController = ga.getControllerClass("BindController")
+            def input = [ 'metaClass' : this.metaClass, 'name' : 'Marc Palmer', 'email' : 'dontwantthis',
+              'address.country':'gbr' ]
+            input.each() {
+                webRequest.currentRequest.addParameter((String)it.key, (String)it.value)
+            }
+            def excludes = ['email']
+            def params = new GrailsParameterMap(webRequest.currentRequest)
+
+            method.invoke( mockController,"bindData", [target, params, excludes].toArray() )
+
+            assertEquals "Marc Palmer", target.name
+            assertEquals safeMeta, target.metaClass
+            assertEquals "gbr", target.address.country
+            assertNull target.email
+        }
+    }
+
+    void testBindDataWithPrefixFilterAndDisallowed() {
 	    runTest() {
             mockController = ga.getControllerClass("BindController")
             def src = [ 'metaClass' : this.metaClass, 'mark.name' : 'Marc Palmer', 'mark.email' : 'dontwantthis',
@@ -99,4 +120,9 @@ class BindController {
 class CommandObject {
     String name
     String email
+    Address address = new Address()
 }
+
+class Address {
+    String country
+}