Skip to content

Commit 5ac2eef

Browse files
committed
Merge branch '2.19'
2 parents de45136 + 70fb3d3 commit 5ac2eef

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

src/test/java/tools/jackson/dataformat/xml/jdk17/Java17CollectionsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import java.util.stream.Collectors;
77
import java.util.stream.Stream;
88

9-
import tools.jackson.dataformat.xml.XmlMapper;
10-
import tools.jackson.dataformat.xml.XmlTestUtil;
9+
import tools.jackson.dataformat.xml.*;
1110

1211
import static org.junit.jupiter.api.Assertions.assertEquals;
1312

src/test/java/tools/jackson/dataformat/xml/tofix/records/XmlRecordDeser734Test.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
import org.junit.jupiter.api.Test;
44

5-
import tools.jackson.dataformat.xml.XmlMapper;
6-
import tools.jackson.dataformat.xml.XmlTestUtil;
5+
import tools.jackson.dataformat.xml.*;
76
import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
87
import tools.jackson.dataformat.xml.annotation.JacksonXmlText;
98
import tools.jackson.dataformat.xml.testutil.failure.JacksonTestFailureExpected;
109

11-
import static org.junit.jupiter.api.Assertions.assertEquals;
10+
import static org.junit.jupiter.api.Assertions.*;
1211

1312
// [dataformat-xml#734]
1413
public class XmlRecordDeser734Test extends XmlTestUtil
1514
{
16-
1715
record Amount(@JacksonXmlText String value,
1816
@JacksonXmlProperty(isAttribute = true, localName = "Ccy") String currency) {}
1917

src/test/java/tools/jackson/dataformat/xml/tofix/records/XmlWrapperRecord517Test.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,21 @@
1616
public class XmlWrapperRecord517Test
1717
extends XmlTestUtil
1818
{
19-
2019
public record Request(
2120
@JacksonXmlElementWrapper(localName = "messages")
2221
@JacksonXmlProperty(localName = "message")
2322
List<Message> messages
2423
) {
2524
public Request {}
2625

27-
Request() {this(null);}
26+
protected Request() {this(null);}
2827
}
2928

3029
public record Message(String text) {
3130
public Message {
3231
}
3332

34-
Message() {
33+
protected Message() {
3534
this(null);
3635
}
3736
}

0 commit comments

Comments
 (0)