Remove deprecated code

Closes gh-1560

Author: snicoll

spring-ws-core/src/main/java/org/springframework/ws/config/annotation/DelegatingWsConfiguration.java

@@ -42,13 +42,6 @@ public class DelegatingWsConfiguration extends WsConfigurationSupport {
 
 	private WsConfigurers configurers = new WsConfigurers(Collections.emptyList());
 
-	@Deprecated(since = "4.0.12", forRemoval = true)
-	public void setConfigurers(List<WsConfigurer> configurers) {
-		if (configurers != null && !configurers.isEmpty()) {
-			this.configurers = new WsConfigurers(configurers);
-		}
-	}
-
 	@Autowired
 	public void setConfigurers(ObjectProvider<WsConfigurer> configurers) {
 		this.configurers = new WsConfigurers(configurers);

spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurerAdapter.java

@@ -32,7 +32,6 @@
 import org.w3c.dom.NodeList;
 
 import org.springframework.util.Assert;
-import org.springframework.ws.FaultAwareWebServiceMessage;
 import org.springframework.ws.pox.PoxMessage;
 import org.springframework.ws.transport.TransportConstants;
 import org.springframework.ws.transport.TransportOutputStream;
@@ -85,29 +84,6 @@ public Source getPayloadSource() {
 		return new DOMSource(this.document);
 	}
 
-	/**
-	 * Does this message have a fault?
-	 * @return {@code true} if the message has a fault
-	 * @deprecated as of 4.0.12 with no replacement as this class does not implement
-	 * {@link FaultAwareWebServiceMessage}
-	 */
-	@Deprecated(since = "4.0.12", forRemoval = true)
-	public boolean hasFault() {
-		return false;
-	}
-
-	/**
-	 * Returns the fault reason message.
-	 * @return the fault reason message, if any; returns {@code null} when no fault is
-	 * present
-	 * @deprecated as of 4.0.12 with no replacement as this class does not implement
-	 * {@link FaultAwareWebServiceMessage}
-	 */
-	@Deprecated(since = "4.0.12", forRemoval = true)
-	public String getFaultReason() {
-		return null;
-	}
-
 	public String toString() {
 		StringBuilder builder = new StringBuilder("DomPoxMessage ");
 		Element root = this.document.getDocumentElement();

spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurerComposite.java

@@ -68,12 +68,8 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter
 
 	private List<MethodArgumentResolver> methodArgumentResolvers;
 
-	private List<MethodArgumentResolver> customMethodArgumentResolvers;
-
 	private List<MethodReturnValueHandler> methodReturnValueHandlers;
 
-	private List<MethodReturnValueHandler> customMethodReturnValueHandlers;
-
 	private ClassLoader classLoader;
 
 	/**
@@ -100,27 +96,6 @@ public void setMethodArgumentResolvers(List<MethodArgumentResolver> methodArgume
 		this.methodArgumentResolvers = methodArgumentResolvers;
 	}
 
-	/**
-	 * Returns the custom argument resolvers.
-	 * @deprecated as of 4.1.0 with no replacement
-	 */
-	@Deprecated(since = "4.1.0", forRemoval = true)
-	public List<MethodArgumentResolver> getCustomMethodArgumentResolvers() {
-		return this.customMethodArgumentResolvers;
-	}
-
-	/**
-	 * Sets the custom handlers for method arguments. Custom handlers are ordered after
-	 * built-in ones. To override the built-in support for return value handling use
-	 * {@link #setMethodArgumentResolvers(List)}.
-	 * @deprecated as of 4.1.0 in favor of setting a single list
-	 * @see #withDefaults()
-	 */
-	@Deprecated(since = "4.1.0", forRemoval = true)
-	public void setCustomMethodArgumentResolvers(List<MethodArgumentResolver> customMethodArgumentResolvers) {
-		this.customMethodArgumentResolvers = customMethodArgumentResolvers;
-	}
-
 	/**
 	 * Returns the list of {@code MethodReturnValueHandler}s to use.
 	 */
@@ -135,27 +110,6 @@ public void setMethodReturnValueHandlers(List<MethodReturnValueHandler> methodRe
 		this.methodReturnValueHandlers = methodReturnValueHandlers;
 	}
 
-	/**
-	 * Returns the custom return value handlers.
-	 * @deprecated as of 4.1.0 with no replacement
-	 */
-	@Deprecated(since = "4.1.0", forRemoval = true)
-	public List<MethodReturnValueHandler> getCustomMethodReturnValueHandlers() {
-		return this.customMethodReturnValueHandlers;
-	}
-
-	/**
-	 * Sets the handlers for custom return value types. Custom handlers are ordered after
-	 * built-in ones. To override the built-in support for return value handling use
-	 * {@link #setMethodReturnValueHandlers(List)}.
-	 * @deprecated as of 4.1.0 in favor of setting a single list
-	 * @see #withDefaults()
-	 */
-	@Deprecated(since = "4.1.0", forRemoval = true)
-	public void setCustomMethodReturnValueHandlers(List<MethodReturnValueHandler> customMethodReturnValueHandlers) {
-		this.customMethodReturnValueHandlers = customMethodReturnValueHandlers;
-	}
-
 	private ClassLoader getClassLoader() {
 		return (this.classLoader != null) ? this.classLoader : DefaultMethodEndpointAdapter.class.getClassLoader();
 	}
@@ -204,9 +158,6 @@ private void initMethodArgumentResolvers() {
 			if (this.logger.isDebugEnabled()) {
 				this.logger.debug("No MethodArgumentResolvers set, using defaults: " + methodArgumentResolvers);
 			}
-			if (getCustomMethodArgumentResolvers() != null) {
-				methodArgumentResolvers.addAll(getCustomMethodArgumentResolvers());
-			}
 			setMethodArgumentResolvers(methodArgumentResolvers);
 		}
 	}
@@ -248,9 +199,6 @@ private void initMethodReturnValueHandlers() {
 			if (this.logger.isDebugEnabled()) {
 				this.logger.debug("No MethodReturnValueHandlers set, using defaults: " + methodReturnValueHandlers);
 			}
-			if (getCustomMethodReturnValueHandlers() != null) {
-				methodReturnValueHandlers.addAll(getCustomMethodReturnValueHandlers());
-			}
 			setMethodReturnValueHandlers(methodReturnValueHandlers);
 		}
 	}

spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java

@@ -109,18 +109,6 @@ public void addClientBuilderCustomizer(HttpClientBuilderCustomizer clientBuilder
 		this.clientBuilderCustomizers.add(clientBuilderCustomizer);
 	}
 
-	/**
-	 * Add a {@link HttpClientBuilderCustomizer} to invoke when creating an
-	 * {@link CloseableHttpClient} managed by this factory.
-	 * @param clientBuilderCustomizer the customizer to invoke
-	 * @deprecated as of 4.1.0 in favor of
-	 * {@link #addClientBuilderCustomizer(HttpClientBuilderCustomizer)}l
-	 */
-	@Deprecated(since = "4.1.0", forRemoval = true)
-	public void setClientBuilderCustomizer(HttpClientBuilderCustomizer clientBuilderCustomizer) {
-		addClientBuilderCustomizer(clientBuilderCustomizer);
-	}
-
 	/**
 	 * Add a {@link PoolingHttpClientConnectionManagerBuilderCustomizer} to invoke when
 	 * creating an {@link CloseableHttpClient} managed by this factory.
@@ -131,19 +119,6 @@ public void addConnectionManagerBuilderCustomizer(
 		this.connectionManagerBuilderCustomizers.add(connectionManagerBuilderCustomizer);
 	}
 
-	/**
-	 * Add a {@link PoolingHttpClientConnectionManagerBuilderCustomizer} to invoke when
-	 * creating an {@link CloseableHttpClient} managed by this factory.
-	 * @param connectionManagerBuilderCustomizer the customizer to invoke
-	 * @deprecated as of 4.1.0 in favor of
-	 * {@link #addConnectionManagerBuilderCustomizer(PoolingHttpClientConnectionManagerBuilderCustomizer)}
-	 */
-	@Deprecated(since = "4.1.0", forRemoval = true)
-	public void setConnectionManagerBuilderCustomizer(
-			PoolingHttpClientConnectionManagerBuilderCustomizer connectionManagerBuilderCustomizer) {
-		addConnectionManagerBuilderCustomizer(connectionManagerBuilderCustomizer);
-	}
-
 	/**
 	 * Sets the credentials to be used. If not set, no authentication is done.
 	 * @see org.apache.hc.client5.http.auth.UsernamePasswordCredentials