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

Fix and test bug with generic input or output types

Browse Source 
Without this fix a Function<Foo<Bar>,...> shows as having an
input type of Bar - we need to only take the parameter if the
raw type is Flux.
This commit is contained in:
Dave Syer
2017-05-22 13:27:49 +01:00
parent 6e1f0b9a6e
commit 998ea3ad35
3 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,21 +396,23 @@ public class ContextFunctionCatalogAutoConfiguration {
String.class)));
}
private Class<?> findType(AbstractBeanDefinition definition, ParamType paramType) {
private Class<?> findType(AbstractBeanDefinition definition,
ParamType paramType) {
Object source = definition.getSource();
Type param;
// Start by assuming output -> Function
int index = paramType==ParamType.OUTPUT ? 1 : 0;
int index = paramType == ParamType.OUTPUT ? 1 : 0;
if (source instanceof StandardMethodMetadata) {
ParameterizedType type;
type = (ParameterizedType) ((StandardMethodMetadata) source)
.getIntrospectedMethod().getGenericReturnType();
if (type.getActualTypeArguments().length==1) {
if (type.getActualTypeArguments().length == 1) {
// There's only one
index = 0;
}
Type typeArgumentAtIndex = type.getActualTypeArguments()[index];
if (typeArgumentAtIndex instanceof ParameterizedType) {
if (typeArgumentAtIndex instanceof ParameterizedType && Flux.class
.equals(((ParameterizedType) typeArgumentAtIndex).getRawType())) {
param = ((ParameterizedType) typeArgumentAtIndex)
.getActualTypeArguments()[0];
}
@@ -470,17 +472,18 @@ public class ContextFunctionCatalogAutoConfiguration {
if (!registry.containsBeanDefinition(name)) {
return Object.class;
}
return findType((AbstractBeanDefinition) registry.getBeanDefinition(name), ParamType.INPUT);
return findType((AbstractBeanDefinition) registry.getBeanDefinition(name),
ParamType.INPUT);
}
private Class<?> findOutputType(String name) {
if (name==null || !registry.containsBeanDefinition(name)) {
if (name == null || !registry.containsBeanDefinition(name)) {
return Object.class;
}
BeanDefinition definition = registry.getBeanDefinition(name);
return findType((AbstractBeanDefinition) definition, ParamType.OUTPUT);
}
static enum ParamType {
INPUT, OUTPUT;
}