From b1c3b6e34b676ca91f98302c175a34d811f88efc Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 17 Mar 2024 20:42:29 +0100 Subject: [PATCH 1/2] Restore original toString representation (revert accidental backport) See gh-32405 --- .../org/springframework/core/convert/TypeDescriptor.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java index 120f676e749..3b7b73866b3 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java +++ b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java @@ -545,16 +545,12 @@ public class TypeDescriptor implements Serializable { public String toString() { StringBuilder builder = new StringBuilder(); for (Annotation ann : getAnnotations()) { - builder.append('@').append(getName(ann.annotationType())).append(' '); + builder.append('@').append(ann.annotationType().getName()).append(' '); } builder.append(getResolvableType()); return builder.toString(); } - private static String getName(Class clazz) { - String canonicalName = clazz.getCanonicalName(); - return (canonicalName != null ? canonicalName : clazz.getName()); - } /** * Create a new type descriptor for an object. @@ -810,7 +806,7 @@ public class TypeDescriptor implements Serializable { @Override public String toString() { - return "AnnotatedElementAdapter annotations=" + Arrays.toString(this.annotations); + return Arrays.toString(this.annotations); } } From 36d1bc57d74f69b645a5bfd795e2525c158f3fb5 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 17 Mar 2024 20:54:54 +0100 Subject: [PATCH 2/2] Upgrade to Checkstyle 10.14.2 --- .../java/org/springframework/build/CheckstyleConventions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java index 599c5b9180f..23507cc62da 100644 --- a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java @@ -50,7 +50,7 @@ public class CheckstyleConventions { project.getPlugins().apply(CheckstylePlugin.class); project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g")); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); - checkstyle.setToolVersion("10.14.1"); + checkstyle.setToolVersion("10.14.2"); checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();