From ca101ba9e90128d3525fec54dbbf5951218802b0 Mon Sep 17 00:00:00 2001 From: Ilayaperumal Gopinathan Date: Mon, 18 Apr 2016 10:42:01 +0530 Subject: [PATCH] Use commons-logging This resolves #490 --- .../cloud/stream/binder/rabbit/RabbitBindingCleaner.java | 8 ++++---- .../stream/binder/rabbit/RabbitMessageChannelBinder.java | 4 ---- .../stream/annotation/rxjava/SubjectMessageHandler.java | 6 +++--- .../test/junit/AbstractExternalResourceTestSupport.java | 6 +++--- .../cloud/stream/test/junit/kafka/KafkaTestSupport.java | 6 +++--- .../cloud/stream/binder/AbstractBinder.java | 6 +++--- .../stream/converter/AbstractFromMessageConverter.java | 6 +++--- 7 files changed, 19 insertions(+), 23 deletions(-) diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java index 28a820659..28fd51e30 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java @@ -22,11 +22,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; -import org.springframework.cloud.stream.binder.BindingCleaner; import org.springframework.cloud.stream.binder.AbstractBinder; +import org.springframework.cloud.stream.binder.BindingCleaner; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; @@ -39,7 +39,7 @@ import org.springframework.web.util.UriComponentsBuilder; */ public class RabbitBindingCleaner implements BindingCleaner { - private final static Logger logger = LoggerFactory.getLogger(RabbitBindingCleaner.class); + private static final Log logger = LogFactory.getLog(RabbitBindingCleaner.class); private static final String PREFIX_DELIMITER = "."; diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java index 57415a359..56f775d31 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java @@ -24,8 +24,6 @@ import java.util.LinkedList; import java.util.Map; import org.aopalliance.aop.Advice; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.amqp.AmqpConnectException; import org.springframework.amqp.core.AnonymousQueue; @@ -124,8 +122,6 @@ public class RabbitMessageChannelBinder extends AbstractBinder implements TestRule private String resourceDescription; - protected final Logger logger = LoggerFactory.getLogger(this.getClass()); + protected final Log logger = LogFactory.getLog(getClass()); protected AbstractExternalResourceTestSupport(String resourceDescription) { Assert.hasText(resourceDescription, "resourceDescription is required"); diff --git a/spring-cloud-stream-test-support-internal/src/main/java/org/springframework/cloud/stream/test/junit/kafka/KafkaTestSupport.java b/spring-cloud-stream-test-support-internal/src/main/java/org/springframework/cloud/stream/test/junit/kafka/KafkaTestSupport.java index fb15767d5..77539d063 100644 --- a/spring-cloud-stream-test-support-internal/src/main/java/org/springframework/cloud/stream/test/junit/kafka/KafkaTestSupport.java +++ b/spring-cloud-stream-test-support-internal/src/main/java/org/springframework/cloud/stream/test/junit/kafka/KafkaTestSupport.java @@ -21,9 +21,9 @@ import java.util.Properties; import org.I0Itec.zkclient.ZkClient; import org.I0Itec.zkclient.exception.ZkInterruptedException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Rule; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.cloud.stream.test.junit.AbstractExternalResourceTestSupport; import org.springframework.util.SocketUtils; @@ -46,7 +46,7 @@ import kafka.utils.ZkUtils; */ public class KafkaTestSupport extends AbstractExternalResourceTestSupport { - private static final Logger log = LoggerFactory.getLogger(KafkaTestSupport.class); + private static final Log log = LogFactory.getLog(KafkaTestSupport.class); private static final String SCS_KAFKA_TEST_EMBEDDED = "SCS_KAFKA_TEST_EMBEDDED"; diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractBinder.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractBinder.java index 36124bd8c..7c8e7a2d0 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractBinder.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractBinder.java @@ -27,8 +27,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.InitializingBean; @@ -67,7 +67,7 @@ public abstract class AbstractBinder targetMimeTypes;