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

GH-1073 Fix Kotlin type resolution

Browse Source 
Resolves #1073
This commit is contained in:
Oleg Zhurakousky
2024-10-18 20:22:40 +02:00
parent d120eb0731
commit 8daa2aae15
1 changed files with 10 additions and 3 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/catalog/FunctionTypeUtils.java
View File

@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
@@ -192,7 +193,12 @@ public final class FunctionTypeUtils {
public static Type discoverFunctionTypeFromClass(Class<?> functionalClass) {
if (KotlinDetector.isKotlinPresent()) {
if (Function1.class.isAssignableFrom(functionalClass)) {
return TypeResolver.reify(Function1.class, (Class<Function1<?, ?>>) functionalClass);
try {
return TypeResolver.reify(Function1.class, (Class<Function1<?, ?>>) functionalClass);
}
catch (Exception e) {
return discoverFunctionTypeFromFunctionMethod(discoverFunctionalMethod(functionalClass));
}
}
else if (Function0.class.isAssignableFrom(functionalClass)) {
return TypeResolver.reify(Function0.class, (Class<Function0<?>>) functionalClass);
@@ -252,10 +258,11 @@ public final class FunctionTypeUtils {
Assert.isTrue(
functionMethod.getName().equals("apply") ||
functionMethod.getName().equals("accept") ||
functionMethod.getName().equals("get"),
functionMethod.getName().equals("get") ||
functionMethod.getName().equals("invoke"),
"Only Supplier, Function or Consumer supported at the moment. Was " + functionMethod.getDeclaringClass());
if (functionMethod.getName().equals("apply")) {
if (functionMethod.getName().equals("apply") || functionMethod.getName().equals("invoke")) {
return ResolvableType.forClassWithGenerics(Function.class,
ResolvableType.forMethodParameter(functionMethod, 0),
ResolvableType.forMethodReturnType(functionMethod)).getType();