GRAILS-10047 - fix binding to a class with no bindable properties

Author: jeffscottbrown

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

@@ -29,6 +29,7 @@ public class DefaultASTDatabindingHelper implements ASTDatabindingHelper {
     public static final String BINDABLE_CONSTRAINT_NAME = "bindable";
 
     public static final String DEFAULT_DATABINDING_WHITELIST = "$defaultDatabindingWhiteList";
+    public static final String NO_BINDABLE_PROPERTIES = "$_NO_BINDABLE_PROPERTIES_$";
 
     private static Map<ClassNode, Set<String>> CLASS_NODE_TO_WHITE_LIST_PROPERTY_NAMES = new HashMap<ClassNode, Set<String>>();
 
@@ -95,31 +96,36 @@ protected AnnotationNode getMarkerAnnotation() {
 
     private void addDefaultDatabindingWhitelistField(final SourceUnit sourceUnit, final ClassNode classNode) {
         final FieldNode defaultWhitelistField = classNode.getDeclaredField(DEFAULT_DATABINDING_WHITELIST);
-        if(defaultWhitelistField == null) {
-            final Set<String> propertyNamesToIncludeInWhiteList = getPropertyNamesToIncludeInWhiteList(sourceUnit, classNode);
-                
-            final ListExpression listExpression = new ListExpression();
-            for(String propertyName : propertyNamesToIncludeInWhiteList) {
+        if (defaultWhitelistField != null) {
+            return;
+        }
+
+        final Set<String> propertyNamesToIncludeInWhiteList = getPropertyNamesToIncludeInWhiteList(sourceUnit, classNode);
+
+        final ListExpression listExpression = new ListExpression();
+        if (propertyNamesToIncludeInWhiteList.size() > 0) {
+            for (String propertyName : propertyNamesToIncludeInWhiteList) {
                 listExpression.addExpression(new ConstantExpression(propertyName));
 
                 final FieldNode declaredField = getDeclaredFieldInInheritanceHierarchy(classNode, propertyName);
                 boolean isSimpleType = false;
-                if(declaredField != null) {
+                if (declaredField != null) {
                     final ClassNode type = declaredField.getType();
-                    if(type != null) {
+                    if (type != null) {
                         isSimpleType = SIMPLE_TYPES.contains(type);
                     }
                 }
-                if(!isSimpleType) {
+                if (!isSimpleType) {
                     listExpression.addExpression(new ConstantExpression(propertyName + "_*"));
                     listExpression.addExpression(new ConstantExpression(propertyName + ".*"));
                 }
             }
-            
-            classNode.addField(DEFAULT_DATABINDING_WHITELIST,
-                    Modifier.STATIC | Modifier.PUBLIC | Modifier.FINAL, new ClassNode(List.class),
-                    listExpression);
-         }
+        } else {
+            listExpression.addExpression(new ConstantExpression(NO_BINDABLE_PROPERTIES));
+        }
+        classNode.addField(DEFAULT_DATABINDING_WHITELIST,
+                Modifier.STATIC | Modifier.PUBLIC | Modifier.FINAL, new ClassNode(List.class),
+                listExpression);
     }
 
 

grails-web/src/test/groovy/org/codehaus/groovy/grails/web/binding/DefaultASTDatabindingHelperSpec.groovy

@@ -19,6 +19,7 @@ class DefaultASTDatabindingHelperSpec extends Specification {
     static setterGetterClass
     static dateBindingClass
     static classWithHasMany
+    static classWithNoBindableProperties
 
     def setupSpec() {
         final gcl = new GrailsAwareClassLoader()
@@ -111,11 +112,20 @@ class DefaultASTDatabindingHelperSpec extends Specification {
                     }
                 }
             ''')
+            classWithNoBindableProperties = gcl.parseClass('''
+                class ClassWithNoBindableProperties {
+                    String firstName
+                    String lastName
+                    static constraints = {
+                        firstName bindable: false
+                        lastName bindable: false
+                    }
+                }''')
 
             // there must be a request bound in order for the structured date editor to be registered
             GrailsWebUtil.bindMockWebRequest()
     }
-
+    
     void 'Test class with hasMany'() {
         when:
         final whiteListField = classWithHasMany.getDeclaredField(DefaultASTDatabindingHelper.DEFAULT_DATABINDING_WHITELIST)
@@ -192,6 +202,18 @@ class DefaultASTDatabindingHelperSpec extends Specification {
            'person_*' in whiteList
     }
 
+    void 'Test binding to a class that has no bindable properties'() {
+        given:
+            def obj = classWithNoBindableProperties.newInstance()
+            
+        when:
+            obj.properties = [firstName: 'First Name', lastName: 'Last Name']
+            
+        then:
+            obj.firstName == null
+            obj.lastName == null
+    }
+
     void 'Test that binding respects the generated white list'() {
         given:
             def obj = widgetClass.newInstance()