Refactor / cleanup Controller trait

mfatihercik · Dec 16, 2014 · d194f13 · d194f13
1 parent 2c78e40
commit d194f13
Show file tree

Hide file tree

Showing 85 changed files with 697 additions and 809 deletions.
diff --git a/grails-bootstrap/src/main/groovy/grails/util/CollectionUtils.java b/grails-bootstrap/src/main/groovy/grails/util/CollectionUtils.java
@@ -15,14 +15,7 @@
  */
 package grails.util;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Collection utility methods.
@@ -66,4 +59,19 @@ public static <T> List<T> newList(T... values) {
 
         return new ArrayList<T>(Arrays.asList(values));
     }
+
+    /**
+     * Gets a child map of the given parent map or returns an empty map if it doesn't exist
+     *
+     * @param parent The parent map
+     * @param key The key that holds the child map
+     * @return The child map
+     */
+    public static Map getOrCreateChildMap(Map parent, String key) {
+        Object o = parent.get(key);
+        if(o instanceof Map) {
+            return (Map)o;
+        }
+        return new LinkedHashMap();
+    }
 }
diff --git a/grails-compat/src/main/groovy/org/codehaus/groovy/grails/web/metaclass/ChainMethod.groovy b/grails-compat/src/main/groovy/org/codehaus/groovy/grails/web/metaclass/ChainMethod.groovy
diff --git a/grails-compat/src/main/groovy/org/codehaus/groovy/grails/web/metaclass/WithFormMethod.groovy b/grails-compat/src/main/groovy/org/codehaus/groovy/grails/web/metaclass/WithFormMethod.groovy
diff --git a/...main/groovy/org/codehaus/groovy/grails/web/servlet/DelegatingApplicationAttributes.groovy b/...main/groovy/org/codehaus/groovy/grails/web/servlet/DelegatingApplicationAttributes.groovy
@@ -8,11 +8,11 @@ import groovy.transform.CompileStatic
  */
 @Deprecated
 @CompileStatic
-class DelegatingApplicationAttributes implements GrailsApplicationAttributes, grails.web.util.GrailsApplicationAttributes {
+class DelegatingApplicationAttributes implements GrailsApplicationAttributes, org.grails.web.util.GrailsApplicationAttributes {
 
-    @Delegate grails.web.util.GrailsApplicationAttributes applicationAttributes
+    @Delegate org.grails.web.util.GrailsApplicationAttributes applicationAttributes
 
-    DelegatingApplicationAttributes(grails.web.util.GrailsApplicationAttributes applicationAttributes) {
+    DelegatingApplicationAttributes(org.grails.web.util.GrailsApplicationAttributes applicationAttributes) {
         this.applicationAttributes = applicationAttributes
     }
 }
diff --git a/...compat/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/GrailsWebRequest.groovy b/...compat/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/GrailsWebRequest.groovy
@@ -1,7 +1,7 @@
 package org.codehaus.groovy.grails.web.servlet.mvc
 
 import grails.util.Holders
-import grails.web.util.GrailsApplicationAttributes
+import org.grails.web.util.GrailsApplicationAttributes
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.grails.commons.GrailsApplication
 import org.codehaus.groovy.grails.web.servlet.DelegatingApplicationAttributes

diff --git a/grails-plugin-async/src/main/groovy/grails/artefact/AsyncController.groovy b/grails-plugin-async/src/main/groovy/grails/artefact/AsyncController.groovy
@@ -15,7 +15,7 @@
  */
 package grails.artefact
 
-import grails.web.util.GrailsApplicationAttributes
+import org.grails.web.util.GrailsApplicationAttributes
 import groovy.transform.CompileStatic
 
 import javax.servlet.AsyncContext

diff --git a/grails-plugin-async/src/main/groovy/grails/async/web/AsyncGrailsWebRequest.groovy b/grails-plugin-async/src/main/groovy/grails/async/web/AsyncGrailsWebRequest.groovy
@@ -1,7 +1,7 @@
 package grails.async.web
 
 import groovy.transform.CompileStatic
-import grails.web.util.GrailsApplicationAttributes
+import org.grails.web.util.GrailsApplicationAttributes
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.springframework.context.ApplicationContext
 import org.springframework.util.Assert

diff --git a/...sync/src/main/groovy/org/grails/plugins/web/async/mvc/AsyncActionResultTransformer.groovy b/...sync/src/main/groovy/org/grails/plugins/web/async/mvc/AsyncActionResultTransformer.groovy
@@ -21,7 +21,7 @@ import grails.async.web.AsyncGrailsWebRequest
 import groovy.transform.CompileStatic
 import org.grails.plugins.web.async.GrailsAsyncContext
 import org.grails.web.errors.GrailsExceptionResolver
-import grails.web.util.GrailsApplicationAttributes
+import org.grails.web.util.GrailsApplicationAttributes
 import org.grails.web.servlet.mvc.ActionResultTransformer
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.springframework.web.context.request.async.AsyncWebRequest