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

GH-925 Fix regression with Kotlin @Component regstration

Browse Source 
Resolves #925
This commit is contained in:
Oleg Zhurakousky
2022-09-20 18:07:18 +02:00
parent e44c00f0ee
commit 586aa7afa4
5 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package org.springframework.cloud.function.context.config;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -70,7 +71,17 @@ public abstract class FunctionContextUtils {
else if (source instanceof Resource) {
param = registry.getType(actualName);
}
return param != null ? param : definition.getResolvableType().getType();
if (param != null) {
return param;
}
else {
Type t = definition.getResolvableType().getType();
if (t instanceof ParameterizedType) {
return t;
}
return FunctionTypeUtils.discoverFunctionTypeFromClass(definition.getBeanClass());
}
}
public static Class<?>[] getParamTypesFromBeanDefinitionFactory(Class<?> factory,

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

@@ -40,6 +40,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.cloud.function.context.FunctionRegistration;
import org.springframework.cloud.function.context.catalog.FunctionTypeUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.ResolvableType;
@@ -79,10 +80,6 @@ public class KotlinLambdaToFunctionAutoConfiguration {
public static final class KotlinFunctionWrapper implements Function<Object, Object>, Supplier<Object>, Consumer<Object>,
Function0<Object>, Function1<Object, Object>, Function2<Object, Object, Object>,
Function3<Object, Object, Object, Object>, Function4<Object, Object, Object, Object, Object> {
// FactoryBean<FunctionRegistration>,
// BeanNameAware,
// BeanFactoryAware {
private final Object kotlinLambdaTarget;
private String name;
@@ -123,7 +120,10 @@ public class KotlinLambdaToFunctionAutoConfiguration {
if (CoroutinesUtils.isValidSuspendingFunction(kotlinLambdaTarget, arg0)) {
return CoroutinesUtils.invokeSuspendingFunction(kotlinLambdaTarget, arg0);
}
return ((Function1) this.kotlinLambdaTarget).invoke(arg0);
if (this.kotlinLambdaTarget instanceof Function1) {
return ((Function1) this.kotlinLambdaTarget).invoke(arg0);
}
return ((Function) this.kotlinLambdaTarget).apply(arg0);
}
@Override
@@ -131,7 +131,10 @@ public class KotlinLambdaToFunctionAutoConfiguration {
if (CoroutinesUtils.isValidSuspendingSupplier(kotlinLambdaTarget)) {
return CoroutinesUtils.invokeSuspendingSupplier(kotlinLambdaTarget);
}
return ((Function0) this.kotlinLambdaTarget).invoke();
if (this.kotlinLambdaTarget instanceof Function0) {
return ((Function0) this.kotlinLambdaTarget).invoke();
}
return ((Supplier) this.kotlinLambdaTarget).get();
}
@Override
@@ -191,7 +194,9 @@ public class KotlinLambdaToFunctionAutoConfiguration {
ResolvableType.forClassWithGenerics(Flux.class, ResolvableType.forType(continuationArgType))
).getType();
}
else {
else if (!FunctionTypeUtils.isFunction(functionType)
&& !FunctionTypeUtils.isConsumer(functionType)
&& !FunctionTypeUtils.isSupplier(functionType)) {
throw new UnsupportedOperationException("Multi argument Kotlin functions are not currently supported");
}
registration = registration.type(functionType);