Make container annotation for ImportHttpServices nested

See gh-33992

Author: rstoyanchev

Diff for: spring-web/src/main/java/org/springframework/web/service/registry/AnnotationHttpServiceRegistrar.java

@@ -32,28 +32,23 @@
 class AnnotationHttpServiceRegistrar extends AbstractHttpServiceRegistrar {
 
 	@Override
-	protected void registerHttpServices(GroupRegistry registry, AnnotationMetadata importMetadata) {
+	protected void registerHttpServices(GroupRegistry registry, AnnotationMetadata metadata) {
 
-		MergedAnnotation<?> groupsAnnot = importMetadata.getAnnotations().get(ImportHttpServiceGroups.class);
+		MergedAnnotation<?> groupsAnnot = metadata.getAnnotations().get(ImportHttpServices.Container.class);
 		if (groupsAnnot.isPresent()) {
-			HttpServiceGroup.ClientType clientType = groupsAnnot.getEnum("clientType", HttpServiceGroup.ClientType.class);
 			for (MergedAnnotation<?> annot : groupsAnnot.getAnnotationArray("value", ImportHttpServices.class)) {
-				processImportAnnotation(annot, registry, clientType);
+				processImportAnnotation(annot, registry);
 			}
 		}
 
-		importMetadata.getAnnotations().stream(ImportHttpServices.class).forEach(annot ->
-				processImportAnnotation(annot, registry, HttpServiceGroup.ClientType.UNSPECIFIED));
+		metadata.getAnnotations().stream(ImportHttpServices.class)
+				.forEach(annot -> processImportAnnotation(annot, registry));
 	}
 
-	private void processImportAnnotation(
-			MergedAnnotation<?> annotation, GroupRegistry groupRegistry,
-			HttpServiceGroup.ClientType containerClientType) {
+	private void processImportAnnotation(MergedAnnotation<?> annotation, GroupRegistry groupRegistry) {
 
 		String groupName = annotation.getString("group");
-
 		HttpServiceGroup.ClientType clientType = annotation.getEnum("clientType", HttpServiceGroup.ClientType.class);
-		clientType = (clientType != HttpServiceGroup.ClientType.UNSPECIFIED ? clientType : containerClientType);
 
 		groupRegistry.forGroup(groupName, clientType)
 				.register(annotation.getClassArray("types"))

Diff for: spring-web/src/main/java/org/springframework/web/service/registry/HttpServiceGroup.java

@@ -70,7 +70,6 @@ enum ClientType {
 		/**
 		 * Not specified, falling back on a default.
 		 * @see ImportHttpServices#clientType()
-		 * @see ImportHttpServiceGroups#clientType()
 		 * @see AbstractHttpServiceRegistrar#setDefaultClientType
 		 */
 		UNSPECIFIED;

Diff for: spring-web/src/main/java/org/springframework/web/service/registry/ImportHttpServiceGroups.java

@@ -46,12 +46,12 @@
  * @author Olga Maciaszek-Sharma
  * @author Rossen Stoyanchev
  * @since 7.0
- * @see ImportHttpServiceGroups
+ * @see Container
  * @see AbstractHttpServiceRegistrar
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-@Repeatable(ImportHttpServiceGroups.class)
+@Repeatable(ImportHttpServices.Container.class)
 @Import(AnnotationHttpServiceRegistrar.class)
 @Documented
 public @interface ImportHttpServices {
@@ -96,4 +96,19 @@
 	 */
 	HttpServiceGroup.ClientType clientType() default HttpServiceGroup.ClientType.UNSPECIFIED;
 
+
+	/**
+	 * Container annotation that is necessary for the repeatable
+	 * {@link ImportHttpServices} annotation, but does not need to be declared
+	 * in application code.
+	 */
+	@Target(ElementType.TYPE)
+	@Retention(RetentionPolicy.RUNTIME)
+	@Documented
+	@Import(AnnotationHttpServiceRegistrar.class)
+	@interface Container {
+
+		ImportHttpServices[] value() default {};
+	}
+
 }

Diff for: spring-web/src/main/java/org/springframework/web/service/registry/ImportHttpServices.java

@@ -63,8 +63,8 @@ void basicScan() {
 	}
 
 	@Test
-	void containerWithClientType() {
-		doRegister(ContainerConfig.class);
+	void clientType() {
+		doRegister(ClientTypeConfig.class);
 		assertGroups(
 				StubGroup.ofListing(ECHO_GROUP, ClientType.WEB_CLIENT, EchoA.class),
 				StubGroup.ofListing(GREETING_GROUP, ClientType.WEB_CLIENT, GreetingA.class));
@@ -97,19 +97,17 @@ private static class ListingConfig {
 	private static class ScanConfig {
 	}
 
-	@ImportHttpServiceGroups(clientType = ClientType.WEB_CLIENT, groups = {
-			@ImportHttpServices(group = ECHO_GROUP, types = {EchoA.class}),
-			@ImportHttpServices(group = GREETING_GROUP, types = {GreetingA.class})
-	})
-	private static class ContainerConfig {
+	@ImportHttpServices(clientType = ClientType.WEB_CLIENT, group = ECHO_GROUP, types = {EchoA.class})
+	@ImportHttpServices(clientType = ClientType.WEB_CLIENT, group = GREETING_GROUP, types = {GreetingA.class})
+	private static class ClientTypeConfig {
 	}
 
 
 	private static class TestAnnotationHttpServiceRegistrar extends AnnotationHttpServiceRegistrar {
 
 		@Override
-		public void registerHttpServices(GroupRegistry registry, AnnotationMetadata importMetadata) {
-			super.registerHttpServices(registry, importMetadata);
+		public void registerHttpServices(GroupRegistry registry, AnnotationMetadata metadata) {
+			super.registerHttpServices(registry, metadata);
 		}
 	}
 

Diff for: spring-web/src/test/java/org/springframework/web/service/registry/AnnotationHttpServiceRegistrarTests.java

@@ -37,9 +37,8 @@
 import org.springframework.web.reactive.function.client.support.greeting.GreetingB;
 import org.springframework.web.service.registry.AbstractHttpServiceRegistrar;
 import org.springframework.web.service.registry.HttpServiceGroup.ClientType;
-import org.springframework.web.service.registry.ImportHttpServices;
-import org.springframework.web.service.registry.ImportHttpServiceGroups;
 import org.springframework.web.service.registry.HttpServiceProxyRegistry;
+import org.springframework.web.service.registry.ImportHttpServices;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -126,19 +125,15 @@ public WebClientHttpServiceGroupConfigurer groupConfigurer() {
 
 
 	@Configuration(proxyBeanMethods = false)
-	@ImportHttpServiceGroups(clientType = ClientType.WEB_CLIENT, groups = {
-			@ImportHttpServices(group = "echo", types = {EchoA.class, EchoB.class}),
-			@ImportHttpServices(group = "greeting", types = {GreetingA.class, GreetingB.class})
-	})
+	@ImportHttpServices(clientType = ClientType.WEB_CLIENT, group = "echo", types = {EchoA.class, EchoB.class})
+	@ImportHttpServices(clientType = ClientType.WEB_CLIENT, group = "greeting", types = {GreetingA.class, GreetingB.class})
 	private static class ListingConfig extends BaseEchoConfig {
 	}
 
 
 	@Configuration(proxyBeanMethods = false)
-	@ImportHttpServiceGroups(clientType = ClientType.WEB_CLIENT, groups = {
-			@ImportHttpServices(group = "echo", basePackageClasses = EchoA.class),
-			@ImportHttpServices(group = "greeting", basePackageClasses = GreetingA.class)
-	})
+	@ImportHttpServices(clientType = ClientType.WEB_CLIENT, group = "echo", basePackageClasses = EchoA.class)
+	@ImportHttpServices(clientType = ClientType.WEB_CLIENT, group = "greeting", basePackageClasses = GreetingA.class)
 	private static class DetectConfig extends BaseEchoConfig {
 	}