SWS-308 in 1.0 branch

Author: poutsma

core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java

@@ -458,17 +458,16 @@ public Object sendAndReceive(String uri,
      * @throws IOException in case of I/O errors
      */
     protected boolean hasError(WebServiceConnection connection, WebServiceMessage request) throws IOException {
-        if (connection.hasError()) {
-            // this could be a fault rather than an error
-            if (connection instanceof FaultAwareWebServiceConnection) {
-                FaultAwareWebServiceConnection faultConnection = (FaultAwareWebServiceConnection) connection;
-                if (faultConnection.hasFault() && request instanceof FaultAwareWebServiceMessage) {
-                    return false;
-                }
-            }
-            return true;
+        if (!connection.hasError()) {
+            return false;
+        }
+        if (checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection) {
+            FaultAwareWebServiceConnection faultConnection = (FaultAwareWebServiceConnection) connection;
+            return !(faultConnection.hasFault() && request instanceof FaultAwareWebServiceMessage);
+        }
+        else {
+            return checkConnectionForFault;
         }
-        return false;
     }
 
     /**
@@ -567,7 +566,7 @@ private static class WebServiceMessageCallbackMessageExtractor implements WebSer
 
         private final WebServiceMessageCallback callback;
 
-        public WebServiceMessageCallbackMessageExtractor(WebServiceMessageCallback callback) {
+        private WebServiceMessageCallbackMessageExtractor(WebServiceMessageCallback callback) {
             this.callback = callback;
         }
 
@@ -582,7 +581,7 @@ private static class SourceExtractorMessageExtractor implements WebServiceMessag
 
         private final SourceExtractor sourceExtractor;
 
-        public SourceExtractorMessageExtractor(SourceExtractor sourceExtractor) {
+        private SourceExtractorMessageExtractor(SourceExtractor sourceExtractor) {
             this.sourceExtractor = sourceExtractor;
         }
 
@@ -591,5 +590,4 @@ public Object extractData(WebServiceMessage message) throws IOException, Transfo
         }
     }
 
-
 }

core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java

@@ -44,6 +44,9 @@
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.servlet.Context;
 import org.mortbay.jetty.servlet.ServletHolder;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
 import org.springframework.util.StringUtils;
 import org.springframework.ws.client.WebServiceTransportException;
 import org.springframework.ws.pox.dom.DomPoxMessageFactory;
@@ -54,8 +57,6 @@
 import org.springframework.ws.transport.http.CommonsHttpMessageSender;
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
 
 public class WebServiceTemplateIntegrationTest extends XMLTestCase {
 
@@ -68,6 +69,9 @@ protected void setUp() throws Exception {
         Context jettyContext = new Context(jettyServer, "/");
         jettyContext.addServlet(new ServletHolder(new EchoSoapServlet()), "/soap/echo");
         jettyContext.addServlet(new ServletHolder(new SoapFaultServlet()), "/soap/fault");
+        SoapFaultServlet badRequestFault = new SoapFaultServlet();
+        badRequestFault.setSc(400);
+        jettyContext.addServlet(new ServletHolder(badRequestFault), "/soap/badRequestFault");
         jettyContext.addServlet(new ServletHolder(new NoResponseSoapServlet()), "/soap/noResponse");
         jettyContext.addServlet(new ServletHolder(new PoxServlet()), "/pox");
         jettyContext.addServlet(new ServletHolder(new ErrorServlet(404)), "/errors/notfound");
@@ -83,6 +87,10 @@ public void testAxiom() throws Exception {
         testSoap(new AxiomSoapMessageFactory());
     }
 
+    public void testWithSaaj() throws Exception {
+        testSoap(new SaajSoapMessageFactory(MessageFactory.newInstance()));
+    }
+
     public void testPox() throws Exception {
         template = new WebServiceTemplate(new DomPoxMessageFactory());
         template.setMessageSender(new CommonsHttpMessageSender());
@@ -99,18 +107,15 @@ public void testPox() throws Exception {
             //expected
         }
         try {
-            template.sendSourceAndReceiveToResult("http://localhost:8888/errors/server", new StringSource(content), result);
+            template.sendSourceAndReceiveToResult("http://localhost:8888/errors/server", new StringSource(content),
+                    result);
             fail("WebServiceTransportException expected");
         }
         catch (WebServiceTransportException ex) {
             //expected
         }
     }
 
-    public void testWithSaaj() throws Exception {
-        testSoap(new SaajSoapMessageFactory(MessageFactory.newInstance()));
-    }
-
     private void testSoap(SoapMessageFactory messageFactory)
             throws SAXException, IOException, ParserConfigurationException {
         template = new WebServiceTemplate(messageFactory);
@@ -119,8 +124,8 @@ private void testSoap(SoapMessageFactory messageFactory)
         StringResult result = new StringResult();
         template.sendSourceAndReceiveToResult("http://localhost:8888/soap/echo", new StringSource(content), result);
         assertXMLEqual(content, result.toString());
-        boolean b = template.sendSourceAndReceiveToResult("http://localhost:8888/soap/noResponse", new StringSource(content),
-                new StringResult());
+        boolean b = template.sendSourceAndReceiveToResult("http://localhost:8888/soap/noResponse",
+                new StringSource(content), new StringResult());
         assertFalse("Invalid result", b);
         try {
             template.sendSourceAndReceiveToResult("http://localhost:8888/errors/notfound", new StringSource(content),
@@ -131,20 +136,31 @@ private void testSoap(SoapMessageFactory messageFactory)
             //expected
         }
         try {
-            template.sendSourceAndReceiveToResult("http://localhost:8888/soap/fault", new StringSource(content), result);
+            template.sendSourceAndReceiveToResult("http://localhost:8888/soap/fault", new StringSource(content),
+                    result);
             fail("SoapFaultClientException expected");
         }
         catch (SoapFaultClientException ex) {
             //expected
         }
+        template.setCheckConnectionForFault(false);
+        try {
+            template.sendSourceAndReceiveToResult("http://localhost:8888/soap/badRequestFault",
+                    new StringSource(content), result);
+            fail("SoapFaultClientException expected");
+        }
+        catch (SoapFaultClientException ex) {
+            //expected
+        }
+        template.setCheckConnectionForFault(true);
     }
 
     /** Servlet that returns and error message for a given status code. */
     private static class ErrorServlet extends HttpServlet {
 
         private int sc;
 
-        public ErrorServlet(int sc) {
+        private ErrorServlet(int sc) {
             this.sc = sc;
         }
 
@@ -185,6 +201,12 @@ private abstract static class AbstractSoapServlet extends HttpServlet {
 
         protected MessageFactory msgFactory = null;
 
+        private int sc = -1;
+
+        public void setSc(int sc) {
+            this.sc = sc;
+        }
+
         public void init(ServletConfig servletConfig) throws ServletException {
             super.init(servletConfig);
             try {
@@ -200,16 +222,21 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
                 MimeHeaders headers = getHeaders(req);
                 SOAPMessage request = msgFactory.createMessage(headers, req.getInputStream());
                 SOAPMessage reply = onMessage(request);
+                if (sc != -1) {
+                    resp.setStatus(sc);
+                }
                 if (reply != null) {
                     if (reply.saveRequired()) {
                         reply.saveChanges();
                     }
-                    resp.setStatus(!reply.getSOAPBody().hasFault() ? HttpServletResponse.SC_OK :
-                            HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                    if (sc == -1) {
+                        resp.setStatus(!reply.getSOAPBody().hasFault() ? HttpServletResponse.SC_OK :
+                                HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                    }
                     putHeaders(reply.getMimeHeaders(), resp);
                     reply.writeTo(resp.getOutputStream());
                 }
-                else {
+                else if (sc == -1) {
                     resp.setStatus(HttpServletResponse.SC_ACCEPTED);
                 }
             }
@@ -267,4 +294,5 @@ protected SOAPMessage onMessage(SOAPMessage message) throws SOAPException {
             return response;
         }
     }
+
 }