Make AbstractHttpServiceRegistrar.findHttpServices(...) protected

Make the `AbstractHttpServiceRegistrar.findHttpServices(...)` a
protected method so that subclasses can use it to find bean definitions.

The method was made `private` in commit 736383e, but is still useful
even with the removal of `@HttpClientService`.

See gh-35447

Author: philwebb

spring-web/src/main/java/org/springframework/web/service/registry/AbstractHttpServiceRegistrar.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
 	 */
-	private Stream<BeanDefinition> findHttpServices(String basePackage) {
+	protected final 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");

spring-web/src/test/java/org/springframework/web/service/registry/HttpServiceRegistrarTests.java

@@ -24,12 +24,15 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
 import org.springframework.core.env.StandardEnvironment;
+import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.util.ClassUtils;
 import org.springframework.web.service.registry.HttpServiceGroup.ClientType;
 import org.springframework.web.service.registry.echo.EchoA;
 import org.springframework.web.service.registry.echo.EchoB;
@@ -123,6 +126,18 @@ void noRegistrations() {
 		assertBeanDefinitionCount(0);
 	}
 
+	@Test
+	void registrarUsingFindHttpService() {
+		TestRegistrarUsingFindHttpServices registrar = new TestRegistrarUsingFindHttpServices();
+		registrar.setEnvironment(new StandardEnvironment());
+		registrar.setResourceLoader(new DefaultResourceLoader());
+		registrar.registerBeanDefinitions(null, beanDefRegistry);
+
+		assertRegistryBeanDef(
+				new TestGroup("EchoA", EchoA.class),
+				new TestGroup("EchoB", EchoB.class));
+	}
+
 
 	@SuppressWarnings("unchecked")
 	private void doRegister(Consumer<AbstractHttpServiceRegistrar.GroupRegistry>... registrars) {
@@ -192,6 +207,21 @@ protected void registerHttpServices(GroupRegistry registry, AnnotationMetadata m
 		}
 	}
 
+	private static class TestRegistrarUsingFindHttpServices extends AbstractHttpServiceRegistrar {
+
+		@Override
+		protected void registerHttpServices(GroupRegistry registry, AnnotationMetadata importingClassMetadata) {
+			findHttpServices(EchoA.class.getPackageName())
+				.map(definition -> ((AnnotatedBeanDefinition) definition).getMetadata())
+				.forEach(metadata -> {
+					String className = metadata.getClassName();
+					String shortName = ClassUtils.getShortName(className);
+					registry.forGroup(shortName).registerTypeNames(className);
+				});
+		}
+
+	}
+
 	private record TestGroup(String name, Set<Class<?>> httpServiceTypes, ClientType clientType)
 			implements HttpServiceGroup {