Polishing

Author: sbrannen

spring-core/src/main/java/org/springframework/core/type/AnnotatedTypeMetadata.java

@@ -160,11 +160,11 @@ default MultiValueMap<String, Object> getAllAnnotationAttributes(
 	 * <p>Note: in contrast to {@link #getAllAnnotationAttributes(String)},
 	 * this method <em>does</em> take attribute overrides on composed annotations
 	 * into account.
-	 * @param annotationName the fully qualified class name of the annotation
+	 * @param annotationName the fully-qualified class name of the annotation
 	 * type to look for
-	 * @return a list of maps of attributes, with the attribute name as map key
-	 * (e.g. "key") and the attribute value as map value; never {@code null} but
-	 * potentially empty if no such annotations are found
+	 * @return a set of maps of attributes, with each annotation attribute name
+	 * as map key (e.g. "location") and the attribute's value as map value; never
+	 * {@code null} but potentially empty if no such annotations are found
 	 * @since 6.1
 	 * @see #getAllMergedAnnotationAttributes(String, boolean)
 	 */
@@ -178,12 +178,14 @@ default Set<? extends Map<String, Object>> getAllMergedAnnotationAttributes(Stri
 	 * <p>Note: in contrast to {@link #getAllAnnotationAttributes(String, boolean)},
 	 * this method <em>does</em> take attribute overrides on composed annotations
 	 * into account.
-	 * @param annotationName the fully qualified class name of the annotation
+	 * @param annotationName the fully-qualified class name of the annotation
 	 * type to look for
 	 * @param classValuesAsString whether to convert class references to String
-	 * @return a list of maps of attributes, with the attribute name as map key
-	 * (e.g. "key") and the attribute value as map value; never {@code null} but
-	 * potentially empty if no such annotations are found
+	 * class names for exposure as values in the returned Map, instead of Class
+	 * references which might potentially have to be loaded first
+	 * @return a set of maps of attributes, with each annotation attribute name
+	 * as map key (e.g. "location") and the attribute's value as map value; never
+	 * {@code null} but potentially empty if no such annotations are found
 	 * @since 6.1
 	 * @see #getAllMergedAnnotationAttributes(String)
 	 */

spring-test/src/test/java/org/springframework/test/gh30941/AppConfig.java

@@ -19,8 +19,8 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConnectedToModuleA
-@ConnectedToModuleB
+@ScanPackageA
+@ScanPackageB
 @PropertySourceA
 @PropertySourceB
 class AppConfig {

spring-test/src/test/java/org/springframework/test/gh30941/ComponentScanAndPropertySourceTests.java

@@ -21,27 +21,27 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-import org.springframework.test.gh30941.a.ModuleAClient;
-import org.springframework.test.gh30941.b.ModuleBClient;
+import org.springframework.test.gh30941.a.ComponentA;
+import org.springframework.test.gh30941.b.ComponentB;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringJUnitConfig(AppConfig.class)
 class ComponentScanAndPropertySourceTests {
 
 	@Autowired
-	ModuleAClient clientA;
+	ComponentA componentA;
 
 	@Autowired
-	ModuleBClient clientB;
+	ComponentB componentB;
 
 	@Autowired
 	Environment env;
 
 	@Test
 	void test() {
-		assertThat(clientA).isNotNull();
-		assertThat(clientB).isNotNull();
+		assertThat(componentA).isNotNull();
+		assertThat(componentB).isNotNull();
 		assertThat(env.getProperty("A")).isEqualTo("apple");
 		assertThat(env.getProperty("B")).isEqualTo("banana");
 	}

spring-test/src/test/java/org/springframework/test/gh30941/ConnectedToModuleA.java renamed to spring-test/src/test/java/org/springframework/test/gh30941/ScanPackageA.java

@@ -22,10 +22,10 @@
 import java.lang.annotation.Target;
 
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.gh30941.a.ModuleAClient;
+import org.springframework.test.gh30941.a.ComponentA;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-@ComponentScan(basePackageClasses = ModuleAClient.class)
-@interface ConnectedToModuleA {
+@ComponentScan(basePackageClasses = ComponentA.class)
+@interface ScanPackageA {
 }

spring-test/src/test/java/org/springframework/test/gh30941/ConnectedToModuleB.java renamed to spring-test/src/test/java/org/springframework/test/gh30941/ScanPackageB.java

@@ -22,10 +22,10 @@
 import java.lang.annotation.Target;
 
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.gh30941.b.ModuleBClient;
+import org.springframework.test.gh30941.b.ComponentB;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-@ComponentScan(basePackageClasses = ModuleBClient.class)
-@interface ConnectedToModuleB {
+@ComponentScan(basePackageClasses = ComponentB.class)
+@interface ScanPackageB {
 }

spring-test/src/test/java/org/springframework/test/gh30941/a/ModuleAClient.java renamed to spring-test/src/test/java/org/springframework/test/gh30941/a/ComponentA.java

@@ -19,5 +19,5 @@
 import org.springframework.stereotype.Component;
 
 @Component
-public class ModuleAClient {
+public class ComponentA {
 }

spring-test/src/test/java/org/springframework/test/gh30941/b/ModuleBClient.java renamed to spring-test/src/test/java/org/springframework/test/gh30941/b/ComponentB.java

@@ -19,5 +19,5 @@
 import org.springframework.stereotype.Component;
 
 @Component
-public class ModuleBClient {
+public class ComponentB {
 }