Skip to content

Commit 18991f7

Browse files
cowtowncodercowtowncoder
committed
Fix 3.0 compilation
1 parent 9e73c85 commit 18991f7

26 files changed

+96
-82
lines changed

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/ModuleTestBase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import com.fasterxml.jackson.databind.ObjectMapper;
77
import com.fasterxml.jackson.databind.cfg.MapperBuilder;
8+
import com.fasterxml.jackson.databind.json.JsonMapper;
89

910
public class ModuleTestBase
1011
{
@@ -18,12 +19,12 @@ protected static ObjectMapper newMapper() {
1819
}
1920

2021
protected static MapperBuilder<?,?> newMapperBuilder() {
21-
return ObjectMapper.builder()
22+
return JsonMapper.builder()
2223
.addModule(new JavaTimeModule());
2324
}
2425

2526
protected static MapperBuilder<?,?> newMapperBuilder(TimeZone tz) {
26-
return ObjectMapper.builder()
27+
return JsonMapper.builder()
2728
.defaultTimeZone(tz)
2829
.addModule(new JavaTimeModule());
2930
}

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestDurationKeySerialization.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
import com.fasterxml.jackson.core.type.TypeReference;
1010
import com.fasterxml.jackson.databind.ObjectMapper;
11+
import com.fasterxml.jackson.databind.json.JsonMapper;
12+
1113
import org.junit.Before;
1214
import org.junit.Test;
1315

@@ -23,7 +25,7 @@ public class TestDurationKeySerialization {
2325

2426
@Before
2527
public void setUp() {
26-
this.om = ObjectMapper.builder()
28+
this.om = JsonMapper.builder()
2729
.addModule(new JavaTimeModule())
2830
.build();
2931
map = new HashMap<>();

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestInstantKeySerialization.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
import com.fasterxml.jackson.core.type.TypeReference;
1010
import com.fasterxml.jackson.databind.ObjectMapper;
11+
import com.fasterxml.jackson.databind.json.JsonMapper;
12+
1113
import org.junit.Assert;
1214
import org.junit.Before;
1315
import org.junit.Test;
@@ -26,7 +28,7 @@ public class TestInstantKeySerialization {
2628

2729
@Before
2830
public void setUp() {
29-
this.om = ObjectMapper.builder()
31+
this.om = JsonMapper.builder()
3032
.addModule(new JavaTimeModule())
3133
.build();
3234
map = new HashMap<>();

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateKeySerialization.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
import com.fasterxml.jackson.core.type.TypeReference;
1010
import com.fasterxml.jackson.databind.ObjectMapper;
11+
import com.fasterxml.jackson.databind.json.JsonMapper;
12+
1113
import org.junit.Before;
1214
import org.junit.Test;
1315

@@ -23,7 +25,7 @@ public class TestLocalDateKeySerialization {
2325

2426
@Before
2527
public void setUp() {
26-
this.om = ObjectMapper.builder()
28+
this.om = JsonMapper.builder()
2729
.addModule(new JavaTimeModule())
2830
.build();
2931
map = new HashMap<>();

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateSerializationWithCustomFormatter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import static org.hamcrest.core.StringContains.containsString;
77

88
import com.fasterxml.jackson.databind.ObjectMapper;
9+
import com.fasterxml.jackson.databind.json.JsonMapper;
910
import com.fasterxml.jackson.databind.module.SimpleModule;
1011
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
1112
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
@@ -34,7 +35,7 @@ public void testSerialization() throws Exception {
3435
}
3536

3637
private String serializeWith(LocalDate date, DateTimeFormatter f) throws Exception {
37-
ObjectMapper mapper = ObjectMapper.builder()
38+
ObjectMapper mapper = JsonMapper.builder()
3839
.addModule(new SimpleModule()
3940
.addSerializer(new LocalDateSerializer(f)))
4041
.build();
@@ -48,7 +49,7 @@ public void testDeserialization() throws Exception {
4849
}
4950

5051
private LocalDate deserializeWith(String json, DateTimeFormatter f) throws Exception {
51-
ObjectMapper mapper = ObjectMapper.builder()
52+
ObjectMapper mapper = JsonMapper.builder()
5253
.addModule(new SimpleModule()
5354
.addDeserializer(LocalDate.class, new LocalDateDeserializer(f)))
5455
.build();

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateTimeDeserialization.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fasterxml.jackson.databind.ObjectReader;
1111
import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
1212
import com.fasterxml.jackson.databind.exc.MismatchedInputException;
13+
import com.fasterxml.jackson.databind.json.JsonMapper;
1314

1415
import org.junit.Test;
1516

@@ -69,12 +70,11 @@ public void testDeserializationAsArrayEnabled() throws Throwable
6970
@Test
7071
public void testDeserializationAsEmptyArrayEnabled() throws Throwable
7172
{
72-
String json="[]";
73-
LocalDateTime value = ObjectMapper.builder()
73+
LocalDateTime value = JsonMapper.builder()
7474
.enable(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS,
7575
DeserializationFeature.ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT)
7676
.build()
77-
.readerFor(LocalDateTime.class).readValue(aposToQuotes(json));
77+
.readerFor(LocalDateTime.class).readValue("[]");
7878
assertNull(value);
7979
}
8080

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateTimeKeySerialization.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ public class TestLocalDateTimeKeySerialization
2828
private static final LocalDateTime DATE_TIME = LocalDateTime.of(2015, 3, 14, 9, 26, 53, 590 * 1000 * 1000);
2929
private static final String DATE_TIME_STRING = "2015-03-14T09:26:53.590";
3030

31-
private final ObjectMapper om = ObjectMapper.builder()
32-
.addModule(new JavaTimeModule())
33-
.build();
31+
private final ObjectMapper om = newMapper();
3432

3533
@Test
3634
public void testSerialization0() throws Exception {

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalDateTimeSerializationWithCustomFormatter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static org.hamcrest.core.StringContains.containsString;
66

77
import com.fasterxml.jackson.databind.ObjectMapper;
8+
import com.fasterxml.jackson.databind.json.JsonMapper;
89
import com.fasterxml.jackson.databind.module.SimpleModule;
910
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
1011
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
@@ -33,7 +34,7 @@ public void testSerialization() throws Exception {
3334
}
3435

3536
private String serializeWith(LocalDateTime dateTime, DateTimeFormatter f) throws Exception {
36-
ObjectMapper mapper = ObjectMapper.builder()
37+
ObjectMapper mapper = JsonMapper.builder()
3738
.addModule(new SimpleModule()
3839
.addSerializer(new LocalDateTimeSerializer(f)))
3940
.build();
@@ -47,7 +48,7 @@ public void testDeserialization() throws Exception {
4748
}
4849

4950
private LocalDateTime deserializeWith(String json, DateTimeFormatter f) throws Exception {
50-
ObjectMapper mapper = ObjectMapper.builder()
51+
ObjectMapper mapper = JsonMapper.builder()
5152
.addModule(new SimpleModule()
5253
.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(f)))
5354
.build();

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalTimeKeySerialization.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
import com.fasterxml.jackson.core.type.TypeReference;
88
import com.fasterxml.jackson.databind.ObjectMapper;
9+
import com.fasterxml.jackson.databind.json.JsonMapper;
10+
911
import org.junit.Assert;
1012
import org.junit.Before;
1113
import org.junit.Test;
@@ -27,7 +29,7 @@ public class TestLocalTimeKeySerialization {
2729

2830
@Before
2931
public void setUp() {
30-
this.om = ObjectMapper.builder()
32+
this.om = JsonMapper.builder()
3133
.addModule(new JavaTimeModule())
3234
.build();
3335
map = new HashMap<>();

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/TestLocalTimeSerializationWithCustomFormatter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static org.hamcrest.core.StringContains.containsString;
66

77
import com.fasterxml.jackson.databind.ObjectMapper;
8+
import com.fasterxml.jackson.databind.json.JsonMapper;
89
import com.fasterxml.jackson.databind.module.SimpleModule;
910
import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
1011
import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
@@ -33,7 +34,7 @@ public void testSerialization() throws Exception {
3334
}
3435

3536
private String serializeWith(LocalTime dateTime, DateTimeFormatter f) throws Exception {
36-
ObjectMapper mapper = ObjectMapper.builder()
37+
ObjectMapper mapper = JsonMapper.builder()
3738
.addModule(new SimpleModule()
3839
.addSerializer(new LocalTimeSerializer(f)))
3940
.build();
@@ -47,7 +48,7 @@ public void testDeserialization() throws Exception {
4748
}
4849

4950
private LocalTime deserializeWith(String json, DateTimeFormatter f) throws Exception {
50-
ObjectMapper mapper = ObjectMapper.builder()
51+
ObjectMapper mapper = JsonMapper.builder()
5152
.addModule(new SimpleModule()
5253
.addDeserializer(LocalTime.class, new LocalTimeDeserializer(f)))
5354
.build();

0 commit comments

Comments
 (0)