Use TypeReference consistently in hints writer

Closes gh-28606

Author: snicoll

spring-core/src/main/java/org/springframework/aot/nativex/ProxyHintsWriter.java

@@ -21,7 +21,6 @@
 
 import org.springframework.aot.hint.JdkProxyHint;
 import org.springframework.aot.hint.ProxyHints;
-import org.springframework.aot.hint.TypeReference;
 
 /**
  * Write {@link JdkProxyHint}s contained in a {@link ProxyHints} to the JSON
@@ -46,8 +45,7 @@ public void write(BasicJsonWriter writer, ProxyHints hints) {
 	private Map<String, Object> toAttributes(JdkProxyHint hint) {
 		Map<String, Object> attributes = new LinkedHashMap<>();
 		handleCondition(attributes, hint);
-		attributes.put("interfaces", hint.getProxiedInterfaces().stream()
-				.map(TypeReference::getCanonicalName).toList());
+		attributes.put("interfaces", hint.getProxiedInterfaces());
 		return attributes;
 	}
 

spring-core/src/main/java/org/springframework/aot/nativex/ReflectionHintsWriter.java

@@ -29,7 +29,6 @@
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.ReflectionHints;
 import org.springframework.aot.hint.TypeHint;
-import org.springframework.aot.hint.TypeReference;
 import org.springframework.lang.Nullable;
 
 /**
@@ -96,7 +95,7 @@ private void handleExecutables(Map<String, Object> attributes, List<ExecutableHi
 	private Map<String, Object> toAttributes(ExecutableHint hint) {
 		Map<String, Object> attributes = new LinkedHashMap<>();
 		attributes.put("name", hint.getName());
-		attributes.put("parameterTypes", hint.getParameterTypes().stream().map(TypeReference::getCanonicalName).toList());
+		attributes.put("parameterTypes", hint.getParameterTypes());
 		return attributes;
 	}
 
@@ -105,14 +104,21 @@ private void handleCategories(Map<String, Object> attributes, Set<MemberCategory
 					switch (category) {
 						case PUBLIC_FIELDS -> attributes.put("allPublicFields", true);
 						case DECLARED_FIELDS -> attributes.put("allDeclaredFields", true);
-						case INTROSPECT_PUBLIC_CONSTRUCTORS -> attributes.put("queryAllPublicConstructors", true);
-						case INTROSPECT_DECLARED_CONSTRUCTORS -> attributes.put("queryAllDeclaredConstructors", true);
-						case INVOKE_PUBLIC_CONSTRUCTORS -> attributes.put("allPublicConstructors", true);
-						case INVOKE_DECLARED_CONSTRUCTORS -> attributes.put("allDeclaredConstructors", true);
-						case INTROSPECT_PUBLIC_METHODS -> attributes.put("queryAllPublicMethods", true);
-						case INTROSPECT_DECLARED_METHODS -> attributes.put("queryAllDeclaredMethods", true);
+						case INTROSPECT_PUBLIC_CONSTRUCTORS ->
+								attributes.put("queryAllPublicConstructors", true);
+						case INTROSPECT_DECLARED_CONSTRUCTORS ->
+								attributes.put("queryAllDeclaredConstructors", true);
+						case INVOKE_PUBLIC_CONSTRUCTORS ->
+								attributes.put("allPublicConstructors", true);
+						case INVOKE_DECLARED_CONSTRUCTORS ->
+								attributes.put("allDeclaredConstructors", true);
+						case INTROSPECT_PUBLIC_METHODS ->
+								attributes.put("queryAllPublicMethods", true);
+						case INTROSPECT_DECLARED_METHODS ->
+								attributes.put("queryAllDeclaredMethods", true);
 						case INVOKE_PUBLIC_METHODS -> attributes.put("allPublicMethods", true);
-						case INVOKE_DECLARED_METHODS -> attributes.put("allDeclaredMethods", true);
+						case INVOKE_DECLARED_METHODS ->
+								attributes.put("allDeclaredMethods", true);
 						case PUBLIC_CLASSES -> attributes.put("allPublicClasses", true);
 						case DECLARED_CLASSES -> attributes.put("allDeclaredClasses", true);
 					}

spring-core/src/test/java/org/springframework/aot/nativex/ProxyHintsWriterTests.java

@@ -63,6 +63,16 @@ void shouldWriteMultipleEntries() throws JSONException {
 				]""", hints);
 	}
 
+	@Test
+	void shouldWriteInnerClass() throws JSONException {
+		ProxyHints hints = new ProxyHints();
+		hints.registerJdkProxy(Inner.class);
+		assertEquals("""
+				[
+					{ "interfaces": [ "org.springframework.aot.nativex.ProxyHintsWriterTests$Inner" ] }
+				]""", hints);
+	}
+
 	@Test
 	void shouldWriteCondition() throws JSONException {
 		ProxyHints hints = new ProxyHints();
@@ -81,4 +91,8 @@ private void assertEquals(String expectedString, ProxyHints hints) throws JSONEx
 		JSONAssert.assertEquals(expectedString, out.toString(), JSONCompareMode.NON_EXTENSIBLE);
 	}
 
+	interface Inner {
+
+	}
+
 }

spring-core/src/test/java/org/springframework/aot/nativex/ReflectionHintsWriterTests.java

@@ -158,6 +158,27 @@ void methods() throws JSONException {
 				""", hints);
 	}
 
+	@Test
+	void methodWithInnerClassParameter() throws JSONException {
+		ReflectionHints hints = new ReflectionHints();
+		hints.registerType(Integer.class, builder -> builder.withMethod("test", List.of(TypeReference.of(Inner.class)),
+				b -> b.withMode(ExecutableMode.INVOKE)));
+
+		assertEquals("""
+				[
+					{
+						"name": "java.lang.Integer",
+						"methods": [
+							{
+								"name": "test",
+								"parameterTypes": ["org.springframework.aot.nativex.ReflectionHintsWriterTests$Inner"]
+							}
+						]
+					}
+				]
+				""", hints);
+	}
+
 	@Test
 	void methodAndQueriedMethods() throws JSONException {
 		ReflectionHints hints = new ReflectionHints();
@@ -194,4 +215,9 @@ private void assertEquals(String expectedString, ReflectionHints hints) throws J
 		JSONAssert.assertEquals(expectedString, out.toString(), JSONCompareMode.NON_EXTENSIBLE);
 	}
 
+
+	static class Inner {
+
+	}
+
 }