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

upgraded to lates s-c-function and s-c-build

Browse Source 
cleaned javadoc errors in some modules
This commit is contained in:
Oleg Zhurakousky
2020-02-12 19:07:27 +01:00
parent f742dca2a7
commit 4dff694beb
8 changed files with 7 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.2.1.RELEASE</version>
<version>2.2.2.RELEASE</version>
<relativePath />
</parent>
<scm>
@@ -23,9 +23,9 @@
</scm>
<properties>
<java.version>1.8</java.version>
<reactor.version>Dysprosium-SR1</reactor.version>
<reactor.version>Dysprosium-SR4</reactor.version>
<objenesis.version>2.1</objenesis.version>
<spring-cloud-function.version>3.0.2.BUILD-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-function.version>3.0.2.RELEASE</spring-cloud-function.version>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
<maven-checkstyle-plugin.includeTestSourceDirectory>true</maven-checkstyle-plugin.includeTestSourceDirectory>

11
spring-cloud-stream-binder-test/pom.xml
View File

@@ -51,15 +51,4 @@
<classifier>test-binder</classifier>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

12
spring-cloud-stream-integration-tests/pom.xml
View File

@@ -47,16 +47,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

11
spring-cloud-stream-test-support-internal/pom.xml
View File

@@ -27,15 +27,4 @@
<artifactId>spring-boot-starter-logging</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

11
spring-cloud-stream-test-support/pom.xml
View File

@@ -34,15 +34,4 @@
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

6
spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/binder/TestSupportBinderAutoConfiguration.java
View File

@@ -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
*/

23
spring-cloud-stream-test-support/src/main/java/org/springframework/cloud/stream/test/matcher/MessageQueueMatcher.java
View File

@@ -33,29 +33,6 @@ import org.springframework.messaging.Message;
/**
* A Hamcrest Matcher meant to be used in conjunction with {@link TestSupportBinder}.
*
* <p>
* Expected usage is of the form (with appropriate static imports):
*
* <pre>
* 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));
* }
*
* }
* </pre>
* </p>
*
* @param <T> return type
* @author Eric Bottard

4
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
View File

@@ -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);