Merge remote-tracking branch 'origin/issue_9365'

Author: jeffscottbrown

grails-codecs/README.md

@@ -0,0 +1,3 @@
+## grails-codecs
+
+Code related to Grails codec methods (`.encodeAsHTML)`, `.encodeAsHex()`, etc...)

grails-codecs/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    compile 'commons-codec:commons-codec:1.6'
+}

grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/Base64Codec.groovy renamed to grails-codecs/src/main/groovy/org/grails/plugins/codecs/Base64CodecExtensionMethods.groovy

@@ -15,18 +15,18 @@
  */
 package org.grails.plugins.codecs
 
-import org.codehaus.groovy.runtime.DefaultGroovyMethods
 import org.apache.commons.codec.binary.Base64
+import org.codehaus.groovy.runtime.NullObject
 
 /**
  * A codec that encodes and decodes Objects using Base64 encoding.
  *
  * @author Drew Varner
  */
-class Base64Codec {
+class Base64CodecExtensionMethods {
 
-    static encode = { theTarget ->
-        if (theTarget == null) {
+    static encodeAsBase64(theTarget) {
+        if (theTarget == null || theTarget instanceof NullObject) {
             return null
         }
 
@@ -37,8 +37,8 @@ class Base64Codec {
         return new String(Base64.encodeBase64(theTarget.toString().getBytes("UTF-8")))
     }
 
-    static decode = { theTarget ->
-        if (theTarget == null) {
+    static decodeBase64(theTarget) {
+        if (theTarget == null || theTarget instanceof NullObject) {
             return null
         }
 

grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/DigestUtils.groovy renamed to grails-codecs/src/main/groovy/org/grails/plugins/codecs/DigestUtils.groovy

@@ -15,13 +15,15 @@
  */
 package org.grails.plugins.codecs
 
-class HexCodec {
+import org.codehaus.groovy.runtime.NullObject
+
+class HexCodecExtensionMethods {
 
     static HEXDIGITS = '0123456789abcdef'
 
     // Expects an array/list of numbers
-    static encode = { theTarget ->
-        if (theTarget == null) {
+    static encodeAsHex(theTarget) {
+        if (theTarget == null || theTarget instanceof NullObject) {
             return null
         }
 
@@ -30,13 +32,13 @@ class HexCodec {
             theTarget = theTarget.getBytes("UTF-8")
         }
         theTarget.each() {
-            result << HexCodec.HEXDIGITS[(it & 0xF0) >> 4]
-            result << HexCodec.HEXDIGITS[it & 0x0F]
+            result << HexCodecExtensionMethods.HEXDIGITS[(it & 0xF0) >> 4]
+            result << HexCodecExtensionMethods.HEXDIGITS[it & 0x0F]
         }
         return result.toString()
     }
 
-    static decode = { theTarget ->
+    static decodeHex(theTarget) {
         if (!theTarget) return null
 
         def output = []

grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/HexCodec.groovy renamed to grails-codecs/src/main/groovy/org/grails/plugins/codecs/HexCodecExtensionMethods.groovy

@@ -15,14 +15,19 @@
  */
 package org.grails.plugins.codecs
 
-class MD5Codec {
+import org.codehaus.groovy.runtime.NullObject
+
+class MD5BytesCodecExtensionMethods {
     // Returns the byte[] of the digest, taken from UTF-8 of the string representation
     // or the raw data coerced to bytes
-    static encode = { theTarget ->
-        HexCodec.encode(MD5BytesCodec.encode(theTarget))
+    static encodeAsMD5Bytes(theTarget) {
+        if(theTarget == null || theTarget instanceof NullObject) {
+            return null
+        }
+        DigestUtils.digest("MD5", theTarget)
     }
 
-    static decode = { theTarget ->
+    static decodeMD5Bytes(theTarget) {
         throw new UnsupportedOperationException("Cannot decode MD5 hashes")
     }
 }

grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/MD5Codec.groovy renamed to grails-codecs/src/main/groovy/org/grails/plugins/codecs/MD5BytesCodecExtensionMethods.groovy

@@ -15,14 +15,14 @@
  */
 package org.grails.plugins.codecs
 
-class MD5BytesCodec {
+class MD5CodecExtensionMethods {
     // Returns the byte[] of the digest, taken from UTF-8 of the string representation
     // or the raw data coerced to bytes
-    static encode = { theTarget ->
-        DigestUtils.digest("MD5", theTarget)
+    static encodeAsMD5(theTarget) {
+        theTarget.encodeAsMD5Bytes()?.encodeAsHex()
     }
 
-    static decode = { theTarget ->
+    static decodeMD5(theTarget) {
         throw new UnsupportedOperationException("Cannot decode MD5 hashes")
     }
 }

grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/MD5BytesCodec.groovy renamed to grails-codecs/src/main/groovy/org/grails/plugins/codecs/MD5CodecExtensionMethods.groovy

@@ -15,13 +15,18 @@
  */
 package org.grails.plugins.codecs
 
-class SHA1BytesCodec {
+import org.codehaus.groovy.runtime.NullObject
+
+class SHA1BytesCodecExtensionMethods {
     // Returns the byte[] of the digest
-    static encode = { theTarget ->
+    static encodeAsSHA1Bytes(theTarget) {
+        if(theTarget == null || theTarget instanceof NullObject) {
+            return null
+        }
         DigestUtils.digest("SHA-1", theTarget)
     }
 
-    static decode = { theTarget ->
+    static decodeSHA1Bytes(theTarget) {
         throw new UnsupportedOperationException("Cannot decode SHA-1 hashes")
     }
 }

grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1BytesCodec.groovy renamed to grails-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1BytesCodecExtensionMethods.groovy

@@ -15,13 +15,18 @@
  */
 package org.grails.plugins.codecs
 
-class SHA1Codec{
+import org.codehaus.groovy.runtime.NullObject
+
+class SHA1CodecExtensionMethods {
     // Returns the byte[] of the digest
-    static encode = { theTarget ->
-        HexCodec.encode(SHA1BytesCodec.encode(theTarget))
+    static encodeAsSHA1(theTarget) {
+        if(theTarget == null || theTarget instanceof NullObject) {
+            return null
+        }
+        theTarget.encodeAsSHA1Bytes().encodeAsHex()
     }
 
-    static decode = { theTarget ->
+    static decodeSHA1(theTarget) {
         throw new UnsupportedOperationException("Cannot decode SHA-1 hashes")
     }
 }

grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1Codec.groovy renamed to grails-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1CodecExtensionMethods.groovy

@@ -15,13 +15,18 @@
  */
 package org.grails.plugins.codecs
 
-class SHA256BytesCodec {
+import org.codehaus.groovy.runtime.NullObject
+
+class SHA256BytesCodecExtensionMethods {
     // Returns the byte[] of the digest
-    static encode = { theTarget ->
+    static encodeAsSHA256Bytes(theTarget) {
+        if(theTarget == null || theTarget instanceof NullObject) {
+            return null
+        }
         DigestUtils.digest("SHA-256", theTarget)
     }
 
-    static decode = { theTarget ->
+    static decodeSHA256Bytes(theTarget) {
         throw new UnsupportedOperationException("Cannot decode SHA-256 hashes")
     }
 }