Fix unexplainable Groovy 2.4.6 compilation errors

Author: graemerocher

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-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-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ResourceResolvingCommandFactory.groovy

@@ -64,8 +64,10 @@ abstract class ResourceResolvingCommandFactory<T> implements CommandFactory {
 
     protected Collection<CommandResourceResolver> getCommandResolvers(boolean inherited) {
         def profileCommandsResolver = new FileSystemCommandResourceResolver(matchingFileExtensions)
+        Collection<CommandResourceResolver> commandResolvers = []
         if(inherited) {
-            return [profileCommandsResolver]
+            commandResolvers.add(profileCommandsResolver)
+            return commandResolvers
         }
         else {
             def localCommandsResolver1 = new FileSystemCommandResourceResolver(matchingFileExtensions) {
@@ -80,7 +82,8 @@ abstract class ResourceResolvingCommandFactory<T> implements CommandFactory {
                     return new FileSystemResource("${BuildSettings.BASE_DIR}/commands/" )
                 }
             }
-            return [profileCommandsResolver, localCommandsResolver1, localCommandsResolver2, new ClasspathCommandResourceResolver(matchingFileExtensions) ]
+            commandResolvers.addAll([profileCommandsResolver, localCommandsResolver1, localCommandsResolver2, new ClasspathCommandResourceResolver(matchingFileExtensions) ])
+            return commandResolvers
         }
     }
 

grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy

@@ -83,7 +83,7 @@ class JsonDataBindingSourceCreator extends AbstractRequestBodyDataBindingSourceC
         }
         return new CollectionDataBindingSource() {
             List<DataBindingSource> getDataBindingSources() {
-                dataBindingSources
+                (List<DataBindingSource>)dataBindingSources
             }
         }
     }