From 93f278e839c6c2343f8e03ea9cb94d4fd4c5200b Mon Sep 17 00:00:00 2001 From: David Turanski Date: Tue, 21 Jul 2015 14:09:50 -0400 Subject: [PATCH] Cleanup after Binder renaming one more... one more comment change --- ...Cleaner.java => RabbitBindingCleaner.java} | 8 ++++---- .../rabbit/RabbitMessageChannelBinder.java | 2 +- .../rabbit/RabbitBinderCleanerTests.java | 2 +- .../binder/rabbit/RabbitBinderTests.java | 12 +++++------ .../cloud/stream/binder/Binder.java | 17 ++-------------- .../cloud/stream/binder/BinderHeaders.java | 11 +++++----- ...BinderCleaner.java => BindingCleaner.java} | 2 +- .../binder/MessageChannelBinderSupport.java | 6 +++--- .../stream/binder/BrokerBinderTests.java | 2 +- .../MessageChannelBinderSupportTests.java | 20 +++++++------------ .../stream/adapter/ChannelBindingAdapter.java | 2 +- .../ChannelBindingAdapterConfiguration.java | 4 ++-- 12 files changed, 33 insertions(+), 55 deletions(-) rename spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/{RabbitBinderCleaner.java => RabbitBindingCleaner.java} (97%) rename spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/{BinderCleaner.java => BindingCleaner.java} (97%) diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderCleaner.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java similarity index 97% rename from spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderCleaner.java rename to spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java index dfa865142..fa3393edb 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderCleaner.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java @@ -24,9 +24,9 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.cloud.stream.binder.BindingCleaner; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; -import org.springframework.cloud.stream.binder.BinderCleaner; import org.springframework.cloud.stream.binder.BinderUtils; import org.springframework.cloud.stream.binder.MessageChannelBinderSupport; import org.springframework.cloud.stream.binder.RabbitAdminException; @@ -34,14 +34,14 @@ import org.springframework.cloud.stream.binder.RabbitManagementUtils; /** - * Implementation of {@link org.springframework.cloud.stream.binder.BinderCleaner} for the {@code RabbitBinder}. + * Implementation of {@link org.springframework.cloud.stream.binder.BindingCleaner} for the {@code RabbitBinder}. * @author Gary Russell * @author David Turanski * @since 1.2 */ -public class RabbitBinderCleaner implements BinderCleaner { +public class RabbitBindingCleaner implements BindingCleaner { - private final static Logger logger = LoggerFactory.getLogger(RabbitBinderCleaner.class); + private final static Logger logger = LoggerFactory.getLogger(RabbitBindingCleaner.class); public static final String BINDER_PREFIX = "binder.rabbit."; 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 6880089d4..9d756ab92 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 @@ -117,7 +117,7 @@ public class RabbitMessageChannelBinder extends MessageChannelBinderSupport impl private static final int DEFAULT_PREFETCH_COUNT = 1; - private static final String DEFAULT_RABBIT_PREFIX = "binder.rabbit."; + static final String DEFAULT_RABBIT_PREFIX = "binder."; private static final int DEFAULT_TX_SIZE = 1; diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderCleanerTests.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderCleanerTests.java index 6fc83ab9b..85af68c3c 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderCleanerTests.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderCleanerTests.java @@ -64,7 +64,7 @@ public class RabbitBinderCleanerTests { @Test public void testCleanStream() { - final RabbitBinderCleaner cleaner = new RabbitBinderCleaner(); + final RabbitBindingCleaner cleaner = new RabbitBindingCleaner(); final RestTemplate template = RabbitManagementUtils.buildRestTemplate("http://localhost:15672", "guest", "guest"); final String stream1 = UUID.randomUUID().toString(); diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java index b2ed4d821..a6c8cf427 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java @@ -80,8 +80,6 @@ public class RabbitBinderTests extends PartitionCapableBinderTests { private final String CLASS_UNDER_TEST_NAME = RabbitMessageChannelBinder.class.getSimpleName(); - public static final String BINDER_PREFIX = "binder.rabbit."; - public static final String TEST_PREFIX = "bindertest."; @Rule @@ -137,7 +135,7 @@ public class RabbitBinderTests extends PartitionCapableBinderTests { SimpleMessageListenerContainer container = TestUtils.getPropertyValue(endpoint, "messageListenerContainer", SimpleMessageListenerContainer.class); assertEquals(AcknowledgeMode.AUTO, container.getAcknowledgeMode()); - assertEquals(BINDER_PREFIX + "props.0", container.getQueueNames()[0]); + assertEquals(RabbitMessageChannelBinder.DEFAULT_RABBIT_PREFIX + "props.0", container.getQueueNames()[0]); assertTrue(TestUtils.getPropertyValue(container, "transactional", Boolean.class)); assertEquals(1, TestUtils.getPropertyValue(container, "concurrentConsumers")); assertNull(TestUtils.getPropertyValue(container, "maxConcurrentConsumers")); @@ -208,7 +206,7 @@ public class RabbitBinderTests extends PartitionCapableBinderTests { List bindings = TestUtils.getPropertyValue(binder, "binder.bindings", List.class); assertEquals(1, bindings.size()); AbstractEndpoint endpoint = bindings.get(0).getEndpoint(); - assertEquals(BINDER_PREFIX + "props.0", TestUtils.getPropertyValue(endpoint, "handler.delegate.routingKey")); + assertEquals(RabbitMessageChannelBinder.DEFAULT_RABBIT_PREFIX + "props.0", TestUtils.getPropertyValue(endpoint, "handler.delegate.routingKey")); MessageDeliveryMode mode = TestUtils.getPropertyValue(endpoint, "handler.delegate.defaultDeliveryMode", MessageDeliveryMode.class); assertEquals(MessageDeliveryMode.PERSISTENT, mode); @@ -589,7 +587,7 @@ public class RabbitBinderTests extends PartitionCapableBinderTests { output.setBeanName("batchingProducer"); binder.bindProducer("batching.0", output, properties); - while (template.receive(BINDER_PREFIX + "batching.0") != null) { + while (template.receive(RabbitMessageChannelBinder.DEFAULT_RABBIT_PREFIX + "batching.0") != null) { } Log logger = spy(TestUtils.getPropertyValue(binder, "binder.compressingPostProcessor.logger", Log.class)); @@ -714,12 +712,12 @@ public class RabbitBinderTests extends PartitionCapableBinderTests { public Object receive(boolean expectNull) throws Exception { if (expectNull) { Thread.sleep(50); - return template.receiveAndConvert(BINDER_PREFIX + queue); + return template.receiveAndConvert(RabbitMessageChannelBinder.DEFAULT_RABBIT_PREFIX + queue); } Object bar = null; int n = 0; while (n++ < 100 && bar == null) { - bar = template.receiveAndConvert(BINDER_PREFIX + queue); + bar = template.receiveAndConvert(RabbitMessageChannelBinder.DEFAULT_RABBIT_PREFIX + queue); Thread.sleep(100); } assertTrue("Message did not arrive in RabbitMQ", n < 100); diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/Binder.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/Binder.java index 66d2ba50f..c70eab5a9 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/Binder.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/Binder.java @@ -15,13 +15,10 @@ package org.springframework.cloud.stream.binder; import java.util.Properties; -import org.springframework.messaging.MessageChannel; - /** * A strategy interface used to bind a module interface to a logical name. The name is intended to identify a * logical consumer or producer of messages. This may be a queue, a channel adapter, another message channel, a Spring * bean, etc. - * * @author Mark Fisher * @author David Turanski * @author Gary Russell @@ -33,7 +30,6 @@ public interface Binder { /** * Bind a message consumer on a p2p channel - * * @param name the logical identity of the message source * @param inboundBindTarget the module interface to be bound as a point to point consumer * @param properties arbitrary String key/value pairs that will be used in the binding @@ -43,7 +39,6 @@ public interface Binder { /** * Bind a message consumer on a pub/sub channel - * * @param name the logical identity of the message source * @param inboundBindTarget the module interface to be bound as a pub/sub consumer * @param properties arbitrary String key/value pairs that will be used in the binding @@ -52,7 +47,6 @@ public interface Binder { /** * Bind a message producer on a p2p channel. - * * @param name the logical identity of the message target * @param outboundBindTarget the module interface bound as a producer * @param properties arbitrary String key/value pairs that will be used in the binding @@ -62,7 +56,6 @@ public interface Binder { /** * Bind a message producer on a pub/sub channel. - * * @param name the logical identity of the message target * @param outboundBindTarget the module interface bound as a producer * @param properties arbitrary String key/value pairs that will be used in the binding @@ -71,21 +64,18 @@ public interface Binder { /** * Unbind inbound module components and stop any active components that use the channel. - * * @param name the channel name */ void unbindConsumers(String name); /** - * Unbind an outbound module components and stop any active components that use the channel. - * + * Unbind outbound module components and stop any active components that use the channel. * @param name the channel name */ void unbindProducers(String name); /** * Unbind a specific p2p or pub/sub message consumer - * * @param name The logical identify of a message source * @param inboundBindTarget The module interface bound as a consumer */ @@ -93,7 +83,6 @@ public interface Binder { /** * Unbind a specific p2p or pub/sub message producer - * * @param name the logical identity of the message target * @param outboundBindTarget the channel bound as a producer */ @@ -101,7 +90,6 @@ public interface Binder { /** * Bind a producer that expects async replies. To unbind, invoke unbindProducer() and unbindConsumer(). - * * @param name The name of the requestor. * @param requests The interface used to send requests. * @param replies The interface used to receive replies. @@ -112,7 +100,6 @@ public interface Binder { /** * Bind a consumer that handles requests from a requestor and asynchronously sends replies. To unbind, invoke * unbindProducer() and unbindConsumer(). - * * @param name The name of the requestor for which this replier will handle requests. * @param requests The interface used to send requests. * @param replies The interface used to receive replies. @@ -121,7 +108,7 @@ public interface Binder { void bindReplier(String name, T requests, T replies, Properties properties); /** - * Create a object and bind a producer dynamically, creating the infrastructure + * Create an object and bind a producer dynamically, creating the infrastructure * required by the binder technology. * @param name The name of the "queue:" channel. * @param properties arbitrary String key/value pairs that will be used in the binding. diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/BinderHeaders.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/BinderHeaders.java index bd7373dc1..503bc4c5f 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/BinderHeaders.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/BinderHeaders.java @@ -22,7 +22,6 @@ import org.springframework.messaging.MessageHeaders; /** * Spring Integration message headers for XD. - * * @author Gary Russell * @author David Turanski */ @@ -47,13 +46,13 @@ public final class BinderHeaders { * that have no inherent header support (by embedding the headers in the payload). */ public static final String[] STANDARD_HEADERS = new String[] { - IntegrationMessageHeaderAccessor.CORRELATION_ID, - IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, - IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, + IntegrationMessageHeaderAccessor.CORRELATION_ID, + IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, + IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, BINDER_REPLY_CHANNEL, - MessageHeaders.CONTENT_TYPE, + MessageHeaders.CONTENT_TYPE, BINDER_ORIGINAL_CONTENT_TYPE, - REPLY_TO, + REPLY_TO, BINDER_HISTORY }; diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/BinderCleaner.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/BindingCleaner.java similarity index 97% rename from spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/BinderCleaner.java rename to spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/BindingCleaner.java index 925b1f63d..ad9eb248d 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/BinderCleaner.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/BindingCleaner.java @@ -25,7 +25,7 @@ import java.util.Map; * @author Gary Russell * @since 1.2 */ -public interface BinderCleaner { +public interface BindingCleaner { /** * Clean up all resources for the supplied stream/job. diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupport.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupport.java index e7abaae1f..0cf3f85e2 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupport.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupport.java @@ -828,7 +828,7 @@ public abstract class MessageChannelBinderSupport } /** - * Attempt to create a direct binding (avoiding the binder) if the consumer is local. Named channel producers are not + * Attempt to create a direct binding (avoiding the broker) if the consumer is local. Named channel producers are not * bound directly. * @param name The name. * @param moduleOutputChannel The channel to bind. @@ -884,8 +884,8 @@ public abstract class MessageChannelBinderSupport } /** - * Attempt to bind a producer directly (avoiding the binder) if there is already a local producer. PubSub producers - * cannot be bound directly. Create the direct binding, then unbind the existing binder producer. + * Attempt to bind a producer directly (avoiding the broker) if there is already a local producer. PubSub producers + * cannot be bound directly. Create the direct binding, then unbind the existing producer. * @param name The name. * @param consumerChannel The channel to bind the producer to. */ diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BrokerBinderTests.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BrokerBinderTests.java index 503c8fdaf..76248e028 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BrokerBinderTests.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BrokerBinderTests.java @@ -74,7 +74,7 @@ public abstract class BrokerBinderTests extends assertEquals(2, count.get()); assertNull(spyOn("direct.0").receive(true)); - // Remove direct binding and bind producer to the binder + // Remove direct binding and bind the producer binder.unbindConsumers("direct.0"); binderBindUnbindLatency(); diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/test/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupportTests.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/test/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupportTests.java index 19748896e..8ab651ac7 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/test/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupportTests.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/test/java/org/springframework/cloud/stream/binder/MessageChannelBinderSupportTests.java @@ -23,6 +23,7 @@ import java.util.Properties; import org.junit.Before; import org.junit.Test; +import org.springframework.cloud.stream.binder.MessageChannelBinderSupport.JavaClassMimeTypeConversion; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; @@ -31,7 +32,6 @@ import org.springframework.messaging.converter.ContentTypeResolver; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.MimeType; import org.springframework.util.MimeTypeUtils; -import org.springframework.cloud.stream.binder.MessageChannelBinderSupport.JavaClassMimeTypeConversion; import org.springframework.xd.dirt.integration.bus.serializer.kryo.PojoCodec; import org.springframework.xd.tuple.DefaultTuple; import org.springframework.xd.tuple.Tuple; @@ -62,8 +62,7 @@ public class MessageChannelBinderSupportTests { public void testBytesPassThru() { byte[] payload = "foo".getBytes(); Message message = MessageBuilder.withPayload(payload).build(); - MessageValues converted = binder.serializePayloadIfNecessary(message - ); + MessageValues converted = binder.serializePayloadIfNecessary(message); assertSame(payload, converted.getPayload()); Message convertedMessage = converted.toMessage(); assertSame(payload, convertedMessage.getPayload()); @@ -81,8 +80,7 @@ public class MessageChannelBinderSupportTests { Message message = MessageBuilder.withPayload(payload) .setHeader(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.APPLICATION_OCTET_STREAM_VALUE) .build(); - MessageValues messageValues = binder.serializePayloadIfNecessary(message - ); + MessageValues messageValues = binder.serializePayloadIfNecessary(message); Message converted = messageValues.toMessage(); assertSame(payload, converted.getPayload()); assertEquals(MimeTypeUtils.APPLICATION_OCTET_STREAM, @@ -130,8 +128,7 @@ public class MessageChannelBinderSupportTests { @Test public void testPojoSerialization() { MessageValues convertedValues = binder.serializePayloadIfNecessary( - new GenericMessage(new Foo("bar")) - ); + new GenericMessage(new Foo("bar"))); Message converted = convertedValues.toMessage(); MimeType mimeType = contentTypeResolver.resolve(converted.getHeaders()); assertEquals("application", mimeType.getType()); @@ -146,8 +143,7 @@ public class MessageChannelBinderSupportTests { @Test public void testPojoWithXJavaObjectMimeTypeNoType() { MessageValues convertedValues = binder.serializePayloadIfNecessary( - new GenericMessage(new Foo("bar")) - ); + new GenericMessage(new Foo("bar"))); Message converted = convertedValues.toMessage(); MimeType mimeType = contentTypeResolver.resolve(converted.getHeaders()); assertEquals("application", mimeType.getType()); @@ -162,8 +158,7 @@ public class MessageChannelBinderSupportTests { @Test public void testPojoWithXJavaObjectMimeTypeExplicitType() { MessageValues convertedValues = binder.serializePayloadIfNecessary( - new GenericMessage(new Foo("bar")) - ); + new GenericMessage(new Foo("bar"))); Message converted = convertedValues.toMessage(); MimeType mimeType = contentTypeResolver.resolve(converted.getHeaders()); assertEquals("application", mimeType.getType()); @@ -178,8 +173,7 @@ public class MessageChannelBinderSupportTests { @Test public void testTupleSerialization() { Tuple payload = TupleBuilder.tuple().of("foo", "bar"); - MessageValues convertedValues = binder.serializePayloadIfNecessary(new GenericMessage(payload) - ); + MessageValues convertedValues = binder.serializePayloadIfNecessary(new GenericMessage(payload)); Message converted = convertedValues.toMessage(); MimeType mimeType = contentTypeResolver.resolve(converted.getHeaders()); assertEquals("application", mimeType.getType()); diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelBindingAdapter.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelBindingAdapter.java index 4523d36ea..e2eef8a07 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelBindingAdapter.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/adapter/ChannelBindingAdapter.java @@ -53,7 +53,7 @@ import org.springframework.util.StringUtils; import org.springframework.cloud.stream.binder.Binder; /** - * Binds input/output channels to the binder. + * Binds input/output channels. * * @author Mark Fisher * @author Dave Syer diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfiguration.java index 8c6ef4222..7c7aebde5 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfiguration.java @@ -65,7 +65,7 @@ public class ChannelBindingAdapterConfiguration { private Binder binder; @Bean - public ChannelBindingAdapter binderAdapter() { + public ChannelBindingAdapter bindingAdapter() { ChannelBindingAdapter adapter = new ChannelBindingAdapter(this.module, this.binder); adapter.setOutputChannels(getOutputChannels()); adapter.setInputChannels(getInputChannels()); @@ -81,7 +81,7 @@ public class ChannelBindingAdapterConfiguration { } public void refresh() { - ChannelBindingAdapter adapter = binderAdapter(); + ChannelBindingAdapter adapter = bindingAdapter(); adapter.setOutputChannels(getOutputChannels()); adapter.setInputChannels(getInputChannels()); }