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

Restore canonical name representation for 6.2

Browse Source 
See gh-32405
This commit is contained in:
Juergen Hoeller
2024-03-17 21:03:02 +01:00
parent b89cf2b16a
commit 2b56ca08d4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
View File

@@ -545,7 +545,7 @@ public class TypeDescriptor implements Serializable {
public String toString() { public String toString() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (Annotation ann : getAnnotations()) { for (Annotation ann : getAnnotations()) {
builder.append('@').append(ann.annotationType().getName()).append(' '); builder.append('@').append(getName(ann.annotationType())).append(' ');
} }
builder.append(getResolvableType()); builder.append(getResolvableType());
return builder.toString(); return builder.toString();
@@ -733,6 +733,11 @@ public class TypeDescriptor implements Serializable {
return new TypeDescriptor(property).nested(nestingLevel); return new TypeDescriptor(property).nested(nestingLevel);
} }
private static String getName(Class<?> clazz) {
String canonicalName = clazz.getCanonicalName();
return (canonicalName != null ? canonicalName : clazz.getName());
}
/** /**
* Adapter class for exposing a {@code TypeDescriptor}'s annotations as an * Adapter class for exposing a {@code TypeDescriptor}'s annotations as an