From e916633f262a24886a175ed1775ac7bb86b8b733 Mon Sep 17 00:00:00 2001
From: Peter Coppinger <peter@teamworkpm.net>
Date: Tue, 7 Apr 2015 17:27:34 +0100
Subject: [PATCH 1/3] Support for saving/loading objects and queries

This allows storing of objects and queries via objectSave/objectLoad
---
 src/cfc/cfredis.cfc | 43 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/cfc/cfredis.cfc b/src/cfc/cfredis.cfc
index 83b7d0d..5b6bb95 100644
--- a/src/cfc/cfredis.cfc
+++ b/src/cfc/cfredis.cfc
@@ -120,7 +120,6 @@ Thanks!
 
 
     <!--- AUTH - String auth(String password) --->
-    <!--- It's advised to set server password when creating the JedisPool instance rather than using AUTH --->
     <cffunction name="auth" access="public" returntype="string" output="no">
         <cfargument name="password" type="string" required="yes" />
 
@@ -527,14 +526,14 @@ Thanks!
 
 
     <!--- GET - String get(String key) --->
-    <cffunction name="get" access="public" returntype="string" output="no">
+    <cffunction name="get" access="public" returntype="any" output="no">
         <cfargument name="key" type="string" required="yes" />
 
         <cfset var connection = '' />
         <cfset var result = '' />
 
         <cfset connection = getResource() />
-        <cfset result = connection.get(JavaCast("string", arguments.key)) />
+        <cfset result = this.deserialize( connection.get(JavaCast("string", arguments.key)) )/>
         <cfset returnResource(connection) />
 
         <cfif isDefined("result")>
@@ -1833,16 +1832,16 @@ Thanks!
     </cffunction>
 
 
-    <!--- SET - String set(String key, String value) --->
+    <!--- SET - String set(String key, value) --->
     <cffunction name="set" access="public" returntype="string" output="no">
         <cfargument name="key" type="string" required="yes" />
-        <cfargument name="value" type="string" required="yes" />
+        <cfargument name="value" type="any" required="yes" />
 
         <cfset var connection = '' />
         <cfset var result = '' />
 
         <cfset connection = getResource() />
-        <cfset result = connection.set(JavaCast("string", arguments.key), JavaCast("string", arguments.value)) />
+        <cfset result = connection.set(JavaCast("string", arguments.key), JavaCast("string", this.serialize(arguments.value))) />
         <cfset returnResource(connection) />
 
         <cfif isDefined("result")>
@@ -2964,4 +2963,36 @@ Thanks!
         </cfif>
     </cffunction>
 
+
+
+
+    <cffunction name="serialize" access="package" output="false" returntype="any"
+        hint="Serializes the given value from a byte stream.">
+        <cfargument name="value" required="true" />
+        <cfscript>
+            var ret = "";
+            if (isSimpleValue(arguments.value)) {
+                ret = arguments.value;
+            } else {
+                ret = "ENC~" & toBase64( objectSave(arguments.value) );
+            }
+        </cfscript>
+        <cfreturn ret>
+    </cffunction>
+
+    <cffunction name="deserialize" access="package" output="false" returntype="any"
+        hint="Deserializes the given value from a byte stream. this works with multiple keys being returned" >
+        <cfargument name="value" required="true" type="any" default="" />
+
+        <cfif isSimpleValue(arguments.value) AND left( arguments.value, 4 ) IS "ENC~">
+            <cfreturn objectLoad( toBinary( right( arguments.value, len(arguments.value)-4 ) ) )>
+        </cfif>
+
+        <cfreturn arguments.value />
+    </cffunction>
+
+
+
+
+
 </cfcomponent>

From be666772651a2b7382995d57f2e7447e22010440 Mon Sep 17 00:00:00 2001
From: Peter Coppinger <peter@teamworkpm.net>
Date: Tue, 7 Apr 2015 17:28:54 +0100
Subject: [PATCH 2/3] Revert "Support for saving/loading objects and queries"

---
 src/cfc/cfredis.cfc | 43 ++++++-------------------------------------
 1 file changed, 6 insertions(+), 37 deletions(-)

diff --git a/src/cfc/cfredis.cfc b/src/cfc/cfredis.cfc
index 5b6bb95..83b7d0d 100644
--- a/src/cfc/cfredis.cfc
+++ b/src/cfc/cfredis.cfc
@@ -120,6 +120,7 @@ Thanks!
 
 
     <!--- AUTH - String auth(String password) --->
+    <!--- It's advised to set server password when creating the JedisPool instance rather than using AUTH --->
     <cffunction name="auth" access="public" returntype="string" output="no">
         <cfargument name="password" type="string" required="yes" />
 
@@ -526,14 +527,14 @@ Thanks!
 
 
     <!--- GET - String get(String key) --->
-    <cffunction name="get" access="public" returntype="any" output="no">
+    <cffunction name="get" access="public" returntype="string" output="no">
         <cfargument name="key" type="string" required="yes" />
 
         <cfset var connection = '' />
         <cfset var result = '' />
 
         <cfset connection = getResource() />
-        <cfset result = this.deserialize( connection.get(JavaCast("string", arguments.key)) )/>
+        <cfset result = connection.get(JavaCast("string", arguments.key)) />
         <cfset returnResource(connection) />
 
         <cfif isDefined("result")>
@@ -1832,16 +1833,16 @@ Thanks!
     </cffunction>
 
 
