Skip to content

Commit 755a78c

Browse files
mp911demp911de
committed
DATAREDIS-639 - Unify logging framework usage.
Move off SLF4J to Commons Logging for code that used SLF4J. Original pull request: #248.
1 parent 4ada49d commit 755a78c

File tree

3 files changed

+21
-28
lines changed

3 files changed

+21
-28
lines changed

‎src/main/java/org/springframework/data/redis/repository/cdi/CdiBean.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import javax.enterprise.inject.spi.InjectionPoint;
3535
import javax.enterprise.inject.spi.PassivationCapable;
3636

37-
import org.slf4j.Logger;
38-
import org.slf4j.LoggerFactory;
37+
import org.apache.commons.logging.Log;
38+
import org.apache.commons.logging.LogFactory;
3939
import org.springframework.util.Assert;
4040
import org.springframework.util.StringUtils;
4141

@@ -47,7 +47,7 @@
4747
*/
4848
public abstract class CdiBean<T> implements Bean<T>, PassivationCapable {
4949

50-
private static final Logger LOGGER = LoggerFactory.getLogger(CdiBean.class);
50+
private final Log log = LogFactory.getLog(getClass());
5151

5252
protected final BeanManager beanManager;
5353

@@ -155,8 +155,8 @@ public final void initialize() {
155155
*/
156156
public void destroy(T instance, CreationalContext<T> creationalContext) {
157157

158-
if (LOGGER.isDebugEnabled()) {
159-
LOGGER.debug(String.format("Destroying bean instance %s for repository type '%s'.", instance.toString(),
158+
if (log.isDebugEnabled()) {
159+
log.debug(String.format("Destroying bean instance %s for repository type '%s'.", instance.toString(),
160160
beanClass.getName()));
161161
}
162162

‎src/main/java/org/springframework/data/redis/repository/cdi/RedisRepositoryExtension.java

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import javax.enterprise.inject.spi.BeanManager;
3232
import javax.enterprise.inject.spi.ProcessBean;
3333

34-
import org.slf4j.Logger;
35-
import org.slf4j.LoggerFactory;
34+
import org.apache.commons.logging.Log;
35+
import org.apache.commons.logging.LogFactory;
3636
import org.springframework.data.keyvalue.core.KeyValueOperations;
3737
import org.springframework.data.redis.core.RedisKeyValueAdapter;
3838
import org.springframework.data.redis.core.RedisKeyValueTemplate;
@@ -50,14 +50,13 @@
5050
*/
5151
public class RedisRepositoryExtension extends CdiRepositoryExtensionSupport {
5252

53-
private static final Logger LOG = LoggerFactory.getLogger(RedisRepositoryExtension.class);
54-
53+
private final Log log = LogFactory.getLog(RedisRepositoryExtension.class);
5554
private final Map<Set<Annotation>, Bean<RedisKeyValueAdapter>> redisKeyValueAdapters = new HashMap<>();
5655
private final Map<Set<Annotation>, Bean<KeyValueOperations>> redisKeyValueTemplates = new HashMap<>();
5756
private final Map<Set<Annotation>, Bean<RedisOperations<?, ?>>> redisOperations = new HashMap<>();
5857

5958
public RedisRepositoryExtension() {
60-
LOG.info("Activating CDI extension for Spring Data Redis repositories.");
59+
log.info("Activating CDI extension for Spring Data Redis repositories.");
6160
}
6261

6362
/**
@@ -79,8 +78,8 @@ <X> void processBean(@Observes ProcessBean<X> processBean) {
7978
}
8079

8180
if (beanType instanceof Class<?> && RedisKeyValueTemplate.class.isAssignableFrom((Class<?>) beanType)) {
82-
if (LOG.isDebugEnabled()) {
83-
LOG.debug(String.format("Discovered %s with qualifiers %s.", RedisKeyValueTemplate.class.getName(),
81+
if (log.isDebugEnabled()) {
82+
log.debug(String.format("Discovered %s with qualifiers %s.", RedisKeyValueTemplate.class.getName(),
8483
bean.getQualifiers()));
8584
}
8685

@@ -89,8 +88,8 @@ <X> void processBean(@Observes ProcessBean<X> processBean) {
8988
}
9089

9190
if (beanType instanceof Class<?> && RedisKeyValueAdapter.class.isAssignableFrom((Class<?>) beanType)) {
92-
if (LOG.isDebugEnabled()) {
93-
LOG.debug(String.format("Discovered %s with qualifiers %s.", RedisKeyValueAdapter.class.getName(),
91+
if (log.isDebugEnabled()) {
92+
log.debug(String.format("Discovered %s with qualifiers %s.", RedisKeyValueAdapter.class.getName(),
9493
bean.getQualifiers()));
9594
}
9695

@@ -99,8 +98,8 @@ <X> void processBean(@Observes ProcessBean<X> processBean) {
9998
}
10099

101100
if (beanType instanceof Class<?> && RedisOperations.class.isAssignableFrom((Class<?>) beanType)) {
102-
if (LOG.isDebugEnabled()) {
103-
LOG.debug(String.format("Discovered %s with qualifiers %s.", RedisOperations.class.getName(),
101+
if (log.isDebugEnabled()) {
102+
log.debug(String.format("Discovered %s with qualifiers %s.", RedisOperations.class.getName(),
104103
bean.getQualifiers()));
105104
}
106105

@@ -122,8 +121,8 @@ void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanMan
122121
// Create the bean representing the repository.
123122
CdiRepositoryBean<?> repositoryBean = createRepositoryBean(repositoryType, qualifiers, beanManager);
124123

125-
if (LOG.isInfoEnabled()) {
126-
LOG.info(String.format("Registering bean for %s with qualifiers %s.", repositoryType.getName(), qualifiers));
124+
if (log.isInfoEnabled()) {
125+
log.info(String.format("Registering bean for %s with qualifiers %s.", repositoryType.getName(), qualifiers));
127126
}
128127

129128
// Register the bean to the container.
@@ -147,8 +146,8 @@ private void registerDependenciesIfNecessary(@Observes AfterBeanDiscovery afterB
147146
Set<Annotation> qualifiers = entry.getValue();
148147

149148
if (!redisKeyValueAdapters.containsKey(qualifiers)) {
150-
if (LOG.isInfoEnabled()) {
151-
LOG.info(String.format("Registering bean for %s with qualifiers %s.", RedisKeyValueAdapter.class.getName(),
149+
if (log.isInfoEnabled()) {
150+
log.info(String.format("Registering bean for %s with qualifiers %s.", RedisKeyValueAdapter.class.getName(),
152151
qualifiers));
153152
}
154153
RedisKeyValueAdapterBean redisKeyValueAdapterBean = createRedisKeyValueAdapterBean(qualifiers, beanManager);
@@ -157,8 +156,8 @@ private void registerDependenciesIfNecessary(@Observes AfterBeanDiscovery afterB
157156
}
158157

159158
if (!redisKeyValueTemplates.containsKey(qualifiers)) {
160-
if (LOG.isInfoEnabled()) {
161-
LOG.info(String.format("Registering bean for %s with qualifiers %s.", RedisKeyValueTemplate.class.getName(),
159+
if (log.isInfoEnabled()) {
160+
log.info(String.format("Registering bean for %s with qualifiers %s.", RedisKeyValueTemplate.class.getName(),
162161
qualifiers));
163162
}
164163

‎src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
import org.junit.AfterClass;
3030
import org.junit.BeforeClass;
3131
import org.junit.Test;
32-
import org.slf4j.Logger;
33-
import org.slf4j.LoggerFactory;
3432

3533
/**
3634
* Integration tests for Spring Data Redis CDI extension.
@@ -39,8 +37,6 @@
3937
*/
4038
public class CdiExtensionIntegrationTests {
4139

42-
private static Logger LOGGER = LoggerFactory.getLogger(CdiExtensionIntegrationTests.class);
43-
4440
static SeContainer container;
4541

4642
@BeforeClass
@@ -50,8 +46,6 @@ public static void setUp() {
5046
.disableDiscovery() //
5147
.addPackages(RepositoryConsumer.class) //
5248
.initialize();
53-
54-
LOGGER.debug("CDI container bootstrapped!");
5549
}
5650

5751
@AfterClass

0 commit comments

Comments
 (0)