Enforce data binding to instance should not affect static properties (#12664)

Author: mattmoss

grails-databinding/src/main/groovy/grails/databinding/SimpleDataBinder.groovy

@@ -32,6 +32,7 @@ import org.grails.databinding.xml.GPathResultMap
 import java.lang.annotation.Annotation
 import java.lang.reflect.Array
 import java.lang.reflect.Field
+import java.lang.reflect.Modifier
 import java.lang.reflect.ParameterizedType
 import java.security.ProtectionDomain
 
@@ -263,7 +264,10 @@ class SimpleDataBinder implements DataBinder {
     }
 
     protected boolean isOkToBind(MetaProperty property, List whitelist, List blacklist) {
-        isOkToBind(property.name, whitelist, blacklist) && (property.type != null && !(ClassLoader.class.isAssignableFrom(property.type) || ProtectionDomain.class.isAssignableFrom(property.type)))
+        isOkToBind(property.name, whitelist, blacklist) &&
+                (property.type != null) &&
+                !Modifier.isStatic(property.modifiers) &&
+                !(ClassLoader.class.isAssignableFrom(property.type) || ProtectionDomain.class.isAssignableFrom(property.type))
     }
 
     protected IndexedPropertyReferenceDescriptor getIndexedPropertyReferenceDescriptor(propName) {

grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderSpec.groovy

@@ -610,6 +610,31 @@ class SimpleDataBinderSpec extends Specification {
         comment.attachments.find { it.filename == 'foo.txt' }
         comment.attachments.find { it.filename == 'bar.txt' }
     }
+
+    void 'Test binding when property is static Object, it should not bind'() {
+        given:
+        def binder = new SimpleDataBinder()
+        def widget = new Widget()
+
+        when:
+        binder.bind widget, [objectStaticProp: 6174] as SimpleMapDataBindingSource
+
+        then:
+        widget.objectStaticProp instanceof Closure
+    }
+
+    void 'Test binding when property is static, it should not bind'() {
+        given:
+        def binder = new SimpleDataBinder()
+        def widget = new Widget()
+
+        when:
+        binder.bind widget, [stringStaticProp: 'abc'] as SimpleMapDataBindingSource
+
+        then:
+        widget.stringStaticProp == 'unchanged'
+    }
+
 }
 
 class Factory {
@@ -639,6 +664,8 @@ class Widget {
     List<Integer> listOfIntegers = []
     List<Long> listOfLongs = []
     Set<Factory> factories
+    static objectStaticProp = { -> 495 }
+    static String stringStaticProp = 'unchanged'
 }
 
 class Gadget extends Widget {