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

Merge branch '6.1.x'

Browse Source 
# Conflicts:
#	framework-platform/framework-platform.gradle
This commit is contained in:
Juergen Hoeller
2024-08-13 19:05:20 +02:00
parent 552936627a 63486bf19c
commit e1cf203295
6 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-core/src/main/java/org/springframework/aot/hint/BindingReflectionHintsRegistrar.java
View File

@@ -55,8 +55,9 @@ public class BindingReflectionHintsRegistrar {
private static final String JACKSON_ANNOTATION = "com.fasterxml.jackson.annotation.JacksonAnnotation";
private static final boolean jacksonAnnotationPresent = ClassUtils.isPresent(JACKSON_ANNOTATION,
BindingReflectionHintsRegistrar.class.getClassLoader());
private static final boolean jacksonAnnotationPresent =
ClassUtils.isPresent(JACKSON_ANNOTATION, BindingReflectionHintsRegistrar.class.getClassLoader());
/**
* Register the necessary reflection hints to bind the specified types.
@@ -96,12 +97,10 @@ public class BindingReflectionHintsRegistrar {
}
}
if (clazz.isEnum()) {
typeHint.withMembers(
MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
typeHint.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS,
MemberCategory.INVOKE_PUBLIC_METHODS);
}
typeHint.withMembers(
MemberCategory.DECLARED_FIELDS,
typeHint.withMembers(MemberCategory.DECLARED_FIELDS,
MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
for (Method method : clazz.getMethods()) {
String methodName = method.getName();
@@ -138,8 +137,7 @@ public class BindingReflectionHintsRegistrar {
}
private void registerPropertyHints(ReflectionHints hints, Set<Type> seen, @Nullable Method method, int parameterIndex) {
if (method != null && method.getDeclaringClass() != Object.class &&
method.getDeclaringClass() != Enum.class) {
if (method != null && method.getDeclaringClass() != Object.class && method.getDeclaringClass() != Enum.class) {
hints.registerMethod(method, ExecutableMode.INVOKE);
MethodParameter methodParameter = MethodParameter.forExecutable(method, parameterIndex);
Type methodParameterType = methodParameter.getGenericParameterType();
@@ -214,6 +212,7 @@ public class BindingReflectionHintsRegistrar {
});
}
/**
* Inner class to avoid a hard dependency on Kotlin at runtime.
*/