Update for scheduler support (fixes)

Author: dariol83

eu.dariolucia.reatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/scheduler/AbsoluteTimeSchedulingTrigger.java

@@ -19,8 +19,6 @@ public Instant getReleaseTime() {
 
     @Override
     public String toString() {
-        return "AbsoluteTimeSchedulingTrigger{" +
-                "releaseTime=" + releaseTime +
-                "} " + super.toString();
+        return "[absolute-time " + releaseTime + "]";
     }
 }

eu.dariolucia.reatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/scheduler/EventBasedSchedulingTrigger.java

@@ -31,9 +31,8 @@ public int getProtectionTime() {
 
     @Override
     public String toString() {
-        return "EventBasedSchedulingTrigger{" +
-                "event=" + event +
-                ", protectionTime=" + protectionTime +
-                "} " + super.toString();
+        return "[event " + event +
+                ", protection-time " + protectionTime +
+                " ms]" + super.toString();
     }
 }

eu.dariolucia.reatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/scheduler/RelativeTimeSchedulingTrigger.java

@@ -39,9 +39,8 @@ public Set<Long> getPredecessors() {
 
     @Override
     public String toString() {
-        return "RelativeTimeSchedulingTrigger{" +
-                "predecessors=" + predecessors +
-                ", delayTime=" + delayTime +
-                "} " + super.toString();
+        return "[relative-time " +
+                "predecessors " + predecessors +
+                ", delay-time " + delayTime + " s]";
     }
 }

eu.dariolucia.reatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/scheduler/ScheduledActivityData.java

@@ -109,4 +109,22 @@ public boolean overlapsWith(Instant otherStartTime, Instant otherEndTime) {
     public Instant getEndTime() {
         return startTime.plus(duration);
     }
+
+    @Override
+    public String toString() {
+        return "ScheduledActivityData{" +
+                "request=" + request +
+                ", activityOccurrence=" + activityOccurrence +
+                ", resources=" + resources +
+                ", source='" + source + '\'' +
+                ", externalId=" + externalId +
+                ", trigger=" + trigger +
+                ", latestInvocationTime=" + latestInvocationTime +
+                ", startTime=" + startTime +
+                ", duration=" + duration +
+                ", conflictStrategy=" + conflictStrategy +
+                ", state=" + state +
+                ", endTime=" + getEndTime() +
+                "} " + super.toString();
+    }
 }

eu.dariolucia.reatmetric.persist/src/main/java/eu/dariolucia/reatmetric/persist/services/AbstractDataItemArchive.java

@@ -499,7 +499,7 @@ public synchronized void remove(IUniqueId id) throws ArchiveException {
                     if (LOG.isLoggable(Level.FINER)) {
                         LOG.finer(this + " - delete statement: " + query);
                     }
-                    prepStmt.executeQuery(query);
+                    prepStmt.execute(query);
                 } finally {
                     storeConnection.commit();
                 }
@@ -525,7 +525,7 @@ public synchronized void remove(K filter) throws ArchiveException {
                     if (LOG.isLoggable(Level.FINER)) {
                         LOG.finer(this + " - delete statement: " + query);
                     }
-                    prepStmt.executeQuery(query);
+                    prepStmt.execute(query);
                 } finally {
                     storeConnection.commit();
                 }

eu.dariolucia.reatmetric.persist/src/main/java/eu/dariolucia/reatmetric/persist/services/ScheduledActivityDataArchive.java

@@ -143,7 +143,7 @@ protected String buildRetrieveQuery(Instant startTime, int numRecords, Retrieval
 
     @Override
     protected String buildRetrieveQuery(Instant startTime, IUniqueId internalId, int numRecords, RetrievalDirection direction, ScheduledActivityDataFilter filter) {
-        StringBuilder query = new StringBuilder("SELECT UniqueId,GenerationTime,ActivityRequest,Path,ActivityOccurrence,Resources,Source,ExternalId,Trigger,LatestInvocationTime,ConflictStrategy,State,AdditionalData " +
+        StringBuilder query = new StringBuilder("SELECT UniqueId,GenerationTime,ActivityRequest,Path,ActivityOccurrence,Resources,Source,ExternalId,Trigger,LatestInvocationTime,StartTime,Duration,ConflictStrategy,State,AdditionalData " +
                 "FROM SCHEDULED_ACTIVITY_DATA_TABLE " +
                 "WHERE ");
         // add time info
@@ -258,7 +258,7 @@ private List<ScheduledActivityData> doRetrieve(Connection connection, Instant ti
         } else if(time.isAfter(MAXIMUM_TIME)) {
             time = MAXIMUM_TIME;
         }
-        StringBuilder query = new StringBuilder("SELECT UniqueId,GenerationTime,ActivityRequest,Path,ActivityOccurrence,Resources,Source,ExternalId,Trigger,LatestInvocationTime,ConflictStrategy,State,AdditionalData " +
+        StringBuilder query = new StringBuilder("SELECT UniqueId,GenerationTime,ActivityRequest,Path,ActivityOccurrence,Resources,Source,ExternalId,Trigger,LatestInvocationTime,StartTime,Duration,ConflictStrategy,State,AdditionalData " +
                 "FROM SCHEDULED_ACTIVITY_DATA_TABLE " +
                 "WHERE ");
         // add time info

eu.dariolucia.reatmetric.scheduler/src/main/java/eu/dariolucia/reatmetric/scheduler/ScheduledTask.java

@@ -403,7 +403,7 @@ public void abortTask() {
             }
             this.currentData = buildUpdatedSchedulingActivityData(currentData.getStartTime(),
                     this.activityId,
-                    SchedulingState.ABORTED);
+                    SchedulingState.REMOVED);
         } else {
             // if not any of the two above, the activity is already over, so do not do anything
             if(LOG.isLoggable(Level.FINE)) {