From 1f43bbce28fc5239235c71f3935f10f4bbe5b92d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 24 Feb 2021 13:31:31 +0100 Subject: [PATCH] GH-654 Remove FunctionProperties injection from MessageRoutingCallbackRSocketTests --- .../cloud/function/context/MessageRoutingCallback.java | 3 +-- .../cloud/function/context/config/RoutingFunction.java | 2 +- .../function/rsocket/MessageRoutingCallbackRSocketTests.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/MessageRoutingCallback.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/MessageRoutingCallback.java index d5229471c..90eda9b8d 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/MessageRoutingCallback.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/MessageRoutingCallback.java @@ -37,8 +37,7 @@ public interface MessageRoutingCallback { * Determines the name of the function definition to route incoming {@link Message}. * * @param message instance of incoming {@link Message} - * @param functionProperties instance of {@link FunctionProperties} * @return the name of the route-to function definition */ - String functionDefinition(Message message, FunctionProperties functionProperties); + String functionDefinition(Message message); } diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java index 422327a8e..e223a7f2d 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/RoutingFunction.java @@ -174,7 +174,7 @@ public class RoutingFunction implements Function { private FunctionInvocationWrapper functionFromCallback(Object input) { if (input instanceof Message) { - String functionDefinition = this.routingCallback.functionDefinition((Message) input, this.functionProperties); + String functionDefinition = this.routingCallback.functionDefinition((Message) input); if (StringUtils.hasText(functionDefinition)) { return this.functionFromDefinition(functionDefinition); } diff --git a/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/MessageRoutingCallbackRSocketTests.java b/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/MessageRoutingCallbackRSocketTests.java index 697c99880..94bcd98cc 100644 --- a/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/MessageRoutingCallbackRSocketTests.java +++ b/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/MessageRoutingCallbackRSocketTests.java @@ -25,7 +25,6 @@ import reactor.test.StepVerifier; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.cloud.function.context.FunctionProperties; import org.springframework.cloud.function.context.MessageRoutingCallback; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; @@ -110,7 +109,7 @@ public class MessageRoutingCallbackRSocketTests { public MessageRoutingCallback customRouter() { return new MessageRoutingCallback() { @Override - public String functionDefinition(Message message, FunctionProperties functionProperties) { + public String functionDefinition(Message message) { return (String) message.getHeaders().get("func_name"); } };