Skip to content

Commit

Permalink
Mark #97 as fixed (was fixed at some point during 2.12.0, along other…
Browse files Browse the repository at this point in the history
… issues)
  • Loading branch information
cowtowncoder committed Jun 30, 2020
1 parent 0a0adb0 commit e5154e6
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
4 changes: 3 additions & 1 deletion release-notes/CREDITS-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ Pascal Gelinas:
(2.3.1)
* Reported and fixed #83: Add support for @JsonUnwrapped
(2.4.0)

* Reported #97: Weird Exception during read with Type info
(2.12.0)

Dan Jasek: (oillio@github)

* Contributed #126: Allow specifying properties that should be written as CData
Expand Down
2 changes: 2 additions & 0 deletions release-notes/VERSION-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Project: jackson-dataformat-xml

2.12.0 (not yet released)

#97: Weird Exception during read with Type info
(reported by Pascal G)
#124: Deserialization if an empty list (with empty XML tag) results in `null`
(reported by Denis C)
#205: `XmlMapper`/`UntypedObjectDeserializer` swallows duplicated elements in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ static class Root {
public void testUnwrappedRoundTrip() throws Exception
{
String xml = MAPPER.writeValueAsString(new Root());
System.err.println("XML: "+xml);
// assertEquals("<Root><id>hello</id></Root>", xml);
assertEquals("<Root><id>1</id></Root>", xml);
//System.err.println("XML: "+xml);
Root result = MAPPER.readValue(xml, Root.class);
assertNotNull(result);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ static class Composite {
static class Header {
public String headerId;
}

private final ObjectMapper MAPPER = newMapper();

public void testXmlMarshallingAndUnmarshalling() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.fasterxml.jackson.dataformat.xml.failing;
package com.fasterxml.jackson.dataformat.xml.lists;

import static org.junit.Assert.*;
import static org.hamcrest.CoreMatchers.*;
Expand Down

0 comments on commit e5154e6

Please sign in to comment.