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

GH-1139 Fix function composition with non-existing functions

Browse Source 
Resolves #1139
This commit is contained in:
Oleg Zhurakousky
2024-04-29 16:56:45 +02:00
parent 26e507fde8
commit 59fe298b67
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java
View File

@@ -144,11 +144,12 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp
Set<String> functionRegistratioinNames = super.getNames(null);
String[] functionNames = StringUtils.delimitedListToStringArray(functionDefinition.replaceAll(",", "|").trim(), "|");
for (String functionName : functionNames) {
if (functionRegistratioinNames.contains(functionName) && logger.isDebugEnabled()) {
logger.debug("Skipping function '" + functionName + "' since it is already present");
if (functionRegistratioinNames.contains(functionName)) {
if (logger.isDebugEnabled()) {
logger.debug("Skipping function '" + functionName + "' since it is already present");
}
}
else {
Object functionCandidate = this.discoverFunctionInBeanFactory(functionName);
if (functionCandidate != null) {
Type functionType = null;

25
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
View File

@@ -29,6 +29,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -115,6 +116,30 @@ public class BeanFactoryAwareFunctionRegistryTests {
assertThat(result).isEqualTo("{}");
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Test
public void testCompositionWithNonExistingFunction() throws Exception {
FunctionCatalog catalog = this.configureCatalog(CompositionWithNullReturnInBetween.class);
for (int i = 0; i < 10; i++) {
catalog.lookup("echo1|any");
}
Field functionRegistrationsField = ReflectionUtils.findField(catalog.getClass(), "functionRegistrations");
functionRegistrationsField.setAccessible(true);
Set<FunctionRegistration> functionRegistrations = (Set) functionRegistrationsField.get(catalog);
assertThat(functionRegistrations.size()).isEqualTo(1);
FunctionRegistration registration = functionRegistrations.iterator().next();
assertThat(registration.getNames().size()).isEqualTo(1);
assertThat(registration.getNames().iterator().next()).isEqualTo("echo1");
for (int i = 0; i < 10; i++) {
catalog.lookup("echo1|any|foo|bar|bye");
}
assertThat(functionRegistrations.size()).isEqualTo(1);
registration = functionRegistrations.iterator().next();
assertThat(registration.getNames().size()).isEqualTo(1);
assertThat(registration.getNames().iterator().next()).isEqualTo("echo1");
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Test
public void testCompositionWithNullReturnInBetween() {