Use canonical names in error messages in annotation processing

sbrannen · sbrannen · commit 6062363738da · 2026-04-06T17:34:54.000+02:00
Prior to this commit, we invoked `Class.getName()` when building error messages during annotation processing, resulting in exceptions like the following which use binary names for nested types and arrays. Attribute 'chars' in annotation org.springframework.core.annotation.AnnotationUtilsTests$CharsContainer should be compatible with [C but a [I value was returned This commit switches to canonical names in error messages in annotation processing, resulting in improved such errors messages such as the following. Attribute 'chars' in annotation org.springframework.core.annotation.AnnotationUtilsTests.CharsContainer should be compatible with char[] but a int[] value was returned In addition, this commit introduces a new getCanonicalName(Class) method in ClassUtils, which has effectively been extracted from the following classes where this functionality was previously duplicated. - AttributeMethods - SynthesizedMergedAnnotationInvocationHandler - TypeDescriptor - DefaultRetryPolicy - ReflectiveIndexAccessor Closes gh-36607
diff --git a/spring-core-test/src/main/java/org/springframework/aot/agent/MethodReference.java b/spring-core-test/src/main/java/org/springframework/aot/agent/MethodReference.java
@@ -20,6 +20,8 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.util.ClassUtils;
+
 /**
  * Reference to a Java method, identified by its owner class and the method name.
  *
@@ -43,7 +45,7 @@ private MethodReference(String className, String methodName) {
 	}
 
 	public static MethodReference of(Class<?> klass, String methodName) {
-		return new MethodReference(klass.getCanonicalName(), methodName);
+		return new MethodReference(ClassUtils.getCanonicalName(klass), methodName);
 	}
 
 	/**
diff --git a/spring-core-test/src/main/java/org/springframework/aot/agent/RecordedInvocation.java b/spring-core-test/src/main/java/org/springframework/aot/agent/RecordedInvocation.java
@@ -25,6 +25,7 @@
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.TypeReference;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 /**
  * Record of an invocation of a method relevant to {@link org.springframework.aot.hint.RuntimeHints}.
@@ -181,7 +182,7 @@ public String toString() {
 		else {
 			Class<?> instanceType = (getInstance() instanceof Class<?> clazz) ? clazz : getInstance().getClass();
 			return "<%s> invocation of <%s> on type <%s> with arguments %s".formatted(
-					getHintType().hintClassName(), getMethodReference(), instanceType.getCanonicalName(), getArguments());
+					getHintType().hintClassName(), getMethodReference(), ClassUtils.getCanonicalName(instanceType), getArguments());
 		}
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AbstractMergedAnnotation.java b/spring-core/src/main/java/org/springframework/core/annotation/AbstractMergedAnnotation.java
@@ -24,6 +24,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 /**
  * Abstract base class for {@link MergedAnnotation} implementations.
@@ -215,7 +216,7 @@ private <T> T getRequiredAttributeValue(String attributeName, Class<T> type) {
 		T value = getAttributeValue(attributeName, type);
 		if (value == null) {
 			throw new NoSuchElementException("No attribute named '" + attributeName +
-					"' present in merged annotation " + getType().getName());
+					"' present in merged annotation " + ClassUtils.getCanonicalName(getType()));
 		}
 		return value;
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java
@@ -25,6 +25,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -126,7 +127,7 @@ public AnnotationAttributes(Class<? extends Annotation> annotationType) {
 	AnnotationAttributes(Class<? extends Annotation> annotationType, boolean validated) {
 		Assert.notNull(annotationType, "'annotationType' must not be null");
 		this.annotationType = annotationType;
-		this.displayName = annotationType.getName();
+		this.displayName = ClassUtils.getCanonicalName(annotationType);
 		this.validated = validated;
 	}
 
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java
@@ -32,6 +32,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.core.annotation.AnnotationTypeMapping.MirrorSets.MirrorSet;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
@@ -649,7 +650,7 @@ <A> int resolve(@Nullable Object source, @Nullable A annotation, ValueExtractor
 						throw new AnnotationConfigurationException(String.format(
 								"Different @AliasFor mirror values for annotation [%s]%s; attribute '%s' " +
 								"and its alias '%s' are declared with values of [%s] and [%s].",
-								getAnnotationType().getName(), on,
+								ClassUtils.getCanonicalName(getAnnotationType()), on,
 								attributes.get(result).getName(),
 								attribute.getName(),
 								ObjectUtils.nullSafeToString(lastValue),
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMappings.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMappings.java
@@ -28,6 +28,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.lang.Contract;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
 
 /**
@@ -124,7 +125,8 @@ private void addIfPossible(Deque<AnnotationTypeMapping> queue, @Nullable Annotat
 			AnnotationUtils.rethrowAnnotationConfigurationException(ex);
 			if (failureLogger.isEnabled()) {
 				failureLogger.log("Failed to introspect " + (meta ? "meta-annotation @" : "annotation @") +
-						annotationType.getName(), (source != null ? source.getAnnotationType() : null), ex);
+						ClassUtils.getCanonicalName(annotationType),
+						(source != null ? ClassUtils.getCanonicalName(source.getAnnotationType()) : null), ex);
 			}
 		}
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AttributeMethods.java b/spring-core/src/main/java/org/springframework/core/annotation/AttributeMethods.java
@@ -26,6 +26,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.ReflectionUtils;
 
@@ -143,8 +144,9 @@ void validate(Annotation annotation) {
 					throw ex;
 				}
 				catch (Throwable ex) {
-					throw new IllegalStateException("Could not obtain annotation attribute value for " +
-							get(i).getName() + " declared on @" + getName(annotation.annotationType()), ex);
+					throw new IllegalStateException(
+							"Could not obtain annotation attribute value for " + get(i).getName() +
+							" declared on @" + ClassUtils.getCanonicalName(annotation.annotationType()), ex);
 				}
 			}
 		}
@@ -305,13 +307,8 @@ static String describe(@Nullable Class<?> annotationType, @Nullable String attri
 		if (attributeName == null) {
 			return "(none)";
 		}
-		String in = (annotationType != null ? " in annotation [" + annotationType.getName() + "]" : "");
+		String in = (annotationType != null ? " in annotation [" + ClassUtils.getCanonicalName(annotationType) + "]" : "");
 		return "attribute '" + attributeName + "'" + in;
 	}
 
-	private static String getName(Class<?> clazz) {
-		String canonicalName = clazz.getCanonicalName();
-		return (canonicalName != null ? canonicalName : clazz.getName());
-	}
-
 }
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/RepeatableContainers.java b/spring-core/src/main/java/org/springframework/core/annotation/RepeatableContainers.java
@@ -26,6 +26,7 @@
 
 import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.ObjectUtils;
 
@@ -312,7 +313,7 @@ private static class ExplicitRepeatableContainer extends RepeatableContainers {
 				if (returnType.componentType() != repeatable) {
 					throw new AnnotationConfigurationException(
 							"Container type [%s] must declare a 'value' attribute for an array of type [%s]"
-								.formatted(container.getName(), repeatable.getName()));
+								.formatted(ClassUtils.getCanonicalName(container), ClassUtils.getCanonicalName(repeatable)));
 				}
 			}
 			catch (AnnotationConfigurationException ex) {
@@ -321,7 +322,7 @@ private static class ExplicitRepeatableContainer extends RepeatableContainers {
 			catch (Throwable ex) {
 				throw new AnnotationConfigurationException(
 						"Invalid declaration of container type [%s] for repeatable annotation [%s]"
-							.formatted(container.getName(), repeatable.getName()), ex);
+							.formatted(ClassUtils.getCanonicalName(container), ClassUtils.getCanonicalName(repeatable)), ex);
 			}
 			this.repeatable = repeatable;
 			this.container = container;
@@ -331,7 +332,7 @@ private static class ExplicitRepeatableContainer extends RepeatableContainers {
 		private Class<? extends Annotation> deduceContainer(Class<? extends Annotation> repeatable) {
 			Repeatable annotation = repeatable.getAnnotation(Repeatable.class);
 			Assert.notNull(annotation, () -> "Annotation type must be a repeatable annotation: " +
-						"failed to resolve container type for " + repeatable.getName());
+						"failed to resolve container type for " + ClassUtils.getCanonicalName(repeatable));
 			return annotation.value();
 		}
 
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java b/spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
@@ -136,7 +136,7 @@ private Integer computeHashCode() {
 	private String annotationToString() {
 		String string = this.string;
 		if (string == null) {
-			StringBuilder builder = new StringBuilder("@").append(getName(this.type)).append('(');
+			StringBuilder builder = new StringBuilder("@").append(ClassUtils.getCanonicalName(this.type)).append('(');
 			if (this.attributes.size() == 1 && this.attributes.get(0).getName().equals(MergedAnnotation.VALUE)) {
 				// Don't prepend "value=" for an annotation that only declares a "value" attribute.
 				builder.append(toString(getAttributeValue(this.attributes.get(0))));
@@ -208,7 +208,7 @@ private String toString(Object value) {
 			return e.name();
 		}
 		if (type == Class.class) {
-			return getName((Class<?>) value) + ".class";
+			return ClassUtils.getCanonicalName((Class<?>) value) + ".class";
 		}
 		return String.valueOf(value);
 	}
@@ -218,7 +218,7 @@ private Object getAttributeValue(Method method) {
 			Class<?> type = ClassUtils.resolvePrimitiveIfNecessary(method.getReturnType());
 			return this.annotation.getValue(attributeName, type).orElseThrow(
 					() -> new NoSuchElementException("No value found for attribute named '" + attributeName +
-							"' in merged annotation " + getName(this.annotation.getType())));
+							"' in merged annotation " + ClassUtils.getCanonicalName(this.annotation.getType())));
 		});
 
 		// Clone non-empty arrays so that users cannot alter the contents of values in our cache.
@@ -272,9 +272,4 @@ static <A extends Annotation> A createProxy(MergedAnnotation<A> annotation, Clas
 		return (A) Proxy.newProxyInstance(classLoader, interfaces, handler);
 	}
 
-	private static String getName(Class<?> clazz) {
-		String canonicalName = clazz.getCanonicalName();
-		return (canonicalName != null ? canonicalName : clazz.getName());
-	}
-
 }
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java b/spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java
@@ -490,7 +490,7 @@ else if (value instanceof MergedAnnotation<?>[] annotations &&
 		}
 		if (!type.isInstance(value)) {
 			throw new IllegalArgumentException("Unable to adapt value of type " +
-					value.getClass().getName() + " to " + type.getName());
+					ClassUtils.getCanonicalName(value.getClass()) + " to " + ClassUtils.getCanonicalName(type));
 		}
 		return (T) value;
 	}
@@ -525,8 +525,8 @@ private Object adaptForAttribute(Method attribute, Object value) {
 		}
 		if (!attributeType.isInstance(value)) {
 			throw new IllegalStateException("Attribute '" + attribute.getName() +
-					"' in annotation " + getType().getName() + " should be compatible with " +
-					attributeType.getName() + " but a " + value.getClass().getName() +
+					"' in annotation " + ClassUtils.getCanonicalName(getType()) + " should be compatible with " +
+					ClassUtils.getCanonicalName(attributeType) + " but a " + ClassUtils.getCanonicalName(value.getClass()) +
 					" value was returned");
 		}
 		return value;
@@ -583,7 +583,7 @@ private int getAttributeIndex(String attributeName, boolean required) {
 		int attributeIndex = (isFiltered(attributeName) ? -1 : this.mapping.getAttributes().indexOf(attributeName));
 		if (attributeIndex == -1 && required) {
 			throw new NoSuchElementException("No attribute named '" + attributeName +
-					"' present in merged annotation " + getType().getName());
+					"' present in merged annotation " + ClassUtils.getCanonicalName(getType()));
 		}
 		return attributeIndex;
 	}
@@ -660,9 +660,10 @@ static <A extends Annotation> MergedAnnotation<A> of(
 		catch (Exception ex) {
 			AnnotationUtils.rethrowAnnotationConfigurationException(ex);
 			if (logger.isEnabled()) {
-				String type = mapping.getAnnotationType().getName();
+				String type = ClassUtils.getCanonicalName(mapping.getAnnotationType());
 				String item = (mapping.getDistance() == 0 ? "annotation " + type :
-						"meta-annotation " + type + " from " + mapping.getRoot().getAnnotationType().getName());
+						"meta-annotation " + type + " from " +
+							ClassUtils.getCanonicalName(mapping.getRoot().getAnnotationType()));
 				logger.log("Failed to introspect " + item, source, ex);
 			}
 			return null;
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
@@ -541,7 +541,7 @@ public int hashCode() {
 	public String toString() {
 		StringBuilder builder = new StringBuilder();
 		for (Annotation ann : getAnnotations()) {
-			builder.append('@').append(getName(ann.annotationType())).append(' ');
+			builder.append('@').append(ClassUtils.getCanonicalName(ann.annotationType())).append(' ');
 		}
 		builder.append(getResolvableType());
 		return builder.toString();
@@ -726,11 +726,6 @@ public static TypeDescriptor map(Class<?> mapType, @Nullable TypeDescriptor keyT
 		return new TypeDescriptor(property).nested(nestingLevel);
 	}
 
-	private static String getName(Class<?> clazz) {
-		String canonicalName = clazz.getCanonicalName();
-		return (canonicalName != null ? canonicalName : clazz.getName());
-	}
-
 
 	private interface AnnotatedElementSupplier extends Supplier<AnnotatedElementAdapter>, Serializable {
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/retry/DefaultRetryPolicy.java b/spring-core/src/main/java/org/springframework/core/retry/DefaultRetryPolicy.java
@@ -23,6 +23,7 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ExceptionTypeFilter;
 import org.springframework.util.backoff.BackOff;
 
@@ -96,8 +97,7 @@ public String toString() {
 	private static String names(Set<Class<? extends Throwable>> types) {
 		StringJoiner result = new StringJoiner(", ", "[", "]");
 		for (Class<? extends Throwable> type : types) {
-			String name = type.getCanonicalName();
-			result.add(name != null? name : type.getName());
+			result.add(ClassUtils.getCanonicalName(type));
 		}
 		return result.toString();
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/style/SimpleValueStyler.java b/spring-core/src/main/java/org/springframework/core/style/SimpleValueStyler.java
@@ -24,6 +24,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.springframework.util.ClassUtils;
+
 /**
  * {@link ValueStyler} that converts objects to String form &mdash; generally for
  * debugging purposes &mdash; using simple styling conventions that mimic the
@@ -45,7 +47,7 @@ public class SimpleValueStyler extends DefaultValueStyler {
 	/**
 	 * Default {@link Class} styling function: {@link Class#getCanonicalName()}.
 	 */
-	public static final Function<Class<?>, String> DEFAULT_CLASS_STYLER = Class::getCanonicalName;
+	public static final Function<Class<?>, String> DEFAULT_CLASS_STYLER = ClassUtils::getCanonicalName;
 
 	/**
 	 * Default {@link Method} styling function: converts the supplied {@link Method}
diff --git a/spring-core/src/main/java/org/springframework/util/ClassUtils.java b/spring-core/src/main/java/org/springframework/util/ClassUtils.java
@@ -1125,6 +1125,20 @@ public static String getPackageName(String fqClassName) {
 		return (lastDotIndex != -1 ? fqClassName.substring(0, lastDotIndex) : "");
 	}
 
+	/**
+	 * Return the {@linkplain Class#getCanonicalName() canonical name} of the given
+	 * class, or the {@linkplain Class#getName() binary name} of the class if the
+	 * canonical name does not exist.
+	 * @param clazz the class
+	 * @return the canonical name of the class, or the binary name as a fallback
+	 * @since 7.1
+	 */
+	public static String getCanonicalName(Class<?> clazz) {
+		Assert.notNull(clazz, "Class must not be null");
+		String canonicalName = clazz.getCanonicalName();
+		return (canonicalName != null ? canonicalName : clazz.getName());
+	}
+
 	/**
 	 * Return the qualified name of the given class: usually simply
 	 * the class name, but component type class name + "[]" for arrays.
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationTypeMappingsTests.java
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/ComposedRepeatableAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/ComposedRepeatableAnnotationsTests.java
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsRepeatableAnnotationTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsRepeatableAnnotationTests.java
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
diff --git a/spring-core/src/test/java/org/springframework/core/annotation/RepeatableContainersTests.java b/spring-core/src/test/java/org/springframework/core/annotation/RepeatableContainersTests.java
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveIndexAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveIndexAccessor.java

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`
`21`	`21`	`import org.jspecify.annotations.Nullable;`
`22`	`22`
	`23`	`+import org.springframework.util.ClassUtils;`
	`24`	`+`
`23`	`25`	`/**`
`24`	`26`	`* Reference to a Java method, identified by its owner class and the method name.`
`25`	`27`	`*`
`@@ -43,7 +45,7 @@ private MethodReference(String className, String methodName) {`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`public static MethodReference of(Class<?> klass, String methodName) {`
`46`		`- return new MethodReference(klass.getCanonicalName(), methodName);`
	`48`	`+ return new MethodReference(ClassUtils.getCanonicalName(klass), methodName);`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`import org.springframework.aot.hint.RuntimeHints;`
`26`	`26`	`import org.springframework.aot.hint.TypeReference;`
`27`	`27`	`import org.springframework.util.Assert;`
	`28`	`+import org.springframework.util.ClassUtils;`
`28`	`29`
`29`	`30`	`/**`
`30`	`31`	`* Record of an invocation of a method relevant to {@link org.springframework.aot.hint.RuntimeHints}.`
`@@ -181,7 +182,7 @@ public String toString() {`
`181`	`182`	`else {`
`182`	`183`	`Class<?> instanceType = (getInstance() instanceof Class<?> clazz) ? clazz : getInstance().getClass();`
`183`	`184`	`return "<%s> invocation of <%s> on type <%s> with arguments %s".formatted(`
`184`		`- getHintType().hintClassName(), getMethodReference(), instanceType.getCanonicalName(), getArguments());`
	`185`	`+ getHintType().hintClassName(), getMethodReference(), ClassUtils.getCanonicalName(instanceType), getArguments());`
`185`	`186`	`}`
`186`	`187`	`}`
`187`	`188`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`import org.jspecify.annotations.Nullable;`
`25`	`25`
`26`	`26`	`import org.springframework.util.Assert;`
	`27`	`+import org.springframework.util.ClassUtils;`
`27`	`28`
`28`	`29`	`/**`
`29`	`30`	`* Abstract base class for {@link MergedAnnotation} implementations.`
`@@ -215,7 +216,7 @@ private <T> T getRequiredAttributeValue(String attributeName, Class<T> type) {`
`215`	`216`	`T value = getAttributeValue(attributeName, type);`
`216`	`217`	`if (value == null) {`
`217`	`218`	`throw new NoSuchElementException("No attribute named '" + attributeName +`
`218`		`- "' present in merged annotation " + getType().getName());`
	`219`	`+ "' present in merged annotation " + ClassUtils.getCanonicalName(getType()));`
`219`	`220`	`}`
`220`	`221`	`return value;`
`221`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`import org.jspecify.annotations.Nullable;`
`29`	`29`
`30`	`30`	`import org.springframework.lang.Contract;`
	`31`	`+import org.springframework.util.ClassUtils;`
`31`	`32`	`import org.springframework.util.ConcurrentReferenceHashMap;`
`32`	`33`
`33`	`34`	`/**`
`@@ -124,7 +125,8 @@ private void addIfPossible(Deque<AnnotationTypeMapping> queue, @Nullable Annotat`
`124`	`125`	`AnnotationUtils.rethrowAnnotationConfigurationException(ex);`
`125`	`126`	`if (failureLogger.isEnabled()) {`
`126`	`127`	`failureLogger.log("Failed to introspect " + (meta ? "meta-annotation @" : "annotation @") +`
`127`		`- annotationType.getName(), (source != null ? source.getAnnotationType() : null), ex);`
	`128`	`+ ClassUtils.getCanonicalName(annotationType),`
	`129`	`+ (source != null ? ClassUtils.getCanonicalName(source.getAnnotationType()) : null), ex);`
`128`	`130`	`}`
`129`	`131`	`}`
`130`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`import org.jspecify.annotations.Nullable;`
`27`	`27`
`28`	`28`	`import org.springframework.util.Assert;`
	`29`	`+import org.springframework.util.ClassUtils;`
`29`	`30`	`import org.springframework.util.ConcurrentReferenceHashMap;`
`30`	`31`	`import org.springframework.util.ReflectionUtils;`
`31`	`32`
`@@ -143,8 +144,9 @@ void validate(Annotation annotation) {`
`143`	`144`	`throw ex;`
`144`	`145`	`}`
`145`	`146`	`catch (Throwable ex) {`
`146`		`- throw new IllegalStateException("Could not obtain annotation attribute value for " +`
`147`		`- get(i).getName() + " declared on @" + getName(annotation.annotationType()), ex);`
	`147`	`+ throw new IllegalStateException(`
	`148`	`+ "Could not obtain annotation attribute value for " + get(i).getName() +`
	`149`	`+ " declared on @" + ClassUtils.getCanonicalName(annotation.annotationType()), ex);`
`148`	`150`	`}`
`149`	`151`	`}`
`150`	`152`	`}`
`@@ -305,13 +307,8 @@ static String describe(@Nullable Class<?> annotationType, @Nullable String attri`
`305`	`307`	`if (attributeName == null) {`
`306`	`308`	`return "(none)";`
`307`	`309`	`}`
`308`		`- String in = (annotationType != null ? " in annotation [" + annotationType.getName() + "]" : "");`
	`310`	`+ String in = (annotationType != null ? " in annotation [" + ClassUtils.getCanonicalName(annotationType) + "]" : "");`
`309`	`311`	`return "attribute '" + attributeName + "'" + in;`
`310`	`312`	`}`
`311`	`313`
`312`		`- private static String getName(Class<?> clazz) {`
`313`		`- String canonicalName = clazz.getCanonicalName();`
`314`		`- return (canonicalName != null ? canonicalName : clazz.getName());`
`315`		`- }`
`316`		`-`
`317`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ else if (value instanceof MergedAnnotation<?>[] annotations &&`
`490`	`490`	`}`
`491`	`491`	`if (!type.isInstance(value)) {`
`492`	`492`	`throw new IllegalArgumentException("Unable to adapt value of type " +`
`493`		`- value.getClass().getName() + " to " + type.getName());`
	`493`	`+ ClassUtils.getCanonicalName(value.getClass()) + " to " + ClassUtils.getCanonicalName(type));`
`494`	`494`	`}`
`495`	`495`	`return (T) value;`
`496`	`496`	`}`
`@@ -525,8 +525,8 @@ private Object adaptForAttribute(Method attribute, Object value) {`
`525`	`525`	`}`
`526`	`526`	`if (!attributeType.isInstance(value)) {`
`527`	`527`	`throw new IllegalStateException("Attribute '" + attribute.getName() +`
`528`		`- "' in annotation " + getType().getName() + " should be compatible with " +`
`529`		`- attributeType.getName() + " but a " + value.getClass().getName() +`
	`528`	`+ "' in annotation " + ClassUtils.getCanonicalName(getType()) + " should be compatible with " +`
	`529`	`+ ClassUtils.getCanonicalName(attributeType) + " but a " + ClassUtils.getCanonicalName(value.getClass()) +`
`530`	`530`	`" value was returned");`
`531`	`531`	`}`
`532`	`532`	`return value;`
`@@ -583,7 +583,7 @@ private int getAttributeIndex(String attributeName, boolean required) {`
`583`	`583`	`int attributeIndex = (isFiltered(attributeName) ? -1 : this.mapping.getAttributes().indexOf(attributeName));`
`584`	`584`	`if (attributeIndex == -1 && required) {`
`585`	`585`	`throw new NoSuchElementException("No attribute named '" + attributeName +`
`586`		`- "' present in merged annotation " + getType().getName());`
	`586`	`+ "' present in merged annotation " + ClassUtils.getCanonicalName(getType()));`
`587`	`587`	`}`
`588`	`588`	`return attributeIndex;`
`589`	`589`	`}`
`@@ -660,9 +660,10 @@ static <A extends Annotation> MergedAnnotation<A> of(`
`660`	`660`	`catch (Exception ex) {`
`661`	`661`	`AnnotationUtils.rethrowAnnotationConfigurationException(ex);`
`662`	`662`	`if (logger.isEnabled()) {`
`663`		`- String type = mapping.getAnnotationType().getName();`
	`663`	`+ String type = ClassUtils.getCanonicalName(mapping.getAnnotationType());`
`664`	`664`	`String item = (mapping.getDistance() == 0 ? "annotation " + type :`
`665`		`- "meta-annotation " + type + " from " + mapping.getRoot().getAnnotationType().getName());`
	`665`	`+ "meta-annotation " + type + " from " +`
	`666`	`+ ClassUtils.getCanonicalName(mapping.getRoot().getAnnotationType()));`
`666`	`667`	`logger.log("Failed to introspect " + item, source, ex);`
`667`	`668`	`}`
`668`	`669`	`return null;`