CWMSVUE-600 Fixed issue with millisecond offset (#1228)

Author: rma-bryson

cwms-data-api/src/main/java/cwms/cda/data/dao/RatingSpecDao.java

@@ -40,6 +40,7 @@
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -74,7 +75,7 @@
 import usace.cwms.db.jooq.codegen.tables.AV_RATING_SPEC;
 
 public class RatingSpecDao extends JooqDao<RatingSpec> {
-    public static final Calendar GMT_CALENDAR = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+    public static final Calendar GMT_CALENDAR = getGmtCalendar();
     private static final Logger logger = Logger.getLogger(RatingSpecDao.class.getName());
     public static final String OFFICE_ID = "OFFICE_ID";
     public static final String SPECIFICATION_ID = "SPECIFICATION_ID";
@@ -96,6 +97,12 @@ private static List<String> sortedUpperList(String... items) {
                 .collect(toList());
     }
 
+    private static Calendar getGmtCalendar() {
+        Calendar retVal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+        retVal.set(Calendar.MILLISECOND, 0); //this is what the OracleTypeMap does, without this we get back some millisecond offset that is incorrect
+        return retVal;
+    }
+
     public RatingSpecDao(DSLContext dsl) {
         super(dsl);
     }

cwms-data-api/src/main/java/cwms/cda/data/dto/rating/RatingEffectiveDatesMap.java

@@ -7,12 +7,12 @@
 import cwms.cda.data.dto.CwmsDTOBase;
 import cwms.cda.formatters.Formats;
 import cwms.cda.formatters.annotations.FormattableWith;
-import cwms.cda.formatters.json.JsonV1;
+import cwms.cda.formatters.json.JsonV2;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@FormattableWith(contentType = Formats.JSONV2, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
+@FormattableWith(contentType = Formats.JSONV2, formatter = JsonV2.class, aliases = {Formats.DEFAULT, Formats.JSON})
 @JsonDeserialize(builder = RatingEffectiveDatesMap.Builder.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)