From 18e33ea58d393c79e3262b54fd63c8d59b5e651c Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Tue, 14 Feb 2017 11:20:21 -0500 Subject: [PATCH] cleanup around provisioning provider usage in binder --- .../binder/rabbit/RabbitMessageChannelBinder.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java b/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java index 8ef7a8c69..8c57c1a06 100644 --- a/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java +++ b/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java @@ -18,6 +18,9 @@ package org.springframework.cloud.stream.binder.rabbit; import java.util.Arrays; +import com.rabbitmq.client.AMQP; +import com.rabbitmq.client.Envelope; + import org.springframework.amqp.core.MessagePostProcessor; import org.springframework.amqp.core.MessageProperties; import org.springframework.amqp.rabbit.config.RetryInterceptorBuilder; @@ -62,9 +65,6 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import com.rabbitmq.client.AMQP; -import com.rabbitmq.client.Envelope; - /** * A {@link org.springframework.cloud.stream.binder.Binder} implementation backed by RabbitMQ. * @author Mark Fisher @@ -77,7 +77,7 @@ import com.rabbitmq.client.Envelope; */ public class RabbitMessageChannelBinder extends AbstractMessageChannelBinder, - ExtendedProducerProperties> + ExtendedProducerProperties, RabbitExchangeQueueProvisioner> implements ExtendedPropertiesBinder { private static final MessagePropertiesConverter inboundMessagePropertiesConverter = @@ -94,8 +94,6 @@ public class RabbitMessageChannelBinder private final RabbitProperties rabbitProperties; - private final RabbitExchangeQueueProvisioner provisioningProvider; - private ConnectionFactory connectionFactory; private MessagePostProcessor decompressingPostProcessor = new DelegatingDecompressingPostProcessor(); @@ -117,7 +115,6 @@ public class RabbitMessageChannelBinder Assert.notNull(rabbitProperties, "rabbitProperties must not be null"); this.connectionFactory = connectionFactory; this.rabbitProperties = rabbitProperties; - this.provisioningProvider = provisioningProvider; } /**