Jedis version updated from 2.9.0 to 3.0.1 for solving redis cluster fixes

Author: ran-jit

pom.xml

@@ -15,7 +15,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.7</java.version>
 
-        <jedis.version>2.9.0</jedis.version>
+        <jedis.version>3.0.1</jedis.version>
         <commons-pool2.version>2.4.2</commons-pool2.version>
         <commons-logging.version>1.2</commons-logging.version>
 

src/main/java/tomcat/request/session/data/cache/impl/redis/RedisClusterManager.java

@@ -4,8 +4,8 @@
 import redis.clients.jedis.JedisCluster;
 import redis.clients.jedis.JedisPoolConfig;
 import redis.clients.jedis.Protocol;
-import redis.clients.jedis.exceptions.JedisClusterMaxRedirectionsException;
 import redis.clients.jedis.exceptions.JedisConnectionException;
+import redis.clients.jedis.exceptions.JedisRedirectionException;
 
 import java.util.Set;
 
@@ -37,7 +37,7 @@ public byte[] set(String key, byte[] value) {
             try {
                 retVal = this.cluster.set(key.getBytes(), value);
                 retry = false;
-            } catch (JedisClusterMaxRedirectionsException | JedisConnectionException ex) {
+            } catch (JedisRedirectionException | JedisConnectionException ex) {
                 handleException(tries, ex);
             }
         } while (retry && tries <= NUM_RETRIES);
@@ -55,7 +55,7 @@ public Long setnx(String key, byte[] value) {
             try {
                 retVal = this.cluster.setnx(key.getBytes(), value);
                 retry = false;
-            } catch (JedisClusterMaxRedirectionsException | JedisConnectionException ex) {
+            } catch (JedisRedirectionException | JedisConnectionException ex) {
                 handleException(tries, ex);
             }
         } while (retry && tries <= NUM_RETRIES);
@@ -73,7 +73,7 @@ public Long expire(String key, int seconds) {
             try {
                 retVal = this.cluster.expire(key, seconds);
                 retry = false;
-            } catch (JedisClusterMaxRedirectionsException | JedisConnectionException ex) {
+            } catch (JedisRedirectionException | JedisConnectionException ex) {
                 handleException(tries, ex);
             }
         } while (retry && tries <= NUM_RETRIES);
@@ -91,7 +91,7 @@ public byte[] get(String key) {
             try {
                 retVal = this.cluster.get(key.getBytes());
                 retry = false;
-            } catch (JedisClusterMaxRedirectionsException | JedisConnectionException ex) {
+            } catch (JedisRedirectionException | JedisConnectionException ex) {
                 handleException(tries, ex);
             }
         } while (retry && tries <= NUM_RETRIES);
@@ -109,7 +109,7 @@ public Long delete(String key) {
             try {
                 retVal = this.cluster.del(key);
                 retry = false;
-            } catch (JedisClusterMaxRedirectionsException | JedisConnectionException ex) {
+            } catch (JedisRedirectionException | JedisConnectionException ex) {
                 handleException(tries, ex);
             }
         } while (retry && tries <= NUM_RETRIES);

src/main/java/tomcat/request/session/data/cache/impl/redis/RedisManager.java

@@ -4,7 +4,7 @@
 import org.apache.commons.logging.LogFactory;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
-import redis.clients.util.Pool;
+import redis.clients.jedis.util.Pool;
 import tomcat.request.session.data.cache.DataCache;
 import tomcat.request.session.data.cache.DataCacheConstants;