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

SWS-208

Browse Source
This commit is contained in:
Arjen Poutsma
2007-10-20 14:02:19 +00:00
parent 62cada56e1
commit aff494f75a
9 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessage.java
View File

@@ -33,6 +33,7 @@ import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.soap.SOAPProcessingException;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.ws.mime.Attachment;
import org.springframework.ws.soap.AbstractSoapMessage;
import org.springframework.ws.soap.SoapEnvelope;
@@ -74,7 +75,7 @@ public class AxiomSoapMessage extends AbstractSoapMessage {
axiomMessage = axiomFactory.createSOAPMessage(soapEnvelope, soapEnvelope.getBuilder());
attachments = new Attachments();
payloadCaching = true;
soapAction = "";
soapAction = "\"\"";
}
/**
@@ -105,6 +106,9 @@ public class AxiomSoapMessage extends AbstractSoapMessage {
axiomMessage = soapMessage;
axiomFactory = (SOAPFactory) soapMessage.getSOAPEnvelope().getOMFactory();
this.attachments = attachments;
if (!StringUtils.hasLength(soapAction)) {
soapAction = "\"\"";
}
this.soapAction = soapAction;
this.payloadCaching = payloadCaching;
}
@@ -132,11 +136,15 @@ public class AxiomSoapMessage extends AbstractSoapMessage {
public void setSoapAction(String soapAction) {
if (soapAction == null) {
this.soapAction = "";
soapAction = "";
}
else {
this.soapAction = soapAction;
if (!soapAction.startsWith("\"")) {
soapAction = "\"" + soapAction;
}
if (!soapAction.endsWith("\"")) {
soapAction = soapAction + "\"";
}
this.soapAction = soapAction;
}
public boolean isXopPackage() {

5
core/src/main/java/org/springframework/ws/soap/saaj/Saaj11Implementation.java
View File

@@ -49,6 +49,7 @@ import org.springframework.ws.soap.SoapVersion;
import org.springframework.ws.soap.saaj.support.SaajContentHandler;
import org.springframework.ws.soap.saaj.support.SaajUtils;
import org.springframework.ws.soap.saaj.support.SaajXmlReader;
import org.springframework.ws.transport.TransportConstants;
import org.springframework.ws.transport.TransportOutputStream;
import org.springframework.xml.namespace.QNameUtils;
import org.xml.sax.InputSource;
@@ -284,8 +285,8 @@ public class Saaj11Implementation implements SaajImplementation {
TransportOutputStream transportOutputStream = (TransportOutputStream) outputStream;
// some SAAJ implementations (Axis 1) do not have a Content-Type header by default
MimeHeaders headers = message.getMimeHeaders();
if (ObjectUtils.isEmpty(headers.getHeader("Content-Type"))) {
headers.addHeader("Content-Type", SoapVersion.SOAP_11.getContentType());
if (ObjectUtils.isEmpty(headers.getHeader(TransportConstants.HEADER_CONTENT_TYPE))) {
headers.addHeader(TransportConstants.HEADER_CONTENT_TYPE, SoapVersion.SOAP_11.getContentType());
if (message.saveRequired()) {
message.saveChanges();
}

5
core/src/main/java/org/springframework/ws/soap/saaj/Saaj12Implementation.java
View File

@@ -46,6 +46,7 @@ import javax.xml.transform.dom.DOMSource;
import org.springframework.util.ObjectUtils;
import org.springframework.ws.soap.SoapVersion;
import org.springframework.ws.soap.saaj.support.SaajUtils;
import org.springframework.ws.transport.TransportConstants;
import org.springframework.ws.transport.TransportOutputStream;
/**
@@ -235,8 +236,8 @@ public class Saaj12Implementation implements SaajImplementation {
TransportOutputStream transportOutputStream = (TransportOutputStream) outputStream;
// some SAAJ implementations (Axis 1) do not have a Content-Type header by default
MimeHeaders headers = message.getMimeHeaders();
if (ObjectUtils.isEmpty(headers.getHeader("Content-Type"))) {
headers.addHeader("Content-Type", SoapVersion.SOAP_11.getContentType());
if (ObjectUtils.isEmpty(headers.getHeader(TransportConstants.HEADER_CONTENT_TYPE))) {
headers.addHeader(TransportConstants.HEADER_CONTENT_TYPE, SoapVersion.SOAP_11.getContentType());
if (message.saveRequired()) {
message.saveChanges();
}

7
core/src/main/java/org/springframework/ws/soap/saaj/Saaj13Implementation.java
View File

@@ -43,6 +43,7 @@ import javax.xml.transform.dom.DOMSource;
import org.springframework.util.ObjectUtils;
import org.springframework.ws.soap.SoapVersion;
import org.springframework.ws.transport.TransportConstants;
import org.springframework.ws.transport.TransportOutputStream;
/**
@@ -262,14 +263,14 @@ public class Saaj13Implementation implements SaajImplementation {
TransportOutputStream transportOutputStream = (TransportOutputStream) outputStream;
// some SAAJ implementations (Axis 1) do not have a Content-Type header by default
MimeHeaders headers = message.getMimeHeaders();
if (ObjectUtils.isEmpty(headers.getHeader("Content-Type"))) {
if (ObjectUtils.isEmpty(headers.getHeader(TransportConstants.HEADER_CONTENT_TYPE))) {
SOAPEnvelope envelope = message.getSOAPPart().getEnvelope();
if (envelope.getElementQName().getNamespaceURI()
.equals(SoapVersion.SOAP_11.getEnvelopeNamespaceUri())) {
headers.addHeader("Content-Type", SoapVersion.SOAP_11.getContentType());
headers.addHeader(TransportConstants.HEADER_CONTENT_TYPE, SoapVersion.SOAP_11.getContentType());
}
else {
headers.addHeader("Content-Type", SoapVersion.SOAP_12.getContentType());
headers.addHeader(TransportConstants.HEADER_CONTENT_TYPE, SoapVersion.SOAP_12.getContentType());
}
if (message.saveRequired()) {
message.saveChanges();

15
core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
View File

@@ -62,6 +62,10 @@ public class SaajSoapMessage extends AbstractSoapMessage {
*/
public SaajSoapMessage(SOAPMessage soapMessage) {
Assert.notNull(soapMessage, "soapMessage must not be null");
MimeHeaders headers = getImplementation().getMimeHeaders(soapMessage);
if (ObjectUtils.isEmpty(headers.getHeader(TransportConstants.HEADER_SOAP_ACTION))) {
headers.addHeader(TransportConstants.HEADER_SOAP_ACTION, "\"\"");
}
saajMessage = soapMessage;
}
@@ -92,11 +96,20 @@ public class SaajSoapMessage extends AbstractSoapMessage {
public String getSoapAction() {
MimeHeaders mimeHeaders = getImplementation().getMimeHeaders(getSaajMessage());
String[] values = mimeHeaders.getHeader(TransportConstants.HEADER_SOAP_ACTION);
return ObjectUtils.isEmpty(values) ? null : values[0];
return ObjectUtils.isEmpty(values) ? "" : values[0];
}
public void setSoapAction(String soapAction) {
if (soapAction == null) {
soapAction = "";
}
MimeHeaders mimeHeaders = getImplementation().getMimeHeaders(getSaajMessage());
if (!soapAction.startsWith("\"")) {
soapAction = "\"" + soapAction;
}
if (!soapAction.endsWith("\"")) {
soapAction = soapAction + "\"";
}
mimeHeaders.setHeader(TransportConstants.HEADER_SOAP_ACTION, soapAction);
}

8
core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java
View File

@@ -34,6 +34,7 @@ import org.springframework.ws.soap.SoapMessageCreationException;
import org.springframework.ws.soap.SoapMessageFactory;
import org.springframework.ws.soap.SoapVersion;
import org.springframework.ws.soap.saaj.support.SaajUtils;
import org.springframework.ws.transport.TransportConstants;
import org.springframework.ws.transport.TransportInputStream;
/**
@@ -57,8 +58,6 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB
private String messageFactoryProtocol;
private static final String CONTENT_TYPE = "Content-Type";
/** Default, empty constructor. */
public SaajSoapMessageFactory() {
}
@@ -166,10 +165,11 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB
catch (SOAPException ex) {
// SAAJ 1.3 RI has a issue with handling multipart XOP content types which contain "startinfo" rather than
// "start-info", so let's try and do something about it
String contentType = StringUtils.arrayToCommaDelimitedString(mimeHeaders.getHeader(CONTENT_TYPE));
String contentType = StringUtils
.arrayToCommaDelimitedString(mimeHeaders.getHeader(TransportConstants.HEADER_CONTENT_TYPE));
if (contentType.indexOf("startinfo") != -1) {
contentType = contentType.replace("startinfo", "start-info");
mimeHeaders.setHeader(CONTENT_TYPE, contentType);
mimeHeaders.setHeader(TransportConstants.HEADER_CONTENT_TYPE, contentType);
try {
return new SaajSoapMessage(messageFactory.createMessage(mimeHeaders, inputStream));
}

5
core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java
View File

@@ -33,6 +33,7 @@ import org.springframework.core.io.Resource;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
import org.springframework.ws.transport.TransportConstants;
import org.springframework.xml.namespace.QNameUtils;
import org.w3c.dom.Element;
@@ -216,8 +217,8 @@ public abstract class SaajUtils {
InputStream is = resource.getInputStream();
try {
MimeHeaders mimeHeaders = new MimeHeaders();
mimeHeaders.addHeader("Content-Type", "text/xml");
mimeHeaders.addHeader("Content-Length", Long.toString(resource.getFile().length()));
mimeHeaders.addHeader(TransportConstants.HEADER_CONTENT_TYPE, "text/xml");
mimeHeaders.addHeader(TransportConstants.HEADER_CONTENT_LENGTH, Long.toString(resource.getFile().length()));
return messageFactory.createMessage(mimeHeaders, is);
}
finally {

6
core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java
View File

@@ -45,9 +45,9 @@ public abstract class AbstractSoapMessageTestCase extends AbstractMimeMessageTes
}
public void testSoapAction() throws Exception {
String soapAction = "SoapAction";
soapMessage.setSoapAction(soapAction);
assertEquals("Invalid SOAP Action", soapAction, soapMessage.getSoapAction());
assertEquals("Invalid default SOAP Action", "\"\"", soapMessage.getSoapAction());
soapMessage.setSoapAction("SoapAction");
assertEquals("Invalid SOAP Action", "\"SoapAction\"", soapMessage.getSoapAction());
}
protected abstract Resource[] getSoapSchemas();

2
core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java
View File

@@ -48,7 +48,7 @@ public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageT
String contentType = (String) tos.getHeaders().get("Content-Type");
assertTrue("Invalid Content-Type set", contentType.indexOf(SoapVersion.SOAP_11.getContentType()) != -1);
String resultSoapAction = (String) tos.getHeaders().get("SOAPAction");
assertEquals("Invalid soap action", soapAction, resultSoapAction);
assertEquals("Invalid soap action", "\"" + soapAction + "\"", resultSoapAction);
}
public void testWriteToTransportResponseAttachment() throws Exception {