Skip to content

Commit 0fa6340

Browse files
cowtowncodercowtowncoder
committed
Merge branch '2.19'
2 parents f7f4e5b + a30ebe5 commit 0fa6340

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+287
-70
lines changed

‎jaxb/pom.xml

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -41,49 +41,54 @@
4141
<version.jaxb.impl>2.3.3</version.jaxb.impl>
4242
-->
4343
</properties>
44-
<dependencies>
45-
<!-- Extends Jackson core and mapper; minor dep on annotations too (JsonInclude) -->
46-
<dependency>
47-
<groupId>com.fasterxml.jackson.core</groupId>
48-
<artifactId>jackson-annotations</artifactId>
49-
</dependency>
50-
<dependency>
51-
<groupId>tools.jackson.core</groupId>
52-
<artifactId>jackson-core</artifactId>
53-
</dependency>
54-
<dependency>
55-
<groupId>tools.jackson.core</groupId>
56-
<artifactId>jackson-databind</artifactId>
57-
</dependency>
44+
<dependencies>
45+
<!-- Extends Jackson core and mapper; minor dep on annotations too (JsonInclude) -->
46+
<dependency>
47+
<groupId>com.fasterxml.jackson.core</groupId>
48+
<artifactId>jackson-annotations</artifactId>
49+
</dependency>
50+
<dependency>
51+
<groupId>tools.jackson.core</groupId>
52+
<artifactId>jackson-core</artifactId>
53+
</dependency>
54+
<dependency>
55+
<groupId>tools.jackson.core</groupId>
56+
<artifactId>jackson-databind</artifactId>
57+
</dependency>
5858

59-
<!-- 20-Apr-2024, tatu: JUnit4 no longer from jackson-base -->
59+
<!-- Test dependencies -->
6060
<dependency>
61-
<groupId>junit</groupId>
62-
<artifactId>junit</artifactId>
61+
<groupId>org.junit.jupiter</groupId>
62+
<artifactId>junit-jupiter</artifactId>
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.junit.jupiter</groupId>
67+
<artifactId>junit-jupiter-api</artifactId>
6368
<scope>test</scope>
6469
</dependency>
6570

