Jedis version upgradation fixes.

ran-jit · May 19, 2019 · bbb4023 · bbb4023
1 parent 82fb1ba
commit bbb4023
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>tomcat-cluster-redis-session-manager</groupId>
     <artifactId>tomcat-cluster-redis-session-manager</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.2</version>
     <packaging>jar</packaging>
 
     <name>tomcat-cluster-redis-session-manager</name>
@@ -17,7 +17,7 @@
 
         <jedis.version>3.0.1</jedis.version>
         <commons-pool2.version>2.6.2</commons-pool2.version>
-        <commons-logging.version>1.2</commons-logging.version>
+        <slf4j-api.version>1.7.26</slf4j-api.version>
 
         <maven-compiler.version>3.6.1</maven-compiler.version>
         <source-java.version>1.7</source-java.version>
@@ -42,9 +42,9 @@
             <version>${commons-pool2.version}</version>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${commons-logging.version}</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j-api.version}</version>
         </dependency>
 
         <!-- For local development dependency begins.. -->

diff --git a/src/main/java/tomcat/request/session/data/cache/DataCacheFactory.java b/src/main/java/tomcat/request/session/data/cache/DataCacheFactory.java
@@ -1,7 +1,7 @@
 package tomcat.request.session.data.cache;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import tomcat.request.session.SessionConstants;
 import tomcat.request.session.data.cache.impl.StandardDataCache;
 import tomcat.request.session.data.cache.impl.redis.RedisCache;
@@ -15,7 +15,7 @@
 /** author: Ranjith Manickam @ 3 Dec' 2018 */
 public class DataCacheFactory {
 
-    private static final Log LOGGER = LogFactory.getLog(DataCacheFactory.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DataCacheFactory.class);
 
     private final int sessionExpiryTime;
 

diff --git a/src/main/java/tomcat/request/session/data/cache/impl/StandardDataCache.java b/src/main/java/tomcat/request/session/data/cache/impl/StandardDataCache.java
@@ -1,7 +1,7 @@
 package tomcat.request.session.data.cache.impl;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import tomcat.request.session.data.cache.DataCache;
 import tomcat.request.session.data.cache.DataCacheConstants;
 import tomcat.request.session.data.cache.DataCacheFactory;
@@ -159,7 +159,7 @@ private synchronized void handleSessionData() {
     /** Session data redis sync thread. */
     private class SessionDataSyncThread implements Runnable {
 
-        private final Log LOGGER = LogFactory.getLog(SessionDataSyncThread.class);
+        private final Logger LOGGER = LoggerFactory.getLogger(SessionDataSyncThread.class);
 
         private final DataCache dataCache;
         private final int sessionExpiryTime;
@@ -192,7 +192,7 @@ public void run() {
     /** Session data expiry thread. This will takes care of the session expired data removal. */
     private class SessionDataExpiryThread implements Runnable {
 
-        private final Log LOGGER = LogFactory.getLog(SessionDataExpiryThread.class);
+        private final Logger LOGGER = LoggerFactory.getLogger(SessionDataExpiryThread.class);
 
         private final long expiry;
         private final Map<String, SessionData> sessionData;

diff --git a/src/main/java/tomcat/request/session/data/cache/impl/redis/RedisManager.java b/src/main/java/tomcat/request/session/data/cache/impl/redis/RedisManager.java
@@ -1,7 +1,7 @@
 package tomcat.request.session.data.cache.impl.redis;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.util.Pool;
@@ -12,7 +12,7 @@
 abstract class RedisManager implements DataCache {
 
     private static final int NUM_RETRIES = 3;
-    private static final Log LOGGER = LogFactory.getLog(RedisManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RedisManager.class);
 
     private final Pool<Jedis> pool;
     private final long failiureWaitTime;

diff --git a/src/main/java/tomcat/request/session/redis/SessionHandlerValve.java b/src/main/java/tomcat/request/session/redis/SessionHandlerValve.java
@@ -3,8 +3,8 @@
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.valves.ValveBase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import tomcat.request.session.exception.BackendException;
 
 import javax.servlet.ServletException;
@@ -13,7 +13,7 @@
 /** author: Ranjith Manickam @ 12 Jul' 2018 */
 public class SessionHandlerValve extends ValveBase {
 
-    private static final Log LOGGER = LogFactory.getLog(SessionHandlerValve.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SessionHandlerValve.class);
 
     private SessionManager manager;
 

diff --git a/src/main/java/tomcat/request/session/redis/SessionManager.java b/src/main/java/tomcat/request/session/redis/SessionManager.java
@@ -7,8 +7,8 @@
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.Valve;
 import org.apache.catalina.session.ManagerBase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import tomcat.request.session.SerializationUtil;
 import tomcat.request.session.Session;
 import tomcat.request.session.SessionConstants;
@@ -33,7 +33,7 @@ public class SessionManager extends ManagerBase implements Lifecycle {
     private ThreadLocal<SessionContext> sessionContext = new ThreadLocal<>();
     private Set<SessionPolicy> sessionPolicy = EnumSet.of(SessionPolicy.DEFAULT);
 
-    private static final Log LOGGER = LogFactory.getLog(SessionManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SessionManager.class);
 
     public boolean getSaveOnChange() {
         return this.sessionPolicy.contains(SessionPolicy.SAVE_ON_CHANGE);