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

GH-2360 Fix trimmimg in multiple function definition

Browse Source 
remove leftovers from spring.cloud.streamfunction.definition

Resolves #2360
This commit is contained in:
Oleg Zhurakousky
2022-04-22 15:32:28 +02:00
parent 51cdcc7c37
commit c22651a3b0
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1002,6 +1002,7 @@ public class FunctionConfiguration {
List<String> eligibleFunctionDefinitions = new ArrayList<>();
String[] functionDefinitions = streamFunctionProperties.getDefinition().split(";");
for (String functionDefinition : functionDefinitions) {
functionDefinition = functionDefinition.trim();
String[] functionNames = StringUtils.delimitedListToStringArray(functionDefinition.replaceAll(",", "|").trim(), "|");
boolean eligibleDefinition = true;
for (int i = 0; i < functionNames.length && eligibleDefinition; i++) {

2
core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/RoutingFunctionEnvironmentPostProcessor.java
View File

@@ -32,7 +32,7 @@ class RoutingFunctionEnvironmentPostProcessor implements EnvironmentPostProcesso
@Override
public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
String name = environment.getProperty("spring.cloud.stream.function.definition");
String name = environment.getProperty("spring.cloud.function.definition");
if (StringUtils.hasText(name) && (
name.equals(RoutingFunction.FUNCTION_NAME) ||
name.contains(RoutingFunction.FUNCTION_NAME + "|") ||

2
core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
View File

@@ -210,7 +210,7 @@ public class ImplicitFunctionBindingTests {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(NullMessagerConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false", "--spring.cloud.function.definition=func;funcMessage")) {
.run("--spring.jmx.enabled=false", "--spring.cloud.function.definition=func; funcMessage")) {
InputDestination inputDestination = context.getBean(InputDestination.class);
OutputDestination outputDestination = context.getBean(OutputDestination.class);