Skip to content

Commit e890575

Browse files
committed
Do not use deprecated methods
1 parent 9fcac7c commit e890575

1 file changed

Lines changed: 13 additions & 9 deletions

File tree

src/test/java/com/maxmind/minfraud/response/AbstractOutputTest.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.maxmind.minfraud.response;
22

3-
import com.fasterxml.jackson.databind.DeserializationFeature;
4-
import com.fasterxml.jackson.databind.InjectableValues;
3+
import com.fasterxml.jackson.annotation.JsonInclude;
4+
import com.fasterxml.jackson.databind.*;
55
import com.fasterxml.jackson.databind.InjectableValues.Std;
6-
import com.fasterxml.jackson.databind.MapperFeature;
7-
import com.fasterxml.jackson.databind.ObjectMapper;
6+
import com.fasterxml.jackson.databind.json.JsonMapper;
87
import com.fasterxml.jackson.databind.util.StdDateFormat;
98
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
109

@@ -14,11 +13,16 @@
1413
public abstract class AbstractOutputTest {
1514

1615
<T> T deserialize(Class<T> cls, String json) throws IOException {
17-
ObjectMapper mapper = new ObjectMapper();
18-
mapper.disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS);
19-
mapper.enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
20-
mapper.registerModule(new JavaTimeModule());
21-
mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
16+
ObjectMapper mapper = JsonMapper.builder()
17+
.addModule(new JavaTimeModule())
18+
.defaultDateFormat(new StdDateFormat().withColonInTimeZone(true))
19+
.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)
20+
.disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)
21+
.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
22+
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
23+
.serializationInclusion(JsonInclude.Include.NON_NULL)
24+
.serializationInclusion(JsonInclude.Include.NON_EMPTY)
25+
.build();
2226
InjectableValues inject = new Std().addValue(
2327
"locales", Collections.singletonList("en"));
2428
return mapper.readerFor(cls).with(inject).readValue(json);

0 commit comments

Comments
 (0)