Commit 2fa75594 authored by Oleg Zhurakousky's avatar Oleg Zhurakousky
Browse files

Fix the implicit composition logic in BeanFactoryAwareFunctionRegistry

parent ab68cb58
Showing with 5 additions and 5 deletions
+5 -5
......@@ -173,7 +173,11 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp
.concat(Stream.of(functionNames), Stream.concat(Stream.of(consumerNames), Stream.of(supplierNames)))
.collect(Collectors.toList());
if (!ObjectUtils.isEmpty(names)) {
if (definition.endsWith("|")) {
Set<String> fNames = this.getNames(null);
definition = this.determinImpliedDefinition(fNames, definition);
}
else if (!ObjectUtils.isEmpty(names)) {
if (names.size() > 1) {
logger.info("Found more then one function beans in BeanFactory: " + names
+ ". If you did not intend to use functions, ignore this message. However, if you did "
......@@ -184,10 +188,6 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp
}
definition = names.get(0);
}
else if (definition.endsWith("|")) {
Set<String> fNames = this.getNames(null);
definition = this.determinImpliedDefinition(fNames, definition);
}
else {
definition = this.discoverDefaultDefinitionFromRegistration();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment