Skip to content

Commit 8ed5a63

Browse files
committed
More work
1 parent 3b840bf commit 8ed5a63

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
9393
<scope>test</scope>
9494
</dependency>
9595
<!-- 11-Jan-2025, joohyukkim: JSTEP-10, part 1, migrate to JUnit5 -->
96+
<!--
9697
<dependency>
9798
<groupId>org.junit.jupiter</groupId>
9899
<artifactId>junit-jupiter</artifactId>
@@ -108,6 +109,7 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
108109
<artifactId>assertj-core</artifactId>
109110
<scope>test</scope>
110111
</dependency>
112+
-->
111113

112114
<!-- Jakarta XMLBind (nee javax/jaxb( annotation introspector is needed BUT ONLY
113115
for tests (starting 2.13: previously compile/runtime)

src/test/java/module-info.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@
1010
requires tools.jackson.core;
1111
requires tools.jackson.databind;
1212

13-
// Then test library dependencies
13+
// Then test dependencies
1414
requires junit;
15-
requires org.junit.jupiter.api;
16-
requires org.junit.jupiter.params;
15+
//requires org.junit.jupiter.api;
16+
//requires org.junit.jupiter.params;
17+
18+
requires com.ctc.wstx; // woodstox
19+
requires jakarta.xml.bind; // Jakarta-binding
20+
requires tools.jackson.module.jakarta.xmlbind;
1721

1822
// Then exports same as main artifact
1923

src/test/java/tools/jackson/dataformat/xml/failing/XmlTextViaCreator306Test.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package tools.jackson.dataformat.xml.failing;
22

3-
import java.beans.ConstructorProperties;
4-
53
import com.fasterxml.jackson.annotation.JsonCreator;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
65
import com.fasterxml.jackson.annotation.JsonRootName;
76

87
import tools.jackson.dataformat.xml.XmlMapper;
@@ -37,8 +36,8 @@ static class Child {
3736
@JacksonXmlText
3837
String el;
3938

40-
@ConstructorProperties({"attr", "el"})
41-
Child(String attr, String el) {
39+
@JsonCreator
40+
Child(@JsonProperty("attr") String attr, @JsonProperty("el") String el) {
4241
this.attr = attr;
4342
this.el = el;
4443
}
@@ -49,8 +48,8 @@ static class RootWithoutConstructor {
4948
@JacksonXmlProperty(localName = "CHILD")
5049
final ChildWithoutConstructor child;
5150

52-
@ConstructorProperties({"child"})
53-
public RootWithoutConstructor(ChildWithoutConstructor child) {
51+
@JsonCreator
52+
public RootWithoutConstructor(@JsonProperty("child") ChildWithoutConstructor child) {
5453
this.child = child;
5554
}
5655

0 commit comments

Comments
 (0)