GRAILS-9082 - improve Map binding

Author: jeffscottbrown

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/binding/DataBindingTests.groovy

@@ -66,9 +66,26 @@ class Person {
     static constraints = {
         birthDate nullable: true
     }
+}
+@Entity
+class Pet {
+    String name
+    Map detailMap
+    Person owner
 }
         ''')
     }
+    
+    void testBindingMapValue() {
+        def petClass = ga.getDomainClass('databindingtests.Pet')
+        def pet = petClass.newInstance()
+        pet.properties = [name: 'lemur', detailMap: [first: 'one', second: 'two'], owner: [name: 'Jeff'], foo: 'bar', bar: [a: 'a', b: 'b']]
+        
+        assert pet.name == 'lemur'
+        assert pet.detailMap.first == 'one'
+        assert pet.detailMap.second == 'two'
+        assert !pet.hasErrors()
+    }
 
     void testBindingNullToANullableDateThatAlreadyHasAValue() {
         def c = ga.getControllerClass('databindingtests.TestController').newInstance()

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/binding/GrailsDataBinder.java

@@ -26,6 +26,7 @@
 import groovy.lang.MissingMethodException;
 import groovy.lang.MissingPropertyException;
 
+import java.beans.PropertyDescriptor;
 import java.beans.PropertyEditor;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -71,6 +72,7 @@
 import org.codehaus.groovy.runtime.InvokerHelper;
 import org.codehaus.groovy.runtime.MetaClassHelper;
 import org.codehaus.groovy.runtime.metaclass.ThreadManagedMetaBeanProperty;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.ConfigurablePropertyAccessor;
@@ -512,14 +514,29 @@ private void filterNestedParameterMaps(MutablePropertyValues mpvs) {
             if (JSONObject.NULL.getClass().isInstance(value)) {
                 mpvs.removePropertyValue(pv);
             }
-            if (isNotCandidateForBinding(value)) {
+            if (!isCandidateForBinding(pv)) {
                 mpvs.removePropertyValue(pv);
             }
         }
     }
 
-    private boolean isNotCandidateForBinding(Object value) {
-        return value instanceof Map;
+    private boolean isCandidateForBinding(PropertyValue pv) {
+        boolean isCandidate = true;
+        final Object value = pv.getValue();
+        if(value instanceof GrailsParameterMap || value instanceof JSONObject) {
+            isCandidate = false;
+        } else if(value instanceof Map) {
+            isCandidate = false;
+            final String propertyName = pv.getName();
+            final PropertyDescriptor property = BeanUtils.getPropertyDescriptor(getTarget().getClass(), propertyName);
+            if(property != null) {
+                final Class<?> propertyType = property.getPropertyType();
+                if(propertyType.isAssignableFrom(value.getClass())) {
+                    isCandidate = true;
+                }
+            }
+        }
+        return isCandidate;
     }
 
     private PropertyValues filterPropertyValues(PropertyValues propertyValues, String prefix) {