Refactored SAAJ implementation from two separate class hierarchies (SAAJ 1.2 and SAAJ 1.3) into one single hierarchy, using bridge pattern (SaajImplementation).

This commit is contained in:
Arjen Poutsma
2006-12-31 20:40:30 +00:00
parent 7f73cafae6
commit 7828c120d1
2 changed files with 3 additions and 5 deletions

View File

@@ -25,7 +25,6 @@ import org.springframework.ws.context.MessageContext;
import org.springframework.ws.soap.SoapMessage;
import org.springframework.ws.soap.saaj.SaajSoapMessage;
import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
import org.springframework.ws.soap.saaj.saaj13.Saaj13SoapMessage;
import org.springframework.ws.soap.security.WsSecurityValidationException;
public class XwsSecurityInterceptorTest extends TestCase {
@@ -53,7 +52,7 @@ public class XwsSecurityInterceptorTest extends TestCase {
};
MessageContext context =
new DefaultMessageContext(new Saaj13SoapMessage(request), new SaajSoapMessageFactory(messageFactory));
new DefaultMessageContext(new SaajSoapMessage(request), new SaajSoapMessageFactory(messageFactory));
interceptor.handleRequest(context, null);
assertEquals("Invalid request", validatedRequest, ((SaajSoapMessage) context.getRequest()).getSaajMessage());
}
@@ -74,7 +73,7 @@ public class XwsSecurityInterceptorTest extends TestCase {
};
SOAPMessage request = messageFactory.createMessage();
MessageContext context =
new DefaultMessageContext(new Saaj13SoapMessage(request), new SaajSoapMessageFactory(messageFactory));
new DefaultMessageContext(new SaajSoapMessage(request), new SaajSoapMessageFactory(messageFactory));
interceptor.handleResponse(context, null);
assertEquals("Invalid response", securedResponse, ((SaajSoapMessage) context.getResponse()).getSaajMessage());
}

View File

@@ -27,7 +27,6 @@ import javax.xml.soap.SOAPMessage;
import junit.framework.TestCase;
import org.springframework.ws.soap.saaj.SaajSoapMessage;
import org.springframework.ws.soap.saaj.saaj13.Saaj13SoapMessage;
import org.springframework.xml.xpath.XPathExpression;
import org.springframework.xml.xpath.XPathExpressionFactory;
import org.w3c.dom.Document;
@@ -83,7 +82,7 @@ public abstract class XwssMessageInterceptorTestCase extends TestCase {
try {
is = getClass().getResourceAsStream(fileName);
assertNotNull("Could not load SAAJ message with name [" + fileName + "]", is);
return new Saaj13SoapMessage(messageFactory.createMessage(mimeHeaders, is));
return new SaajSoapMessage(messageFactory.createMessage(mimeHeaders, is));
}
finally {
if (is != null) {