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

Fix naming indirection so that input types are correctly located

Browse Source 
Also applies to output types, wrapper types and identifying if
messages can be processed directly.

See gh-81 (the ambiguity is still there, but the indirection bug
is fixed).
This commit is contained in:
Dave Syer
2017-07-11 17:37:45 +01:00
parent 18743fdf17
commit 4b30721d02
2 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,6 +153,7 @@ public class ContextFunctionCatalogAutoConfiguration {
private Set<String> suppliers = new HashSet<>();
private Set<String> functions = new HashSet<>();
private Set<String> consumers = new HashSet<>();
private Map<String, String> beans = new HashMap<>();
private BeanDefinitionRegistry registry;
private ConversionService conversionService;
@@ -178,7 +179,8 @@ public class ContextFunctionCatalogAutoConfiguration {
}
Class<?> type = findInputType(name);
return conversionService.canConvert(String.class, type)
? conversionService.convert(value, type) : value;
? conversionService.convert(value, type)
: value;
}
public Set<FunctionRegistration<?>> merge(
@@ -248,6 +250,9 @@ public class ContextFunctionCatalogAutoConfiguration {
private void wrap(FunctionRegistration<Object> registration, String key) {
Object target = registration.getTarget();
for (String name : registration.getNames()) {
beans.put(name, key);
}
if (target instanceof Supplier) {
registration.target(target((Supplier<?>) target, key));
}
@@ -529,6 +534,9 @@ public class ContextFunctionCatalogAutoConfiguration {
}
private boolean isMessage(String name) {
if (name != null) {
name = beans.get(name);
}
if (name == null || !registry.containsBeanDefinition(name)) {
return false;
}
@@ -542,6 +550,9 @@ public class ContextFunctionCatalogAutoConfiguration {
}
private Class<?> findInputWrapper(String name) {
if (name != null) {
name = beans.get(name);
}
if (name == null || !registry.containsBeanDefinition(name)) {
return Object.class;
}
@@ -551,6 +562,9 @@ public class ContextFunctionCatalogAutoConfiguration {
}
private Class<?> findOutputWrapper(String name) {
if (name != null) {
name = beans.get(name);
}
if (name == null || !registry.containsBeanDefinition(name)) {
return Object.class;
}
@@ -560,6 +574,9 @@ public class ContextFunctionCatalogAutoConfiguration {
}
private Class<?> findInputType(String name) {
if (name != null) {
name = beans.get(name);
}
if (name == null || !registry.containsBeanDefinition(name)) {
return Object.class;
}
@@ -569,6 +586,9 @@ public class ContextFunctionCatalogAutoConfiguration {
}
private Class<?> findOutputType(String name) {
if (name != null) {
name = beans.get(name);
}
if (name == null || !registry.containsBeanDefinition(name)) {
return Object.class;
}