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

GH-964, GH-959 Fix Kotlin type discovery

Browse Source 
Resolves #964
Resolves #959
This commit is contained in:
Oleg Zhurakousky
2022-12-15 12:40:23 +01:00
parent 3a297051e5
commit e63d0d734f
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/FunctionContextUtils.java
View File

@@ -30,8 +30,6 @@ import org.springframework.beans.factory.config.ConstructorArgumentValues;
import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.cloud.function.context.catalog.FunctionTypeUtils; import org.springframework.cloud.function.context.catalog.FunctionTypeUtils;
import org.springframework.cloud.function.core.FunctionFactoryMetadata;
import org.springframework.context.annotation.ScannedGenericBeanDefinition;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.type.MethodMetadata; import org.springframework.core.type.MethodMetadata;
@@ -62,12 +60,17 @@ public abstract class FunctionContextUtils {
} }
} }
Class<?> beanClass = null;
if (definition == null) { if (definition == null) {
return null; return null;
} }
else if (definition instanceof ScannedGenericBeanDefinition) {
if (definition instanceof AbstractBeanDefinition) {
try { try {
return FunctionTypeUtils.discoverFunctionTypeFromClass(definition.getBeanClass()); beanClass = resolveBeanClass(definition);
return FunctionTypeUtils.discoverFunctionTypeFromClass(beanClass);
} }
catch (Exception e) { catch (Exception e) {
// ignore since name may not be actually resolved to a class in some cases // ignore since name may not be actually resolved to a class in some cases
@@ -89,24 +92,10 @@ public abstract class FunctionContextUtils {
if (type != null) { if (type != null) {
param = type.getType(); param = type.getType();
} }
else {
Class<?> beanClass = definition.hasBeanClass() ? definition.getBeanClass() : null;
if (beanClass != null
&& !FunctionFactoryMetadata.class.isAssignableFrom(beanClass)) {
param = beanClass;
}
else {
Object bean = registry.getBean(actualName);
// could be FunctionFactoryMetadata. . . TODO investigate and fix
if (bean instanceof FunctionFactoryMetadata) {
param = ((FunctionFactoryMetadata<?>) bean).getFactoryMethod().getGenericReturnType();
}
}
}
} }
if (!(param instanceof ParameterizedType) && definition.hasBeanClass()) { if (!(param instanceof ParameterizedType) && beanClass != null) {
return FunctionTypeUtils.discoverFunctionTypeFromClass(definition.getBeanClass()); return FunctionTypeUtils.discoverFunctionTypeFromClass(beanClass);
} }
return param; return param;
} }
@@ -129,6 +118,15 @@ public abstract class FunctionContextUtils {
return params.toArray(new Class<?>[0]); return params.toArray(new Class<?>[0]);
} }
private static Class<?> resolveBeanClass(AbstractBeanDefinition beanDefinition) {
try {
return beanDefinition.hasBeanClass() ? beanDefinition.getBeanClass() : ClassUtils.getDefaultClassLoader().loadClass(beanDefinition.getBeanClassName());
}
catch (Exception e) {
throw new IllegalStateException("Can't resolve class", e);
}
}
private static Type findBeanType(AbstractBeanDefinition definition, String declaringClassName, String methodName) { private static Type findBeanType(AbstractBeanDefinition definition, String declaringClassName, String methodName) {
Class<?> factory = ClassUtils.resolveClassName(declaringClassName, null); Class<?> factory = ClassUtils.resolveClassName(declaringClassName, null);
Class<?>[] params = getParamTypesFromBeanDefinitionFactory(factory, definition); Class<?>[] params = getParamTypesFromBeanDefinitionFactory(factory, definition);