Merge branch 'groovy246' into 3.1.x

Author: graemerocher

build.gradle

@@ -36,7 +36,7 @@ ext {
     datastoreVersion = "5.0.2.BUILD-SNAPSHOT"
     gantVersion = "1.9.6"
     gdocEngineVersion = "1.0.1"
-    groovyVersion = System.getenv('CI_GROOVY_VERSION') ?: "2.4.5"
+    groovyVersion = System.getenv('CI_GROOVY_VERSION') ?: "2.4.6"
     ivyVersion = "2.3.0"
     jansiVersion = "1.11"
     jlineVersion = "2.12"

grails-bootstrap/src/main/groovy/grails/codegen/model/ModelBuilder.groovy

@@ -111,7 +111,7 @@ trait ModelBuilder {
 
         @Override
         Map<String, Object> asMap() {
-            [ className: className, fullName: fullName, propertyName: propertyName, modelName: propertyName, packageName: packageName, packagePath: packagePath, simpleName: simpleName, lowerCaseName: lowerCaseName]
+            (Map<String,Object>) [ className: className, fullName: fullName, propertyName: propertyName, modelName: propertyName, packageName: packageName, packagePath: packagePath, simpleName: simpleName, lowerCaseName: lowerCaseName]
         }
     }
 

grails-core/src/main/groovy/grails/boot/config/GrailsAutoConfiguration.groovy

@@ -118,7 +118,7 @@ class GrailsAutoConfiguration implements GrailsApplicationClass, ApplicationCont
      */
     Collection<Package> packages() {
         def thisPackage = getClass().package
-        thisPackage ? [ thisPackage ] : []
+        thisPackage ? [ thisPackage ] : new ArrayList<Package>()
     }
 
     /**

grails-core/src/main/groovy/grails/plugins/Plugin.groovy

@@ -165,6 +165,6 @@ abstract class Plugin implements GrailsApplicationLifeCycle, GrailsApplicationAw
         def bb = new BeanBuilder(null, grailsApplication.classLoader)
         bb.beans beanDefinitions
         bb.registerBeans((BeanDefinitionRegistry)applicationContext)
-        new MapBasedSmartPropertyOverrideConfigurer(grailsApplication).postProcessBeanFactory(((ConfigurableApplicationContext)applicationContext).beanFactory)
+        new MapBasedSmartPropertyOverrideConfigurer(grailsApplication: grailsApplication).postProcessBeanFactory(((ConfigurableApplicationContext)applicationContext).beanFactory)
     }
 }

grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/WebRequestPromiseDecoratorLookupStrategy.groovy

@@ -32,7 +32,9 @@ class WebRequestPromiseDecoratorLookupStrategy implements PromiseDecoratorLookup
     List<PromiseDecorator> findDecorators() {
         final webRequest = GrailsWebRequest.lookup()
         if (webRequest) {
-            return [new WebRequestPromiseDecorator(webRequest)]
+            List<PromiseDecorator> decorators = []
+            decorators.add(new WebRequestPromiseDecorator(webRequest))
+            return decorators
         }
         return Collections.emptyList()
     }

grails-plugin-domain-class/src/main/groovy/grails/artefact/DomainClass.groovy

@@ -37,6 +37,12 @@ trait DomainClass {
 
     static Map<String, Constrained> getConstrainedProperties() {
         GrailsDomainClass domainClass = (GrailsDomainClass)Holders?.grailsApplication?.getArtefact(DomainClassArtefactHandler.TYPE, this.name)
-        return (Map<String, Constrained>)domainClass?.getConstrainedProperties() ?: Collections.emptyMap()
+        def constrainedProperties = domainClass?.getConstrainedProperties()
+        if(constrainedProperties) {
+            return constrainedProperties
+        }
+        else {
+            return Collections.<String,Constrained>emptyMap()
+        }
     }
 }

grails-plugin-events/src/main/groovy/grails/events/Events.groovy

@@ -96,7 +96,7 @@ trait Events {
      */
     public <E extends Event<?> > Registration<Object, Consumer<E>> on(Selector sel, Consumer<E> consumer) {
         if(eventBus == null) throw new IllegalStateException("EventBus not present. Event registration attempted outside of application context.")
-        eventBus.on sel, consumer
+        return ( Registration<Object, Consumer<E>>) eventBus.on( sel, consumer )
     }
 
     /**

grails-plugin-rest/src/main/groovy/grails/rest/render/errors/VndErrorJsonRenderer.groovy

@@ -18,10 +18,9 @@ package grails.rest.render.errors
 import grails.rest.render.RenderContext
 import grails.util.GrailsWebUtil
 import groovy.json.JsonOutput
+import groovy.json.StreamingJsonBuilder
 import groovy.transform.CompileStatic
 import grails.web.mime.MimeType
-import org.grails.web.json.StreamingJsonBuilder
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpMethod
 import org.springframework.validation.BeanPropertyBindingResult
 import org.springframework.validation.Errors

grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonCollectionRenderer.groovy

@@ -16,11 +16,9 @@
 package grails.rest.render.hal
 
 import grails.rest.render.ContainerRenderer
-import grails.rest.render.RenderContext
 import grails.util.GrailsNameUtils
 
 import grails.web.mime.MimeType
-import org.grails.web.json.StreamingJsonBuilder
 
 
 /**

grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonRenderer.groovy

@@ -19,6 +19,7 @@ import grails.rest.Link
 import grails.rest.render.RenderContext
 import grails.rest.render.util.AbstractLinkingRenderer
 import groovy.json.JsonOutput
+import groovy.json.StreamingJsonBuilder
 import groovy.transform.CompileStatic
 import org.grails.web.databinding.bindingsource.DataBindingSourceRegistry
 import org.grails.web.databinding.bindingsource.HalJsonDataBindingSourceCreator
@@ -27,7 +28,6 @@ import org.grails.datastore.mapping.model.MappingFactory
 import org.grails.datastore.mapping.model.PersistentEntity
 import org.grails.datastore.mapping.model.types.Association
 import org.grails.datastore.mapping.model.types.ToOne
-import org.grails.web.json.StreamingJsonBuilder
 import org.springframework.beans.PropertyAccessorFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.convert.converter.Converter