SWS-1049 - Replace direct API usage with better defaults.

Author: gregturn

spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java

@@ -32,6 +32,7 @@
 import org.springframework.ws.client.WebServiceIOException;
 import org.springframework.ws.client.WebServiceTransformerException;
 import org.springframework.xml.transform.ResourceSource;
+import org.springframework.xml.transform.TransformerFactoryUtils;
 import org.springframework.xml.xpath.XPathExpression;
 import org.springframework.xml.xpath.XPathExpressionFactory;
 
@@ -52,7 +53,7 @@ public class Wsdl11DestinationProvider extends AbstractCachingDestinationProvide
 	public static final String DEFAULT_WSDL_LOCATION_EXPRESSION =
 			"/wsdl:definitions/wsdl:service/wsdl:port/soap:address/@location";
 
-	private static TransformerFactory transformerFactory = TransformerFactory.newInstance();
+	private static TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance();
 
 	private Map<String, String> expressionNamespaces = new HashMap<String, String>();
 

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

@@ -29,6 +29,7 @@
 import org.springframework.util.Assert;
 import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.xml.transform.TransformerObjectSupport;
+import org.springframework.xml.DocumentBuilderFactoryUtils;
 
 /**
  * Implementation of the {@link WebServiceMessageFactory} interface that creates a {@link DomPoxMessage}.
@@ -42,11 +43,25 @@ public class DomPoxMessageFactory extends TransformerObjectSupport implements We
 	/** The default content type for the POX messages. */
 	public static final String DEFAULT_CONTENT_TYPE = "application/xml";
 
-	private DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+	private DocumentBuilderFactory documentBuilderFactory;
 
 	private String contentType = DEFAULT_CONTENT_TYPE;
 
