Skip to content

Commit 5342e9d

Browse files
jhoellerYangushan
authored andcommitted
Restore original toString representation (revert accidental backport)
See spring-projectsgh-32405
1 parent 513663b commit 5342e9d

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -511,16 +511,12 @@ public int hashCode() {
511511
public String toString() {
512512
StringBuilder builder = new StringBuilder();
513513
for (Annotation ann : getAnnotations()) {
514-
builder.append('@').append(getName(ann.annotationType())).append(' ');
514+
builder.append('@').append(ann.annotationType().getName()).append(' ');
515515
}
516516
builder.append(getResolvableType());
517517
return builder.toString();
518518
}
519519

520-
private static String getName(Class<?> clazz) {
521-
String canonicalName = clazz.getCanonicalName();
522-
return (canonicalName != null ? canonicalName : clazz.getName());
523-
}
524520

525521
/**
526522
* Create a new type descriptor for an object.
@@ -802,7 +798,7 @@ public int hashCode() {
802798

803799
@Override
804800
public String toString() {
805-
return "AnnotatedElementAdapter annotations=" + Arrays.toString(this.annotations);
801+
return Arrays.toString(this.annotations);
806802
}
807803
}
808804

0 commit comments

Comments
 (0)