SWS-544 - Added URI to ResponseCallback

poutsma · poutsma · commit 3b334e408718 · 2010-07-27T12:38:26.000Z
diff --git a/test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCallback.java
@@ -17,6 +17,7 @@
 package org.springframework.ws.mock.client;
 
 import java.io.IOException;
+import java.net.URI;
 
 import org.springframework.ws.WebServiceMessage;
 
@@ -35,11 +36,11 @@ class ErrorResponseCallback implements ResponseCallback {
         this.errorMessage = errorMessage;
     }
 
-    public void doWithResponse(WebServiceMessage response, WebServiceMessage request) throws IOException {
+    public void doWithResponse(URI uri, WebServiceMessage response, WebServiceMessage request) throws IOException {
         // Do nothing
     }
 
     String getErrorMessage() {
         return errorMessage;
     }
-}
+}
diff --git a/test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCallback.java
@@ -17,6 +17,7 @@
 package org.springframework.ws.mock.client;
 
 import java.io.IOException;
+import java.net.URI;
 
 import org.springframework.ws.WebServiceMessage;
 
@@ -39,12 +40,12 @@ class ExceptionResponseCallback implements ResponseCallback {
         this.exception = exception;
     }
 
-    public void doWithResponse(WebServiceMessage request, WebServiceMessage response) throws IOException {
+    public void doWithResponse(URI uri, WebServiceMessage request, WebServiceMessage response) throws IOException {
         if (exception instanceof IOException) {
             throw (IOException) exception;
         }
         else {
             throw (RuntimeException) exception;
         }
     }
-}
+}
diff --git a/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java b/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java
@@ -89,7 +89,7 @@ public void send(WebServiceMessage message) throws IOException {
     public WebServiceMessage receive(WebServiceMessageFactory messageFactory) throws IOException {
         if (responseCallback != null) {
             WebServiceMessage response = messageFactory.createWebServiceMessage();
-            responseCallback.doWithResponse(request, response);
+            responseCallback.doWithResponse(uri, request, response);
             return response;
         }
         else {
@@ -132,4 +132,4 @@ public void close() throws IOException {
         }
     }
 
-}
+}
diff --git a/test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java
@@ -17,6 +17,7 @@
 package org.springframework.ws.mock.client;
 
 import java.io.IOException;
+import java.net.URI;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 
@@ -37,12 +38,12 @@ class PayloadResponseCallback extends TransformerObjectSupport implements Respon
         this.payload = payload;
     }
 
-    public void doWithResponse(WebServiceMessage request, WebServiceMessage response) throws IOException {
+    public void doWithResponse(URI uri, WebServiceMessage request, WebServiceMessage response) throws IOException {
         try {
             transform(payload, response.getPayloadResult());
         }
         catch (TransformerException ex) {
             throw new AssertionError("Could not transform response payload to message: " + ex.getMessage());
         }
     }
-}
+}
diff --git a/test/src/main/java/org/springframework/ws/mock/client/ResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/ResponseCallback.java
@@ -17,12 +17,13 @@
 package org.springframework.ws.mock.client;
 
 import java.io.IOException;
+import java.net.URI;
 
 import org.springframework.ws.WebServiceMessage;
 
 /**
- * Callback interface for code that operates on response {@link org.springframework.ws.WebServiceMessage}s. Defines the contract for creating
- * responses in test scenarios.
+ * Callback interface for code that operates on response {@link org.springframework.ws.WebServiceMessage}s. Defines the
+ * contract for creating responses in test scenarios.
  *
  * @author Arjen Poutsma
  * @author Lukas Krecan
@@ -33,10 +34,11 @@ public interface ResponseCallback {
     /**
      * Execute any number of operations on the supplied response, given the request.
      *
+     * @param uri      of the service called
      * @param request  the request message
      * @param response the response message
-     * @throws java.io.IOException in case of I/O errors
+     * @throws IOException in case of I/O errors
      */
-    void doWithResponse(WebServiceMessage request, WebServiceMessage response) throws IOException;
+    void doWithResponse(URI uri, WebServiceMessage request, WebServiceMessage response) throws IOException;
 
 }
diff --git a/test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java b/test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java
@@ -17,6 +17,7 @@
 package org.springframework.ws.mock.client;
 
 import java.io.IOException;
+import java.net.URI;
 import java.util.Locale;
 
 import org.springframework.ws.WebServiceMessage;
