Remove pointless Optional and clean up API response

2 files changed, 8 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunLog.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunLog.java
index 596249a762b..b5ee571a387 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunLog.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunLog.java
@@ -31,7 +31,10 @@ public class RunLog {
     /** Creates a RunLog which contains a deep copy of the given log. */
     public static RunLog of(Map<Step, List<LogEntry>> log) {
         ImmutableMap.Builder<Step, List<LogEntry>> builder = ImmutableMap.builder();
-        log.forEach((step, entries) -> builder.put(step, ImmutableList.copyOf(entries)));
+        log.forEach((step, entries) -> {
+            if ( ! entries.isEmpty())
+                builder.put(step, ImmutableList.copyOf(entries));
+        });
         OptionalLong lastId = log.values().stream()
                                  .flatMap(List::stream)
                                  .mapToLong(LogEntry::id)
@@ -45,8 +48,8 @@ public class RunLog {
     }
 
     /** Returns the log entries for the given step, if any are recorded. */
-    public Optional<List<LogEntry>> get(Step step) {
-        return Optional.ofNullable(log.get(step));
+    public List<LogEntry> get(Step step) {
+        return log.getOrDefault(step, Collections.emptyList());
     }
 
     /** Returns the id of the last log entry in this, if it has any. */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
index df682490200..6140a2fa810 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
@@ -371,7 +371,8 @@ class JobControllerApiHandlerHelper {
 
         Cursor logObject = detailsObject.setObject("log");
         for (Step step : Step.values()) {
-            runLog.get(step).ifPresent(entries -> toSlime(logObject.setArray(step.name()), entries));
+            if ( ! runLog.get(step).isEmpty())
+                toSlime(logObject.setArray(step.name()), runLog.get(step));
         }
         runLog.lastId().ifPresent(id -> detailsObject.setLong("lastId", id));