BITMAG-1247-date-time-modernizing

bitrepository-alarm-service/pom.xml

@@ -91,6 +91,15 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>io.qameta.allure</groupId>
+        <artifactId>allure-maven</artifactId>
+        <version>2.12.0</version>
+        <configuration>
+          <resultsDirectory>${project.build.directory}/allure-results</resultsDirectory>
+          <reportDirectory>${project.build.directory}/allure-report</reportDirectory>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>

bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmService.java

@@ -29,6 +29,7 @@
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.service.LifeCycledService;
 
+import java.time.Instant;
 import java.util.Collection;
 import java.util.Date;
 
@@ -56,7 +57,14 @@ public interface AlarmService extends LifeCycledService {
      * @param ascending    Whether the alarms should be delivered ascending.
      * @return The requested collection of alarms from the store.
      */
-    Collection<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate,
-                                    String fileID, String collectionID, Integer maxResults, boolean ascending);
+    @Deprecated(forRemoval = true)
+    default Collection<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate,
+                                    String fileID, String collectionID, Integer maxResults, boolean ascending) {
+        Instant min = minDate != null ? minDate.toInstant() : null;
+        Instant max = maxDate != null ? maxDate.toInstant() : null;
+        return extractAlarms(componentID, alarmCode, min, max, fileID, collectionID, maxResults, ascending);
+    }
 
+    Collection<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Instant instant, Instant instant1,
+                                    String fileID, String collectionID, Integer maxResults, boolean ascending);
 }

bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/BasicAlarmService.java

@@ -36,8 +36,8 @@
 import org.slf4j.LoggerFactory;
 
 import javax.jms.JMSException;
+import java.time.Instant;
 import java.util.Collection;
-import java.util.Date;
 
 public class BasicAlarmService implements AlarmService {
     private final Logger log = LoggerFactory.getLogger(this.getClass());
@@ -90,7 +90,7 @@ public void shutdown() {
     public void start() {}
 
     @Override
-    public Collection<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate,
+    public Collection<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Instant minDate, Instant maxDate,
                                            String fileID, String collectionID, Integer maxResults, boolean ascending) {
         return store.extractAlarms(componentID, alarmCode, minDate, maxDate, fileID, collectionID, maxResults, ascending);
     }

bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/RestAlarmService.java

@@ -37,17 +37,17 @@
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import java.time.Instant;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
-import java.util.TimeZone;
 import java.util.stream.Collectors;
 
 @Path("/AlarmService")
 public class RestAlarmService {
     private final AlarmService alarmService;
-    private final CalendarUtils calendarUtils = CalendarUtils.getInstance(TimeZone.getDefault());
+    private final CalendarUtils calendarUtils = CalendarUtils.getInstance(ZoneId.systemDefault());
 
     public RestAlarmService() {
         alarmService = AlarmServiceFactory.getAlarmService();
@@ -63,7 +63,7 @@ public RestAlarmService() {
     @Path("/getShortAlarmList/")
     @Produces("application/json")
     public List<Alarm> getShortAlarmList() {
-        return new ArrayList<>(alarmService.extractAlarms(null, null, null, null,
+        return new ArrayList<>(alarmService.extractAlarms(null, null, (Instant) null, (Instant) null,
                 null, null, 10, false));
     }
 
@@ -76,7 +76,7 @@ public List<Alarm> getShortAlarmList() {
     @Path("/getFullAlarmList/")
     @Produces("application/json")
     public List<Alarm> getFullAlarmList() {
-        return new ArrayList<>(alarmService.extractAlarms(null, null, null, null,
+        return new ArrayList<>(alarmService.extractAlarms(null, null, (Instant) null, (Instant) null,
                 null, null, null, true));
     }
 
@@ -103,8 +103,8 @@ public List<WebAlarm> queryAlarms(
             @DefaultValue("true")
             @FormParam("oldestAlarmFirst")
                     boolean oldestAlarmFirst) {
-        Date from = calendarUtils.makeStartDateObject(fromDate);
-        Date to = calendarUtils.makeEndDateObject(toDate);
+        Instant from = calendarUtils.makeStartInstant(fromDate);
+        Instant to = calendarUtils.makeEndInstant(toDate);
 
         Collection<Alarm> alarms = alarmService.extractAlarms(contentOrNull(reportingComponent), makeAlarmCode(alarmCode), from, to,
                 contentOrNull(fileID), makeCollectionID(collectionID), maxAlarms, oldestAlarmFirst);
@@ -117,8 +117,8 @@ public List<WebAlarm> queryAlarms(
     @Consumes("application/json")
     @Produces("application/json")
     public List<Alarm> queryAlarms(AlarmServiceInput input) {
-        Date from = calendarUtils.makeStartDateObject(input.getFromDate());
-        Date to = calendarUtils.makeEndDateObject(input.getToDate());
+        Instant from = calendarUtils.makeStartInstant(input.getFromDate());
+        Instant to = calendarUtils.makeEndInstant(input.getToDate());
 
         Collection<Alarm> alarms = alarmService.extractAlarms(contentOrNull(input.getReportingComponent()),
                 makeAlarmCode(input.getAlarmCode()), from, to, contentOrNull(input.getFileID()), makeCollectionID(input.getCollectionID()),

bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java

@@ -44,7 +44,7 @@ public class WebAlarm {
     public WebAlarm(Alarm alarm) {
         collectionID = alarm.getCollectionID() == null ? "" : alarm.getCollectionID();
         fileID = (alarm.getFileID() == null) ? "" : alarm.getFileID();
-        origDateTime = TimeUtils.shortDate(CalendarUtils.convertFromXMLGregorianCalendar(alarm.getOrigDateTime()));
+        origDateTime = TimeUtils.shortDate(CalendarUtils.convertFromXMLGregorianCalendarToInstant(alarm.getOrigDateTime()));
         alarmRaiser = alarm.getAlarmRaiser();
         alarmCode = alarm.getAlarmCode();
         alarmText = alarm.getAlarmText();