+	/**
+	 * Use default {@link DocumentBuilderFactory}.
+	 */
 	public DomPoxMessageFactory() {
+		this(DocumentBuilderFactoryUtils.newInstance());
+	}
+
+	/**
+	 * Provide your own {@link DocumentBuilderFactory}.
+	 * 
+	 * @param documentBuilderFactory
+	 */
+	public DomPoxMessageFactory(DocumentBuilderFactory documentBuilderFactory) {
+		this.documentBuilderFactory = documentBuilderFactory;
+		
 		documentBuilderFactory.setNamespaceAware(true);
 		documentBuilderFactory.setValidating(false);
 		documentBuilderFactory.setExpandEntityReferences(false);

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java

@@ -29,6 +29,7 @@
 import org.w3c.dom.Node;
 
 import org.springframework.xml.transform.TransformerObjectSupport;
+import org.springframework.xml.DocumentBuilderFactoryUtils;
 
 /**
  * Abstract base class for endpoints that handle the message payload as DOM elements.
@@ -120,7 +121,7 @@ protected DocumentBuilder createDocumentBuilder(DocumentBuilderFactory factory)
 	 * @throws ParserConfigurationException if thrown by JAXP methods
 	 */
 	protected DocumentBuilderFactory createDocumentBuilderFactory() throws ParserConfigurationException {
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		DocumentBuilderFactory factory = DocumentBuilderFactoryUtils.newInstance();
 		factory.setValidating(validating);
 		factory.setNamespaceAware(namespaceAware);
 		factory.setExpandEntityReferences(expandEntityReferences);

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java

@@ -19,6 +19,7 @@
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
 
+import org.springframework.xml.XMLInputFactoryUtils;
 import org.springframework.xml.transform.TransformerObjectSupport;
 
 /**
@@ -63,7 +64,7 @@ protected final XMLOutputFactory getOutputFactory() {
 	 * @return the created {@code XMLInputFactory}
 	 */
 	protected XMLInputFactory createXmlInputFactory() {
-		return XMLInputFactory.newInstance();
+		return XMLInputFactoryUtils.newInstance();
 	}
 
 	/**

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java

@@ -29,13 +29,14 @@
 import javax.xml.transform.stax.StAXSource;
 import javax.xml.transform.stream.StreamSource;
 
-import org.springframework.core.MethodParameter;
-import org.springframework.xml.JaxpVersion;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
 
+import org.springframework.core.MethodParameter;
+import org.springframework.xml.JaxpVersion;
+import org.springframework.xml.XMLInputFactoryUtils;
+
 /**
  * Implementation of {@link MethodArgumentResolver} and {@link MethodReturnValueHandler} that supports {@link Source}
  * objects.
@@ -125,7 +126,7 @@ private boolean supports(MethodParameter parameter) {
 	 * @return the created factory
 	 */
 	protected XMLInputFactory createXmlInputFactory() {
-		return XMLInputFactory.newInstance();
+		return XMLInputFactoryUtils.newInstance();
 	}
 
 	/** Inner class to avoid a static JAXP 1.4 dependency. */

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java

@@ -30,6 +30,7 @@
 import org.springframework.util.xml.StaxUtils;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.server.endpoint.annotation.RequestPayload;
+import org.springframework.xml.XMLInputFactoryUtils;
 import org.springframework.xml.transform.TransformerObjectSupport;
 
 /**
@@ -152,7 +153,7 @@ private XMLEventReader resolveEventReader(Source requestSource) throws Transform
 	 * @return the created factory
 	 */
 	protected XMLInputFactory createXmlInputFactory() {
-		return XMLInputFactory.newInstance();
+		return XMLInputFactoryUtils.newInstance();
 	}
 
 	private ByteArrayInputStream convertToByteArrayInputStream(Source source) throws TransformerException {

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessor.java

@@ -25,16 +25,17 @@
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.dom.DOMSource;
 
-import org.springframework.core.MethodParameter;
-import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor;
-
 import nu.xom.Builder;
 import nu.xom.Document;
 import nu.xom.Element;
 import nu.xom.ParsingException;
 import nu.xom.converters.DOMConverter;
 import org.w3c.dom.DOMImplementation;
 
+import org.springframework.core.MethodParameter;
+import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor;
+import org.springframework.xml.DocumentBuilderFactoryUtils;
+
 /**
  * Implementation of {@link org.springframework.ws.server.endpoint.adapter.method.MethodArgumentResolver
  * MethodArgumentResolver} and {@link org.springframework.ws.server.endpoint.adapter.method.MethodReturnValueHandler
@@ -104,7 +105,7 @@ private boolean supports(MethodParameter parameter) {
 	 * @return the created factory
 	 */
 	protected DocumentBuilderFactory createDocumentBuilderFactory() {
-		return DocumentBuilderFactory.newInstance();
+		return DocumentBuilderFactoryUtils.newInstance();
 	}
 
 }

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java

@@ -29,6 +29,7 @@
 import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
 import org.springframework.ws.server.endpoint.annotation.PayloadRoots;
 import org.springframework.ws.server.endpoint.support.PayloadRootUtils;
+import org.springframework.xml.transform.TransformerFactoryUtils;
 
 /**
  * Implementation of the {@link EndpointMapping} interface that uses the {@link PayloadRoot} annotation to map methods
@@ -54,7 +55,16 @@ public class PayloadRootAnnotationMethodEndpointMapping extends AbstractAnnotati
 	private static TransformerFactory transformerFactory;
 
 	static {
-		transformerFactory = TransformerFactory.newInstance();
+		setTransformerFactory(TransformerFactoryUtils.newInstance());
+	}
+
+	/**
+	 * Override the default {@link TransformerFactory}.
+	 * 
+	 * @param transformerFactory
+	 */
+	public static void setTransformerFactory(TransformerFactory transformerFactory) {
+		PayloadRootAnnotationMethodEndpointMapping.transformerFactory = transformerFactory;
 	}
 
 	@Override

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java

@@ -22,6 +22,7 @@
 
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.server.endpoint.support.PayloadRootUtils;
+import org.springframework.xml.transform.TransformerFactoryUtils;
 
 /**
  * Implementation of the {@code EndpointMapping} interface to map from the qualified name of the request payload
@@ -49,12 +50,20 @@ public class PayloadRootQNameEndpointMapping extends AbstractQNameEndpointMappin
 	private static TransformerFactory transformerFactory;
 
 	static {
-		transformerFactory = TransformerFactory.newInstance();
+		setTransformerFactory(TransformerFactoryUtils.newInstance());
 	}
 
+	/**
+	 * Override the default {@link TransformerFactory}.
+	 *
+	 * @param transformerFactory
+	 */
+	public static void setTransformerFactory(TransformerFactory transformerFactory) {
+		PayloadRootQNameEndpointMapping.transformerFactory = transformerFactory;
+	}
+	
 	@Override
 	protected QName resolveQName(MessageContext messageContext) throws TransformerException {
 		return PayloadRootUtils.getPayloadRootQName(messageContext.getRequest().getPayloadSource(), transformerFactory);
 	}
-
 }

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java

@@ -26,6 +26,7 @@
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.server.endpoint.support.PayloadRootUtils;
+import org.springframework.xml.transform.TransformerFactoryUtils;
 
 /**
  * Simple subclass of {@link AbstractMethodEndpointMapping} that maps from the local name of the request payload to
@@ -108,7 +109,7 @@ public void setMethodSuffix(String methodSuffix) {
 	@Override
 	public final void afterPropertiesSet() throws Exception {
 		Assert.notEmpty(getEndpoints(), "'endpoints' is required");
-		transformerFactory = TransformerFactory.newInstance();
+		transformerFactory = TransformerFactoryUtils.newInstance();
 		for (int i = 0; i < getEndpoints().length; i++) {
 			registerMethods(getEndpoints()[i]);
 		}