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

GH-944 Remove deprecations and update documentation for MessageRoutingCallback

Browse Source 
Resolves #944
This commit is contained in:
Oleg Zhurakousky
2022-10-25 16:01:06 +02:00
parent e5302f255d
commit fd65decdb6
5 changed files with 9 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/MessageRoutingCallback.java
View File

@@ -32,17 +32,9 @@ import org.springframework.messaging.Message;
*/
public interface MessageRoutingCallback {
/**
* @deprecated in 3.1 in favor of {@link #routingResult(Message)}
*/
@Deprecated
default String functionDefinition(Message<?> message) {
return null;
}
/**
* Computes and returns the instance of {@link FunctionRoutingResult} which encapsulates,
* at the very minimum, function definition and optionally Message to be used downstream.
* at the very minimum, function definition.
* <br><br>
* Providing such message is primarily an optimization feature. It could be useful for cases
* where routing procedure is complex and results in, let's say, conversion of the payload to
@@ -52,39 +44,7 @@ public interface MessageRoutingCallback {
* @param message input message
* @return instance of {@link FunctionRoutingResult} containing the result of the routing computation
*/
default FunctionRoutingResult routingResult(Message<?> message) {
return new FunctionRoutingResult(functionDefinition(message));
}
/**
* Domain object that represents the result of the {@link MessageRoutingCallback#routingResult(Message)}
* computation. It consists of function definition and optional Message to be used downstream
* (see {@link MessageRoutingCallback#routingResult(Message)} for more details.
*
* @author Oleg Zhurakousky
*
*/
final class FunctionRoutingResult {
private final String functionDefinition;
private final Message<?> message;
FunctionRoutingResult(String functionDefinition, Message<?> message) {
this.functionDefinition = functionDefinition;
this.message = message;
}
public FunctionRoutingResult(String functionDefinition) {
this(functionDefinition, null);
}
public String getFunctionDefinition() {
return functionDefinition;
}
public Message<?> getMessage() {
return message;
}
default String routingResult(Message<?> message) {
return (String) message.getHeaders().get(FunctionProperties.FUNCTION_DEFINITION);
}
}

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

@@ -28,7 +28,6 @@ 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.MessageRoutingCallback.FunctionRoutingResult;
import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
import org.springframework.cloud.function.context.message.MessageUtils;
import org.springframework.context.expression.MapAccessor;
@@ -123,14 +122,9 @@ public class RoutingFunction implements Function<Object, Object> {
if (input instanceof Message) {
Message<?> message = (Message<?>) input;
if (this.routingCallback != null) {
FunctionRoutingResult routingResult = this.routingCallback.routingResult(message);
if (routingResult != null) {
if (StringUtils.hasText(routingResult.getFunctionDefinition())) {
function = this.functionFromDefinition(routingResult.getFunctionDefinition());
}
if (routingResult.getMessage() != null) {
message = routingResult.getMessage();
}
String functionDefinition = this.routingCallback.routingResult(message);
if (StringUtils.hasText(functionDefinition)) {
function = this.functionFromDefinition(functionDefinition);
}
}
if (function == null) {

5
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/MessageRoutingCallbackTests.java
View File

@@ -80,7 +80,7 @@ public class MessageRoutingCallbackTests {
return new MessageRoutingCallback() {
@Override
public FunctionRoutingResult routingResult(Message<?> message) {
public String routingResult(Message<?> message) {
String payload = new String((byte[]) message.getPayload());
MessageBuilder<?> builder;
@@ -95,8 +95,7 @@ public class MessageRoutingCallbackTests {
}
Message<?> m = builder.copyHeaders(message.getHeaders()).build();
createdMessageIds.put(functionDefinition, m.getHeaders().getId());
FunctionRoutingResult functionRoutingResult = new FunctionRoutingResult(functionDefinition, m);
return functionRoutingResult;
return functionDefinition;
}
};
}