Remove HttpServiceClient annotation

Closes gh-35431

Author: rstoyanchev

framework-docs/modules/ROOT/pages/integration/rest-clients.adoc

@@ -1195,46 +1195,6 @@ One way to declare HTTP Service groups is via `@ImportHttpServices` annotations
 <1> Manually list interfaces for group "echo"
 <2> Detect interfaces for group "greeting" under a base package
 
-The above lets you declare HTTP Services and groups. As an alternative, you can also
-annotate HTTP interfaces as follows:
-
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@HttpServiceClient("echo")
-	public interface EchoServiceA {
-		// ...
-	}
-
-	@HttpServiceClient("echo")
-	public interface EchoServiceB {
-		// ...
-	}
-----
-
-The above requires a dedicated import registrar as follows:
-
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	public class MyClientHttpServiceRegistrar implements AbstractClientHttpServiceRegistrar { // <1>
-
-		@Override
-		protected void registerHttpServices(GroupRegistry registry, AnnotationMetadata metadata) {
-			findAndRegisterHttpServiceClients(groupRegistry, List.of("org.example.echo")); // <2>
-		}
-	}
-
-	@Configuration
-	@Import(MyClientHttpServiceRegistrar.class) // <3>
-	public class ClientConfig {
-	}
-----
-<1> Extend dedicated `AbstractClientHttpServiceRegistrar`
-<2> Specify base packages where to find client interfaces
-<3> Import the registrar
-
-TIP: `@HttpServiceClient` interfaces are excluded from `@ImportHttpServices` scans, so there
-is no overlap with scans for client interfaces when pointed at the same package.
-
 It is also possible to declare groups programmatically by creating an HTTP Service
 registrar and then importing it:
 

spring-web/src/main/java/org/springframework/web/service/registry/AbstractClientHttpServiceRegistrar.java

@@ -211,7 +211,7 @@ private Object getProxyInstance(String groupName, String httpServiceType) {
 	 * @param basePackage the names of packages to look under
 	 * @return match bean definitions
 	 */
-	protected Stream<BeanDefinition> findHttpServices(String basePackage) {
+	private Stream<BeanDefinition> findHttpServices(String basePackage) {
 		if (this.scanner == null) {
 			Assert.state(this.environment != null, "Environment has not been set");
 			Assert.state(this.resourceLoader != null, "ResourceLoader has not been set");
@@ -267,9 +267,6 @@ interface GroupSpec {
 			/**
 			 * Detect HTTP Service types in the given packages, looking for
 			 * interfaces with type or method {@link HttpExchange} annotations.
-			 * <p>The performed scan, however, filters out any interfaces
-			 * annotated with {@link HttpServiceClient} that are instead supported
-			 * by {@link AbstractClientHttpServiceRegistrar}.
 			 */
 			GroupSpec detectInBasePackages(Class<?>... packageClasses);
 
@@ -326,19 +323,11 @@ public GroupRegistry.GroupSpec detectInBasePackages(String... packageNames) {
 
 			private void detectInBasePackage(String packageName) {
 				findHttpServices(packageName)
-						.filter(DefaultGroupSpec::isNotHttpServiceClientAnnotated)
 						.map(BeanDefinition::getBeanClassName)
 						.filter(Objects::nonNull)
 						.forEach(this::registerServiceTypeName);
 			}
 
-			private static boolean isNotHttpServiceClientAnnotated(BeanDefinition defintion) {
-				if (defintion instanceof AnnotatedBeanDefinition abd) {
-					return !abd.getMetadata().hasAnnotation(HttpServiceClient.class.getName());
-				}
-				return true;
-			}
-
 			private void registerServiceTypeName(String httpServiceTypeName) {
 				this.registration.httpServiceTypeNames().add(httpServiceTypeName);
 			}

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

@@ -78,9 +78,6 @@
 	/**
 	 * Detect HTTP Services in the packages of the specified classes, looking
 	 * for interfaces with type or method {@link HttpExchange} annotations.
-	 * <p>The performed scan, however, filters out interfaces annotated with
-	 * {@link HttpServiceClient} that are instead supported by
-	 * {@link AbstractClientHttpServiceRegistrar}.
 	 */
 	Class<?>[] basePackageClasses() default {};