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

Merge pull request #413 from ericbottard/issue_412

Browse Source 
Don't assume function is a bean
This commit is contained in:
Oleg Zhurakousky
2019-10-02 10:15:34 -04:00
committed by GitHub
parent 52f1f04020 32fb70a573
commit 08c194e14f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,21 +219,23 @@ public class BeanFactoryAwareFunctionRegistry
*/ */
List<String> names = Stream List<String> names = Stream
.concat(Stream.of(functionNames), Stream.concat(Stream.of(consumerNames), Stream.of(supplierNames))).collect(Collectors.toList()); .concat(Stream.of(functionNames), Stream.concat(Stream.of(consumerNames), Stream.of(supplierNames))).collect(Collectors.toList());
Object fnObject = null;
if (!ObjectUtils.isEmpty(names)) { if (!ObjectUtils.isEmpty(names)) {
Assert.isTrue(names.size() == 1, "Found more then one function in BeanFactory: " + names Assert.isTrue(names.size() == 1, "Found more then one function in BeanFactory: " + names
+ ". Consider providing 'spring.cloud.function.definition' property."); + ". Consider providing 'spring.cloud.function.definition' property.");
definition = names.get(0); definition = names.get(0);
fnObject = this.applicationContext.getBean(definition);
} }
else { else {
if (this.registrationsByName.size() > 0) { if (this.registrationsByName.size() > 0) {
Assert.isTrue(this.registrationsByName.size() == 1, "Found more then one function in local registry"); Assert.isTrue(this.registrationsByName.size() == 1, "Found more then one function in local registry");
definition = this.registrationsByName.keySet().iterator().next(); definition = this.registrationsByName.keySet().iterator().next();
fnObject = this.registrationsByName.values().iterator().next().getTarget();
} }
} }
if (StringUtils.hasText(definition)) { if (StringUtils.hasText(definition)) {
Type functionType = discoverFunctionType(this.applicationContext.getBean(definition), definition); Type functionType = discoverFunctionType(fnObject, definition);
if (!FunctionTypeUtils.isSupplier(functionType) && !FunctionTypeUtils.isFunction(functionType) && !FunctionTypeUtils.isConsumer(functionType)) { if (!FunctionTypeUtils.isSupplier(functionType) && !FunctionTypeUtils.isFunction(functionType) && !FunctionTypeUtils.isConsumer(functionType)) {
logger.info("Discovered functional instance of bean '" + definition + "' as a default function, however its " logger.info("Discovered functional instance of bean '" + definition + "' as a default function, however its "
+ "function argument types can not be determined. Discarding."); + "function argument types can not be determined. Discarding.");