From 5fdc7837b389be0adb447bc12c8cced73ae9c21f Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 17 Dec 2018 21:05:25 -0800 Subject: [PATCH] Switch from Log4j to SLF4J. Resolves gh-18. --- ...actGemFireOperationsSessionRepository.java | 20 +++++++++---------- ...mFireOperationsSessionRepositoryTests.java | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java index 319bc61..7a20be2 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java @@ -70,8 +70,8 @@ import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link AbstractGemFireOperationsSessionRepository} is an abstract base class encapsulating functionality @@ -115,7 +115,7 @@ public abstract class AbstractGemFireOperationsSessionRepository extends CacheLi private final GemfireOperations template; - private final Log logger = newLogger(); + private final Logger logger = newLogger(); private final Set cachedSessionIds = new ConcurrentSkipListSet<>(); @@ -138,14 +138,14 @@ public abstract class AbstractGemFireOperationsSessionRepository extends CacheLi } /** - * Constructs a new instance of {@link Log} using Apache Commons {@link LogFactory}. + * Constructs a new instance of {@link Logger} using Apache Commons {@link LoggerFactory}. * - * @return a new instance of {@link Log} constructed from Apache commons-logging {@link LogFactory}. + * @return a new instance of {@link Logger} constructed from Apache commons-logging {@link LoggerFactory}. * @see org.apache.commons.logging.LogFactory#getLog(Class) * @see org.apache.commons.logging.Log */ - private Log newLogger() { - return LogFactory.getLog(getClass()); + private Logger newLogger() { + return LoggerFactory.getLogger(getClass()); } /** @@ -187,12 +187,12 @@ public abstract class AbstractGemFireOperationsSessionRepository extends CacheLi } /** - * Return a reference to the {@link Log} used to log messages. + * Return a reference to the {@link Logger} used to log messages. * - * @return a reference to the {@link Log} used to log messages. + * @return a reference to the {@link Logger} used to log messages. * @see org.apache.commons.logging.Log */ - protected Log getLogger() { + protected Logger getLogger() { return this.logger; } diff --git a/spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepositoryTests.java b/spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepositoryTests.java index 1c832e1..9261081 100644 --- a/spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepositoryTests.java +++ b/spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepositoryTests.java @@ -89,7 +89,7 @@ import org.springframework.session.events.SessionDeletedEvent; import org.springframework.session.events.SessionDestroyedEvent; import org.springframework.session.events.SessionExpiredEvent; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; /** * Unit tests for {@link AbstractGemFireOperationsSessionRepository}. @@ -118,7 +118,7 @@ public class AbstractGemFireOperationsSessionRepositoryTests { private AbstractGemFireOperationsSessionRepository sessionRepository; @Mock - private Log mockLog; + private Logger mockLog; @Mock private Region mockRegion;