Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Sébastien Deleuze
2023-05-05 18:20:43 +02:00
parent 592a3074e1 2c15dcc56b
commit e416dfdbc0
3 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContribution.java
View File

@@ -16,6 +16,8 @@
package org.springframework.beans.factory.aot;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Type;
import java.util.Map;
import javax.lang.model.element.Modifier;
@@ -30,9 +32,11 @@ import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.ReflectionHints;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.ResolvableType;
import org.springframework.javapoet.ClassName;
import org.springframework.javapoet.CodeBlock;
import org.springframework.javapoet.MethodSpec;
import org.springframework.util.ReflectionUtils;
/**
* AOT contribution from a {@link BeanRegistrationsAotProcessor} used to
@@ -118,6 +122,17 @@ class BeanRegistrationsAotContribution
if (beanClass.isRecord()) {
hints.registerType(beanClass, MemberCategory.INVOKE_DECLARED_METHODS);
}
// Workaround for https://github.com/oracle/graal/issues/6529
ReflectionUtils.doWithMethods(beanClass, method -> {
for (Type type : method.getGenericParameterTypes()) {
if (type instanceof GenericArrayType) {
Class<?> clazz = ResolvableType.forType(type).resolve();
if (clazz != null) {
hints.registerType(clazz);
}
}
}
});
});
}