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

SWS-469: Content type not set accouring to Http specification, RFC 2616

Browse Source
This commit is contained in:
Arjen Poutsma
2009-01-26 10:39:38 +00:00
parent 2f5e7eaeb9
commit f59591c09a
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,7 @@ public class AxiomSoapMessage extends AbstractSoapMessage {
TransportOutputStream transportOutputStream = (TransportOutputStream) outputStream;
String contentType = format.getContentType();
if (!hasAttachments) {
contentType += "; charset=\"" + charsetEncoding + "\"";
contentType += "; charset=" + charsetEncoding;
}
if (SoapVersion.SOAP_11 == getVersion()) {
transportOutputStream.addHeader(TransportConstants.HEADER_SOAP_ACTION, soapAction);

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

@@ -16,13 +16,21 @@
package org.springframework.ws.soap;
import java.io.ByteArrayOutputStream;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.xml.sax.SAXParseException;
import org.springframework.core.io.Resource;
import org.springframework.util.StringUtils;
import org.springframework.ws.mime.AbstractMimeMessageTestCase;
import org.springframework.ws.mime.MimeMessage;
import org.springframework.ws.transport.MockTransportOutputStream;
import org.springframework.ws.transport.TransportConstants;
import org.springframework.xml.validation.XmlValidator;
import org.springframework.xml.validation.XmlValidatorFactory;
import org.xml.sax.SAXParseException;
public abstract class AbstractSoapMessageTestCase extends AbstractMimeMessageTestCase {
@@ -50,6 +58,21 @@ public abstract class AbstractSoapMessageTestCase extends AbstractMimeMessageTes
assertEquals("Invalid SOAP Action", "\"SoapAction\"", soapMessage.getSoapAction());
}
public void testCharsetAttribute() throws Exception {
MockTransportOutputStream outputStream = new MockTransportOutputStream(new ByteArrayOutputStream());
soapMessage.writeTo(outputStream);
Map headers = outputStream.getHeaders();
String contentType = (String) headers.get(TransportConstants.HEADER_CONTENT_TYPE);
if (contentType != null) {
Pattern charsetPattern = Pattern.compile("charset\\s*=\\s*([^;]+)");
Matcher matcher = charsetPattern.matcher(contentType);
if (matcher.find() && matcher.groupCount() == 1) {
String charset = matcher.group(1).trim();
assertTrue("Invalid charset", charset.indexOf('"') < 0);
}
}
}
protected abstract Resource[] getSoapSchemas();
public abstract void testGetVersion() throws Exception;