Polishing

spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java

@@ -96,7 +96,7 @@ class AnnotationBeanNameGeneratorTests {
 						"myComponent", "myService");
 	}
 
-	@Test  // gh-gh-36524
+	@Test  // gh-36524
 	void generateBeanNameForConventionBasedComponentWithMissingAnnotationAttributeTypeViaAsm() throws Exception {
 		FilteringClassLoader classLoader = new FilteringClassLoader(getClass().getClassLoader());
 		MetadataReaderFactory readerFactory = new SimpleMetadataReaderFactory(classLoader);

spring-core/src/test/java/org/springframework/core/annotation/TypeMappedAnnotationTests.java

@@ -103,10 +103,10 @@ class TypeMappedAnnotationTests {
 
 	@Test
 	void adaptFromNestedMergedAnnotation() {
-		MergedAnnotation<Nested> nested = MergedAnnotation.of(Nested.class);
+		MergedAnnotation<NestedAnnotation> nested = MergedAnnotation.of(NestedAnnotation.class);
 		MergedAnnotation<?> annotation = TypeMappedAnnotation.of(null, null,
 				NestedContainer.class, Collections.singletonMap("value", nested));
-		assertThat(annotation.getAnnotation("value", Nested.class)).isSameAs(nested);
+		assertThat(annotation.getAnnotation("value", NestedAnnotation.class)).isSameAs(nested);
 	}
 
 	@Test
@@ -152,6 +152,7 @@ class TypeMappedAnnotationTests {
 				"No mapping from " + annotation + " to " + mappedAnnotationType);
 	}
 
+
 	@Retention(RetentionPolicy.RUNTIME)
 	@interface ExplicitMirror {
 
@@ -247,11 +248,11 @@ class TypeMappedAnnotationTests {
 	@Retention(RetentionPolicy.RUNTIME)
 	@interface NestedContainer {
 
-		Nested value();
+		NestedAnnotation value();
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
-	@interface Nested {
+	@interface NestedAnnotation {
 
 		String value() default "";
 	}