Skip to content

Commit 8460a2d

Browse files
committed
Restore original toString representation (revert accidental backport)
See gh-32405
1 parent c3d186b commit 8460a2d

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -510,16 +510,12 @@ public int hashCode() {
510510
public String toString() {
511511
StringBuilder builder = new StringBuilder();
512512
for (Annotation ann : getAnnotations()) {
513-
builder.append('@').append(getName(ann.annotationType())).append(' ');
513+
builder.append('@').append(ann.annotationType().getName()).append(' ');
514514
}
515515
builder.append(getResolvableType());
516516
return builder.toString();
517517
}
518518

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

524520
/**
525521
* Create a new type descriptor for an object.
@@ -801,7 +797,7 @@ public int hashCode() {
801797

802798
@Override
803799
public String toString() {
804-
return "AnnotatedElementAdapter annotations=" + Arrays.toString(this.annotations);
800+
return Arrays.toString(this.annotations);
805801
}
806802
}
807803

0 commit comments

Comments
 (0)