SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use commons-logging

Browse Source 
This resolves #490
This commit is contained in:
Ilayaperumal Gopinathan
2016-04-18 10:42:01 +05:30
committed by Marius Bogoevici
parent bfff729b81
commit ca101ba9e9
7 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java
View File

@@ -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 = ".";

4
spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java
View File

@@ -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<MessageChannel, E
private static final ExpressionParser EXPRESSION_PARSER = new SpelExpressionParser();
private final Logger logger = LoggerFactory.getLogger(this.getClass());
private final RabbitAdmin rabbitAdmin;
private final GenericApplicationContext autoDeclareContext = new GenericApplicationContext();

6
spring-cloud-stream-rxjava/src/main/java/org/springframework/cloud/stream/annotation/rxjava/SubjectMessageHandler.java
View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.stream.annotation.rxjava;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.SmartLifecycle;
import org.springframework.integration.handler.AbstractMessageProducingHandler;
@@ -65,7 +65,7 @@ import rx.subjects.Subject;
@SuppressWarnings({"unchecked", "rawtypes"})
public class SubjectMessageHandler extends AbstractMessageProducingHandler implements SmartLifecycle {
private final Logger logger = LoggerFactory.getLogger(getClass());
private final Log logger = LogFactory.getLog(getClass());
@SuppressWarnings("rawtypes")
private final RxJavaProcessor processor;

6
spring-cloud-stream-test-support-internal/src/main/java/org/springframework/cloud/stream/test/junit/AbstractExternalResourceTestSupport.java
View File

@@ -18,13 +18,13 @@ package org.springframework.cloud.stream.test.junit;
import static org.junit.Assert.fail;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Assume;
import org.junit.Rule;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.Assert;
@@ -46,7 +46,7 @@ public abstract class AbstractExternalResourceTestSupport<R> 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");

6
spring-cloud-stream-test-support-internal/src/main/java/org/springframework/cloud/stream/test/junit/kafka/KafkaTestSupport.java
View File

@@ -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<String> {
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";

6
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractBinder.java
View File

@@ -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<T, C extends ConsumerProperties, P extends
*/
private static final String GROUP_INDEX_DELIMITER = ".";
protected final Logger logger = LoggerFactory.getLogger(getClass());
protected final Log logger = LogFactory.getLog(getClass());
private volatile AbstractApplicationContext applicationContext;

6
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/converter/AbstractFromMessageConverter.java
View File

@@ -21,8 +21,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;
@@ -43,7 +43,7 @@ import org.springframework.util.MimeType;
*/
public abstract class AbstractFromMessageConverter extends AbstractMessageConverter {
protected Logger logger = LoggerFactory.getLogger(this.getClass());
protected final Log logger = LogFactory.getLog(getClass());
protected final List<MimeType> targetMimeTypes;