minor

Author: dprzybyl

app/aem/core/src/main/java/com/cognifide/apm/core/history/HistoryEntry.java

@@ -40,8 +40,6 @@ public interface HistoryEntry {
 
   String getChecksum();
 
-  Date getUploadTime();
-
   String getExecutionSummaryJson();
 
   String getPath();

app/aem/core/src/main/java/com/cognifide/apm/core/history/HistoryEntryImpl.java

@@ -61,8 +61,6 @@ public class HistoryEntryImpl implements HistoryEntry {
 
   public static final String PROGRESS_LOG = "summaryJSON";
 
-  public static final String UPLOAD_TIME = "uploadTime";
-
   public static final String SCRIPT_CONTENT_PATH = "scriptContentPath";
 
   public static final String INSTANCE_NAME = "instanceName";
@@ -107,10 +105,6 @@ public class HistoryEntryImpl implements HistoryEntry {
   @Named(CHECKSUM)
   private String checksum;
 
-  @Inject
-  @Named(UPLOAD_TIME)
-  private Date uploadTime;
-
   private String executionSummaryJson;
 
   @Inject
@@ -176,10 +170,6 @@ public String getChecksum() {
     return checksum;
   }
 
-  public Date getUploadTime() {
-    return uploadTime;
-  }
-
   public String getExecutionSummaryJson() {
     if (executionSummaryJson == null) {
       Object progressLog = resource.getValueMap().get(PROGRESS_LOG);

app/aem/core/src/main/java/com/cognifide/apm/core/services/async/AsyncScriptExecutorImpl.java

@@ -26,8 +26,8 @@
 import com.cognifide.apm.core.jobs.JobResultsCache;
 import com.cognifide.apm.core.jobs.JobResultsCache.ExecutionSummary;
 import com.cognifide.apm.core.jobs.ScriptRunnerJobConsumer;
-import com.cognifide.apm.core.ui.utils.DateFormatter;
 import com.google.common.collect.ImmutableMap;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -87,14 +87,13 @@ public ExecutionStatus checkStatus(String id) {
 
   private ExecutionStatus finishedExecution(ExecutionSummary executionSummary) {
     String path = executionSummary.getPath();
-    long timestamp = executionSummary.getResult().getStartTime().getTimeInMillis();
-    String formattedDate = DateFormatter.format(executionSummary.getResult().getStartTime());
+    Calendar startTime = executionSummary.getResult().getStartTime();
     List<ExecutionResult.Entry> entries = executionSummary.getResult().getEntries();
     ExecutionResult.Entry errorEntry = executionSummary.getResult().getLastError();
     if (errorEntry != null) {
-      return new ExecutionStatus.Failed(path, timestamp, formattedDate, entries, errorEntry);
+      return new ExecutionStatus.Failed(path, startTime, entries, errorEntry);
     } else {
-      return new ExecutionStatus.Successful(path, timestamp, formattedDate, entries);
+      return new ExecutionStatus.Successful(path, startTime, entries);
     }
   }
 }

app/aem/core/src/main/java/com/cognifide/apm/core/services/async/ExecutionStatus.java

@@ -20,6 +20,8 @@
 package com.cognifide.apm.core.services.async;
 
 import com.cognifide.apm.api.services.ExecutionResult;
+import com.cognifide.apm.core.ui.utils.DateFormatter;
+import java.util.Calendar;
 import java.util.List;
 
 public abstract class ExecutionStatus {
@@ -58,11 +60,11 @@ protected static class Finished extends ExecutionStatus {
 
     private final List<ExecutionResult.Entry> entries;
 
-    public Finished(String path, long timestamp, String formattedDate, List<ExecutionResult.Entry> entries) {
+    public Finished(String path, Calendar startTime, List<ExecutionResult.Entry> entries) {
       super("finished");
       this.path = path;
-      this.timestamp = timestamp;
-      this.formattedDate = formattedDate;
+      this.timestamp = startTime.getTimeInMillis();
+      this.formattedDate = DateFormatter.format(startTime);
       this.entries = entries;
     }
 
@@ -85,17 +87,17 @@ public List<ExecutionResult.Entry> getEntries() {
 
   public static class Successful extends Finished {
 
-    public Successful(String path, long timestamp, String formattedDate, List<ExecutionResult.Entry> entries) {
-      super(path, timestamp, formattedDate, entries);
+    public Successful(String path, Calendar startTime, List<ExecutionResult.Entry> entries) {
+      super(path, startTime, entries);
     }
   }
 
   public static class Failed extends Finished {
 
     private final ExecutionResult.Entry error;
 
-    public Failed(String path, long timestamp, String formattedDate, List<ExecutionResult.Entry> entries, ExecutionResult.Entry error) {
-      super(path, timestamp, formattedDate, entries);
+    public Failed(String path, Calendar startTime, List<ExecutionResult.Entry> entries, ExecutionResult.Entry error) {
+      super(path, startTime, entries);
       this.error = error;
     }
 

app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/components/historyRow/historyRow.html

@@ -30,8 +30,8 @@
        class="foundation-collection-item-title"
        style="text-decoration:none; color:#4b4b4b">${item.scriptName}</a>
   </td>
-  <td is="coral-table-cell" value="${item.executionTime.timeInMillis || 0}">
-    <time data-sly-test="${item.executionTime}" datetime="${item.executionTime.timeInMillis || 0}"
+  <td is="coral-table-cell" value="${item.executionTimeCalendar.timeInMillis || 0}">
+    <time data-sly-test="${item.executionTime}" datetime="${item.executionTimeCalendar.timeInMillis || 0}"
           data-sly-use.execLast="${'com.cognifide.apm.core.ui.utils.DateFormatter' @ date=item.executionTimeCalendar}">
       ${execLast.formattedDate}
     </time>