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

Use unique function if there is only one and name not provided

Browse Source 
If the user doesn't ask for a specific function, but there is only
one possible choice, we can just use that.
This commit is contained in:
Dave Syer
2017-11-24 12:41:10 +09:00
parent 8459fb4e30
commit 1ee517ab01
2 changed files with 78 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/ContextFunctionCatalogAutoConfiguration.java
View File

@@ -245,8 +245,12 @@ public class ContextFunctionCatalogAutoConfiguration {
return lookup.get(name);
}
String[] stages = StringUtils.tokenizeToStringArray(name, ",");
Object function = lookup(stages[0],
!hasInput || stages.length == 1 ? lookup : this.functions);
Map<String, Object> source = !hasInput || stages.length <= 1 ? lookup
: this.functions;
if (stages.length == 0 && source.size() == 1) {
stages = new String[] { source.keySet().iterator().next() };
}
Object function = lookup(stages[0], source);
if (function == null) {
return null;
}
@@ -494,12 +498,13 @@ public class ContextFunctionCatalogAutoConfiguration {
int index = paramType.isOutput() ? 1 : 0;
if (source instanceof StandardMethodMetadata) {
// Standard @Bean metadata
Type beanType = ((StandardMethodMetadata) source)
.getIntrospectedMethod().getGenericReturnType();
Type beanType = ((StandardMethodMetadata) source).getIntrospectedMethod()
.getGenericReturnType();
if (beanType instanceof ParameterizedType) {
ParameterizedType type = (ParameterizedType) beanType;
param = extractType(type, paramType, index);
} else {
ParameterizedType type = (ParameterizedType) beanType;
param = extractType(type, paramType, index);
}
else {
param = findTypeFromBeanClass((Class<?>) beanType, paramType);
}
}