("Hello".getBytes()));
Message message = target.receive();
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/integration/SpringIntegrationChannelBinder.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/TestChannelBinder.java
similarity index 93%
rename from spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/integration/SpringIntegrationChannelBinder.java
rename to spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/TestChannelBinder.java
index a5d1c210f..6886b7be0 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/integration/SpringIntegrationChannelBinder.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/TestChannelBinder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.integration;
+package org.springframework.cloud.stream.binder.test;
import java.util.Collections;
import java.util.function.Consumer;
@@ -25,8 +25,8 @@ import org.springframework.cloud.stream.binder.AbstractMessageChannelBinder;
import org.springframework.cloud.stream.binder.Binder;
import org.springframework.cloud.stream.binder.ConsumerProperties;
import org.springframework.cloud.stream.binder.ProducerProperties;
-import org.springframework.cloud.stream.binder.integration.SpringIntegrationProvisioner.SpringIntegrationConsumerDestination;
-import org.springframework.cloud.stream.binder.integration.SpringIntegrationProvisioner.SpringIntegrationProducerDestination;
+import org.springframework.cloud.stream.binder.test.TestChannelBinderProvisioner.SpringIntegrationConsumerDestination;
+import org.springframework.cloud.stream.binder.test.TestChannelBinderProvisioner.SpringIntegrationProducerDestination;
import org.springframework.cloud.stream.provisioning.ConsumerDestination;
import org.springframework.cloud.stream.provisioning.ProducerDestination;
import org.springframework.core.AttributeAccessor;
@@ -61,12 +61,12 @@ import org.springframework.util.StringUtils;
*
* The destination classes are
*
- * - {@link SourceDestination}
- * - {@link TargetDestination}
+ * - {@link InputDestination}
+ * - {@link OutputDestination}
*
* Simply autowire them in your your application and send/receive messages.
*
- * You must also add {@link SpringIntegrationBinderConfiguration} to your configuration.
+ * You must also add {@link TestChannelBinderConfiguration} to your configuration.
* Below is the example using Spring Boot test.
*
*
@@ -101,8 +101,8 @@ import org.springframework.util.StringUtils;
* @author Gary Russell
*
*/
-public class SpringIntegrationChannelBinder extends AbstractMessageChannelBinder {
+public class TestChannelBinder extends AbstractMessageChannelBinder {
@Autowired
private BeanFactory beanFactory;
@@ -112,7 +112,7 @@ public class SpringIntegrationChannelBinder extends AbstractMessageChannelBinder
private MessageSource messageSourceDelegate = () -> new GenericMessage<>("polled data",
Collections.singletonMap(MessageHeaders.CONTENT_TYPE, "text/plain"));
- public SpringIntegrationChannelBinder(SpringIntegrationProvisioner provisioningProvider) {
+ public TestChannelBinder(TestChannelBinderProvisioner provisioningProvider) {
super(new String[] {}, provisioningProvider);
}
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/integration/SpringIntegrationBinderConfiguration.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/TestChannelBinderConfiguration.java
similarity index 79%
rename from spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/integration/SpringIntegrationBinderConfiguration.java
rename to spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/TestChannelBinderConfiguration.java
index 98e24b638..82e29edaa 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/integration/SpringIntegrationBinderConfiguration.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/TestChannelBinderConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.integration;
+package org.springframework.cloud.stream.binder.test;
import java.util.ArrayList;
import java.util.Arrays;
@@ -39,16 +39,16 @@ import org.springframework.integration.config.EnableIntegration;
/**
* {@link Binder} configuration backed by Spring Integration.
*
- * Please see {@link SpringIntegrationChannelBinder} for more details.
+ * Please see {@link TestChannelBinder} for more details.
*
* @author Oleg Zhurakousky
*
- * @see SpringIntegrationChannelBinder
+ * @see TestChannelBinder
*/
@Configuration
@ConditionalOnMissingBean(Binder.class)
@EnableIntegration
-public class SpringIntegrationBinderConfiguration {
+public class TestChannelBinderConfiguration {
public static final String NAME = "integration";
@@ -61,7 +61,7 @@ public class SpringIntegrationBinderConfiguration {
*/
public static Class[] getCompleteConfiguration(Class... additionalConfigurationClasses) {
List> configClasses = new ArrayList<>();
- configClasses.add(SpringIntegrationBinderConfiguration.class);
+ configClasses.add(TestChannelBinderConfiguration.class);
Import annotation = AnnotationUtils.getAnnotation(EnableBinding.class, Import.class);
Map annotationAttributes = AnnotationUtils.getAnnotationAttributes(annotation);
configClasses.addAll(Arrays.asList((Class[])annotationAttributes.get("value")));
@@ -73,30 +73,30 @@ public class SpringIntegrationBinderConfiguration {
@Bean
public BinderTypeRegistry binderTypeRegistry() {
- BinderType binderType = new BinderType(NAME, new Class[] {SpringIntegrationBinderConfiguration.class});
+ BinderType binderType = new BinderType(NAME, new Class[] {TestChannelBinderConfiguration.class});
BinderTypeRegistry btr = new DefaultBinderTypeRegistry(Collections.singletonMap(NAME, binderType));
return btr;
}
@Bean
- public SourceDestination sourceDestination() {
- return new SourceDestination();
+ public InputDestination sourceDestination() {
+ return new InputDestination();
}
@Bean
- public TargetDestination targetDestination() {
- return new TargetDestination();
+ public OutputDestination targetDestination() {
+ return new OutputDestination();
}
@SuppressWarnings("unchecked")
@Bean
- public Binder springIntegrationChannelBinder(SpringIntegrationProvisioner provisioner) {
- return (Binder) new SpringIntegrationChannelBinder(provisioner);
+ public Binder springIntegrationChannelBinder(TestChannelBinderProvisioner provisioner) {
+ return (Binder) new TestChannelBinder(provisioner);
}
@Bean
- public SpringIntegrationProvisioner springIntegrationProvisioner() {
- return new SpringIntegrationProvisioner();
+ public TestChannelBinderProvisioner springIntegrationProvisioner() {
+ return new TestChannelBinderProvisioner();
}
}
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/integration/SpringIntegrationProvisioner.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/TestChannelBinderProvisioner.java
similarity index 92%
rename from spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/integration/SpringIntegrationProvisioner.java
rename to spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/TestChannelBinderProvisioner.java
index 35d111fd2..5fc05c112 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/integration/SpringIntegrationProvisioner.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/TestChannelBinderProvisioner.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.integration;
+package org.springframework.cloud.stream.binder.test;
import java.util.HashMap;
import java.util.Map;
@@ -34,7 +34,7 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.SubscribableChannel;
/**
- * {@link ProvisioningProvider} to support {@link SpringIntegrationChannelBinder}. It
+ * {@link ProvisioningProvider} to support {@link TestChannelBinder}. It
* exists primarily to support {@link AbstractMessageChannel} semantics for creating
* {@link ConsumerDestination} and {@link ProducerDestination}, to interact with this
* {@link Binder}.
@@ -42,21 +42,21 @@ import org.springframework.messaging.SubscribableChannel;
* @author Oleg Zhurakousky
*
*/
-public class SpringIntegrationProvisioner implements ProvisioningProvider {
+public class TestChannelBinderProvisioner implements ProvisioningProvider {
private final Map provisionedDestinations = new HashMap<>();
@Autowired
- private SourceDestination source;
+ private InputDestination source;
@Autowired
- private TargetDestination target;
+ private OutputDestination target;
/**
* Will provision producer destination as an SI {@link PublishSubscribeChannel}.
*
* This provides convenience of registering additional subscriber (handler in the test method)
- * along side of being able to call {@link TargetDestination#receive()} to get a
+ * along side of being able to call {@link OutputDestination#receive()} to get a
* {@link Message} for additional assertions.
*/
@Override
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/package-info.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/package-info.java
new file mode 100644
index 000000000..b4bf3526c
--- /dev/null
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/test/package-info.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Provides test channel binder and supporting classes
+ *
+ * THe test binder is backed by Spring Integration framework and is not intended
+ * for uses outside of local testing.
+ *
+ * The test binder implementation - {@link org.springframework.cloud.stream.binder.test.TestChannelBinder}
+ * The test binder configuration - {@link org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration}
+ * The example that shows how to use it - {@link org.springframework.cloud.stream.binder.test.SampleStreamApp}
+ *
+ */
+package org.springframework.cloud.stream.binder.test;
diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingServiceConfigurationTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingServiceConfigurationTests.java
index 986418eca..cd6cee7a0 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingServiceConfigurationTests.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingServiceConfigurationTests.java
@@ -22,7 +22,7 @@ import org.junit.Test;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.stream.binder.integration.SpringIntegrationBinderConfiguration;
+import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -40,7 +40,7 @@ public class BindingServiceConfigurationTests {
@Test
public void valdateImportedConfiguartionHandlerPostProcessing() {
- ApplicationContext context = new SpringApplicationBuilder(SpringIntegrationBinderConfiguration.getCompleteConfiguration(RootConfiguration.class)).web(WebApplicationType.NONE).run();
+ ApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration.getCompleteConfiguration(RootConfiguration.class)).web(WebApplicationType.NONE).run();
Map beansOfType = context.getBeansOfType(AbstractReplyProducingMessageHandler.class);
for (AbstractReplyProducingMessageHandler handler : beansOfType.values()) {
assertTrue(handler.getNotPropagatedHeaders().contains("contentType"));