Force mapper to use JVM timezone, to avoid JDBC layer from butchering the dates between JPA and the DB; (DOECODE-483)

sowerstl · sowerstl · commit af62e4dfdc1f · 2018-05-23T14:32:01.000-04:00
diff --git a/src/main/java/gov/osti/connectors/BitBucket.java b/src/main/java/gov/osti/connectors/BitBucket.java
@@ -14,6 +14,7 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimeZone;
 import org.apache.http.client.methods.HttpGet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -85,7 +86,7 @@ private static String getProjectNameFromUrl(String url) {
     @Override
     public JsonNode read(String url) {
         DOECodeMetadata md = new DOECodeMetadata();
-        ObjectMapper mapper = new ObjectMapper();
+        ObjectMapper mapper = new ObjectMapper().setTimeZone(TimeZone.getDefault());;
         
         String name = getProjectNameFromUrl(url);
         if (null==name)
diff --git a/src/main/java/gov/osti/connectors/GitHub.java b/src/main/java/gov/osti/connectors/GitHub.java
@@ -15,6 +15,7 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimeZone;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHeaders;
@@ -120,7 +121,7 @@ private static String getProjectFromUrl(String url) {
     @Override
     public JsonNode read(String url) {
         DOECodeMetadata md = new DOECodeMetadata();
-        ObjectMapper mapper = new ObjectMapper();
+        ObjectMapper mapper = new ObjectMapper().setTimeZone(TimeZone.getDefault());;
         
         try {
             // try to identify the NAME of the project
diff --git a/src/main/java/gov/osti/connectors/HttpUtil.java b/src/main/java/gov/osti/connectors/HttpUtil.java
@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import gov.osti.entity.DOECodeMetadata;
 import java.io.IOException;
+import java.util.TimeZone;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.config.RequestConfig;
@@ -35,13 +36,16 @@ public class HttpUtil {
     // jackson mappers
     protected static final ObjectMapper YAML_MAPPER = new ObjectMapper(new YAMLFactory())
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-            .setSerializationInclusion(Include.NON_NULL);
+            .setSerializationInclusion(Include.NON_NULL)
+            .setTimeZone(TimeZone.getDefault());
     protected static final ObjectMapper XML_MAPPER = new XmlMapper()
             .setSerializationInclusion(Include.NON_NULL)
-            .enable(SerializationFeature.INDENT_OUTPUT);
+            .enable(SerializationFeature.INDENT_OUTPUT)
+            .setTimeZone(TimeZone.getDefault());
     protected static final ObjectMapper JSON_MAPPER = new ObjectMapper()
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            .setTimeZone(TimeZone.getDefault());
     /**
      * Retrieve just the String content from a given HttpGet request.
      * 
diff --git a/src/main/java/gov/osti/connectors/SourceForge.java b/src/main/java/gov/osti/connectors/SourceForge.java
@@ -13,6 +13,7 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.http.client.methods.HttpGet;
@@ -90,7 +91,7 @@ protected static String getProjectNameFromUrl(String url) {
     @Override
     public JsonNode read(String url) {
         DOECodeMetadata md = new DOECodeMetadata();
-        ObjectMapper mapper = new ObjectMapper();
+        ObjectMapper mapper = new ObjectMapper().setTimeZone(TimeZone.getDefault());
         
         // attempt to identify the project name
         String name = getProjectNameFromUrl(url);
diff --git a/src/main/java/gov/osti/connectors/api/GitLabAPI.java b/src/main/java/gov/osti/connectors/api/GitLabAPI.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.TimeZone;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
@@ -59,7 +60,7 @@ public final class GitLabAPI {
     private static final String API_PATH = "/api/v4/";
 
     private static final JsonNodeFactory FACTORY_INSTANCE = JsonNodeFactory.instance;
-    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final ObjectMapper MAPPER = new ObjectMapper().setTimeZone(TimeZone.getDefault());
 
     private String currentProjectName = "";
     private String currentApiBase = "";
diff --git a/src/main/java/gov/osti/doi/DataCite.java b/src/main/java/gov/osti/doi/DataCite.java
@@ -18,6 +18,7 @@
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.TimeZone;
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
 import javax.ws.rs.core.HttpHeaders;
@@ -55,7 +56,8 @@ public class DataCite {
     // Jackson object mapper
     private static final ObjectMapper mapper = new ObjectMapper()
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            .setTimeZone(TimeZone.getDefault());
     
     /**
      * Convert a List of Developers into something DataCite can understand.
diff --git a/src/main/java/gov/osti/entity/DOECodeMetadata.java b/src/main/java/gov/osti/entity/DOECodeMetadata.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.TimeZone;
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.CollectionTable;
@@ -54,8 +55,9 @@
 @XmlRootElement (name = "metadata")
 @JsonRootName (value = "metadata")
 public class DOECodeMetadata implements Serializable {
+
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = -909574677603914304L;
     private static final Logger log = LoggerFactory.getLogger(DOECodeMetadata.class.getName());
@@ -228,7 +230,8 @@ public String label() {
     // Jackson object mapper
     private static final ObjectMapper mapper = new ObjectMapper()
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-            .setSerializationInclusion(Include.NON_NULL);
+            .setSerializationInclusion(Include.NON_NULL)
+            .setTimeZone(TimeZone.getDefault());
 
     //for Gson
     public DOECodeMetadata() {
diff --git a/src/main/java/gov/osti/entity/OstiMetadata.java b/src/main/java/gov/osti/entity/OstiMetadata.java
@@ -14,6 +14,7 @@
 import java.io.Reader;
 import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 import java.util.regex.Pattern;
 import org.apache.commons.lang3.StringUtils;
 
@@ -54,7 +55,8 @@ public class OstiMetadata {
     // Jackson object mapper
     private static final ObjectMapper mapper = new ObjectMapper()
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            .setTimeZone(TimeZone.getDefault());
     
     public OstiMetadata() {
         
diff --git a/src/main/java/gov/osti/search/SearchData.java b/src/main/java/gov/osti/search/SearchData.java
@@ -14,6 +14,7 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.util.TimeZone;
 import java.util.regex.Pattern;
 import org.apache.commons.lang3.StringUtils;
 
@@ -25,7 +26,8 @@ public class SearchData implements Serializable {
 
     private static final ObjectMapper mapper = new ObjectMapper()
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-            .setSerializationInclusion(Include.NON_NULL);
+            .setSerializationInclusion(Include.NON_NULL)
+            .setTimeZone(TimeZone.getDefault());
 
     // set of special characters to be escaped before sending to SOLR
     protected static Pattern TEXT_REGEX_CHARACTERS = Pattern.compile("[{}()\\[\\].+*?^$\\\\|]");
diff --git a/src/main/java/gov/osti/services/ErrorResponse.java b/src/main/java/gov/osti/services/ErrorResponse.java
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimeZone;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import org.apache.commons.lang3.StringUtils;
@@ -41,7 +42,8 @@ public class ErrorResponse {
     // XML/JSON mapper reference
     private static final ObjectMapper mapper = new ObjectMapper()
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            .setTimeZone(TimeZone.getDefault());;
 
     protected ErrorResponse() {
         
diff --git a/src/main/java/gov/osti/services/Metadata.java b/src/main/java/gov/osti/services/Metadata.java
@@ -109,6 +109,7 @@
 
 import gov.osti.connectors.gitlab.Project;
 import java.io.FileInputStream;
+import java.util.TimeZone;
 import org.apache.commons.codec.binary.Base64InputStream;
 
 /**
@@ -202,14 +203,17 @@ class PropertyFilterMixIn {}
     protected static final ObjectMapper YAML_MAPPER = new ObjectMapper(new YAMLFactory())
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
             .setSerializationInclusion(JsonInclude.Include.NON_NULL)
-            .addMixIn(Object.class, PropertyFilterMixIn.class);
+            .addMixIn(Object.class, PropertyFilterMixIn.class)
+            .setTimeZone(TimeZone.getDefault());
     // ObjectMapper instance for metadata interchange
     private static final ObjectMapper mapper = new ObjectMapper()
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            .setTimeZone(TimeZone.getDefault());
     // ObjectMapper specifically for indexing purposes
     protected static final ObjectMapper index_mapper = new ObjectMapper()
-            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            .setTimeZone(TimeZone.getDefault());
     static {
         // customized serializer module for Agent names consolidation
         SimpleModule module = new SimpleModule();
diff --git a/src/main/java/gov/osti/services/SearchService.java b/src/main/java/gov/osti/services/SearchService.java
@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.URISyntaxException;
+import java.util.TimeZone;
 import javax.servlet.ServletContext;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -95,21 +96,25 @@ class PropertyFilterMixIn {}
     protected static final ObjectMapper YAML_MAPPER = new ObjectMapper(new YAMLFactory())
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
             .setSerializationInclusion(JsonInclude.Include.NON_NULL)
-            .addMixIn(Object.class, PropertyFilterMixIn.class);
+            .addMixIn(Object.class, PropertyFilterMixIn.class)
+            .setTimeZone(TimeZone.getDefault());
     protected static final ObjectMapper XML_MAPPER = new XmlMapper()
             .setSerializationInclusion(JsonInclude.Include.NON_NULL)
             .enable(SerializationFeature.INDENT_OUTPUT)
-            .addMixIn(Object.class, PropertyFilterMixIn.class);
+            .addMixIn(Object.class, PropertyFilterMixIn.class)
+            .setTimeZone(TimeZone.getDefault());
     protected static final ObjectMapper JSON_MAPPER = new ObjectMapper()
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
             .setSerializationInclusion(JsonInclude.Include.NON_NULL)
             .registerModule(module)
-            .addMixIn(Object.class, PropertyFilterMixIn.class);
+            .addMixIn(Object.class, PropertyFilterMixIn.class)
+            .setTimeZone(TimeZone.getDefault());
     protected static final ObjectMapper BIBLIO_WRAPPER = new ObjectMapper()
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
             .setSerializationInclusion(JsonInclude.Include.NON_NULL)
             .configure(SerializationFeature.WRAP_ROOT_VALUE, true)
-            .addMixIn(Object.class, PropertyFilterMixIn.class);
+            .addMixIn(Object.class, PropertyFilterMixIn.class)
+            .setTimeZone(TimeZone.getDefault());
     
     // configured location of the search service endpoint
     private static String SEARCH_URL = DoeServletContextListener.getConfigurationProperty("search.url");
diff --git a/src/main/java/gov/osti/services/SiteServices.java b/src/main/java/gov/osti/services/SiteServices.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.List;
+import java.util.TimeZone;
 
 import javax.persistence.TypedQuery;
 import javax.ws.rs.POST;
@@ -40,7 +41,8 @@ public class SiteServices {
     // ObjectMapper instance for metadata interchange
     private static final ObjectMapper mapper = new ObjectMapper()
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            .setTimeZone(TimeZone.getDefault());
 
     public SiteServices() {
     }
diff --git a/src/main/java/gov/osti/services/Types.java b/src/main/java/gov/osti/services/Types.java
@@ -20,6 +20,7 @@
 import gov.osti.indexer.RelatedIdentifierTypeSerializer;
 import gov.osti.indexer.RelationTypeSerializer;
 import java.util.Arrays;
+import java.util.TimeZone;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.Produces;
@@ -44,7 +45,7 @@ public class Types {
     // a Logger
     private static final Logger log = LoggerFactory.getLogger(Types.class);
     // JSON data binder
-    private static final ObjectMapper mapper = new ObjectMapper();
+    private static final ObjectMapper mapper = new ObjectMapper().setTimeZone(TimeZone.getDefault());
     static {
         // customized serializer module for Agent names consolidation
         SimpleModule module = new SimpleModule()
diff --git a/src/main/java/gov/osti/services/UserServices.java b/src/main/java/gov/osti/services/UserServices.java
@@ -40,6 +40,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.regex.Pattern;
 
 import javax.persistence.TypedQuery;
@@ -1182,7 +1183,8 @@ public Response loadRequests(
     // ObjectMapper instance for metadata interchange
     private static final ObjectMapper mapper = new ObjectMapper()
             .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL)
+            .setTimeZone(TimeZone.getDefault());
 
     /**
      * an Email request; for approve/disapprove endpoints.
diff --git a/src/main/java/gov/osti/services/Validation.java b/src/main/java/gov/osti/services/Validation.java
@@ -17,6 +17,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.net.URLEncoder;
+import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.servlet.ServletContext;
@@ -101,7 +102,7 @@ public class Validation {
     // API host for servicing external validation calls
     private static final String API_HOST = DoeServletContextListener.getConfigurationProperty("api.host");
     // a JSON mapper
-    protected static final ObjectMapper mapper = new ObjectMapper();
+    protected static final ObjectMapper mapper = new ObjectMapper().setTimeZone(TimeZone.getDefault());
     // static DOI resolution prefix
     private static final String DOI_BASE_URL = "https://doi.org/";
 
diff --git a/src/test/java/gov/osti/connectors/MetadataYamlTest.java b/src/test/java/gov/osti/connectors/MetadataYamlTest.java
@@ -21,6 +21,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 import org.junit.After;
 import org.junit.AfterClass;
 import static org.junit.Assert.assertEquals;
@@ -83,7 +84,8 @@ public void testYamlToMetadata() throws Exception {
         final ObjectMapper mapper = 
                 new ObjectMapper(new YAMLFactory())
                 .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-                .setSerializationInclusion(Include.NON_NULL);
+                .setSerializationInclusion(Include.NON_NULL)
+                .setTimeZone(TimeZone.getDefault());
         
         DOECodeMetadata metadata = mapper.readValue(new FileReader(getPathFor("metadata.yml")), DOECodeMetadata.class);
         