66-
<!-- 20-May-2024: [modules-base#233]: Tolerate [2.2,3) for javax.xml.bind Import-Package
67-
in the generated MANIFEST.MF -->
68-
<!-- 16-Jan-2025, tatu: Let's not bother with 2.2 any more -->
69-
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
70-
<dependency>
71-
<groupId>javax.xml.bind</groupId>
72-
<artifactId>jaxb-api</artifactId>
73-
<version>2.3.1</version>
74-
</dependency>
75-
<!-- 05-May-2019, tatu: As per #111, looks like we actually need this
76-
flavor of activation API...
77-
-->
78-
<!-- 16-Jan-2025, tatu: Should not be needed; adds conflict -->
79-
<!--
80-
<dependency>
81-
<groupId>jakarta.activation</groupId>
82-
<artifactId>jakarta.activation-api</artifactId>
83-
<version>1.2.1</version>
84-
</dependency>
85-
-->
86-
</dependencies>
71+
<!-- 20-May-2024: [modules-base#233]: Tolerate [2.2,3) for javax.xml.bind Import-Package
72+
in the generated MANIFEST.MF -->
73+
<!-- 16-Jan-2025, tatu: Let's not bother with 2.2 any more -->
74+
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
75+
<dependency>
76+
<groupId>javax.xml.bind</groupId>
77+
<artifactId>jaxb-api</artifactId>
78+
<version>2.3.1</version>
79+
</dependency>
80+
<!-- 05-May-2019, tatu: As per #111, looks like we actually need this
81+
flavor of activation API...
82+
-->
83+
<!-- 16-Jan-2025, tatu: Should not be needed; adds conflict -->
84+
<!--
85+
<dependency>
86+
<groupId>jakarta.activation</groupId>
87+
<artifactId>jakarta.activation-api</artifactId>
88+
<version>1.2.1</version>
89+
</dependency>
90+
-->
91+
</dependencies>
8792

8893
<build>
8994
<plugins>

‎jaxb/src/test/java/module-info.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414

1515
// Additional test lib/framework dependencies
1616

17-
requires junit; // JUnit4 To Be Removed in future
17+
requires org.junit.jupiter.api;
18+
requires org.junit.jupiter.params;
1819

1920
// Further, need to open up some packages for JUnit et al
2021

‎jaxb/src/test/java/tools/jackson/module/jaxb/BaseJaxbTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package tools.jackson.module.jaxb;
22

3-
import java.io.IOException;
43
import java.util.Map;
54

65
import tools.jackson.databind.*;
@@ -10,7 +9,6 @@
109
import tools.jackson.databind.json.JsonMapper;
1110

1211
public abstract class BaseJaxbTest
13-
extends junit.framework.TestCase
1412
{
1513
protected BaseJaxbTest() { }
1614

@@ -68,24 +66,22 @@ protected ObjectMapper getJaxbAndJacksonMapper()
6866

6967
@SuppressWarnings("unchecked")
7068
protected Map<String,Object> writeAndMap(ObjectMapper m, Object value)
71-
throws IOException
7269
{
7370
String str = m.writeValueAsString(value);
7471
return (Map<String,Object>) m.readValue(str, Map.class);
7572
}
7673

7774
protected Map<String,Object> writeAndMap(Object value)
78-
throws IOException
7975
{
8076
return writeAndMap(new ObjectMapper(), value);
8177
}
8278

83-
protected String serializeAsString(ObjectMapper m, Object value) throws IOException
79+
protected String serializeAsString(ObjectMapper m, Object value)
8480
{
8581
return m.writeValueAsString(value);
8682
}
8783

88-
protected String serializeAsString(Object value) throws IOException
84+
protected String serializeAsString(Object value)
8985
{
9086
return serializeAsString(new ObjectMapper(), value);
9187
}

‎jaxb/src/test/java/tools/jackson/module/jaxb/TestVersions.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
package tools.jackson.module.jaxb;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import tools.jackson.core.Version;
46
import tools.jackson.core.Versioned;
57

8+
import static org.junit.jupiter.api.Assertions.*;
9+
610
public class TestVersions extends BaseJaxbTest
711
{
12+
@Test
813
public void testVersions()
914
{
1015
assertVersion(new JaxbAnnotationIntrospector());
@@ -19,7 +24,7 @@ public void testVersions()
1924
private void assertVersion(Versioned vers)
2025
{
2126
Version v = vers.version();
22-
assertFalse("Should find version information (got "+v+")", v.isUnknownVersion());
27+
assertFalse(v.isUnknownVersion(), "Should find version information (got "+v+")");
2328
Version exp = PackageVersion.VERSION;
2429
assertEquals(exp.toFullString(), v.toFullString());
2530
assertEquals(exp, v);

‎jaxb/src/test/java/tools/jackson/module/jaxb/adapters/EntryType.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package tools.jackson.module.jaxb.adapters;
22

3-
/**
4-
* @author Ryan Heaton
5-
*/
63
public class EntryType<K, V> {
74

85
private K key;

‎jaxb/src/test/java/tools/jackson/module/jaxb/adapters/MapAdapter.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package tools.jackson.module.jaxb.adapters;
22

3-
import javax.xml.bind.annotation.adapters.XmlAdapter;
4-
3+
import java.util.*;
54

6-
import java.util.HashMap;
7-
import java.util.LinkedList;
8-
import java.util.List;
9-
import java.util.Map;
5+
import javax.xml.bind.annotation.adapters.XmlAdapter;
106

117
public class MapAdapter<K, V> extends XmlAdapter<MapType<K, V>, Map<K, V>>
128
{

‎jaxb/src/test/java/tools/jackson/module/jaxb/adapters/MapType.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
import java.util.List;
44

5-
/**
6-
* @author Ryan Heaton
7-
*/
85
public class MapType<K,V> {
96

107
public List<EntryType<K, V>> entries;

‎jaxb/src/test/java/tools/jackson/module/jaxb/adapters/TestAdaptedMapType.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@
66
import javax.xml.bind.annotation.adapters.XmlAdapter;
77
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
88

9+
import org.junit.jupiter.api.Test;
10+
911
import tools.jackson.databind.ObjectMapper;
1012
import tools.jackson.module.jaxb.BaseJaxbTest;
1113

14+
import static org.junit.jupiter.api.Assertions.*;
15+
1216
/**
1317
* Tests for verifying JAXB adapter handling for {@link java.util.Map}
1418
* types.
@@ -63,6 +67,7 @@ public Map<String, String> unmarshal(Map<String, String> input)
6367
/**********************************************************
6468
*/
6569

70+
@Test
6671
public void testJacksonAdaptedMapType() throws IOException
6772
{
6873
ObjectContainingAMap obj = new ObjectContainingAMap();
@@ -82,6 +87,7 @@ public void testJacksonAdaptedMapType() throws IOException
8287
assertEquals("here", map.get("how"));
8388
}
8489

90+
@Test
8591
public void testStringMaps() throws IOException
8692
{
8793
ObjectMapper mapper = getJaxbMapper();

‎jaxb/src/test/java/tools/jackson/module/jaxb/adapters/TestAdapters.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@
66
import javax.xml.bind.annotation.adapters.XmlAdapter;
77
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
88

9+
import org.junit.jupiter.api.Test;
10+
911
import tools.jackson.databind.ObjectMapper;
1012
import tools.jackson.module.jaxb.BaseJaxbTest;
1113

14+
import static org.junit.jupiter.api.Assertions.*;
15+
1216
/**
1317
* Unit tests for checking that JAXB type adapters work (to some
1418
* degree, anyway).
@@ -164,12 +168,14 @@ public IdentityAdapterPropertyBean() { }
164168
/**********************************************************
165169
*/
166170

171+
@Test
167172
public void testSimpleAdapterSerialization() throws Exception
168173
{
169174
Bean bean = new Bean(123L);
170175
assertEquals("{\"value\":\"XXX\"}", getJaxbMapper().writeValueAsString(bean));
171176
}
172177

178+
@Test
173179
public void testSimpleAdapterDeserialization() throws Exception
174180
{
175181
Bean bean = getJaxbMapper().readValue("{\"value\":\"abc\"}", Bean.class);
@@ -178,6 +184,7 @@ public void testSimpleAdapterDeserialization() throws Exception
178184
}
179185

180186
// [JACKSON-288]
187+
@Test
181188
public void testDateAdapter() throws Exception
182189
{
183190
Bean288 input = new Bean288("test");
@@ -189,6 +196,7 @@ public void testDateAdapter() throws Exception
189196

190197
// [JACKSON-656]
191198

199+
@Test
192200
public void testJackson656() throws Exception
193201
{
194202
Bean656 bean = new Bean656();

‎jaxb/src/test/java/tools/jackson/module/jaxb/adapters/TestAdaptersForContainers.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
import javax.xml.bind.annotation.*;
77
import javax.xml.bind.annotation.adapters.*;
88

9+
import org.junit.jupiter.api.Test;
10+
911
import tools.jackson.databind.ObjectMapper;
1012
import tools.jackson.module.jaxb.BaseJaxbTest;
1113
import tools.jackson.module.jaxb.introspect.JaxbAnnotationIntrospectorTest.KeyValuePair;
1214

15+
import static org.junit.jupiter.api.Assertions.*;
16+
1317
/**
1418
* Unit tests to check that {@link XmlAdapter}s also work with
1519
* container types (Lists, Maps)
@@ -111,12 +115,14 @@ public void setValues(List<Date> values) {
111115
/**********************************************************
112116
*/
113117

118+
@Test
114119
public void testAdapterForList() throws Exception
115120
{
116121
Wrapper w = new Wrapper(123L);
117122
assertEquals("{\"values\":[\"XXX\"]}", getJaxbMapper().writeValueAsString(w));
118123
}
119124

125+
@Test
120126
public void testSimpleAdapterDeserialization() throws Exception
121127
{
122128
Wrapper w = getJaxbMapper().readValue("{\"values\":[\"abc\"]}", Wrapper.class);
@@ -126,12 +132,14 @@ public void testSimpleAdapterDeserialization() throws Exception
126132
assertEquals(29L, w.values.get(0).getTime());
127133
}
128134

135+
@Test
129136
public void testAdapterOnGetterSerialization() throws Exception
130137
{
131138
WrapperWithGetterAndSetter w = new WrapperWithGetterAndSetter(123L);
132139
assertEquals("{\"values\":[\"XXX\"]}", getJaxbMapper().writeValueAsString(w));
133140
}
134141

142+
@Test
135143
public void testAdapterOnGetterDeserialization() throws Exception
136144
{
137145
WrapperWithGetterAndSetter w = getJaxbMapper().readValue("{\"values\":[\"abc\"]}",
@@ -148,6 +156,7 @@ public void testAdapterOnGetterDeserialization() throws Exception
148156
/**********************************************************
149157
*/
150158

159+
@Test
151160
public void testAdapterForBeanWithMap() throws Exception
152161
{
153162
ObjectMapper mapper = getJaxbMapper();

‎jaxb/src/test/java/tools/jackson/module/jaxb/adapters/TestIdentityAdapters.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
import javax.xml.bind.annotation.adapters.XmlAdapter;
44
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
55

6+
import org.junit.jupiter.api.Test;
7+
68
import tools.jackson.databind.ObjectMapper;
79
import tools.jackson.module.jaxb.BaseJaxbTest;
810

11+
import static org.junit.jupiter.api.Assertions.*;
12+
913
/**
1014
* Failing unit tests related to Adapter handling.
1115
*/
@@ -60,6 +64,7 @@ public IdentityAdapterPropertyBean() { }
6064
*/
6165

6266
// [Issue-10]
67+
@Test
6368
public void testIdentityAdapterForClass() throws Exception
6469
{
6570
IdentityAdapterBean input = new IdentityAdapterBean("A");
@@ -73,6 +78,7 @@ public void testIdentityAdapterForClass() throws Exception
7378
}
7479

7580
// [Issue-10]
81+
@Test
7682
public void testIdentityAdapterForProperty() throws Exception
7783
{
7884
IdentityAdapterPropertyBean input = new IdentityAdapterPropertyBean("B");

‎jaxb/src/test/java/tools/jackson/module/jaxb/failing/TestEnums256.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
import javax.xml.bind.annotation.*;
44
import javax.xml.bind.annotation.adapters.*;
55

6+
import org.junit.jupiter.api.Test;
7+
68
import tools.jackson.databind.ObjectMapper;
79
import tools.jackson.module.jaxb.BaseJaxbTest;
810

11+
import static org.junit.jupiter.api.Assertions.*;
12+
913
public class TestEnums256 extends BaseJaxbTest
1014
{
1115
// [modules-base#256]
@@ -40,6 +44,7 @@ public enum Code {
4044
private final ObjectMapper MAPPER = getJaxbMapper();
4145

4246
// [modules-base#256]
47+
@Test
4348
public void testEnumSerialize256() throws Exception
4449
{
4550
final Document256 document = new Document256(Code.RED);

0 commit comments

Comments
 (0)