Skip to content
This repository was archived by the owner on Feb 23, 2023. It is now read-only.

make reflection analysis cover kotlin coroutines usage #1432

Closed
czp3009 wants to merge 3 commits into from
Closed

make reflection analysis cover kotlin coroutines usage #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17ea6a7
make reflection analysis cover kotlin coroutines usage
czp3009 Jan 9, 2022
d428e48
remove @TypeHint in webflux-kotlin
czp3009 Jan 10, 2022
7153d5a
only inference kotlin coroutine real return type if it's suspend fun
czp3009 Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions samples/webflux-kotlin/src/main/kotlin/com/example/webflux/WebfluxApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import org.springframework.nativex.hint.NativeHint
import org.springframework.nativex.hint.TypeAccess
import org.springframework.nativex.hint.TypeHint

// Reflection entry required due to how Coroutines generates bytecode with an Object return type, see https://github.com/spring-projects/spring-framework/issues/21546 related issue
@TypeHint(types = [Bar::class], access = [ TypeAccess.DECLARED_CONSTRUCTORS, TypeAccess.DECLARED_METHODS ])
@SpringBootApplication
class WebfluxApplication

Expand Down
18 changes: 16 additions & 2 deletions ...work/aot/context/bootstrap/generator/infrastructure/nativex/NativeConfigurationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Set;
import java.util.TreeSet;

import org.springframework.core.KotlinDetector;

// TODO review - does spring core already do some of these things?

/**
Expand Down Expand Up @@ -56,8 +59,19 @@ public static Set<Class<?>> collectTypesInSignature(Field field) {
*/
public static Set<Class<?>> collectTypesInSignature(Method controllerMethod) {
Set<Class<?>> collector = new TreeSet<>(Comparator.comparing(Class::getName));
collectReferenceTypesUsed(controllerMethod.getGenericReturnType(), collector);
for (Type parameterType : controllerMethod.getGenericParameterTypes()) {
Type genericReturnType;
Type[] genericParameterTypes;
if (KotlinDetector.isSuspendingFunction(controllerMethod)) {
Type[] types = controllerMethod.getGenericParameterTypes();
ParameterizedType continuation = (ParameterizedType) types[types.length - 1];
genericReturnType = ((WildcardType) continuation.getActualTypeArguments()[0]).getLowerBounds()[0];
genericParameterTypes = Arrays.copyOf(types, types.length - 1);
} else {
genericReturnType = controllerMethod.getGenericReturnType();
genericParameterTypes = controllerMethod.getGenericParameterTypes();
}
collectReferenceTypesUsed(genericReturnType, collector);
for (Type parameterType : genericParameterTypes) {
collectReferenceTypesUsed(parameterType, collector);
}
return collector;
Expand Down