Further minor cleanup

mckenfra · Sep 13, 2013 · 292e610 · 292e610
1 parent 0d175fc
commit 292e610
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 35 deletions.
diff --git a/lib/gspresources-background-servlet-2.4.jar b/lib/gspresources-background-servlet-2.4.jar
diff --git a/src/lib/groovy/org/grails/plugin/gspresources/servlet/BackgroundRequest.groovy b/src/lib/groovy/org/grails/plugin/gspresources/servlet/BackgroundRequest.groovy
@@ -148,12 +148,12 @@ class BackgroundRequest implements HttpServletRequest {
 
     String getAuthType() { '' }
 
-    int getContentLength() { content ? content.length() : 0 }
+    int getContentLength() { String c = content; return c ? c.length() : 0 }
 
     String getContextPath() { servletContext?.contextPath ?: '' }
 
     ServletInputStream getInputStream() {
-        final InputStream input = new ByteArrayInputStream((content?:'').getBytes(contentType))
+        final InputStream input = new ByteArrayInputStream((content?:'').getBytes(contentType?:'UTF-8'))
         return new ServletInputStream() {
             int read() { input.read() }
         }
@@ -176,23 +176,28 @@ class BackgroundRequest implements HttpServletRequest {
     boolean isSecure() { false }
 
     long getDateHeader(String name) {
-        if (! (headerMap?.get(name)) ) return -1
-        try { Long.valueOf(headerMap.get(name)[0]) }
+        String[] header = headerMap?.get(name)
+        if (!header) return -1
+        try { Long.valueOf(header[0]) }
         catch(e) { throw new IllegalArgumentException(name) }
     }
 
-    String getHeader(String name) { headerMap?.get(name) ? headerMap.get(name)[0] : null }
+    String getHeader(String name) {
+        String[] header = headerMap?.get(name)
+        header ? header[0] : null
+    }
 
     Enumeration<String> getHeaders(String name) {
-        def values = headerMap?.get(name) ?: []
+        def values = headerMap?.get(name) ?: Collections.emptyList()
         new IteratorEnumeration(values.iterator())
     }
 
-    Enumeration<String> getHeaderNames() { new IteratorEnumeration((headerMap?.keySet()?:[]).iterator()) }
+    Enumeration<String> getHeaderNames() { new IteratorEnumeration((headerMap?.keySet()?:Collections.emptySet()).iterator()) }
 
     int getIntHeader(String name) {
-        if (! (headerMap?.get(name)) ) return -1
-        try { Integer.valueOf(headerMap.get(name)[0]) }
+        String[] header = headerMap?.get(name)
+        if (!header) return -1
+        try { Integer.valueOf(header[0]) }
         catch(e) { throw new NumberFormatException(name) }
     }
 
@@ -204,19 +209,22 @@ class BackgroundRequest implements HttpServletRequest {
         session || !create || !servletContext ? session : (session = BackgroundSession.createInstance(servletContext))
     }
 
-    Object getAttribute(String name) { attributeMap ? attributeMap.get(name) : null }
+    Object getAttribute(String name) { attributeMap?.get(name) }
 
-    Enumeration<String> getAttributeNames() { new IteratorEnumeration((attributeMap?.keySet()?:[]).iterator()) }
+    Enumeration<String> getAttributeNames() { new IteratorEnumeration((attributeMap?.keySet()?:Collections.emptySet()).iterator()) }
 
-    void setAttribute(String name, Object o) { attributeMap.put(name, o) }
+    void setAttribute(String name, Object o) { attributeMap?.put(name, o) }
 
     void removeAttribute(String name) { attributeMap?.remove(name) }
 
-    String getParameter(String name) { parameterMap?.get(name) ? parameterMap.get(name)[0] : null }
+    String getParameter(String name) {
+        String[] parameter = parameterMap?.get(name)
+        parameter ? parameter[0] : null
+    }
 
-    Enumeration<String> getParameterNames() { new IteratorEnumeration((parameterMap?.keySet()?:[]).iterator()) }
+    Enumeration<String> getParameterNames() { new IteratorEnumeration((parameterMap?.keySet()?:Collections.emptySet()).iterator()) }
 
-    String[] getParameterValues(String name) { parameterMap ? parameterMap.get(name) : [] as String[] }
+    String[] getParameterValues(String name) { parameterMap?.get(name) }
 
     RequestDispatcher getRequestDispatcher(String path) { servletContext?.getRequestDispatcher(path) }
 

diff --git a/src/lib/groovy/org/grails/plugin/gspresources/servlet/BackgroundResponse.groovy b/src/lib/groovy/org/grails/plugin/gspresources/servlet/BackgroundResponse.groovy
@@ -55,7 +55,7 @@ class BackgroundResponse implements HttpServletResponse {
         this.writer = writer instanceof PrintWriter ? writer : new PrintWriter(writer)
     }
 
-    void addCookie(Cookie cookie) { cookies.add(cookie) }
+    void addCookie(Cookie cookie) { cookies?.add(cookie) }
 
     void setContentLength(int contentLength) {
         this.contentLength = contentLength
@@ -67,7 +67,7 @@ class BackgroundResponse implements HttpServletResponse {
         setHeader('Content-Type', contentType)
     }
 
-    boolean containsHeader(String name) { return headers.containsKey(name) }
+    boolean containsHeader(String name) { return headerMap?.containsKey(name) }
 
     String encodeURL(String url) { url }
 
@@ -87,17 +87,19 @@ class BackgroundResponse implements HttpServletResponse {
     void sendRedirect(String location) { status = 302 }
 
     void setHeader(String name, String value) {
-        if (!headerMap || !name) return
-        if (value == null) headerMap.remove(name)
-        else headerMap.put(name, [value] as List<String>)
+        Map<String,List<String>> headers = headerMap
+        if (!headers || !name) return
+        if (value == null) headers.remove(name)
+        else headers.put(name, [value] as List<String>)
     }
 
     void addHeader(String name, String value) {
-        if (!headerMap) return
-        List<String> values = headerMap.get(name)
+        Map<String,List<String>> headers = headerMap
+        if (!headers) return
+        List<String> values = headers.get(name)
         if (!values) {
             values = [] as List<String>
-            headerMap.put(name, values)
+            headers.put(name, values)
         }
         values.add(value)
     }
@@ -125,12 +127,15 @@ class BackgroundResponse implements HttpServletResponse {
 
     void reset() {
         status = 0
-        headerMap.clear()
+        headerMap?.clear()
     }
 
-    Collection<String> getHeaders(String name) { headerMap?.get(name) ?: [] }
+    Collection<String> getHeaders(String name) { headerMap?.get(name) ?: Collections.emptyList() }
 
-    Collection<String> getHeaderNames() { headerMap?.keySet() }
+    Collection<String> getHeaderNames() { headerMap?.keySet() ?: Collections.emptySet() }
 
-    String getHeader(String name) { headerMap.get(name) ? headerMap.get(name)[0] : null }
+    String getHeader(String name) {
+        List<String> header = headerMap?.get(name)
+        header ? header[0] : null
+    }
 }
diff --git a/src/lib/groovy/org/grails/plugin/gspresources/servlet/BackgroundSession.groovy b/src/lib/groovy/org/grails/plugin/gspresources/servlet/BackgroundSession.groovy
@@ -48,31 +48,31 @@ class BackgroundSession implements HttpSession {
 
     int getMaxInactiveInterval() { 0 }
 
-    void invalidate() { attributeMap.clear() }
+    void invalidate() { attributeMap?.clear() }
 
     boolean isNew() { false }
 
     void setMaxInactiveInterval(int arg0) { /** No-op **/ }
 
-    Enumeration<String> getAttributeNames() { new IteratorEnumeration((attributeMap?.keySet()?:[]).iterator()) }
+    Enumeration<String> getAttributeNames() { new IteratorEnumeration((attributeMap?.keySet()?:Collections.emptySet()).iterator()) }
 
     Object getAttribute(String name) { attributeMap?.get(name) }
 
     void setAttribute(String name, Object value) { attributeMap?.put(name, value) }
 
-    void removeAttribute(String name) { attributeMap.remove(name) }
+    void removeAttribute(String name) { attributeMap?.remove(name) }
 
     // DEPRECATED METHODS
 
     HttpSessionContext getSessionContext() {
         throw new UnsupportedOperationException("You cannot get session context in non-request rendering operations")
     }
 
-    String[] getValueNames() { (attributeMap?.keySet()?:[]) as String[] }
+    String[] getValueNames() { (attributeMap?.keySet()?:Collections.emptySet()) as String[] }
 
     Object getValue(String name) { attributeMap?.get(name) }
 
     void putValue(String name, Object value) { attributeMap?.put(name, value) }
 
-    void removeValue(String name) { attributeMap.remove(name) }
+    void removeValue(String name) { attributeMap?.remove(name) }
 }
diff --git a/src/lib/groovy/org/grails/plugin/gspresources/servlet/BackgroundUtils.groovy b/src/lib/groovy/org/grails/plugin/gspresources/servlet/BackgroundUtils.groovy
@@ -25,16 +25,16 @@ class BackgroundUtils {
         return result as Cookie[]
     }
 
-    static Map<String,String[]> createAttributeMap(withMap) {
-        Map<String,String[]> result = [:] as Map<String,String[]>
+    static Map<String,Object> createAttributeMap(withMap) {
+        Map<String,Object> result = [:] as Map<String,Object>
         if (withMap in Map) {
             withMap.each { result.put(it.key.toString(), it.value) }
         }
         return result
     }
 
     static Map<String,String[]> createParameterMap(withMap) {
-        Map<String,String[]> result = [:]
+        Map<String,String[]> result = [:] as Map<String,String[]>
         if (withMap in Map) {
             withMap.each { key, value ->
                 def values