Merge branch '2.3.x' of github.com:grails/grails-core into 2.3.x

Author: graemerocher

gradle/assemble.gradle

@@ -104,7 +104,7 @@ task pluginsFromRepo {
         jquery: "1.11.0.2",
         resources: "1.2.7",
         scaffolding: "2.0.2",
-        tomcat: "7.0.52",
+        tomcat: "7.0.52.1",
         webxml: "1.4.1"
     ]
 

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

@@ -467,7 +467,11 @@ class SimpleDataBinder implements DataBinder {
         if (formattedConverter) {
             converter = { SimpleMapDataBindingSource source ->
                 def value = source.getPropertyValue field.name
-                formattedConverter.convert (value, formattingValue)
+                def convertedValue = null
+                if(value != null) {
+                    convertedValue = formattedConverter.convert (value, formattingValue)
+                }
+                convertedValue
             } as ValueConverter
         }
         converter

grails-resources/src/grails/grails-app/conf/BuildConfig.groovy

@@ -54,7 +54,7 @@ grails.project.dependency.resolution = {
 
     plugins {
         // plugins for the build system only
-        build ":tomcat:7.0.52"
+        build ":tomcat:7.0.52.1"
 
         // plugins for the compile step
         compile ":scaffolding:2.0.2"

grails-resources/src/grails/grails-app/conf/Config.groovy

@@ -83,6 +83,12 @@ grails.exceptionresolver.params.exclude = ['password']
 // configure auto-caching of queries by default (if false you can cache individual queries with 'cache: true')
 grails.hibernate.cache.queries = false
 
+// configure passing transaction's read-only attribute to Hibernate session, queries and criterias
+// set "singleSession = false" OSIV mode in hibernate configuration after enabling
+grails.hibernate.pass.readonly = false
+// configure passing read-only to OSIV session by default, requires "singleSession = false" OSIV mode
+grails.hibernate.osiv.readonly = false
+
 environments {
     development {
         grails.logging.jul.usebridge = true

grails-resources/src/grails/grails-app/conf/DataSource.groovy

@@ -10,6 +10,7 @@ hibernate {
     cache.use_query_cache = false
     cache.region.factory_class = 'net.sf.ehcache.hibernate.EhCacheRegionFactory' // Hibernate 3
 //    cache.region.factory_class = 'org.hibernate.cache.ehcache.EhCacheRegionFactory' // Hibernate 4
+    singleSession = true // configure OSIV singleSession mode
 }
 
 // environment specific settings

grails-test-suite-persistence/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,61 @@ 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:
+        !obj.hasErrors()
+        obj.somethings?.size() == 1
+        obj.somethings[0].name == 'One'
+    }
+    
+    @Issue('GRAILS-11175')
+    void 'Test binding multiple XML child elements 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>
+        <something><name>Two</name></something>
+    </somethings>
+  </commandObject>
+""")
+        binder.bind obj, xml
+        
+        then:
+        !obj.hasErrors()
+        obj.somethings?.size() == 2
+        obj.somethings[0].name == 'One'
+        obj.somethings[1].name == 'Two'
+    }
+}
+
+@Validateable
+class CommandObject {
+    List<Something> somethings
+}
+
+class Something {
+    String name
 }
 
 @Entity

grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/GrailsWebDataBinderSpec.groovy

@@ -33,18 +33,24 @@ import org.grails.databinding.events.DataBindingListenerAdapter
 
 import spock.lang.Issue
 import spock.lang.Specification
+import spock.lang.Unroll
 
 import com.google.gson.internal.LazilyParsedNumber
 
 @TestMixin(DomainClassUnitTestMixin)
 @Mock([Foo, AssociationBindingAuthor, AssociationBindingPage, AssociationBindingBook, Author, Child, CollectionContainer, DataBindingBook, Fidget, Parent, Publication, Publisher, Team, Widget])
 class GrailsWebDataBinderSpec extends Specification {
+    private static Locale defaultLocale = Locale.getDefault()
 
     GrailsWebDataBinder binder
 
     void setup() {
         binder = grailsApplication.mainContext.getBean(DataBindingUtils.DATA_BINDER_BEAN_NAME)
     }
+    
+    void cleanup() {
+        Locale.setDefault(defaultLocale)
+    }
 
     void 'Test binding an invalid String to an object reference does not result in an empty instance being bound'() {
         // GRAILS-3159
@@ -92,8 +98,10 @@ class GrailsWebDataBinderSpec extends Specification {
         obj.stringWithSpecialBinding == ''
     }
 
-    void 'Test binding to primitives from Strings'() {
+    @Unroll
+    void 'Test binding to primitives from Strings when locale is #locale'() {
         given:
+        Locale.setDefault(locale)
         def obj = new PrimitiveContainer()
 
         when:
@@ -103,8 +111,8 @@ class GrailsWebDataBinderSpec extends Specification {
             someShort: '2',
             someInt: '3',
             someLong: '4',
-            someFloat: '5.5',
-            someDouble: '6.6']))
+            someFloat: '5.5'.replace('.', decimalSeparator),
+            someDouble: '6.6'.replace('.', decimalSeparator)]))
 
         then:
         obj.someBoolean == true
@@ -115,6 +123,9 @@ class GrailsWebDataBinderSpec extends Specification {
         obj.someLong == 4
         obj.someFloat == 5.5
         obj.someDouble == 6.6
+        where:
+        locale << [Locale.getInstance("fi", "FI", ""), Locale.getInstance("en", "US", "")]
+        decimalSeparator << [',', '.']
     }
 
     void 'Test binding null to id of element nested in a List'() {
@@ -1207,6 +1218,27 @@ class GrailsWebDataBinderSpec extends Specification {
         obj.objectIds[3] instanceof ObjectId
         obj.objectIds[3].value == 'eight'
     }
+    
+    @Issue('GRAILS-11174')
+    void 'Test binding null to a Date marked with @BindingFormat'() {
+        given:
+        def obj = new DataBindingBook()
+        
+        when:
+        binder.bind obj, [datePublished: null] as SimpleMapDataBindingSource
+        
+        then:
+        obj.datePublished == null
+        !obj.hasErrors()
+        
+        when:
+        obj.datePublished = new Date()
+        binder.bind obj, [datePublished: null] as SimpleMapDataBindingSource
+        
+        then:
+        obj.datePublished == null
+        !obj.hasErrors()
+    }
 }
 
 @Entity
@@ -1317,6 +1349,8 @@ class DataBindingBook {
     String title
     List importantPageNumbers
     List topics
+    @BindingFormat("MMddyyyy")
+    Date datePublished
     static hasMany = [topics: String, importantPageNumbers: Integer]
 }
 

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

@@ -0,0 +1,49 @@
+package org.codehaus.groovy.grails.web.binding
+
+import grails.persistence.Entity
+import spock.lang.Issue
+import spock.lang.Specification
+
+
+class DefaultASTDatabindingHelperDomainClassSpecialPropertiesSpec extends
+        Specification {
+
+    @Issue('GRAILS-11173')
+    void 'Test binding to special properties in a domain class'() {
+        when:
+        def now = new Date()
+        def obj = new SomeDomainClass(dateCreated: now, lastUpdated: now)
+        
+        then:
+        obj.dateCreated == null
+        obj.lastUpdated == null
+    }
+    
+    @Issue('GRAILS-11173')
+    void 'Test binding to special properties in a domain class with explicit bindable rules'() {
+        when:
+        def now = new Date()
+        def obj = new SomeDomainClassWithExplicitBindableRules(dateCreated: now, lastUpdated: now)
+        
+        then:
+        obj.dateCreated == now
+        obj.lastUpdated == now
+    }
+}
+        
+@Entity
+class SomeDomainClass {
+    Date dateCreated
+    Date lastUpdated
+}
+
+@Entity
+class SomeDomainClassWithExplicitBindableRules {
+    Date dateCreated
+    Date lastUpdated
+
+    static constraints = {
+        dateCreated bindable: true
+        lastUpdated bindable: true
+    }
+}

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

@@ -15,6 +15,7 @@
  */
 package org.codehaus.groovy.grails.web.binding;
 
+import grails.util.CollectionUtils;
 import grails.util.GrailsNameUtils;
 
 import java.lang.reflect.Modifier;
@@ -30,6 +31,7 @@
 import java.util.Set;
 
 import grails.web.controllers.ControllerMethod;
+
 import org.codehaus.groovy.ast.*;
 import org.codehaus.groovy.ast.expr.ClosureExpression;
 import org.codehaus.groovy.ast.expr.ConstantExpression;
@@ -72,6 +74,8 @@ public class DefaultASTDatabindingHelper implements ASTDatabindingHelper {
        add(new ClassNode(String.class));
        add(new ClassNode(URL.class));
     }};
+    
+    private static final Set<String> DOMAIN_CLASS_PROPERTIES_TO_EXCLUDE_BY_DEFAULT = CollectionUtils.newSet("id", "version", "dateCreated", "lastUpdated");
 
     public void injectDatabindingCode(final SourceUnit source, final GeneratorContext context, final ClassNode classNode) {
         addDefaultDatabindingWhitelistField(source, classNode);
@@ -249,7 +253,7 @@ private boolean shouldFieldBeInWhiteList(final FieldNode fieldNode, final Set<St
                 fieldNode.getType().equals(new ClassNode(Object.class))) {
             shouldInclude = false;
         } else if (isDomainClass) {
-            if ("id".equals(fieldName) || "version".equals(fieldName)) {
+            if (DOMAIN_CLASS_PROPERTIES_TO_EXCLUDE_BY_DEFAULT.contains(fieldName)) {
                 shouldInclude = false;
             }
         }

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
+                                        }
                                     }
                                 }
                             }