GRAILS-11837 move TypeConvertingMap to grails-core module

mfatihercik · Jan 3, 2015 · 15a0aff · 15a0aff
1 parent b4fe47b
commit 15a0aff
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 26 deletions.
diff --git a/...s/web/util/AbstractTypeConvertingMap.java → ...rails/util/AbstractTypeConvertingMap.java b/...s/web/util/AbstractTypeConvertingMap.java → ...rails/util/AbstractTypeConvertingMap.java
@@ -13,27 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package grails.web.util;
+package grails.util;
 
-import grails.databinding.DataBinder;
+import grails.util.GrailsStringUtils;
 import groovy.lang.GroovyObjectSupport;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
+import org.codehaus.groovy.util.HashCodeHelper;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import grails.util.GrailsStringUtils;
-import org.codehaus.groovy.runtime.DefaultGroovyMethods;
-import org.codehaus.groovy.util.HashCodeHelper;
+import java.util.*;
 
 /**
  * An category for use with maps that want type conversion capabilities
@@ -47,6 +36,7 @@
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public abstract class AbstractTypeConvertingMap extends GroovyObjectSupport implements Map, Cloneable {
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.S";
     protected Map wrappedMap;
 
     public AbstractTypeConvertingMap() {
@@ -360,10 +350,10 @@ public Boolean getBoolean(String name, Boolean defaultValue) {
     /**
      * Obtains a date for the parameter name using the default format
      * @param name
-     * @return The date (in the {@link org.grails.databinding.DataBinder#DEFAULT_DATE_FORMAT}) or null
+     * @return The date (in the {@link DEFAULT_DATE_FORMAT}) or null
      */
     public Date getDate(String name) {
-        return getDate(name, DataBinder.DEFAULT_DATE_FORMAT);
+        return getDate(name, DEFAULT_DATE_FORMAT);
     }
 
     /**

diff --git a/.../grails/web/util/TypeConvertingMap.groovy → ...oovy/grails/util/TypeConvertingMap.groovy b/.../grails/web/util/TypeConvertingMap.groovy → ...oovy/grails/util/TypeConvertingMap.groovy
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package grails.web.util
+package grails.util
 
 import groovy.transform.CompileStatic
 

diff --git a/...ls/web/util/TypeConvertingMapTests.groovy → ...grails/util/TypeConvertingMapTests.groovy b/...ls/web/util/TypeConvertingMapTests.groovy → ...grails/util/TypeConvertingMapTests.groovy
@@ -1,6 +1,6 @@
-package org.grails.web.util
+package org.grails.util
 
-import grails.web.util.TypeConvertingMap
+import grails.util.TypeConvertingMap
 
 import groovy.transform.CompileStatic
 

diff --git a/...ugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java b/...ugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java
@@ -31,7 +31,7 @@
 import grails.web.Action;
 import grails.web.RequestParameter;
 import grails.web.controllers.ControllerMethod;
-import grails.web.util.TypeConvertingMap;
+import grails.util.TypeConvertingMap;
 import groovy.lang.Closure;
 
 import java.io.File;

diff --git a/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/UrlMappingTagLib.groovy b/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/UrlMappingTagLib.groovy
@@ -2,7 +2,7 @@ package org.grails.plugins.web.taglib
 import grails.artefact.TagLibrary
 import grails.gsp.TagLib
 import grails.web.mapping.UrlMapping
-import grails.web.util.TypeConvertingMap
+import grails.util.TypeConvertingMap
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.grails.web.metaclass.ControllerDynamicMethods
 import org.grails.encoder.CodecLookup

diff --git a/grails-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsParameterMap.java b/grails-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsParameterMap.java
@@ -33,7 +33,7 @@
 import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.grails.web.binding.StructuredDateEditor;
 import org.grails.web.servlet.mvc.exceptions.ControllerExecutionException;
-import grails.web.util.TypeConvertingMap;
+import grails.util.TypeConvertingMap;
 import org.grails.web.util.WebUtils;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.springframework.context.MessageSource;

diff --git a/grails-web-gsp-taglib/src/main/groovy/org/grails/plugins/web/taglib/RenderTagLib.groovy b/grails-web-gsp-taglib/src/main/groovy/org/grails/plugins/web/taglib/RenderTagLib.groovy
@@ -17,10 +17,9 @@ package org.grails.plugins.web.taglib
 
 import com.opensymphony.module.sitemesh.*
 import com.opensymphony.module.sitemesh.parser.AbstractHTMLPage
-import grails.artefact.Artefact
 import grails.artefact.TagLibrary
 import grails.gsp.TagLib
-import grails.web.util.TypeConvertingMap
+import grails.util.TypeConvertingMap
 import groovy.text.Template
 import groovy.transform.CompileStatic
 import org.grails.buffer.FastStringWriter