@@ -33,7 +34,8 @@
  */
 abstract class SoapFaultResponseCallback implements ResponseCallback {
 
-    public final void doWithResponse(WebServiceMessage request, WebServiceMessage response) throws IOException {
+    public final void doWithResponse(URI uri, WebServiceMessage request, WebServiceMessage response)
+            throws IOException {
         if (!(response instanceof SoapMessage)) {
             fail("Response message is not a SOAP message");
             return;
diff --git a/test/src/test/java/org/springframework/ws/mock/client/ErrorResponseCallbackTest.java b/test/src/test/java/org/springframework/ws/mock/client/ErrorResponseCallbackTest.java
@@ -28,7 +28,7 @@ public class ErrorResponseCallbackTest {
     public void callback() throws IOException {
         String errorMessage = "Error message";
         ErrorResponseCallback callback = new ErrorResponseCallback(errorMessage);
-        callback.doWithResponse(null, null);
+        callback.doWithResponse(null, null, null);
         assertEquals(errorMessage, callback.getErrorMessage());
     }
 }
diff --git a/test/src/test/java/org/springframework/ws/mock/client/ExceptionResponseCallbackTest.java b/test/src/test/java/org/springframework/ws/mock/client/ExceptionResponseCallbackTest.java
@@ -26,13 +26,13 @@ public class ExceptionResponseCallbackTest {
     public void ioException() throws Exception {
         ExceptionResponseCallback callback = new ExceptionResponseCallback(new IOException());
 
-        callback.doWithResponse(null, null);
+        callback.doWithResponse(null, null, null);
     }
 
     @Test(expected = RuntimeException.class)
     public void runtimeException() throws Exception {
         ExceptionResponseCallback callback = new ExceptionResponseCallback(new RuntimeException());
 
-        callback.doWithResponse(null, null);
+        callback.doWithResponse(null, null, null);
     }
 }
diff --git a/test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java b/test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java
@@ -47,9 +47,10 @@ public void createResponse() throws SOAPException {
     @Test
     public void clientOrSenderFault() throws IOException {
         String faultString = "Foo";
-        SoapFaultResponseCallback callback = SoapFaultResponseCallback.createClientOrSenderFault(faultString, Locale.ENGLISH);
+        SoapFaultResponseCallback callback =
+                SoapFaultResponseCallback.createClientOrSenderFault(faultString, Locale.ENGLISH);
 
-        callback.doWithResponse(null, response);
+        callback.doWithResponse(null, null, response);
 
         assertTrue("Response has no fault", response.hasFault());
         Soap11Fault soapFault = (Soap11Fault) response.getSoapBody().getFault();
@@ -62,9 +63,10 @@ public void clientOrSenderFault() throws IOException {
     @Test
     public void mustUnderstandFault() throws IOException {
         String faultString = "Foo";
-        SoapFaultResponseCallback callback = SoapFaultResponseCallback.createMustUnderstandFault(faultString, Locale.ENGLISH);
+        SoapFaultResponseCallback callback =
+                SoapFaultResponseCallback.createMustUnderstandFault(faultString, Locale.ENGLISH);
 
-        callback.doWithResponse(null, response);
+        callback.doWithResponse(null, null, response);
 
         assertTrue("Response has no fault", response.hasFault());
         Soap11Fault soapFault = (Soap11Fault) response.getSoapBody().getFault();
@@ -77,9 +79,10 @@ public void mustUnderstandFault() throws IOException {
     @Test
     public void serverOrReceiverFault() throws IOException {
         String faultString = "Foo";
-        SoapFaultResponseCallback callback = SoapFaultResponseCallback.createServerOrReceiverFault(faultString, Locale.ENGLISH);
+        SoapFaultResponseCallback callback =
+                SoapFaultResponseCallback.createServerOrReceiverFault(faultString, Locale.ENGLISH);
 
-        callback.doWithResponse(null, response);
+        callback.doWithResponse(null, null, response);
 
         assertTrue("Response has no fault", response.hasFault());
         Soap11Fault soapFault = (Soap11Fault) response.getSoapBody().getFault();
@@ -92,9 +95,10 @@ public void serverOrReceiverFault() throws IOException {
     @Test
     public void versionMismatchFault() throws IOException {
         String faultString = "Foo";
-        SoapFaultResponseCallback callback = SoapFaultResponseCallback.createVersionMismatchFault(faultString, Locale.ENGLISH);
+        SoapFaultResponseCallback callback =
+                SoapFaultResponseCallback.createVersionMismatchFault(faultString, Locale.ENGLISH);
 
-        callback.doWithResponse(null, response);
+        callback.doWithResponse(null, null, response);
 
         assertTrue("Response has no fault", response.hasFault());
         Soap11Fault soapFault = (Soap11Fault) response.getSoapBody().getFault();
diff --git a/test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java b/test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java
@@ -57,20 +57,21 @@ public void setUp() throws Exception {
 
     @Test
     public void mocks() throws Exception {
-        String uri = "http://example.com";
+        URI uri = URI.create("http://example.com");
 
         RequestMatcher requestMatcher1 = EasyMock.createStrictMock("requestMatcher1", RequestMatcher.class);
         RequestMatcher requestMatcher2 = EasyMock.createStrictMock("requestMatcher2", RequestMatcher.class);
         ResponseCallback responseCallback = EasyMock.createStrictMock(ResponseCallback.class);
 
-        requestMatcher1.match(EasyMock.eq(URI.create(uri)), EasyMock.isA(SaajSoapMessage.class));
-        requestMatcher2.match(EasyMock.eq(URI.create(uri)), EasyMock.isA(SaajSoapMessage.class));
-        responseCallback.doWithResponse(EasyMock.isA(SaajSoapMessage.class), EasyMock.isA(SaajSoapMessage.class));
+        requestMatcher1.match(EasyMock.eq(uri), EasyMock.isA(SaajSoapMessage.class));
+        requestMatcher2.match(EasyMock.eq(uri), EasyMock.isA(SaajSoapMessage.class));
+        responseCallback.doWithResponse(EasyMock.eq(uri), EasyMock.isA(SaajSoapMessage.class),
+                EasyMock.isA(SaajSoapMessage.class));
 
         EasyMock.replay(requestMatcher1, requestMatcher2, responseCallback);
 
         expect(requestMatcher1).andExpect(requestMatcher2).andRespond(responseCallback);
-        template.sendSourceAndReceiveToResult(uri, new StringSource("<request xmlns='http://example.com'/>"),
+        template.sendSourceAndReceiveToResult(uri.toString(), new StringSource("<request xmlns='http://example.com'/>"),
                 new StringResult());
 
         EasyMock.verify(requestMatcher1, requestMatcher2, responseCallback);

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`package org.springframework.ws.mock.client;`
`18`	`18`
`19`	`19`	`import java.io.IOException;`
	`20`	`+import java.net.URI;`
`20`	`21`
`21`	`22`	`import org.springframework.ws.WebServiceMessage;`
`22`	`23`
`@@ -35,11 +36,11 @@ class ErrorResponseCallback implements ResponseCallback {`
`35`	`36`	`this.errorMessage = errorMessage;`
`36`	`37`	`}`
`37`	`38`
`38`		`- public void doWithResponse(WebServiceMessage response, WebServiceMessage request) throws IOException {`
	`39`	`+ public void doWithResponse(URI uri, WebServiceMessage response, WebServiceMessage request) throws IOException {`
`39`	`40`	`// Do nothing`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`String getErrorMessage() {`
`43`	`44`	`return errorMessage;`
`44`	`45`	`}`
`45`		`-}`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public void send(WebServiceMessage message) throws IOException {`
`89`	`89`	`public WebServiceMessage receive(WebServiceMessageFactory messageFactory) throws IOException {`
`90`	`90`	`if (responseCallback != null) {`
`91`	`91`	`WebServiceMessage response = messageFactory.createWebServiceMessage();`
`92`		`- responseCallback.doWithResponse(request, response);`
	`92`	`+ responseCallback.doWithResponse(uri, request, response);`
`93`	`93`	`return response;`
`94`	`94`	`}`
`95`	`95`	`else {`
`@@ -132,4 +132,4 @@ public void close() throws IOException {`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`135`		`-}`
	`135`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class ErrorResponseCallbackTest {`
`28`	`28`	`public void callback() throws IOException {`
`29`	`29`	`String errorMessage = "Error message";`
`30`	`30`	`ErrorResponseCallback callback = new ErrorResponseCallback(errorMessage);`
`31`		`- callback.doWithResponse(null, null);`
	`31`	`+ callback.doWithResponse(null, null, null);`
`32`	`32`	`assertEquals(errorMessage, callback.getErrorMessage());`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ public class ExceptionResponseCallbackTest {`
`26`	`26`	`public void ioException() throws Exception {`
`27`	`27`	`ExceptionResponseCallback callback = new ExceptionResponseCallback(new IOException());`
`28`	`28`
`29`		`- callback.doWithResponse(null, null);`
	`29`	`+ callback.doWithResponse(null, null, null);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Test(expected = RuntimeException.class)`
`33`	`33`	`public void runtimeException() throws Exception {`
`34`	`34`	`ExceptionResponseCallback callback = new ExceptionResponseCallback(new RuntimeException());`
`35`	`35`
`36`		`- callback.doWithResponse(null, null);`
	`36`	`+ callback.doWithResponse(null, null, null);`
`37`	`37`	`}`
`38`	`38`	`}`