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

Fix queriedMethods handling in ReflectionHintsSerializer

Browse Source 
Closes gh-28212
This commit is contained in:
Sébastien Deleuze
2022-03-22 09:59:55 +01:00
parent d11389e783
commit 1ffc96be8c
2 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/main/java/org/springframework/aot/nativex/ReflectionHintsSerializer.java
View File

@@ -98,11 +98,9 @@ class ReflectionHintsSerializer {
if (methodIterator.hasNext()) { if (methodIterator.hasNext()) {
builder.append(",\n"); builder.append(",\n");
serializeMethods("methods", methodIterator, builder); serializeMethods("methods", methodIterator, builder);
if (queriedMethodIterator.hasNext()) {
builder.append(",\n");
}
} }
if (queriedMethodIterator.hasNext()) { if (queriedMethodIterator.hasNext()) {
builder.append(",\n");
serializeMethods("queriedMethods", queriedMethodIterator, builder); serializeMethods("queriedMethods", queriedMethodIterator, builder);
} }
} }

70
spring-core/src/test/java/org/springframework/aot/nativex/ReflectionHintsSerializerTests.java
View File

@@ -117,6 +117,76 @@ public class ReflectionHintsSerializerTests {
]""", hints); ]""", hints);
} }
@Test
void queriedMethods() throws JSONException {
ReflectionHints hints = new ReflectionHints();
hints.registerType(Integer.class, builder -> builder.withMethod("parseInt", List.of(TypeReference.of(String.class)),
(b) -> b.withMode(ExecutableMode.INTROSPECT)));
assertEquals("""
[
{
"name": "java.lang.Integer",
"queriedMethods": [
{
"name": "parseInt",
"parameterTypes": ["java.lang.String"]
}
]
}
]
""", hints);
}
@Test
void methods() throws JSONException {
ReflectionHints hints = new ReflectionHints();
hints.registerType(Integer.class, builder -> builder.withMethod("parseInt", List.of(TypeReference.of(String.class)),
(b) -> b.withMode(ExecutableMode.INVOKE)));
assertEquals("""
[
{
"name": "java.lang.Integer",
"methods": [
{
"name": "parseInt",
"parameterTypes": ["java.lang.String"]
}
]
}
]
""", hints);
}
@Test
void methodAndQueriedMethods() throws JSONException {
ReflectionHints hints = new ReflectionHints();
hints.registerType(Integer.class, builder -> builder.withMethod("parseInt", List.of(TypeReference.of(String.class)),
(b) -> b.withMode(ExecutableMode.INVOKE)));
hints.registerType(Integer.class, builder -> builder.withMethod("parseInt", List.of(TypeReference.of(String.class)),
(b) -> b.withMode(ExecutableMode.INTROSPECT)));
assertEquals("""
[
{
"name": "java.lang.Integer",
"queriedMethods": [
{
"name": "parseInt",
"parameterTypes": ["java.lang.String"]
}
],
"methods": [
{
"name": "parseInt",
"parameterTypes": ["java.lang.String"]
}
]
}
]
""", hints);
}
private void assertEquals(String expectedString, ReflectionHints hints) throws JSONException { private void assertEquals(String expectedString, ReflectionHints hints) throws JSONException {
JSONAssert.assertEquals(expectedString, serializer.serialize(hints), JSONCompareMode.LENIENT); JSONAssert.assertEquals(expectedString, serializer.serialize(hints), JSONCompareMode.LENIENT);
} }