From bbb402368909007c060b59c598aa5401a4d80134 Mon Sep 17 00:00:00 2001 From: Ranjith Manickam Date: Mon, 20 May 2019 03:23:33 +0530 Subject: [PATCH] Jedis version upgradation fixes. --- pom.xml | 10 +++++----- .../request/session/data/cache/DataCacheFactory.java | 6 +++--- .../session/data/cache/impl/StandardDataCache.java | 8 ++++---- .../session/data/cache/impl/redis/RedisManager.java | 6 +++--- .../request/session/redis/SessionHandlerValve.java | 6 +++--- .../tomcat/request/session/redis/SessionManager.java | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index e5d79de..29cfdd2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ tomcat-cluster-redis-session-manager tomcat-cluster-redis-session-manager - 3.0.3 + 3.0.2 jar tomcat-cluster-redis-session-manager @@ -17,7 +17,7 @@ 3.0.1 2.6.2 - 1.2 + 1.7.26 3.6.1 1.7 @@ -42,9 +42,9 @@ ${commons-pool2.version} - commons-logging - commons-logging - ${commons-logging.version} + org.slf4j + slf4j-api + ${slf4j-api.version} diff --git a/src/main/java/tomcat/request/session/data/cache/DataCacheFactory.java b/src/main/java/tomcat/request/session/data/cache/DataCacheFactory.java index ef1418a..e081afc 100644 --- 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 @@ import java.util.Properties; /** 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 index 91aeeb7..ccbd93a 100644 --- 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 @@ public class StandardDataCache extends RedisCache { /** 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 class StandardDataCache extends RedisCache { /** 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 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 index d5af87d..c9aafb3 100644 --- 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 @@ import tomcat.request.session.data.cache.DataCacheConstants; 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 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 index 1fec7f5..782074d 100644 --- a/src/main/java/tomcat/request/session/redis/SessionHandlerValve.java +++ b/src/main/java/tomcat/request/session/redis/SessionHandlerValve.java @@ -3,8 +3,8 @@ package tomcat.request.session.redis; 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 @@ import java.io.IOException; /** 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 index faf0887..35e1edc 100644 --- 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.LifecycleListener; 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 = new ThreadLocal<>(); private Set 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);