SWS-302

Author: poutsma

core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap11Body.java

@@ -28,6 +28,7 @@
 import org.apache.axiom.soap.SOAPFaultCode;
 import org.apache.axiom.soap.SOAPFaultReason;
 import org.apache.axiom.soap.SOAPProcessingException;
+
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.ws.soap.SoapFault;
@@ -76,7 +77,7 @@ public Soap11Fault addFault(QName code, String faultString, Locale locale) {
                     "A fault code with namespace and local part must be specific for a custom fault code");
         }
         try {
-            detachAllBodyChildren();
+            AxiomUtils.removeContents(getAxiomBody());
             SOAPFault fault = getAxiomFactory().createSOAPFault(getAxiomBody());
             SOAPFaultCode faultCode = getAxiomFactory().createSOAPFaultCode(fault);
             setValueText(code, fault, faultCode);
@@ -115,7 +116,7 @@ else if (StringUtils.hasLength(code.getNamespaceURI())) {
     private SOAPFault addStandardFault(String localName, String faultString, Locale locale) {
         Assert.notNull(faultString, "No faultString given");
         try {
-            detachAllBodyChildren();
+            AxiomUtils.removeContents(getAxiomBody());
             SOAPFault fault = getAxiomFactory().createSOAPFault(getAxiomBody());
             SOAPFaultCode faultCode = getAxiomFactory().createSOAPFaultCode(fault);
             faultCode.setText(QNameUtils.createQName(fault.getNamespace().getNamespaceURI(), localName,

core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoap12Body.java

@@ -28,6 +28,7 @@
 import org.apache.axiom.soap.SOAPFaultText;
 import org.apache.axiom.soap.SOAPFaultValue;
 import org.apache.axiom.soap.SOAPProcessingException;
+
 import org.springframework.util.Assert;
 import org.springframework.ws.soap.SoapFault;
 import org.springframework.ws.soap.axiom.support.AxiomUtils;
@@ -79,7 +80,7 @@ public Soap12Fault addDataEncodingUnknownFault(QName[] subcodes, String reason,
     private SOAPFault addStandardFault(String localName, String faultStringOrReason, Locale locale) {
         Assert.notNull(faultStringOrReason, "No faultStringOrReason given");
         try {
-            detachAllBodyChildren();
+            AxiomUtils.removeContents(getAxiomBody());
             SOAPFault fault = getAxiomFactory().createSOAPFault(getAxiomBody());
             SOAPFaultCode code = getAxiomFactory().createSOAPFaultCode(fault);
             SOAPFaultValue value = getAxiomFactory().createSOAPFaultValue(code);

core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapBody.java

@@ -16,21 +16,15 @@
 
 package org.springframework.ws.soap.axiom;
 
-import java.util.Iterator;
-import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPFault;
 
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapFault;
-import org.springframework.ws.soap.axiom.support.AxiomUtils;
-import org.springframework.xml.transform.StaxSource;
 
 /**
  * Axiom-specific version of <code>org.springframework.ws.soap.Soap11Body</code>.
@@ -40,36 +34,24 @@
  */
 abstract class AxiomSoapBody extends AxiomSoapElement implements SoapBody {
 
-    private boolean payloadCaching;
+    private final Payload payload;
 
     protected AxiomSoapBody(SOAPBody axiomBody, SOAPFactory axiomFactory, boolean payloadCaching) {
         super(axiomBody, axiomFactory);
-        this.payloadCaching = payloadCaching;
+        if (payloadCaching) {
+            payload = new CachingPayload(axiomBody, axiomFactory);
+        }
+        else {
+            payload = new NonCachingPayload(axiomBody, axiomFactory);
+        }
     }
 
     public Source getPayloadSource() {
-        try {
-            OMElement payloadElement = getPayloadElement();
-            XMLStreamReader streamReader;
-            if (payloadElement == null) {
-                return null;
-            }
-            else if (payloadCaching) {
-                streamReader = payloadElement.getXMLStreamReader();
-            }
-            else {
-                streamReader = payloadElement.getXMLStreamReaderWithoutCaching();
-            }
-            return new StaxSource(streamReader);
-        }
-        catch (OMException ex) {
-            throw new AxiomSoapBodyException(ex);
-        }
+        return payload.getSource();
     }
 
     public Result getPayloadResult() {
-        AxiomUtils.removeContents(getAxiomBody());
-        return new AxiomResult(getAxiomBody(), getAxiomFactory());
+        return payload.getResult();
     }
 
     public boolean hasFault() {
@@ -81,23 +63,6 @@ public SoapFault getFault() {
         return axiomFault != null ? new AxiomSoap11Fault(axiomFault, getAxiomFactory()) : null;
     }
 
-    private OMElement getPayloadElement() throws OMException {
-        return getAxiomBody().getFirstElement();
-    }
-
-    protected void detachAllBodyChildren() {
-        try {
-            for (Iterator iterator = getAxiomBody().getChildElements(); iterator.hasNext();) {
-                OMElement child = (OMElement) iterator.next();
-                child.detach();
-            }
-        }
-        catch (OMException ex) {
-            throw new AxiomSoapBodyException(ex);
-        }
-
-    }
-
     protected final SOAPBody getAxiomBody() {
         return (SOAPBody) getAxiomElement();
     }

core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapEnvelope.java

@@ -7,6 +7,7 @@
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPHeader;
+
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapEnvelope;
 import org.springframework.ws.soap.SoapHeader;
@@ -23,7 +24,7 @@ class AxiomSoapEnvelope extends AxiomSoapElement implements SoapEnvelope {
 
     private AxiomSoapBody body;
 
-    public AxiomSoapEnvelope(SOAPEnvelope axiomEnvelope, SOAPFactory axiomFactory, boolean payloadCaching) {
+    AxiomSoapEnvelope(SOAPEnvelope axiomEnvelope, SOAPFactory axiomFactory, boolean payloadCaching) {
         super(axiomEnvelope, axiomFactory);
         this.payloadCaching = payloadCaching;
     }

core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessage.java

@@ -214,6 +214,7 @@ public void writeTo(OutputStream outputStream) throws IOException {
                 transportOutputStream.addHeader(TransportConstants.HEADER_CONTENT_TYPE, contentType);
                 transportOutputStream.addHeader(TransportConstants.HEADER_SOAP_ACTION, soapAction);
             }
+
             if (payloadCaching) {
                 axiomMessage.serialize(outputStream, format);
             }

core/src/main/java/org/springframework/ws/soap/axiom/CachingPayload.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.soap.axiom;
+
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.Result;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.soap.SOAPBody;
+import org.apache.axiom.soap.SOAPFactory;
+
+/**
+ * @author Arjen Poutsma
+ * @since 1.5.2
+ */
+class CachingPayload extends Payload {
+
+    CachingPayload(SOAPBody axiomBody, SOAPFactory axiomFactory) {
+        super(axiomBody, axiomFactory);
+    }
+
+    protected XMLStreamReader getStreamReader(OMElement payloadElement) {
+        return payloadElement.getXMLStreamReader();
+    }
+
+    public Result getResultInternal() {
+        return new AxiomResult(getAxiomBody(), getAxiomFactory());
+    }
+
+}