renamed

Author: dprzybyl

app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/ScriptExecutionServlet.java

@@ -73,21 +73,21 @@ public class ScriptExecutionServlet extends SlingAllMethodsServlet {
   protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException {
     RequestProcessor.process(modelFactory, ScriptExecutionStatusForm.class, request, response, (form, resourceResolver) -> {
       ExecutionStatus status = asyncScriptExecutor.checkStatus(form.getId());
-      if (status instanceof ExecutionStatus.FinishedSuccessfulExecution) {
+      if (status instanceof ExecutionStatus.Successful) {
         return ResponseEntity.ok("Script successfully executed")
             .addEntry("status", status.getStatus())
-            .addEntry("output", ((ExecutionStatus.FinishedSuccessfulExecution) status).getEntries())
-            .addEntry("path", ((ExecutionStatus.FinishedSuccessfulExecution) status).getPath())
-            .addEntry("timestamp", ((ExecutionStatus.FinishedSuccessfulExecution) status).getTimestamp())
-            .addEntry("formattedDate", ((ExecutionStatus.FinishedSuccessfulExecution) status).getFormattedDate());
-      } else if (status instanceof ExecutionStatus.FinishedFailedExecution) {
+            .addEntry("output", ((ExecutionStatus.Successful) status).getEntries())
+            .addEntry("path", ((ExecutionStatus.Successful) status).getPath())
+            .addEntry("timestamp", ((ExecutionStatus.Successful) status).getTimestamp())
+            .addEntry("formattedDate", ((ExecutionStatus.Successful) status).getFormattedDate());
+      } else if (status instanceof ExecutionStatus.Failed) {
         return ResponseEntity.internalServerError("Errors while executing script")
             .addEntry("status", status.getStatus())
-            .addEntry("output", ((ExecutionStatus.FinishedFailedExecution) status).getEntries())
-            .addEntry("path", ((ExecutionStatus.FinishedFailedExecution) status).getPath())
-            .addEntry("timestamp", ((ExecutionStatus.FinishedFailedExecution) status).getTimestamp())
-            .addEntry("formattedDate", ((ExecutionStatus.FinishedFailedExecution) status).getFormattedDate())
-            .addEntry("errors", ((ExecutionStatus.FinishedFailedExecution) status).getError().getMessages());
+            .addEntry("output", ((ExecutionStatus.Failed) status).getEntries())
+            .addEntry("path", ((ExecutionStatus.Failed) status).getPath())
+            .addEntry("timestamp", ((ExecutionStatus.Failed) status).getTimestamp())
+            .addEntry("formattedDate", ((ExecutionStatus.Failed) status).getFormattedDate())
+            .addEntry("errors", ((ExecutionStatus.Failed) status).getError().getMessages());
       } else {
         return ResponseEntity.ok("Script is still being processed")
             .addEntry("status", status.getStatus());

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

@@ -77,11 +77,11 @@ public String process(Script script, ExecutionMode executionMode, Map<String, St
   public ExecutionStatus checkStatus(String id) {
     ExecutionSummary executionSummary = jobResultsCache.get(id);
     if (executionSummary == null) {
-      return new ExecutionStatus.UnknownExecution();
+      return new ExecutionStatus.Unknown();
     } else if (executionSummary.isFinished()) {
       return finishedExecution(executionSummary);
     } else {
-      return new ExecutionStatus.RunningExecution();
+      return new ExecutionStatus.Running();
     }
   }
 
@@ -92,9 +92,9 @@ private ExecutionStatus finishedExecution(ExecutionSummary executionSummary) {
     List<ExecutionResult.Entry> entries = executionSummary.getResult().getEntries();
     ExecutionResult.Entry errorEntry = executionSummary.getResult().getLastError();
     if (errorEntry != null) {
-      return new ExecutionStatus.FinishedFailedExecution(path, timestamp, formattedDate, entries, errorEntry);
+      return new ExecutionStatus.Failed(path, timestamp, formattedDate, entries, errorEntry);
     } else {
-      return new ExecutionStatus.FinishedSuccessfulExecution(path, timestamp, formattedDate, entries);
+      return new ExecutionStatus.Successful(path, timestamp, formattedDate, entries);
     }
   }
 }

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

@@ -34,21 +34,21 @@ public String getStatus() {
     return status;
   }
 
-  public static class RunningExecution extends ExecutionStatus {
+  public static class Running extends ExecutionStatus {
 
-    public RunningExecution() {
+    public Running() {
       super("running");
     }
   }
 
-  public static class UnknownExecution extends ExecutionStatus {
+  public static class Unknown extends ExecutionStatus {
 
-    public UnknownExecution() {
+    public Unknown() {
       super("unknown");
     }
   }
 
-  protected static class FinishedExecutionStatus extends ExecutionStatus {
+  protected static class Finished extends ExecutionStatus {
 
     private final String path;
 
@@ -58,7 +58,7 @@ protected static class FinishedExecutionStatus extends ExecutionStatus {
 
     private final List<ExecutionResult.Entry> entries;
 
-    public FinishedExecutionStatus(String path, long timestamp, String formattedDate, List<ExecutionResult.Entry> entries) {
+    public Finished(String path, long timestamp, String formattedDate, List<ExecutionResult.Entry> entries) {
       super("finished");
       this.path = path;
       this.timestamp = timestamp;
@@ -83,18 +83,18 @@ public List<ExecutionResult.Entry> getEntries() {
     }
   }
 
-  public static class FinishedSuccessfulExecution extends FinishedExecutionStatus {
+  public static class Successful extends Finished {
 
-    public FinishedSuccessfulExecution(String path, long timestamp, String formattedDate, List<ExecutionResult.Entry> entries) {
+    public Successful(String path, long timestamp, String formattedDate, List<ExecutionResult.Entry> entries) {
       super(path, timestamp, formattedDate, entries);
     }
   }
 
-  public static class FinishedFailedExecution extends FinishedExecutionStatus {
+  public static class Failed extends Finished {
 
     private final ExecutionResult.Entry error;
 
-    public FinishedFailedExecution(String path, long timestamp, String formattedDate, List<ExecutionResult.Entry> entries, ExecutionResult.Entry error) {
+    public Failed(String path, long timestamp, String formattedDate, List<ExecutionResult.Entry> entries, ExecutionResult.Entry error) {
       super(path, timestamp, formattedDate, entries);
       this.error = error;
     }