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

Ensure a concrete type with parametrric subtype is detected

Browse Source 
If user defines their own @Beans from conrete types that implement
Function<...> then their type signature is detectable from the
class.
This commit is contained in:
Dave Syer
2017-11-20 15:34:06 +00:00
parent 7bf7b8b9c0
commit 8459fb4e30
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -494,9 +494,14 @@ public class ContextFunctionCatalogAutoConfiguration {
int index = paramType.isOutput() ? 1 : 0; int index = paramType.isOutput() ? 1 : 0;
if (source instanceof StandardMethodMetadata) { if (source instanceof StandardMethodMetadata) {
// Standard @Bean metadata // Standard @Bean metadata
ParameterizedType type = (ParameterizedType) ((StandardMethodMetadata) source) Type beanType = ((StandardMethodMetadata) source)
.getIntrospectedMethod().getGenericReturnType(); .getIntrospectedMethod().getGenericReturnType();
if (beanType instanceof ParameterizedType) {
ParameterizedType type = (ParameterizedType) beanType;
param = extractType(type, paramType, index); param = extractType(type, paramType, index);
} else {
param = findTypeFromBeanClass((Class<?>) beanType, paramType);
}
} }
else if (source instanceof MethodMetadataReadingVisitor) { else if (source instanceof MethodMetadataReadingVisitor) {
// A component scan with @Beans // A component scan with @Beans

20
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/ContextFunctionCatalogAutoConfigurationTests.java
View File

@@ -211,6 +211,17 @@ public class ContextFunctionCatalogAutoConfigurationTests {
.isAssignableFrom(Integer.class); .isAssignableFrom(Integer.class);
} }
@Test
public void nonParametericTypeFunction() {
create(NonParametricTypeSingletonConfiguration.class);
assertThat(context.getBean("function")).isInstanceOf(Function.class);
assertThat(catalog.lookupFunction("function")).isInstanceOf(Function.class);
assertThat(inspector.getInputType(catalog.lookupFunction("function")))
.isAssignableFrom(Integer.class);
assertThat(inspector.getInputWrapper(catalog.lookupFunction("function")))
.isAssignableFrom(Integer.class);
}
@Test @Test
public void componentScanBeanFunction() { public void componentScanBeanFunction() {
create(ComponentScanBeanConfiguration.class); create(ComponentScanBeanConfiguration.class);
@@ -487,6 +498,15 @@ public class ContextFunctionCatalogAutoConfigurationTests {
} }
} }
@EnableAutoConfiguration
@Configuration
protected static class NonParametricTypeSingletonConfiguration {
@Bean
public SingletonFunction function() {
return new SingletonFunction();
}
}
protected static class SingletonFunction implements Function<Integer, String> { protected static class SingletonFunction implements Function<Integer, String> {
@Override @Override