Skip to content

Commit e5154e6

Browse files
committed
Mark #97 as fixed (was fixed at some point during 2.12.0, along other issues)
1 parent 0a0adb0 commit e5154e6

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

release-notes/CREDITS-2.x

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ Pascal Gelinas:
1515
(2.3.1)
1616
* Reported and fixed #83: Add support for @JsonUnwrapped
1717
(2.4.0)
18-
18+
* Reported #97: Weird Exception during read with Type info
19+
(2.12.0)
20+
1921
Dan Jasek: (oillio@github)
2022

2123
* Contributed #126: Allow specifying properties that should be written as CData

release-notes/VERSION-2.x

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Project: jackson-dataformat-xml
66

77
2.12.0 (not yet released)
88

9+
#97: Weird Exception during read with Type info
10+
(reported by Pascal G)
911
#124: Deserialization if an empty list (with empty XML tag) results in `null`
1012
(reported by Denis C)
1113
#205: `XmlMapper`/`UntypedObjectDeserializer` swallows duplicated elements in

src/test/java/com/fasterxml/jackson/dataformat/xml/failing/Unwrapped374Test.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ static class Root {
2222
public void testUnwrappedRoundTrip() throws Exception
2323
{
2424
String xml = MAPPER.writeValueAsString(new Root());
25-
System.err.println("XML: "+xml);
26-
// assertEquals("<Root><id>hello</id></Root>", xml);
25+
assertEquals("<Root><id>1</id></Root>", xml);
26+
//System.err.println("XML: "+xml);
2727
Root result = MAPPER.readValue(xml, Root.class);
2828
assertNotNull(result);
2929
}

src/test/java/com/fasterxml/jackson/dataformat/xml/failing/UnwrappedAndList299DeserTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static class Composite {
2626
static class Header {
2727
public String headerId;
2828
}
29-
29+
3030
private final ObjectMapper MAPPER = newMapper();
3131

3232
public void testXmlMarshallingAndUnmarshalling() throws Exception {

src/test/java/com/fasterxml/jackson/dataformat/xml/failing/PolymorphicList97Test.java renamed to src/test/java/com/fasterxml/jackson/dataformat/xml/lists/PolymorphicList97Test.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.fasterxml.jackson.dataformat.xml.failing;
1+
package com.fasterxml.jackson.dataformat.xml.lists;
22

33
import static org.junit.Assert.*;
44
import static org.hamcrest.CoreMatchers.*;

0 commit comments

Comments
 (0)