-    <!--- SET - String set(String key, value) --->
+    <!--- SET - String set(String key, String value) --->
     <cffunction name="set" access="public" returntype="string" output="no">
         <cfargument name="key" type="string" required="yes" />
-        <cfargument name="value" type="any" required="yes" />
+        <cfargument name="value" type="string" required="yes" />
 
         <cfset var connection = '' />
         <cfset var result = '' />
 
         <cfset connection = getResource() />
-        <cfset result = connection.set(JavaCast("string", arguments.key), JavaCast("string", this.serialize(arguments.value))) />
+        <cfset result = connection.set(JavaCast("string", arguments.key), JavaCast("string", arguments.value)) />
         <cfset returnResource(connection) />
 
         <cfif isDefined("result")>
@@ -2963,36 +2964,4 @@ Thanks!
         </cfif>
     </cffunction>
 
-
-
-
-    <cffunction name="serialize" access="package" output="false" returntype="any"
-        hint="Serializes the given value from a byte stream.">
-        <cfargument name="value" required="true" />
-        <cfscript>
-            var ret = "";
-            if (isSimpleValue(arguments.value)) {
-                ret = arguments.value;
-            } else {
-                ret = "ENC~" & toBase64( objectSave(arguments.value) );
-            }
-        </cfscript>
-        <cfreturn ret>
-    </cffunction>
-
-    <cffunction name="deserialize" access="package" output="false" returntype="any"
-        hint="Deserializes the given value from a byte stream. this works with multiple keys being returned" >
-        <cfargument name="value" required="true" type="any" default="" />
-
-        <cfif isSimpleValue(arguments.value) AND left( arguments.value, 4 ) IS "ENC~">
-            <cfreturn objectLoad( toBinary( right( arguments.value, len(arguments.value)-4 ) ) )>
-        </cfif>
-
-        <cfreturn arguments.value />
-    </cffunction>
-
-
-
-
-
 </cfcomponent>

From 32cef5254117a39024d6c6445bc47fcca42573d1 Mon Sep 17 00:00:00 2001
From: Peter Coppinger <peter@teamworkpm.net>
Date: Tue, 7 Apr 2015 17:29:40 +0100
Subject: [PATCH 3/3] Support for objects and queries

---
 src/cfc/cfredis.cfc | 43 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/cfc/cfredis.cfc b/src/cfc/cfredis.cfc
index 83b7d0d..5b6bb95 100644
--- a/src/cfc/cfredis.cfc
+++ b/src/cfc/cfredis.cfc
@@ -120,7 +120,6 @@ Thanks!
 
 
     <!--- AUTH - String auth(String password) --->
-    <!--- It's advised to set server password when creating the JedisPool instance rather than using AUTH --->
     <cffunction name="auth" access="public" returntype="string" output="no">
         <cfargument name="password" type="string" required="yes" />
 
@@ -527,14 +526,14 @@ Thanks!
 
 
     <!--- GET - String get(String key) --->
-    <cffunction name="get" access="public" returntype="string" output="no">
+    <cffunction name="get" access="public" returntype="any" output="no">
         <cfargument name="key" type="string" required="yes" />
 
         <cfset var connection = '' />
         <cfset var result = '' />
 
         <cfset connection = getResource() />
-        <cfset result = connection.get(JavaCast("string", arguments.key)) />
+        <cfset result = this.deserialize( connection.get(JavaCast("string", arguments.key)) )/>
         <cfset returnResource(connection) />
 
         <cfif isDefined("result")>
@@ -1833,16 +1832,16 @@ Thanks!
     </cffunction>
 
 
-    <!--- SET - String set(String key, String value) --->
+    <!--- SET - String set(String key, value) --->
     <cffunction name="set" access="public" returntype="string" output="no">
         <cfargument name="key" type="string" required="yes" />
-        <cfargument name="value" type="string" required="yes" />
+        <cfargument name="value" type="any" required="yes" />
 
         <cfset var connection = '' />
         <cfset var result = '' />
 
         <cfset connection = getResource() />
-        <cfset result = connection.set(JavaCast("string", arguments.key), JavaCast("string", arguments.value)) />
+        <cfset result = connection.set(JavaCast("string", arguments.key), JavaCast("string", this.serialize(arguments.value))) />
         <cfset returnResource(connection) />
 
         <cfif isDefined("result")>
@@ -2964,4 +2963,36 @@ Thanks!
         </cfif>
     </cffunction>
 
+
+
+
+    <cffunction name="serialize" access="package" output="false" returntype="any"
+        hint="Serializes the given value from a byte stream.">
+        <cfargument name="value" required="true" />
+        <cfscript>
+            var ret = "";
+            if (isSimpleValue(arguments.value)) {
+                ret = arguments.value;
+            } else {
+                ret = "ENC~" & toBase64( objectSave(arguments.value) );
+            }
+        </cfscript>
+        <cfreturn ret>
+    </cffunction>
+
+    <cffunction name="deserialize" access="package" output="false" returntype="any"
+        hint="Deserializes the given value from a byte stream. this works with multiple keys being returned" >
+        <cfargument name="value" required="true" type="any" default="" />
+
+        <cfif isSimpleValue(arguments.value) AND left( arguments.value, 4 ) IS "ENC~">
+            <cfreturn objectLoad( toBinary( right( arguments.value, len(arguments.value)-4 ) ) )>
+        </cfif>
+
+        <cfreturn arguments.value />
+    </cffunction>
+
+
+
+
+
 </cfcomponent>