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

GH-649 Ignire factory bean names during discovery of a function

Browse Source 
Resolves #649
This commit is contained in:
Oleg Zhurakousky
2021-02-15 17:53:12 +01:00
parent 9b62f6e3f8
commit 73bd787c8d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View File

@@ -211,7 +211,8 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
.collect(Collectors.toList()); .collect(Collectors.toList());
if (eligibleFunction.size() == 1 if (eligibleFunction.size() == 1
&& !eligibleFunction.get(0).equals(functionDefinition) && !eligibleFunction.get(0).equals(functionDefinition)
&& !functionDefinition.contains("|")) { && !functionDefinition.contains("|")
&& !eligibleFunction.get(0).startsWith("&")) {
functionDefinition = eligibleFunction.get(0); functionDefinition = eligibleFunction.get(0);
} }
} }

8
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/FunctionWebUtils.java
View File

@@ -70,10 +70,10 @@ public final class FunctionWebUtils {
Map<String, Object> attributes, String path, String[] acceptContentTypes) { Map<String, Object> attributes, String path, String[] acceptContentTypes) {
path = path.startsWith("/") ? path.substring(1) : path; path = path.startsWith("/") ? path.substring(1) : path;
if (method.equals(HttpMethod.GET)) { if (method.equals(HttpMethod.GET)) {
FunctionInvocationWrapper supplier = functionCatalog.lookup(path, acceptContentTypes); FunctionInvocationWrapper function = functionCatalog.lookup(path, acceptContentTypes);
if (supplier != null) { if (function != null && function.isSupplier()) {
attributes.put(WebRequestConstants.SUPPLIER, supplier); attributes.put(WebRequestConstants.SUPPLIER, function);
return supplier; return function;
} }
} }