Add support for explicit names for WSDL and Schema

This commit improves Wsdl11Definition and XmlSchema to offer an
optional name, rather than relying on the name of the bean name.

This allows to provide an explicit name without having to expose the
bean with that name. If no explicit name is provided, we fall-back on
the name of the bean as we used to do.

Closes gh-1746

Author: snicoll

spring-ws-core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java

@@ -18,6 +18,7 @@
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -476,24 +477,34 @@ private void initMessageReceiver(ApplicationContext context) {
 	}
 
 	private void initWsdlDefinitions(ApplicationContext context) {
-		this.wsdlDefinitions = BeanFactoryUtils.beansOfTypeIncludingAncestors(context, WsdlDefinition.class, true,
-				false);
+		this.wsdlDefinitions = BeanFactoryUtils
+			.beansOfTypeIncludingAncestors(context, WsdlDefinition.class, true, false)
+			.entrySet()
+			.stream()
+			.collect(Collectors.toMap(
+					(entry) -> (entry.getValue().getName() != null) ? entry.getValue().getName() : entry.getKey(),
+					Map.Entry::getValue));
 		if (this.logger.isDebugEnabled()) {
 			for (Map.Entry<String, WsdlDefinition> entry : this.wsdlDefinitions.entrySet()) {
-				String beanName = entry.getKey();
+				String name = entry.getKey();
 				WsdlDefinition definition = entry.getValue();
-				this.logger.debug("Published [" + definition + "] as " + beanName + WSDL_SUFFIX_NAME);
+				this.logger.debug("Published [" + definition + "] as " + name + WSDL_SUFFIX_NAME);
 			}
 		}
 	}
 
 	private void initXsdSchemas(ApplicationContext context) {
-		this.xsdSchemas = BeanFactoryUtils.beansOfTypeIncludingAncestors(context, XsdSchema.class, true, false);
+		this.xsdSchemas = BeanFactoryUtils.beansOfTypeIncludingAncestors(context, XsdSchema.class, true, false)
+			.entrySet()
+			.stream()
+			.collect(Collectors.toMap(
+					(entry) -> (entry.getValue().getName() != null) ? entry.getValue().getName() : entry.getKey(),
+					Map.Entry::getValue));
 		if (this.logger.isDebugEnabled()) {
 			for (Map.Entry<String, XsdSchema> entry : this.xsdSchemas.entrySet()) {
-				String beanName = entry.getKey();
+				String name = entry.getKey();
 				XsdSchema schema = entry.getValue();
-				this.logger.debug("Published [" + schema + "] as " + beanName + XSD_SUFFIX_NAME);
+				this.logger.debug("Published [" + schema + "] as " + name + XSD_SUFFIX_NAME);
 			}
 		}
 	}

spring-ws-core/src/main/java/org/springframework/ws/wsdl/WsdlDefinition.java

@@ -18,6 +18,8 @@
 
 import javax.xml.transform.Source;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Represents an abstraction for WSDL definitions.
  *
