root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

This commit is contained in:
Brian Clozel 2024-12-09 11:18:28 +01:00
parent 810da11bb5 13df9058a4
commit 78f28fda54
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-core/src/main/java/org/springframework/aot/hint/MemberCategory.java
View File

@ -166,6 +166,14 @@ public enum MemberCategory {
* when {@link ReflectionHints#registerType(Class, MemberCategory...) adding a reflection hint for a type}. * when {@link ReflectionHints#registerType(Class, MemberCategory...) adding a reflection hint for a type}.
*/ */
@Deprecated(since = "7.0", forRemoval = true) @Deprecated(since = "7.0", forRemoval = true)
DECLARED_CLASSES DECLARED_CLASSES,
/**
* A category that represents the need for
* {@link sun.misc.Unsafe#allocateInstance(Class) unsafe allocation}
* for this type.
* @since 6.2.1
*/
UNSAFE_ALLOCATED
} }

3
spring-core/src/main/java/org/springframework/aot/nativex/ReflectionHintsAttributes.java
View File

@ -129,6 +129,9 @@ class ReflectionHintsAttributes {
case INVOKE_PUBLIC_METHODS -> attributes.put("allPublicMethods", true); case INVOKE_PUBLIC_METHODS -> attributes.put("allPublicMethods", true);
case INVOKE_DECLARED_METHODS -> case INVOKE_DECLARED_METHODS ->
attributes.put("allDeclaredMethods", true); attributes.put("allDeclaredMethods", true);
case PUBLIC_CLASSES -> attributes.put("allPublicClasses", true);
case DECLARED_CLASSES -> attributes.put("allDeclaredClasses", true);
case UNSAFE_ALLOCATED -> attributes.put("unsafeAllocated", true);
} }
} }
); );

4
spring-core/src/test/java/org/springframework/aot/nativex/RuntimeHintsWriterTests.java
View File

@ -84,7 +84,8 @@ class RuntimeHintsWriterTests {
.onReachableType(String.class) .onReachableType(String.class)
.withMembers(MemberCategory.INVOKE_PUBLIC_FIELDS, MemberCategory.INVOKE_DECLARED_FIELDS, .withMembers(MemberCategory.INVOKE_PUBLIC_FIELDS, MemberCategory.INVOKE_DECLARED_FIELDS,
MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_DECLARED_METHODS) MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_DECLARED_METHODS,
MemberCategory.UNSAFE_ALLOCATED)
.withField("DEFAULT_CHARSET") .withField("DEFAULT_CHARSET")
.withField("defaultCharset") .withField("defaultCharset")
.withField("aScore") .withField("aScore")
@ -101,6 +102,7 @@ class RuntimeHintsWriterTests {
"allDeclaredConstructors": true, "allDeclaredConstructors": true,
"allPublicMethods": true, "allPublicMethods": true,
"allDeclaredMethods": true, "allDeclaredMethods": true,
"unsafeAllocated": true,
"fields": [ "fields": [
{ "name": "aScore" }, { "name": "aScore" },
{ "name": "DEFAULT_CHARSET" }, { "name": "DEFAULT_CHARSET" },