GRAILS-11175 - improve binding XML to non domain objects

grails · Mar 4, 2014 · 22f8915 · 22f8915
1 parent 0d343b5
commit 22f8915
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 8 deletions.
diff --git a/...e/src/test/groovy/org/codehaus/groovy/grails/orm/GrailsWebDataBinderBindingXmlSpec.groovy b/...e/src/test/groovy/org/codehaus/groovy/grails/orm/GrailsWebDataBinderBindingXmlSpec.groovy
@@ -4,6 +4,7 @@ import grails.persistence.Entity
 import grails.test.mixin.Mock
 import grails.test.mixin.TestMixin
 import grails.test.mixin.domain.DomainClassUnitTestMixin
+import grails.validation.Validateable
 
 import org.codehaus.groovy.grails.web.binding.GrailsWebDataBinder
 
@@ -71,6 +72,40 @@ class GrailsWebDataBinderBindingXmlSpec extends Specification {
         writer.books[1].publisher == 'Publisher Two'
         writer.books[1].title == 'Book Two'
     }
+
+    @Issue('GRAILS-11175')
+    void 'Test binding a single XML child element to a List in a non domain class'() {
+        given:
+        def binder = new GrailsWebDataBinder(grailsApplication)
+        def obj = new CommandObject()
+
+        when:
+        def xml = new XmlSlurper().parseText("""
+  <commandObject>
+    <somethings>
+        <something><name>One</name></something>
+    </somethings>
+  </commandObject>
+""")
+        binder.bind obj, xml
+
+        then:
+        println obj.errors
+        !obj.hasErrors()
+        obj.somethings?.size() == 1
+        obj.somethings[0].name == 'One'
+    }
+
+
+}
+
+@Validateable
+class CommandObject {
+    List<Something> somethings
+}
+
+class Something {
+    String name
 }
 
 @Entity

diff --git a/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/binding/GrailsWebDataBinder.groovy b/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/binding/GrailsWebDataBinder.groovy
@@ -279,7 +279,7 @@ class GrailsWebDataBinder extends SimpleDataBinder {
                 }
             } else if(Collection.isAssignableFrom(metaProperty.type)) {
                 def referencedType = getReferencedTypeForCollection(propName, obj)
-                if(referencedType && isDomainClass(referencedType)) {
+                if(referencedType) {
                     def listValue
                     if(val instanceof List) {
                         listValue = (List)val
@@ -301,13 +301,15 @@ class GrailsWebDataBinder extends SimpleDataBinder {
                         def itemsWhichNeedBinding = []
                         listValue.each { item ->
                             def persistentInstance
-                            if(item instanceof Map || item instanceof DataBindingSource) {
-                                def idValue = getIdentifierValueFrom(item)
-                                if(idValue != null) {
-                                    persistentInstance = getPersistentInstance(referencedType, idValue)
-                                    if(persistentInstance != null) {
-                                        bind persistentInstance, new SimpleMapDataBindingSource(item), listener
-                                        itemsWhichNeedBinding << persistentInstance
+                            if(isDomainClass(referencedType)) {
+                                if(item instanceof Map || item instanceof DataBindingSource) {
+                                    def idValue = getIdentifierValueFrom(item)
+                                    if(idValue != null) {
+                                        persistentInstance = getPersistentInstance(referencedType, idValue)
+                                        if(persistentInstance != null) {
+                                            bind persistentInstance, new SimpleMapDataBindingSource(item), listener
+                                            itemsWhichNeedBinding << persistentInstance
+                                        }
                                     }
                                 }
                             }