diff --git a/pom.xml b/pom.xml index 83e2cbd4d..571d7469d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-build - 2.2.1.RELEASE + 2.2.2.RELEASE @@ -23,9 +23,9 @@ 1.8 - Dysprosium-SR1 + Dysprosium-SR4 2.1 - 3.0.2.BUILD-SNAPSHOT + 3.0.2.RELEASE true true true diff --git a/spring-cloud-stream-binder-test/pom.xml b/spring-cloud-stream-binder-test/pom.xml index 776c4a0f2..477442fda 100644 --- a/spring-cloud-stream-binder-test/pom.xml +++ b/spring-cloud-stream-binder-test/pom.xml @@ -51,15 +51,4 @@ test-binder - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - diff --git a/spring-cloud-stream-integration-tests/pom.xml b/spring-cloud-stream-integration-tests/pom.xml index 1a0ddc7ab..3e3b08e56 100644 --- a/spring-cloud-stream-integration-tests/pom.xml +++ b/spring-cloud-stream-integration-tests/pom.xml @@ -47,16 +47,4 @@ test - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - - diff --git a/spring-cloud-stream-test-support-internal/pom.xml b/spring-cloud-stream-test-support-internal/pom.xml index 994d9b78f..9046beba8 100644 --- a/spring-cloud-stream-test-support-internal/pom.xml +++ b/spring-cloud-stream-test-support-internal/pom.xml @@ -27,15 +27,4 @@ spring-boot-starter-logging - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - diff --git a/spring-cloud-stream-test-support/pom.xml b/spring-cloud-stream-test-support/pom.xml index 4cba68d3a..e357cb801 100644 --- a/spring-cloud-stream-test-support/pom.xml +++ b/spring-cloud-stream-test-support/pom.xml @@ -34,15 +34,4 @@ jackson-databind - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - diff --git a/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/binder/TestSupportBinderAutoConfiguration.java b/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/binder/TestSupportBinderAutoConfiguration.java index a031fb5cc..ead7b84c0 100644 --- a/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/binder/TestSupportBinderAutoConfiguration.java +++ b/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/binder/TestSupportBinderAutoConfiguration.java @@ -30,15 +30,13 @@ import org.springframework.core.Ordered; import org.springframework.messaging.MessageChannel; /** - * Installs the {@link TestSupportBinder} and exposes - * {@link TestSupportBinder.MessageCollectorImpl} to be injected in tests. + * Installs the TestSupportBinder} and exposes + * MessageCollectorImplto be injected in tests. * * Note that this auto-configuration has higher priority than regular binder * configuration, so adding this on the classpath in test scope is sufficient to have * support kick in and replace all binders with the test binder. * - * The test binder instance is supplied by the {@link TestSupportBinderConfiguration}. - * * @author Eric Bottard * @author Marius Bogoevici */ diff --git a/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/matcher/MessageQueueMatcher.java b/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/matcher/MessageQueueMatcher.java index ab9fba30a..36b54cc20 100644 --- a/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/matcher/MessageQueueMatcher.java +++ b/spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/matcher/MessageQueueMatcher.java @@ -33,29 +33,6 @@ import org.springframework.messaging.Message; /** * A Hamcrest Matcher meant to be used in conjunction with {@link TestSupportBinder}. * - *

- * Expected usage is of the form (with appropriate static imports): - * - * 

- * public class TransformProcessorApplicationTests {
- *
- *    {@literal @}Autowired
- *    {@literal @}Bindings(TransformProcessor.class)
- *    private Processor processor;
- *
- *    {@literal @}Autowired
- *    private MessageCollectorImpl messageCollector;
- *
- *
- *    {@literal @}Test
- *    public void testUsingExpression() {
- *        processor.input().send(new GenericMessage{@literal <}Object>("hello"));
- *        assertThat(messageCollector.forChannel(processor.output()), receivesPayloadThat(is("hellofoo")).within(10));
- *    }
- *
- * }
- *
- *

* * @param return type * @author Eric Bottard diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java index 295e984e3..88c4c9876 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java @@ -315,7 +315,7 @@ public class FunctionConfiguration { @Override public Object apply(Object input) { - if (this.outputMessageEnricher == null) {// to avoid breaking change + if (this.outputMessageEnricher == null) { // to avoid breaking change return this.function.apply(input); } return this.function.apply(input, this.outputMessageEnricher); @@ -323,7 +323,7 @@ public class FunctionConfiguration { @Override public Object get() { - if (this.outputMessageEnricher == null) {// to avoid breaking change + if (this.outputMessageEnricher == null) { // to avoid breaking change return this.function.get(); } return this.function.get(this.outputMessageEnricher);