Skip to content

Commit 647d78a

Browse files
committed
Merge branch '2.19'
2 parents b7c0aac + 5a5ff14 commit 647d78a

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package tools.jackson.dataformat.xml.jdk17;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import java.util.List;
46
import java.util.stream.Collectors;
57
import java.util.stream.Stream;
68

7-
import org.junit.jupiter.api.Test;
8-
99
import tools.jackson.dataformat.xml.XmlMapper;
1010
import tools.jackson.dataformat.xml.XmlTestUtil;
1111

@@ -16,7 +16,8 @@ public class Java17CollectionsTest extends XmlTestUtil
1616
private final XmlMapper _xmlMapper = new XmlMapper();
1717

1818
@Test
19-
public void testStreamOf() throws Exception
19+
public void testStreamOf()
20+
throws Exception
2021
{
2122
List<String> input = Stream.of("a", "b", "c").collect(Collectors.toList());
2223

@@ -31,5 +32,4 @@ public void testStreamOf() throws Exception
3132
deser = _xmlMapper.readValue(ser, List.class);
3233
assertEquals(input, deser);
3334
}
34-
3535
}

src/test/java/tools/jackson/dataformat/xml/lists/StringListRoundtripTest.java

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

33
import java.util.*;
4-
import static java.util.Arrays.asList;
54

65
import org.junit.jupiter.api.Test;
76

@@ -129,7 +128,7 @@ public void testStringList() throws Exception
129128

130129
private void _stringListRoundtrip(ObjectMapper mapper, boolean shouldBeNull) throws Exception
131130
{
132-
List<String> list = asList(TEST_DATA);
131+
List<String> list = Arrays.asList(TEST_DATA);
133132

134133
// serialize to string
135134
String xml = mapper.writeValueAsString(list);
@@ -166,7 +165,7 @@ public void testStringListPojo() throws Exception
166165
private void _stringListPojoRoundtrip(ObjectMapper mapper, boolean shouldBeNull) throws Exception
167166
{
168167
ListPojo listPojo = new ListPojo();
169-
listPojo.setList(asList(TEST_DATA));
168+
listPojo.setList(Arrays.asList(TEST_DATA));
170169

171170
// serialize to string
172171
String xml = mapper.writeValueAsString(listPojo);

0 commit comments

Comments
 (0)