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

Simple refactor: function is always null, see l121

Browse Source 
Resolves #934
This commit is contained in:
Neokeld
2022-10-10 16:22:17 +02:00
committed by Oleg Zhurakousky
parent b89952c2cb
commit 47f3964435
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java
View File

@@ -160,18 +160,16 @@ public class RoutingFunction implements Function<Object, Object> {
} }
} }
else if (input instanceof Publisher) { else if (input instanceof Publisher) {
if (function == null) { if (StringUtils.hasText(functionProperties.getDefinition())) {
if (StringUtils.hasText(functionProperties.getDefinition())) { function = functionFromDefinition(functionProperties.getDefinition());
function = functionFromDefinition(functionProperties.getDefinition()); }
} else if (StringUtils.hasText(functionProperties.getRoutingExpression())) {
else if (StringUtils.hasText(functionProperties.getRoutingExpression())) { function = this.functionFromExpression(functionProperties.getRoutingExpression(), input);
function = this.functionFromExpression(functionProperties.getRoutingExpression(), input); }
} else {
else { return input instanceof Mono
return input instanceof Mono
? Mono.from((Publisher<?>) input).map(v -> route(v, originalInputIsPublisher)) ? Mono.from((Publisher<?>) input).map(v -> route(v, originalInputIsPublisher))
: Flux.from((Publisher<?>) input).map(v -> route(v, originalInputIsPublisher)); : Flux.from((Publisher<?>) input).map(v -> route(v, originalInputIsPublisher));
}
} }
} }
else { else {