Revert "Merge pull request #24755 from vespa-engine/jonmv/avoid-npe"

This reverts commit 8c382a06c54bab318c7d0bc35f641885dd82637a, reversing
changes made to 4145eae54a40b7a254e27e03c03022a57c3a788b.

1 files changed, 21 insertions, 25 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index f94bd51fe4c..08cf8d2e1c4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -207,36 +207,32 @@ public class JobController {
                 return run;
 
             List<LogEntry> log;
-            Optional<Instant> deployedAt;
+            Instant deployedAt;
             Instant from;
             if ( ! run.id().type().isProduction()) {
-                deployedAt = run.stepInfo(installInitialReal).or(() -> run.stepInfo(installReal)).flatMap(StepInfo::startTime);
-                if (deployedAt.isPresent()) {
-                    from = run.lastVespaLogTimestamp().isAfter(run.start()) ? run.lastVespaLogTimestamp() : deployedAt.get().minusSeconds(10);
-                    log = LogEntry.parseVespaLog(controller.serviceRegistry().configServer()
-                                                           .getLogs(new DeploymentId(id.application(), zone),
-                                                                    Map.of("from", Long.toString(from.toEpochMilli()))),
-                                                 from);
-                }
-                else log = List.of();
+                deployedAt = run.stepInfo(installInitialReal).or(() -> run.stepInfo(installReal)).flatMap(StepInfo::startTime).orElseThrow();
+                from = run.lastVespaLogTimestamp().isAfter(run.start()) ? run.lastVespaLogTimestamp() : deployedAt.minusSeconds(10);
+                log = LogEntry.parseVespaLog(controller.serviceRegistry().configServer()
+                                                       .getLogs(new DeploymentId(id.application(), zone),
+                                                                Map.of("from", Long.toString(from.toEpochMilli()))),
+                                             from);
             }
-            else log = List.of();
+            else
+                log = List.of();
 
             if (id.type().isTest()) {
-                deployedAt = run.stepInfo(installTester).flatMap(StepInfo::startTime);
-                if (deployedAt.isPresent()) {
-                    from = run.lastVespaLogTimestamp().isAfter(run.start()) ? run.lastVespaLogTimestamp() : deployedAt.get().minusSeconds(10);
-                    List<LogEntry> testerLog = LogEntry.parseVespaLog(controller.serviceRegistry().configServer()
-                                                                                .getLogs(new DeploymentId(id.tester().id(), zone),
-                                                                                         Map.of("from", Long.toString(from.toEpochMilli()))),
-                                                                      from);
-
-                    Instant justNow = controller.clock().instant().minusSeconds(2);
-                    log = Stream.concat(log.stream(), testerLog.stream())
-                                .filter(entry -> entry.at().isBefore(justNow))
-                                .sorted(comparing(LogEntry::at))
-                                .toList();
-                }
+                deployedAt = run.stepInfo(installTester).flatMap(StepInfo::startTime).orElseThrow();
+                from = run.lastVespaLogTimestamp().isAfter(run.start()) ? run.lastVespaLogTimestamp() : deployedAt.minusSeconds(10);
+                List<LogEntry> testerLog = LogEntry.parseVespaLog(controller.serviceRegistry().configServer()
+                                                                            .getLogs(new DeploymentId(id.tester().id(), zone),
+                                                                                     Map.of("from", Long.toString(from.toEpochMilli()))),
+                                                                  from);
+
+                Instant justNow = controller.clock().instant().minusSeconds(2);
+                log = Stream.concat(log.stream(), testerLog.stream())
+                            .filter(entry -> entry.at().isBefore(justNow))
+                            .sorted(comparing(LogEntry::at))
+                            .collect(toUnmodifiableList());
             }
             if (log.isEmpty())
                 return run;