8345614: Improve AnnotationFormatError message for duplicate annotation interfaces

liach · shipilev · commit 91e7582724f7 · 2025-01-23T11:40:42.000Z
Backport-of: 7aa0cbc91d90493a3dae973cb8077cfa283c32b4
diff --git a/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java
@@ -124,7 +124,7 @@ private static Map<Class<? extends Annotation>, Annotation> parseAnnotations2(
                 if (AnnotationType.getInstance(klass).retention() == RetentionPolicy.RUNTIME &&
                     result.put(klass, a) != null) {
                         throw new AnnotationFormatError(
-                            "Duplicate annotation for class: "+klass+": " + a);
+                            "Duplicate annotation " + klass + " in " + container);
             }
         }
         }

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ private static Map<Class<? extends Annotation>, Annotation> parseAnnotations2(`
`124`	`124`	`if (AnnotationType.getInstance(klass).retention() == RetentionPolicy.RUNTIME &&`
`125`	`125`	`result.put(klass, a) != null) {`
`126`	`126`	`throw new AnnotationFormatError(`
`127`		`- "Duplicate annotation for class: "+klass+": " + a);`
	`127`	`+ "Duplicate annotation " + klass + " in " + container);`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`	`}`