Some simplifications

3 files changed, 11 insertions, 13 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunStatus.java
index 1fd32524c88..0f605c162aa 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunStatus.java
@@ -83,7 +83,7 @@ public class RunStatus {
     public Optional<RunResult> result() {
 
         // No result of not finished yet
-        if (!hasEnded()) return Optional.empty();
+        if ( ! hasEnded()) return Optional.empty();
 
         // If any steps has failed - then we need to figure out what - for now return fixed error result
         if (hasFailed()) return Optional.of(RunResult.testError);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java
index e1e2281c5ea..f734dde9440 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java
@@ -66,10 +66,6 @@ public enum Step {
 
     public List<Step> prerequisites() { return prerequisites; }
 
-    public static Step last() {
-        return report;
-    }
-
     public enum Status {
 
         /** Step still has unsatisfied finish criteria -- it may not even have started. */
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
index bc671d2375e..856b91b912e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
@@ -39,13 +39,15 @@ public class JobControllerApiHandlerHelperTest {
     private final ApplicationId appId = ApplicationId.from("vespa", "music", "default");
     private final Instant start = Instant.parse("2018-06-27T10:12:35Z");
 
+    private static Step lastStep = Step.values()[Step.values().length - 1];
+
     @Test
     public void jobTypeResponse() {
         Map<JobType, RunStatus> jobMap = new HashMap<>();
         List<JobType> jobList = new ArrayList<>();
-        jobMap.put(JobType.systemTest, createStatus(JobType.systemTest, 1, 30, Step.last(), Step.Status.succeeded));
+        jobMap.put(JobType.systemTest, createStatus(JobType.systemTest, 1, 30, lastStep, Step.Status.succeeded));
         jobList.add(JobType.systemTest);
-        jobMap.put(JobType.productionApNortheast1, createStatus(JobType.productionApNortheast1, 1, 60, Step.last(), Step.Status.succeeded));
+        jobMap.put(JobType.productionApNortheast1, createStatus(JobType.productionApNortheast1, 1, 60, lastStep, Step.Status.succeeded));
         jobList.add(JobType.productionApNortheast1);
         jobMap.put(JobType.productionUsWest1, createStatus(JobType.productionUsWest1, 1, 60, Step.startTests, Step.Status.failed));
         jobList.add(JobType.productionUsWest1);
@@ -61,13 +63,13 @@ public class JobControllerApiHandlerHelperTest {
         Map<RunId, RunStatus> statusMap = new HashMap<>();
         RunStatus status;
 
-        status = createStatus(JobType.systemTest, 3, 30, Step.last(), Step.Status.succeeded);
+        status = createStatus(JobType.systemTest, 3, 30, lastStep, Step.Status.succeeded);
         statusMap.put(status.id(), status);
 
         status = createStatus(JobType.systemTest, 2, 56, Step.installReal, Step.Status.failed);
         statusMap.put(status.id(), status);
 
-        status = createStatus(JobType.systemTest, 1, 44, Step.last(), Step.Status.succeeded);
+        status = createStatus(JobType.systemTest, 1, 44, lastStep, Step.Status.succeeded);
         statusMap.put(status.id(), status);
 
         URI jobTypeUrl = URI.create("https://domain.tld/application/v4/tenant/sometenant/application/someapp/instance/usuallydefault/job/systemtest");
@@ -85,7 +87,7 @@ public class JobControllerApiHandlerHelperTest {
         tester.curator().writeHistoricRuns(
                 runId.application(),
                 runId.type(),
-                Collections.singleton(createStatus(JobType.systemTest, 42, 44, Step.last(), Step.Status.succeeded)));
+                Collections.singleton(createStatus(JobType.systemTest, 42, 44, lastStep, Step.Status.succeeded)));
 
         logStore.append(runId, Step.deployTester.name(), "INFO\t1234567890\tSUCCESS".getBytes());
         logStore.append(runId, Step.installTester.name(), "INFO\t1234598760\tSUCCESS".getBytes());
@@ -114,7 +116,7 @@ public class JobControllerApiHandlerHelperTest {
         RunId runId = new RunId(appId, type, runid);
 
         Map<Step, Step.Status> stepStatusMap = new HashMap<>();
-        Arrays.stream(Step.values()).sorted(Comparator.naturalOrder()).forEach(step -> {
+        for (Step step : Step.values()) {
             if (step.ordinal() < lastStep.ordinal()) {
                 stepStatusMap.put(step, Step.Status.succeeded);
             } else if (step.equals(lastStep)) {
@@ -122,10 +124,10 @@ public class JobControllerApiHandlerHelperTest {
             } else {
                 stepStatusMap.put(step, Step.Status.unfinished);
             }
-        });
+        }
 
         Optional<Instant> end = Optional.empty();
-        if (lastStepStatus == Step.Status.failed || (lastStepStatus != Step.Status.unfinished && lastStep == Step.last())) {
+        if (lastStepStatus == Step.Status.failed || stepStatusMap.get(lastStep) == Step.Status.succeeded) {
             end = Optional.of(start.plusSeconds(duration));
         }