Rename HttpServiceGroups to ImportHttpServiceGroups

See gh-33992

Author: rstoyanchev

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

@@ -68,6 +68,7 @@
  *
  * @author Rossen Stoyanchev
  * @author Phillip Webb
+ * @author Olga Maciaszek-Sharma
  * @since 7.0
  * @see ImportHttpServices
  * @see HttpServiceProxyRegistryFactoryBean

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

@@ -25,14 +25,16 @@
  * to determine the HTTP services and groups to register.
  *
  * @author Rossen Stoyanchev
+ * @author Phillip Webb
+ * @author Olga Maciaszek-Sharma
  * @since 7.0
  */
 class AnnotationHttpServiceRegistrar extends AbstractHttpServiceRegistrar {
 
 	@Override
 	protected void registerHttpServices(GroupRegistry registry, AnnotationMetadata importMetadata) {
 
-		MergedAnnotation<?> groupsAnnot = importMetadata.getAnnotations().get(HttpServiceGroups.class);
+		MergedAnnotation<?> groupsAnnot = importMetadata.getAnnotations().get(ImportHttpServiceGroups.class);
 		if (groupsAnnot.isPresent()) {
 			HttpServiceGroup.ClientType clientType = groupsAnnot.getEnum("clientType", HttpServiceGroup.ClientType.class);
 			for (MergedAnnotation<?> annot : groupsAnnot.getAnnotationArray("value", ImportHttpServices.class)) {

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

@@ -23,8 +23,8 @@
  * {@link org.springframework.web.service.invoker.HttpServiceProxyFactory} and
  * HTTP client setup.
  *
- * @author Olga Maciaszek-Sharma
  * @author Rossen Stoyanchev
+ * @author Olga Maciaszek-Sharma
  * @since 7.0
  */
 public interface HttpServiceGroup {
@@ -70,7 +70,7 @@ enum ClientType {
 		/**
 		 * Not specified, falling back on a default.
 		 * @see ImportHttpServices#clientType()
-		 * @see HttpServiceGroups#clientType()
+		 * @see ImportHttpServiceGroups#clientType()
 		 * @see AbstractHttpServiceRegistrar#setDefaultClientType
 		 */
 		UNSPECIFIED;

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

@@ -26,6 +26,7 @@
  * Callback to configure the set of declared {@link HttpServiceGroup}s.
  *
  * @author Rossen Stoyanchev
+ * @author Olga Maciaszek-Sharma
  * @since 7.0
  * @param <CB> the type of client builder, i.e. {@code RestClient} or {@code WebClient} builder.
  */

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

@@ -22,6 +22,7 @@
  * A registry that contains HTTP Service client proxies.
  *
  * @author Rossen Stoyanchev
+ * @author Olga Maciaszek-Sharma
  * @since 7.0
  * @see ImportHttpServices
  * @see HttpServiceProxyRegistryFactoryBean

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

@@ -52,6 +52,7 @@
  *
  * @author Rossen Stoyanchev
  * @author Phillip Webb
+ * @author Olga Maciaszek-Sharma
  * @since 7.0
  * @see AbstractHttpServiceRegistrar
  */

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

@@ -32,14 +32,15 @@
  * may be used to set the {@link #clientType()} and that would be inherited by
  * all nested annotations.
  *
+ * @author Olga Maciaszek-Sharma
  * @author Rossen Stoyanchev
  * @since 7.0
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Import(AnnotationHttpServiceRegistrar.class)
-public @interface HttpServiceGroups {
+public @interface ImportHttpServiceGroups {
 
 	/**
 	 * Alias for {@link #groups()}.

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

@@ -46,12 +46,12 @@
  * @author Olga Maciaszek-Sharma
  * @author Rossen Stoyanchev
  * @since 7.0
- * @see HttpServiceGroups
+ * @see ImportHttpServiceGroups
  * @see AbstractHttpServiceRegistrar
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-@Repeatable(HttpServiceGroups.class)
+@Repeatable(ImportHttpServiceGroups.class)
 @Import(AnnotationHttpServiceRegistrar.class)
 @Documented
 public @interface ImportHttpServices {

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

@@ -97,7 +97,7 @@ private static class ListingConfig {
 	private static class ScanConfig {
 	}
 
-	@HttpServiceGroups(clientType = ClientType.WEB_CLIENT, groups = {
+	@ImportHttpServiceGroups(clientType = ClientType.WEB_CLIENT, groups = {
 			@ImportHttpServices(group = ECHO_GROUP, types = {EchoA.class}),
 			@ImportHttpServices(group = GREETING_GROUP, types = {GreetingA.class})
 	})

Diff for: spring-webflux/src/test/java/org/springframework/web/reactive/function/client/support/WebClientProxyRegistryIntegrationTests.java

@@ -37,9 +37,9 @@
 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.HttpServiceGroups;
-import org.springframework.web.service.registry.HttpServiceProxyRegistry;
 import org.springframework.web.service.registry.ImportHttpServices;
+import org.springframework.web.service.registry.ImportHttpServiceGroups;
+import org.springframework.web.service.registry.HttpServiceProxyRegistry;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -126,7 +126,7 @@ public WebClientHttpServiceGroupConfigurer groupConfigurer() {
 
 
 	@Configuration(proxyBeanMethods = false)
-	@HttpServiceGroups(clientType = ClientType.WEB_CLIENT, groups = {
+	@ImportHttpServiceGroups(clientType = ClientType.WEB_CLIENT, groups = {
 			@ImportHttpServices(group = "echo", types = {EchoA.class, EchoB.class}),
 			@ImportHttpServices(group = "greeting", types = {GreetingA.class, GreetingB.class})
 	})
@@ -135,7 +135,7 @@ private static class ListingConfig extends BaseEchoConfig {
 
 
 	@Configuration(proxyBeanMethods = false)
-	@HttpServiceGroups(clientType = ClientType.WEB_CLIENT, groups = {
+	@ImportHttpServiceGroups(clientType = ClientType.WEB_CLIENT, groups = {
 			@ImportHttpServices(group = "echo", basePackageClasses = EchoA.class),
 			@ImportHttpServices(group = "greeting", basePackageClasses = GreetingA.class)
 	})