Modifed to work with DOM Element as Message content

Author: mageshbk

.gitignore

@@ -0,0 +1,4 @@
+.project
+.classpath
+.settings/
+target/

src/main/java/org/switchyard/soap/DefaultMessageComposer.java

@@ -22,20 +22,16 @@
 
 package org.switchyard.soap;
 
-import java.io.StringWriter;
 import java.util.Iterator;
 
 import javax.xml.soap.Node;
 import javax.xml.soap.SOAPBody;
 import javax.xml.soap.SOAPElement;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.transform.stream.StreamResult;
 
 import org.switchyard.Message;
 import org.switchyard.MessageBuilder;
-import org.switchyard.soap.util.XMLHelper;
 
 /**
  * The default implementation of MessageComposer simply copies the SOAP body into
@@ -66,10 +62,8 @@ public Message compose(final SOAPMessage soapMessage) throws SOAPException {
                     if (found) {
                         throw new SOAPException("Found multiple SOAPElements in SOAPBody");
                     }
-                    final StringWriter sw = new StringWriter();
-                    final XMLEventWriter writer = XMLHelper.getXMLEventWriter(new StreamResult(sw));
-                    XMLHelper.readDomNode(node, writer, true);
-                    message.setContent(sw.toString());
+                    node.detachNode();
+                    message.setContent(node);
                     found = true;
                 }
             }

src/main/java/org/switchyard/soap/DefaultMessageDecomposer.java

@@ -27,7 +27,8 @@
 
 import org.switchyard.Message;
 import org.switchyard.soap.util.SOAPUtil;
-import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 
 /**
  * The default implementation of MessageDecomposer simply copies the Message body onto SOAP
@@ -48,14 +49,13 @@ public SOAPMessage decompose(final Message message) throws SOAPException {
 
         final SOAPMessage response = SOAPUtil.SOAP_MESSAGE_FACTORY.createMessage();
         if (message != null) {
-            final Object input = message.getContent();
+            final Element input = message.getContent(Element.class);
             if (input == null) {
                 throw new SOAPException("Null response from service");
             }
-            final String soapRes = input.toString();
             try {
-                final Document root = SOAPUtil.parseAsDom(soapRes);
-                response.getSOAPBody().addDocument(root);
+                Node node = response.getSOAPBody().getOwnerDocument().importNode(input, true);
+                response.getSOAPBody().appendChild(node);
             } catch (Exception e) {
                 throw new SOAPException("Unable to parse SOAP Message", e);
             }

src/main/java/org/switchyard/soap/OutboundHandler.java

@@ -30,7 +30,7 @@
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.BindingProvider;
+//import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Dispatch;
 import javax.xml.ws.Service;
 import javax.xml.ws.soap.AddressingFeature;
@@ -142,8 +142,8 @@ private SOAPMessage invokeService(final SOAPMessage soapMessage) throws SOAPExce
                 URL wsdlUrl = new URL(_wsdlLocation);
                 Service service = Service.create(wsdlUrl, serviceName);
                 _dispatcher = service.createDispatch(portName, SOAPMessage.class, Service.Mode.MESSAGE, new AddressingFeature(false, false));
-                BindingProvider bp = (BindingProvider) _dispatcher;
-                // this does not return a proper qualified Fault element and has no Detail so deffering for now
+                // this does not return a proper qualified Fault element and has no Detail so defering for now
+                // BindingProvider bp = (BindingProvider) _dispatcher;
                 // bp.getRequestContext().put("jaxws.response.throwExceptionIfSOAPFault", Boolean.FALSE);
 
             } catch (Exception e) {

src/main/java/org/switchyard/soap/util/XMLHelper.java

@@ -27,6 +27,7 @@
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.StringReader;
+import java.io.StringWriter;
 import java.io.Writer;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -46,16 +47,21 @@
 import javax.xml.stream.events.XMLEvent;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
 import org.apache.log4j.Logger;
+import org.w3c.dom.Element;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
@@ -402,8 +408,29 @@ public static boolean compareXMLContent(final InputSource content1, final InputS
         return (handler1.getRootElement().equals(handler2.getRootElement()));
     }
 
-    private static SchemaFactory newSchemaFactory() {
-        return SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
+    /**
+     * Compare two DOM Nodes.
+     * @param node1 The first Node.
+     * @param node2 The second Node.
+     * @return true if equals, false otherwise.
+     * @throws ParserConfigurationException Parser confiuration exception
+     * @throws TransformerException Transformer exception
+     * @throws SAXException SAX exception
+     * @throws IOException If unable to read the stream
+     */
+    public static boolean compareXMLContent(final Node node1, final Node node2)
+        throws ParserConfigurationException, TransformerException, SAXException, IOException {
+        TransformerFactory transFactory = TransformerFactory.newInstance();
+        Transformer transformer = transFactory.newTransformer();
+        StringWriter writer1 = new StringWriter();
+        StringWriter writer2 = new StringWriter();
+        DOMSource source = new DOMSource(node1);
+        StreamResult result = new StreamResult(writer1);
+        transformer.transform(source, result);
+        source = new DOMSource(node2);
+        result = new StreamResult(writer2);
+        transformer.transform(source, result);
+        return compareXMLContent(writer1.toString(), writer2.toString());
     }
 
     /**
@@ -447,6 +474,48 @@ private static Document getNewDocument()
             return builder.newDocument();
         }
     }
+
+    /**
+     * Transform a DOM Node to String.
+     * @param node The Node to be transformed.
+     * @return a String representation.
+     * @throws ParserConfigurationException Parser confiuration exception
+     * @throws TransformerException Transformer exception
+     */
+    public static String toString(final Node node)
+        throws ParserConfigurationException, TransformerException {
+        TransformerFactory transFactory = TransformerFactory.newInstance();
+        Transformer transformer = transFactory.newTransformer();
+        StringWriter writer = new StringWriter();
+        DOMSource source = new DOMSource(node);
+        StreamResult result = new StreamResult(writer);
+        transformer.transform(source, result);
+        return writer.toString();
+    }
+
+    /**
+     * Get the first child Element of the supplied node that matches a given tag name.
+     *
+     * @param node The DOM Node.
+     * @param name The name of the child node to search for.
+     * @return The first child element with the matching tag name.
+     */
+    public static Element getFirstChildElementByName(Node node, String name) {
+        NodeList children = node.getChildNodes();
+        int childCount = children.getLength();
+
+        for (int i = 0; i < childCount; i++) {
+            Node child = children.item(i);
+            if (child != null
+                && child.getNodeType() == Node.ELEMENT_NODE
+                && child.getNodeName() != null
+                && child.getNodeName().equals(name)) {
+                return (Element) child;
+            }
+        }
+
+        return null;
+    }
 
     /**
      * Get the document builder for creation

src/test/java/org/switchyard/soap/SOAPGatewayTest.java

@@ -38,8 +38,11 @@
 import org.switchyard.MockHandler;
 import org.switchyard.ServiceDomain;
 import org.switchyard.internal.ServiceDomains;
+import org.switchyard.soap.util.SOAPUtil;
 import org.switchyard.soap.util.XMLHelper;
 
+import org.w3c.dom.Element;
+
 public class SOAPGatewayTest {
     private static final QName PUBLISH_AS_WS_SERVICE = new QName("publish-as-ws");
     private static final QName WS_CONSUMER_SERVICE = new QName("webservice-consumer");
@@ -84,9 +87,9 @@ public static void tearDown() throws Exception {
 
     @Test
     public void invokeOneWay() throws Exception {
-        String input = "<test:helloWS xmlns:test=\"http://test.ws/\">"
+        Element input = SOAPUtil.parseAsDom("<test:helloWS xmlns:test=\"http://test.ws/\">"
                      + "   <arg0>Hello</arg0>"
-                     + "</test:helloWS>";
+                     + "</test:helloWS>").getDocumentElement();
 
         // Invoke the WS via our WS Consumer service
         MockHandler consumer = new MockHandler();
@@ -98,13 +101,13 @@ public void invokeOneWay() throws Exception {
 
     @Test
     public void invokeRequestResponse() throws Exception {
-        String input = "<test:sayHello xmlns:test=\"http://test.ws/\">"
+        Element input = SOAPUtil.parseAsDom("<test:sayHello xmlns:test=\"http://test.ws/\">"
                      + "   <arg0>Jimbo</arg0>"
-                     + "</test:sayHello>";
+                     + "</test:sayHello>").getDocumentElement();
 
-        String output = "<test:sayHelloResponse xmlns:test=\"http://test.ws/\">"
+        Element output = SOAPUtil.parseAsDom("<test:sayHelloResponse xmlns:test=\"http://test.ws/\">"
                      + "   <return>Hello Jimbo</return>"
-                     + "</test:sayHelloResponse>";
+                     + "</test:sayHelloResponse>").getDocumentElement();
 
         // Invoke the WS via our WS Consumer service
         MockHandler consumer = new MockHandler();
@@ -113,24 +116,24 @@ public void invokeRequestResponse() throws Exception {
         message.setContent(input);
         exchange.send(message);
         consumer.waitForMessage();
-        String response = consumer._messages.peek().getMessage().getContent(String.class);
-        Assert.assertTrue("Expected \r\n" + output + "\r\nbut was \r\n" + response, XMLHelper.compareXMLContent(output, response));
+        Element response = consumer.getMessages().peek().getMessage().getContent(Element.class);
+        Assert.assertTrue("Expected \r\n" + XMLHelper.toString(output) + "\r\nbut was \r\n" + XMLHelper.toString(response), XMLHelper.compareXMLContent(output, response));
     }
 
     @Test
     public void invokeRequestResponseFault() throws Exception {
-        String input = "<test:sayHello xmlns:test=\"http://test.ws/\">"
+        Element input = SOAPUtil.parseAsDom("<test:sayHello xmlns:test=\"http://test.ws/\">"
                      + "   <arg0></arg0>"
-                     + "</test:sayHello>";
+                     + "</test:sayHello>").getDocumentElement();
 
-        String output = "<soap:Fault xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+        Element output = SOAPUtil.parseAsDom("<soap:Fault xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
                         + "   <faultcode>soap:Server.AppError</faultcode>"
                         + "   <faultstring>Invalid name</faultstring>"
                         + "   <detail>"
                         + "      <message>Looks like you did not specify a name!</message>"
                         + "      <errorcode>1000</errorcode>"
                         + "   </detail>"
-                        + "</soap:Fault>";
+                        + "</soap:Fault>").getDocumentElement();
 
         // Invoke the WS via our WS Consumer service
         MockHandler consumer = new MockHandler();
@@ -139,7 +142,7 @@ public void invokeRequestResponseFault() throws Exception {
         message.setContent(input);
         exchange.send(message);
         consumer.waitForMessage();
-        String response = consumer._messages.peek().getMessage().getContent(String.class);
-        Assert.assertTrue("Expected \r\n" + output + "\r\nbut was \r\n" + response, XMLHelper.compareXMLContent(output, response));
+        Element response = consumer.getMessages().peek().getMessage().getContent(Element.class);
+        Assert.assertTrue("Expected \r\n" + XMLHelper.toString(output) + "\r\nbut was \r\n" + XMLHelper.toString(response), XMLHelper.compareXMLContent(output, response));
     }
 }

src/test/java/org/switchyard/soap/SOAPProvider.java

@@ -29,18 +29,23 @@
 import org.switchyard.Message;
 import org.switchyard.MessageBuilder;
 import org.switchyard.message.FaultMessage;
+import org.switchyard.soap.util.SOAPUtil;
+import org.switchyard.soap.util.XMLHelper;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 public class SOAPProvider extends BaseHandler {
 
     @Override
     public void handleMessage(Exchange exchange) throws HandlerException {
         if (exchange.getPattern().equals(ExchangePattern.IN_OUT)) {
             Message message;
-            String request = exchange.getMessage().getContent(String.class);
+            Element request = exchange.getMessage().getContent(Element.class);
+            Element name = XMLHelper.getFirstChildElementByName(request, "arg0");
             String toWhom = "";
-            int argIdx = request.indexOf("<arg0>");
-            if (argIdx > 0) {
-                toWhom = request.substring(argIdx + 6, request.indexOf("</arg0>"));
+            if (name != null) {
+                toWhom = name.getTextContent();
             }
             String response = null;
             if (toWhom.length() == 0) {
@@ -59,8 +64,12 @@ public void handleMessage(Exchange exchange) throws HandlerException {
                              + "   <return>Hello " + toWhom + "</return>"
                              + "</test:sayHelloResponse>";
             }
-
-            message.setContent(response);
+            try {
+                Document responseDom = SOAPUtil.parseAsDom(response);
+                message.setContent(responseDom.getDocumentElement());
+            } catch (Exception e) {
+                // Generate fault
+            }
             exchange.send(message);
         }
     }