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

GH-654 Initial support for non-SpEL based routing mechanism

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-02-22 18:57:07 +01:00
parent c01b25f2fa
commit 29115aeb64
6 changed files with 171 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/FunctionRSocketMessageHandler.java
View File

@@ -32,6 +32,7 @@ import reactor.core.publisher.Mono;
import org.springframework.cloud.function.context.FunctionCatalog;
import org.springframework.cloud.function.context.FunctionProperties;
import org.springframework.cloud.function.context.MessageRoutingCallback;
import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
import org.springframework.cloud.function.context.config.RoutingFunction;
import org.springframework.core.MethodParameter;
@@ -59,6 +60,7 @@ import org.springframework.messaging.rsocket.annotation.support.RSocketFrameType
import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
import org.springframework.messaging.rsocket.annotation.support.RSocketPayloadReturnValueHandler;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.util.CollectionUtils;
import org.springframework.util.MimeTypeUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.RouteMatcher;
@@ -179,7 +181,10 @@ class FunctionRSocketMessageHandler extends RSocketMessageHandler {
private String discoverAndInjectDestinationHeader(Message<?> message) {
String destination;
if (StringUtils.hasText(this.functionProperties.getRoutingExpression())) {
if (!CollectionUtils.isEmpty(this.getApplicationContext().getBeansOfType(MessageRoutingCallback.class))) {
destination = RoutingFunction.FUNCTION_NAME;
}
else if (StringUtils.hasText(this.functionProperties.getRoutingExpression())) {
destination = RoutingFunction.FUNCTION_NAME;
this.updateMessageHeaders(message, destination);
}

3
spring-cloud-function-rsocket/src/main/java/org/springframework/cloud/function/rsocket/FunctionRSocketUtils.java
View File

@@ -78,7 +78,8 @@ final class FunctionRSocketUtils {
if (functionCatalog.lookup(name) == null) { // this means RSocket
String[] functionToRSocketDefinition = StringUtils.delimitedListToStringArray(name, ">");
if (functionToRSocketDefinition.length == 1) {
throw new IllegalArgumentException("Function definition '" + name + "' does not exist in Function Catalog");
//throw new IllegalArgumentException("Function definition '" + name + "' does not exist in Function Catalog");
return;
}
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Registering RSocket forwarder for '" + name + "' function.");