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

SWS-579 - AxiomSoapMessageFactory does not parse application/xop+xml Content-Type properly

Browse Source
This commit is contained in:
Arjen Poutsma
2009-11-10 15:07:32 +00:00
parent a98a7a903c
commit 4736135783
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java
View File

@@ -81,9 +81,9 @@ import org.springframework.ws.transport.TransportInputStream;
*/
public class AxiomSoapMessageFactory implements SoapMessageFactory, InitializingBean {
private static final String CHAR_SET_ENCODING = "charset";
private static final String CHARSET_PARAMETER = "charset";
private static final String DEFAULT_CHAR_SET_ENCODING = "UTF-8";
private static final String DEFAULT_CHARSET_ENCODING = "UTF-8";
private static final String MULTI_PART_RELATED_CONTENT_TYPE = "multipart/related";
@@ -295,26 +295,29 @@ public class AxiomSoapMessageFactory implements SoapMessageFactory, Initializing
* @return the character set encoding
*/
protected String getCharSetEncoding(String contentType) {
int index = contentType.indexOf(CHAR_SET_ENCODING);
if (index == -1) {
return DEFAULT_CHAR_SET_ENCODING;
int charSetIdx = contentType.indexOf(CHARSET_PARAMETER);
if (charSetIdx == -1) {
return DEFAULT_CHARSET_ENCODING;
}
int idx = contentType.indexOf("=", index);
int eqIdx = contentType.indexOf("=", charSetIdx);
int indexOfSemiColon = contentType.indexOf(";", idx);
int indexOfSemiColon = contentType.indexOf(";", eqIdx);
String value;
if (indexOfSemiColon > 0) {
value = contentType.substring(idx + 1, indexOfSemiColon);
value = contentType.substring(eqIdx + 1, indexOfSemiColon);
}
else {
value = contentType.substring(idx + 1, contentType.length()).trim();
value = contentType.substring(eqIdx + 1, contentType.length()).trim();
}
if (value.charAt(0) == '"' && value.charAt(value.length() - 1) == '"') {
return value.substring(1, value.length() - 1);
if (value.startsWith("\"")) {
value = value.substring(1);
}
if (value.endsWith("\"")) {
return value.substring(0, value.length() - 1);
}
if ("null".equalsIgnoreCase(value)) {
return DEFAULT_CHAR_SET_ENCODING;
return DEFAULT_CHARSET_ENCODING;
}
else {
return value.trim();

11
core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java
View File

@@ -44,6 +44,14 @@ public class AxiomSoap11MessageFactoryTest extends AbstractSoap11MessageFactoryT
return factory;
}
public void testGetCharsetEncoding() {
AxiomSoapMessageFactory messageFactory = new AxiomSoapMessageFactory();
assertEquals("Invalid charset", "utf-8", messageFactory.getCharSetEncoding("text/html; charset=utf-8"));
assertEquals("Invalid charset", "utf-8", messageFactory.getCharSetEncoding("application/xop+xml;type=text/xml; charset=utf-8"));
assertEquals("Invalid charset", "utf-8", messageFactory.getCharSetEncoding("application/xop+xml;type=\"text/xml; charset=utf-8\""));
}
public void testRepetitiveReadCaching() throws Exception {
AxiomSoapMessageFactory messageFactory = new AxiomSoapMessageFactory();
messageFactory.setPayloadCaching(true);
@@ -82,6 +90,9 @@ public class AxiomSoap11MessageFactoryTest extends AbstractSoap11MessageFactoryT
}
}
/**
* See http://jira.springframework.org/browse/SWS-502
*/
public void testSWS502() throws Exception {
AxiomSoapMessageFactory messageFactory = new AxiomSoapMessageFactory();
messageFactory.setPayloadCaching(false);