Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1325: Ignore Unicode BOM in XML parser 

This caused failures to parse Azure Queue Storage list requests.
This commit is contained in:
Andrew Gaul 2017-07-23 19:08:26 -07:00
parent 2487b0c513
commit 78104938e5
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/jclouds/http/functions/ParseXMLWithJAXB.java
View File

@ -82,7 +82,8 @@ public class ParseXMLWithJAXB<T> implements Function<HttpResponse, T> {
public <V> V apply(final InputStream stream, final Class<V> type) throws IOException {
try {
return xml.fromXML(Strings2.toStringAndClose(stream), type);
String str = Strings2.toStringAndClose(stream);
return xml.fromXML(str, type);
} finally {
if (stream != null) {
stream.close();

6
core/src/main/java/org/jclouds/xml/internal/JAXBParser.java
View File

@ -70,7 +70,11 @@ public class JAXBParser implements XMLParser {
@SuppressWarnings("unchecked")
@Override
public <T> T fromXML(final String xml, final Class<T> type) throws IOException {
public <T> T fromXML(String xml, final Class<T> type) throws IOException {
// ignore byte order mark
if (xml.charAt(0) == 0xFEFF) {
xml = xml.substring(1);
}
try {
StringReader reader = new StringReader(xml);
JAXBContext context = JAXBContext.newInstance(type);

8
core/src/test/java/org/jclouds/rest/binders/BindToXMLPayloadTest.java
View File

@ -16,6 +16,7 @@
*/
package org.jclouds.rest.binders;
import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.Assert.assertEquals;
import javax.xml.bind.annotation.XmlRootElement;
@ -82,6 +83,13 @@ public class BindToXMLPayloadTest {
request = binder.bindToRequest(request, new Object());
}
@Test
public void testJAXBParserBOM() throws Exception {
String input = "\uFEFF<test><elem>foo</elem></test>";
TestJAXBDomain obj = xml.fromXML(input, TestJAXBDomain.class);
assertThat(obj.getElem()).isEqualTo("foo");
}
@XmlRootElement(name = "test")
public static class TestJAXBDomain {
private String elem;