Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-631 - generics suck

Browse Source
This commit is contained in:
Arjen Poutsma
2010-08-02 09:05:40 +00:00
parent 7e4b2f05b1
commit 133e57ed74
10 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/src/main/java/org/springframework/ws/mock/client/AbstractResponseCreator.java
View File

@@ -35,7 +35,7 @@ import org.springframework.xml.transform.TransformerObjectSupport;
abstract class AbstractResponseCreator<T extends WebServiceMessage> extends TransformerObjectSupport
implements ResponseCreator<T> {
public final T createResponse(URI uri, T request, WebServiceMessageFactory<T> messageFactory) throws IOException {
public final T createResponse(URI uri, T request, WebServiceMessageFactory<? extends T> messageFactory) throws IOException {
T response = messageFactory.createWebServiceMessage();
doWithResponse(uri, request, response);
return response;

2
test/src/main/java/org/springframework/ws/mock/client/ErrorResponseCreator.java
View File

@@ -39,7 +39,7 @@ class ErrorResponseCreator implements ResponseCreator<WebServiceMessage> {
public WebServiceMessage createResponse(URI uri,
WebServiceMessage request,
WebServiceMessageFactory<WebServiceMessage> factory) throws IOException {
WebServiceMessageFactory<? extends WebServiceMessage> factory) throws IOException {
// Do nothing
return null;
}

2
test/src/main/java/org/springframework/ws/mock/client/ExceptionResponseCreator.java
View File

@@ -43,7 +43,7 @@ class ExceptionResponseCreator implements ResponseCreator<WebServiceMessage> {
public WebServiceMessage createResponse(URI uri,
WebServiceMessage request,
WebServiceMessageFactory<WebServiceMessage> factory) throws IOException {
WebServiceMessageFactory<? extends WebServiceMessage> factory) throws IOException {
if (exception instanceof IOException) {
throw (IOException) exception;
}

2
test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java
View File

@@ -115,7 +115,7 @@ class MockSenderConnection implements FaultAwareWebServiceConnection, ResponseAc
}
public boolean hasFault() throws IOException {
return responseCreator instanceof SoapFaultResponseCallback;
return responseCreator instanceof SoapFaultResponseCreator;
}
public void setFault(boolean fault) throws IOException {

4
test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCallback.java → test/src/main/java/org/springframework/ws/mock/client/PayloadResponseCreator.java
View File

@@ -29,11 +29,11 @@ import org.springframework.ws.WebServiceMessage;
* @author Arjen Poutsma
* @since 2.0
*/
class PayloadResponseCallback extends AbstractResponseCreator<WebServiceMessage> {
class PayloadResponseCreator extends AbstractResponseCreator<WebServiceMessage> {
private final Source payload;
PayloadResponseCallback(Source payload) {
PayloadResponseCreator(Source payload) {
this.payload = payload;
}

2
test/src/main/java/org/springframework/ws/mock/client/ResponseCreator.java
View File

@@ -39,6 +39,6 @@ public interface ResponseCreator<T extends WebServiceMessage> {
* @param messageFactory the message that can be used to create responses
* @throws IOException in case of I/O errors
*/
T createResponse(URI uri, T request, WebServiceMessageFactory<T> messageFactory) throws IOException;
T createResponse(URI uri, T request, WebServiceMessageFactory<? extends T> messageFactory) throws IOException;
}

18
test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCallback.java → test/src/main/java/org/springframework/ws/mock/client/SoapFaultResponseCreator.java
View File

@@ -31,7 +31,7 @@ import static org.springframework.ws.mock.client.Assert.fail;
* @author Arjen Poutsma
* @since 2.0
*/
abstract class SoapFaultResponseCallback extends AbstractResponseCreator<SoapMessage> {
abstract class SoapFaultResponseCreator extends AbstractResponseCreator<SoapMessage> {
@Override
protected void doWithResponse(URI uri, SoapMessage request, SoapMessage response) throws IOException {
@@ -44,9 +44,9 @@ abstract class SoapFaultResponseCallback extends AbstractResponseCreator<SoapMes
public abstract void addSoapFault(SoapBody soapBody);
public static SoapFaultResponseCallback createMustUnderstandFault(final String faultStringOrReason,
public static SoapFaultResponseCreator createMustUnderstandFault(final String faultStringOrReason,
final Locale locale) {
return new SoapFaultResponseCallback() {
return new SoapFaultResponseCreator() {
@Override
public void addSoapFault(SoapBody soapBody) {
soapBody.addMustUnderstandFault(faultStringOrReason, locale);
@@ -55,9 +55,9 @@ abstract class SoapFaultResponseCallback extends AbstractResponseCreator<SoapMes
}
public static SoapFaultResponseCallback createClientOrSenderFault(final String faultStringOrReason,
public static SoapFaultResponseCreator createClientOrSenderFault(final String faultStringOrReason,
final Locale locale) {
return new SoapFaultResponseCallback() {
return new SoapFaultResponseCreator() {
@Override
public void addSoapFault(SoapBody soapBody) {
soapBody.addClientOrSenderFault(faultStringOrReason, locale);
@@ -65,9 +65,9 @@ abstract class SoapFaultResponseCallback extends AbstractResponseCreator<SoapMes
};
}
public static SoapFaultResponseCallback createServerOrReceiverFault(final String faultStringOrReason,
public static SoapFaultResponseCreator createServerOrReceiverFault(final String faultStringOrReason,
final Locale locale) {
return new SoapFaultResponseCallback() {
return new SoapFaultResponseCreator() {
@Override
public void addSoapFault(SoapBody soapBody) {
soapBody.addServerOrReceiverFault(faultStringOrReason, locale);
@@ -76,9 +76,9 @@ abstract class SoapFaultResponseCallback extends AbstractResponseCreator<SoapMes
}
public static SoapFaultResponseCallback createVersionMismatchFault(final String faultStringOrReason,
public static SoapFaultResponseCreator createVersionMismatchFault(final String faultStringOrReason,
final Locale locale) {
return new SoapFaultResponseCallback() {
return new SoapFaultResponseCreator() {
@Override
public void addSoapFault(SoapBody soapBody) {
soapBody.addVersionMismatchFault(faultStringOrReason, locale);

12
test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java
View File

@@ -260,7 +260,7 @@ public abstract class WebServiceMock {
*/
public static ResponseCreator withPayload(Source payload) {
Assert.notNull(payload, "'payload' must not be null");
return new PayloadResponseCallback(payload);
return new PayloadResponseCreator(payload);
}
/**
@@ -271,7 +271,7 @@ public abstract class WebServiceMock {
*/
public static ResponseCreator withPayload(Resource payload) {
Assert.notNull(payload, "'payload' must not be null");
return new PayloadResponseCallback(createResourceSource(payload));
return new PayloadResponseCreator(createResourceSource(payload));
}
/**
@@ -318,7 +318,7 @@ public abstract class WebServiceMock {
*/
public static ResponseCreator withMustUnderstandFault(String faultStringOrReason, Locale locale) {
Assert.hasLength(faultStringOrReason, "'faultStringOrReason' must not be empty");
return SoapFaultResponseCallback.createMustUnderstandFault(faultStringOrReason, locale);
return SoapFaultResponseCreator.createMustUnderstandFault(faultStringOrReason, locale);
}
/**
@@ -330,7 +330,7 @@ public abstract class WebServiceMock {
*/
public static ResponseCreator withClientOrSenderFault(String faultStringOrReason, Locale locale) {
Assert.hasLength(faultStringOrReason, "'faultStringOrReason' must not be empty");
return SoapFaultResponseCallback.createClientOrSenderFault(faultStringOrReason, locale);
return SoapFaultResponseCreator.createClientOrSenderFault(faultStringOrReason, locale);
}
/**
@@ -342,7 +342,7 @@ public abstract class WebServiceMock {
*/
public static ResponseCreator withServerOrReceiverFault(String faultStringOrReason, Locale locale) {
Assert.hasLength(faultStringOrReason, "'faultStringOrReason' must not be empty");
return SoapFaultResponseCallback.createServerOrReceiverFault(faultStringOrReason, locale);
return SoapFaultResponseCreator.createServerOrReceiverFault(faultStringOrReason, locale);
}
/**
@@ -354,7 +354,7 @@ public abstract class WebServiceMock {
*/
public static ResponseCreator withVersionMismatchFault(String faultStringOrReason, Locale locale) {
Assert.hasLength(faultStringOrReason, "'faultStringOrReason' must not be empty");
return SoapFaultResponseCallback.createVersionMismatchFault(faultStringOrReason, locale);
return SoapFaultResponseCreator.createVersionMismatchFault(faultStringOrReason, locale);
}
// Verification

4
test/src/test/java/org/springframework/ws/mock/client/MockSenderConnectionTest.java
View File

@@ -38,7 +38,7 @@ public class MockSenderConnectionTest {
@Test
public void normal() throws IOException {
MockSenderConnection connection = new MockSenderConnection();
connection.andRespond(new PayloadResponseCallback(new StringSource("<response/>")));
connection.andRespond(new PayloadResponseCreator(new StringSource("<response/>")));
assertFalse(connection.hasError());
assertNull(connection.getErrorMessage());
}
@@ -46,7 +46,7 @@ public class MockSenderConnectionTest {
@Test(expected = AssertionError.class)
public void noRequestMatchers() throws IOException {
MockSenderConnection connection = new MockSenderConnection();
connection.andRespond(new PayloadResponseCallback(new StringSource("<response/>")));
connection.andRespond(new PayloadResponseCreator(new StringSource("<response/>")));
connection.send(null);
}
}

16
test/src/test/java/org/springframework/ws/mock/client/SoapFaultResponseCallbackTest.java
View File

@@ -47,8 +47,8 @@ public class SoapFaultResponseCallbackTest {
@Test
public void clientOrSenderFault() throws IOException {
String faultString = "Foo";
SoapFaultResponseCallback callback =
SoapFaultResponseCallback.createClientOrSenderFault(faultString, Locale.ENGLISH);
SoapFaultResponseCreator callback =
SoapFaultResponseCreator.createClientOrSenderFault(faultString, Locale.ENGLISH);
callback.doWithResponse(null, null, response);
@@ -63,8 +63,8 @@ public class SoapFaultResponseCallbackTest {
@Test
public void mustUnderstandFault() throws IOException {
String faultString = "Foo";
SoapFaultResponseCallback callback =
SoapFaultResponseCallback.createMustUnderstandFault(faultString, Locale.ENGLISH);
SoapFaultResponseCreator callback =
SoapFaultResponseCreator.createMustUnderstandFault(faultString, Locale.ENGLISH);
callback.doWithResponse(null, null, response);
@@ -79,8 +79,8 @@ public class SoapFaultResponseCallbackTest {
@Test
public void serverOrReceiverFault() throws IOException {
String faultString = "Foo";
SoapFaultResponseCallback callback =
SoapFaultResponseCallback.createServerOrReceiverFault(faultString, Locale.ENGLISH);
SoapFaultResponseCreator callback =
SoapFaultResponseCreator.createServerOrReceiverFault(faultString, Locale.ENGLISH);
callback.doWithResponse(null, null, response);
@@ -95,8 +95,8 @@ public class SoapFaultResponseCallbackTest {
@Test
public void versionMismatchFault() throws IOException {
String faultString = "Foo";
SoapFaultResponseCallback callback =
SoapFaultResponseCallback.createVersionMismatchFault(faultString, Locale.ENGLISH);
SoapFaultResponseCreator callback =
SoapFaultResponseCreator.createVersionMismatchFault(faultString, Locale.ENGLISH);
callback.doWithResponse(null, null, response);