Share ObjectMaper between classes

Author: oschwald

src/main/java/com/maxmind/minfraud/AbstractModel.java

@@ -1,34 +1,14 @@
 package com.maxmind.minfraud;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-
 import java.io.IOException;
 
 public abstract class AbstractModel {
-    private final static ObjectMapper mapper = JsonMapper.builder()
-            .addModule(new JavaTimeModule())
-            .defaultDateFormat(new StdDateFormat().withColonInTimeZone(true))
-            .enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)
-            .disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)
-            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-            .serializationInclusion(JsonInclude.Include.NON_NULL)
-            .serializationInclusion(JsonInclude.Include.NON_EMPTY)
-            .build();
-
     /**
      * @return JSON representation of this object.
      * @throws IOException if there is an error serializing the object to JSON.
      */
     public final String toJson() throws IOException {
-        return mapper.writeValueAsString(this);
+        return Mapper.get().writeValueAsString(this);
     }
 
     @Override

src/main/java/com/maxmind/minfraud/Mapper.java

@@ -0,0 +1,27 @@
+package com.maxmind.minfraud;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+class Mapper {
+    private final static ObjectMapper mapper = JsonMapper.builder()
+            .addModule(new JavaTimeModule())
+            .defaultDateFormat(new StdDateFormat().withColonInTimeZone(true))
+            .enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)
+            .disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+            .serializationInclusion(JsonInclude.Include.NON_NULL)
+            .serializationInclusion(JsonInclude.Include.NON_EMPTY)
+            .build();
+
+    public static ObjectMapper get() {
+        return mapper;
+    }
+}

src/main/java/com/maxmind/minfraud/WebServiceClient.java

@@ -1,13 +1,8 @@
 package com.maxmind.minfraud;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.InjectableValues.Std;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.util.StdDateFormat;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.maxmind.minfraud.exception.*;
 import com.maxmind.minfraud.request.Transaction;
 import com.maxmind.minfraud.request.TransactionReport;
@@ -42,7 +37,6 @@ public final class WebServiceClient implements Closeable {
     private final List<String> locales;
     private final Duration requestTimeout;
 
-    private final ObjectMapper mapper;
     private final HttpClient httpClient;
 
     private WebServiceClient(WebServiceClient.Builder builder) {
@@ -59,12 +53,6 @@ private WebServiceClient(WebServiceClient.Builder builder) {
                         .encodeToString((builder.accountId + ":" + builder.licenseKey)
                                 .getBytes(StandardCharsets.UTF_8));
 
-        mapper = new ObjectMapper();
-        mapper.disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS);
-        mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-        mapper.registerModule(new JavaTimeModule());
-        mapper.setDateFormat(new StdDateFormat().withColonInTimeZone(true));
-
         requestTimeout = builder.requestTimeout;
         HttpClient.Builder httpClientBuilder = HttpClient.newBuilder()
                 .proxy(builder.proxy);
@@ -409,7 +397,7 @@ private <T> T handleResponse(HttpResponse<InputStream> response, URI uri, Class<
                 "locales", locales);
 
         try (InputStream stream = response.body()) {
-            return mapper.readerFor(cls).with(inject).readValue(stream);
+            return Mapper.get().readerFor(cls).with(inject).readValue(stream);
         } catch (IOException e) {
             throw new MinFraudException(
                     "Received a 200 response but could not decode it as JSON", e);
@@ -429,7 +417,7 @@ private void handle4xxStatus(HttpResponse<InputStream> response, URI uri)
 
         Map<String, String> content;
         try {
-            content = mapper.readValue(body,
+            content = Mapper.get().readValue(body,
                     new TypeReference<HashMap<String, String>>() {
                     });
             this.handleErrorWithJsonBody(content, body, status, uri);
@@ -516,7 +504,6 @@ public String toString() {
                 ", port=" + port +
                 ", useHttps=" + useHttps +
                 ", locales=" + locales +
-                ", mapper=" + mapper +
                 ", httpClient=" + httpClient +
                 '}';
     }