fix for GRAILS-6056 "GrailsDataBinder.autoCreatePropertyIfPossible doesn't work for hibernate domain classes"

Author: graemerocher

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

@@ -470,7 +470,7 @@ private Object autoCreatePropertyIfPossible(BeanWrapper bean, String propertyNam
         Object val = bean.isReadableProperty(propertyName) ? bean.getPropertyValue(propertyName) : null;
 
         LOG.debug("Checking if auto-create is possible for property ["+propertyName+"] and type ["+type+"]");
-        if(type != null && val == null && DomainClassArtefactHandler.isDomainClass(type)) {
+        if(type != null && val == null && isDomainClass(type)) {
             if(!shouldPropertyValueSkipAutoCreate(propertyValue) && isNullAndWritableProperty(bean, propertyName)) {
 
                 Object created = autoInstantiateDomainInstance(type);
@@ -504,7 +504,7 @@ private Object autoCreatePropertyIfPossible(BeanWrapper bean, String propertyNam
                    int index = Integer.parseInt(indexString);
 
 
-                   if(DomainClassArtefactHandler.isDomainClass(referencedType)) {
+                   if(isDomainClass(referencedType)) {
                        Object instance = findIndexedValue(c, index);
                        if(instance != null) {
                            val = instance;
@@ -546,7 +546,7 @@ else if(type!=null && Map.class.isAssignableFrom(type)) {
                 if(currentKeyStart > -1 && currentKeyEnd > -1) {
                     String indexString = propertyNameWithIndex.substring(currentKeyStart+1, currentKeyEnd);
                     Class referencedType = getReferencedTypeForCollection(propertyName, beanInstance);
-                    if(DomainClassArtefactHandler.isDomainClass(referencedType)) {
+                    if(isDomainClass(referencedType)) {
                         final Object domainInstance = autoInstantiateDomainInstance(referencedType);
                         val = domainInstance;
                         map.put(indexString, domainInstance);
@@ -558,6 +558,10 @@ else if(type!=null && Map.class.isAssignableFrom(type)) {
         return val;
     }
 
+	private boolean isDomainClass(final Class clazz) {
+		return DomainClassArtefactHandler.isDomainClass(clazz) || AnnotationDomainClassArtefactHandler.isJPADomainClass(clazz);
+	}
+
     private boolean shouldPropertyValueSkipAutoCreate(Object propertyValue) {
         return (propertyValue instanceof Map) || ((propertyValue instanceof String) && StringUtils.isBlank((String) propertyValue));
     }
@@ -570,7 +574,7 @@ private Collection decorateCollectionForDomainAssociation(Collection c, final Cl
     }
 
     private boolean canDecorateWithListOrderedSet(Collection c, Class referencedType) {
-        return (c instanceof Set) && !(c instanceof ListOrderedSet) && !(c instanceof SortedSet) && DomainClassArtefactHandler.isDomainClass(referencedType);
+        return (c instanceof Set) && !(c instanceof ListOrderedSet) && !(c instanceof SortedSet) && isDomainClass(referencedType);
     }
 
     private Object findIndexedValue(Collection c, int index) {
@@ -776,7 +780,7 @@ private void associateObjectForId(PropertyValue pv, Object id, Class associatedT
     }
 
     private boolean isDomainAssociation(Class associatedType) {
-        return associatedType != null && DomainClassArtefactHandler.isDomainClass(associatedType);
+        return associatedType != null && isDomainClass(associatedType);
     }
 
     private void addAssociationToTarget(String name, Object target, Object obj) {