Revise method order in AbstractHttpServiceRegistrar

See gh-35244

Author: rstoyanchev

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

@@ -163,6 +163,16 @@ public final void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefin
 		}));
 	}
 
+	/**
+	 * This method is called before any bean definition registrations are made.
+	 * Subclasses must implement it to register the HTTP Services for which bean
+	 * definitions for which proxies need to be created.
+	 * @param registry to perform HTTP Service registrations with
+	 * @param importingClassMetadata annotation metadata of the importing class
+	 */
+	protected abstract void registerHttpServices(
+			GroupRegistry registry, AnnotationMetadata importingClassMetadata);
+
 	private RootBeanDefinition createOrGetRegistry(BeanDefinitionRegistry beanRegistry) {
 		if (!beanRegistry.containsBeanDefinition(HTTP_SERVICE_PROXY_REGISTRY_BEAN_NAME)) {
 			RootBeanDefinition proxyRegistryBeanDef = new RootBeanDefinition();
@@ -177,21 +187,25 @@ private RootBeanDefinition createOrGetRegistry(BeanDefinitionRegistry beanRegist
 		}
 	}
 
-	/**
-	 * This method is called before any bean definition registrations are made.
-	 * Subclasses must implement it to register the HTTP Services for which bean
-	 * definitions for which proxies need to be created.
-	 * @param registry to perform HTTP Service registrations with
-	 * @param importingClassMetadata annotation metadata of the importing class
-	 */
-	protected abstract void registerHttpServices(
-			GroupRegistry registry, AnnotationMetadata importingClassMetadata);
+	private void mergeGroups(RootBeanDefinition proxyRegistryBeanDef) {
+		ConstructorArgumentValues args = proxyRegistryBeanDef.getConstructorArgumentValues();
+		ConstructorArgumentValues.ValueHolder valueHolder = args.getArgumentValue(0, GroupsMetadata.class);
+		Assert.state(valueHolder != null, "Expected GroupsMetadata constructor argument at index 0");
+		GroupsMetadata target = (GroupsMetadata) valueHolder.getValue();
+		Assert.state(target != null, "No constructor argument value");
+		target.mergeWith(this.groupsMetadata);
+	}
 
+	private Object getProxyInstance(String groupName, String httpServiceType) {
+		Assert.state(this.beanFactory != null, "BeanFactory has not been set");
+		HttpServiceProxyRegistry registry = this.beanFactory.getBean(HTTP_SERVICE_PROXY_REGISTRY_BEAN_NAME, HttpServiceProxyRegistry.class);
+		return registry.getClient(groupName, ClassUtils.resolveClassName(httpServiceType, this.beanClassLoader));
+	}
 
 	/**
-	 * Exposes the scan for HTTP Service types, looking for
+	 * Find HTTP Service types under the given base package, looking for
 	 * interfaces with type or method {@link HttpExchange} annotations.
-	 * @param basePackage the packages to look under
+	 * @param basePackage the names of packages to look under
 	 * @return match bean definitions
 	 */
 	protected Stream<BeanDefinition> findHttpServices(String basePackage) {
@@ -205,21 +219,6 @@ protected Stream<BeanDefinition> findHttpServices(String basePackage) {
 		return this.scanner.findCandidateComponents(basePackage).stream();
 	}
 
-	private void mergeGroups(RootBeanDefinition proxyRegistryBeanDef) {
-		ConstructorArgumentValues args = proxyRegistryBeanDef.getConstructorArgumentValues();
-		ConstructorArgumentValues.ValueHolder valueHolder = args.getArgumentValue(0, GroupsMetadata.class);
-		Assert.state(valueHolder != null, "Expected GroupsMetadata constructor argument at index 0");
-		GroupsMetadata target = (GroupsMetadata) valueHolder.getValue();
-		Assert.state(target != null, "No constructor argument value");
-		target.mergeWith(this.groupsMetadata);
-	}
-
-	private Object getProxyInstance(String groupName, String httpServiceType) {
-		Assert.state(this.beanFactory != null, "BeanFactory has not been set");
-		HttpServiceProxyRegistry registry = this.beanFactory.getBean(HTTP_SERVICE_PROXY_REGISTRY_BEAN_NAME, HttpServiceProxyRegistry.class);
-		return registry.getClient(groupName, ClassUtils.resolveClassName(httpServiceType, this.beanClassLoader));
-	}
-
 
 	/**
 	 * Registry API to allow subclasses to register HTTP Services.