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

Fix RoutingFunction initialization based on routing-expression

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-10-28 16:25:31 +01:00
parent 9ec31d8fd7
commit 0a59a60a7f
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
docs/src/main/asciidoc/spring-cloud-stream.adoc
View File

@@ -570,7 +570,8 @@ For example `--spring.cloud.stream.poller.fixed-delay=2000` sets the poller inte
===== Routing with functions
Routing with functions can be achieved by relying on `RoutingFunction` available in Spring Cloud Function 3.0. All you need to do is enable it via
`--spring.cloud.stream.function.routing.enabled=true` application property. Once enabled `RoutingFunction` will be bound to input destination
`--spring.cloud.stream.function.routing.enabled=true` application property or provide `spring.cloud.function.routing-expression` property.
Once enabled `RoutingFunction` will be bound to input destination
receiving all the messages and route them to other functions based on the provided instruction.
Instruction could be provided with individual messages as well as application properties.
@@ -2310,26 +2311,6 @@ Below is the example of the required Maven POM entries which could be easily ret
<scope>test</scope>
<classifier>test-binder</classifier>
</dependency>
. . .
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<configuration>
<includes>
<include>**/integration/*</include>
</includes>
<classifier>test-binder</classifier>
</configuration>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
----
***Remove the dependency for `spring-cloud-stream-test-support`***

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

@@ -649,7 +649,8 @@ public class FunctionConfiguration {
if (StringUtils.hasText(definition)) {
streamFunctionProperties.setDefinition(definition);
}
else if (Boolean.parseBoolean(environment.getProperty("spring.cloud.stream.function.routing.enabled", "false"))) {
else if (Boolean.parseBoolean(environment.getProperty("spring.cloud.stream.function.routing.enabled", "false"))
|| environment.containsProperty("spring.cloud.function.routing-expression")) {
streamFunctionProperties.setDefinition(RoutingFunction.FUNCTION_NAME);
}
else {