@@ -26,6 +28,14 @@
  */
 public interface WsdlDefinition {
 
+	/**
+	 * Return the name of the definition, if known.
+	 * @since 5.1.0
+	 */
+	default @Nullable String getName() {
+		return null;
+	}
+
 	/**
 	 * Returns the {@code Source} of the definition.
 	 * @return the {@code Source} of this WSDL definition

spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java

@@ -22,6 +22,7 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.StringUtils;
 import org.springframework.ws.wsdl.wsdl11.provider.DefaultMessagesProvider;
@@ -53,7 +54,9 @@
  * @author Arjen Poutsma
  * @since 1.5.0
  */
-public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBean {
+public class DefaultWsdl11Definition implements Wsdl11Definition, BeanNameAware, InitializingBean {
+
+	private @Nullable String name;
 
 	private final InliningXsdSchemaTypesProvider typesProvider = new InliningXsdSchemaTypesProvider();
 
@@ -175,6 +178,13 @@ public void setServiceName(String serviceName) {
 		this.serviceName = serviceName;
 	}
 
+	@Override
+	public void setBeanName(String name) {
+		if (this.name == null) {
+			this.name = name;
+		}
+	}
+
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		if (!StringUtils.hasText(this.delegate.getTargetNamespace())
@@ -185,9 +195,24 @@ public void afterPropertiesSet() throws Exception {
 		if (!StringUtils.hasText(this.serviceName) && StringUtils.hasText(this.portTypesProvider.getPortTypeName())) {
 			this.soapProvider.setServiceName(this.portTypesProvider.getPortTypeName() + "Service");
 		}
+		this.delegate.setName(this.name);
 		this.delegate.afterPropertiesSet();
 	}
 
+	@Override
+	public @Nullable String getName() {
+		return this.delegate.getName();
+	}
+
+	/**
+	 * Set the name of this definition.
+	 * @param name the name
+	 * @since 5.1.0
+	 */
+	public void setName(@Nullable String name) {
+		this.name = name;
+	}
+
 	@Override
 	public Source getSource() {
 		return this.delegate.getSource();

spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java

@@ -22,6 +22,7 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 import org.springframework.ws.wsdl.wsdl11.provider.BindingsProvider;
@@ -59,7 +60,7 @@
  * @see #setBindingsProvider(BindingsProvider)
  * @see #setServicesProvider(ServicesProvider)
  */
-public class ProviderBasedWsdl4jDefinition extends Wsdl4jDefinition implements InitializingBean {
+public class ProviderBasedWsdl4jDefinition extends Wsdl4jDefinition implements BeanNameAware, InitializingBean {
 
 	/** The prefix used to register the target namespace in the WSDL. */
 	public static final String TARGET_NAMESPACE_PREFIX = "tns";
@@ -224,6 +225,13 @@ public void setTargetNamespace(String targetNamespace) {
 		this.targetNamespace = targetNamespace;
 	}
 
+	@Override
+	public void setBeanName(String name) {
+		if (this.name == null) {
+			this.name = name;
+		}
+	}
+
 	@Override
 	public void afterPropertiesSet() throws WSDLException {
 		Assert.notNull(this.targetNamespace, "'targetNamespace' is required");

spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11Definition.java

@@ -24,6 +24,7 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
@@ -40,10 +41,12 @@
  * @author Arjen Poutsma
  * @since 1.0.0
  */
-public class SimpleWsdl11Definition implements Wsdl11Definition, InitializingBean {
+public class SimpleWsdl11Definition implements Wsdl11Definition, BeanNameAware, InitializingBean {
 
 	private @Nullable Resource wsdlResource;
 
+	private @Nullable String name;
+
 	/**
 	 * Create a new instance of the {@link SimpleWsdl11Definition} class.
 	 * <p>
@@ -60,8 +63,29 @@ public SimpleWsdl11Definition() {
 	 * {@code null}
 	 */
 	public SimpleWsdl11Definition(Resource wsdlResource) {
+		this(wsdlResource, null);
+	}
+
+	/**
+	 * Create a new instance of the {@link SimpleWsdl11Definition} class with the
+	 * specified resource, and name.
+	 * @param wsdlResource the WSDL resource; must not be {@code null}
+	 * @param name the name of the definition
+	 * @throws IllegalArgumentException if the supplied {@code wsdlResource} is
+	 * {@code null}
+	 * @since 5.1.0
+	 */
+	public SimpleWsdl11Definition(Resource wsdlResource, @Nullable String name) {
 		Assert.notNull(wsdlResource, "wsdlResource must not be null");
 		this.wsdlResource = wsdlResource;
+		this.name = name;
+	}
+
+	@Override
+	public void setBeanName(String name) {
+		if (this.name == null) {
+			this.name = name;
+		}
 	}
 
 	@Override
@@ -70,6 +94,20 @@ public void afterPropertiesSet() throws Exception {
 		Assert.isTrue(this.wsdlResource.exists(), "wsdl '" + this.wsdlResource + "' does not exist");
 	}
 
+	@Override
+	public @Nullable String getName() {
+		return this.name;
+	}
+
+	/**
+	 * Set the name of this definition.
+	 * @param name the name
+	 * @since 5.1.0
+	 */
+	public void setName(@Nullable String name) {
+		this.name = name;
+	}
+
 	@Override
 	public Source getSource() {
 		Assert.notNull(this.wsdlResource, "wsdl is required");

spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java

@@ -43,6 +43,8 @@
  */
 public class Wsdl4jDefinition implements Wsdl11Definition {
 
+	protected @Nullable String name;
+
 	private @Nullable Definition definition;
 
 	/** WSDL4J is not thread safe, hence the need for a monitor. */
@@ -63,6 +65,20 @@ public Wsdl4jDefinition(Definition definition) {
 		setDefinition(definition);
 	}
 
+	@Override
+	public @Nullable String getName() {
+		return this.name;
+	}
+
+	/**
+	 * Set the name of this definition.
+	 * @param name the name
+	 * @since 5.1.0
+	 */
+	public void setName(@Nullable String name) {
+		this.name = name;
+	}
+
 	/** Returns the WSDL4J {@code Definition}. */
 	public @Nullable Definition getDefinition() {
 		synchronized (this.monitor) {