Merge pull request #15361 from vespa-engine/ogronnesby/remove-use-of-stream

Remove unnecessary use of .stream()

1 files changed, 23 insertions, 27 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 0f9d3e181b4..1c0dca26f5a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -1353,33 +1353,29 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         Cursor detailsMem = details.setObject("mem");
         Cursor detailsDisk = details.setObject("disk");
 
-        history.entrySet().stream()
-                .forEach(entry -> {
-                    String instanceName = entry.getKey().instance().value();
-                    Cursor detailsCpuApp = detailsCpu.setObject(instanceName);
-                    Cursor detailsMemApp = detailsMem.setObject(instanceName);
-                    Cursor detailsDiskApp = detailsDisk.setObject(instanceName);
-                    Cursor detailsCpuData = detailsCpuApp.setArray("data");
-                    Cursor detailsMemData = detailsMemApp.setArray("data");
-                    Cursor detailsDiskData = detailsDiskApp.setArray("data");
-                    entry.getValue().stream()
-                            .forEach(resourceSnapshot -> {
-
-                                Cursor cpu = detailsCpuData.addObject();
-                                cpu.setLong("unixms", resourceSnapshot.getTimestamp().toEpochMilli());
-                                cpu.setDouble("value", resourceSnapshot.getCpuCores());
-
-                                Cursor mem = detailsMemData.addObject();
-                                mem.setLong("unixms", resourceSnapshot.getTimestamp().toEpochMilli());
-                                mem.setDouble("value", resourceSnapshot.getMemoryGb());
-
-                                Cursor disk = detailsDiskData.addObject();
-                                disk.setLong("unixms", resourceSnapshot.getTimestamp().toEpochMilli());
-                                disk.setDouble("value", resourceSnapshot.getDiskGb());
-
-                            });
-
-                });
+        history.forEach((applicationId, resources) -> {
+            String instanceName = applicationId.instance().value();
+            Cursor detailsCpuApp = detailsCpu.setObject(instanceName);
+            Cursor detailsMemApp = detailsMem.setObject(instanceName);
+            Cursor detailsDiskApp = detailsDisk.setObject(instanceName);
+            Cursor detailsCpuData = detailsCpuApp.setArray("data");
+            Cursor detailsMemData = detailsMemApp.setArray("data");
+            Cursor detailsDiskData = detailsDiskApp.setArray("data");
+
+            resources.forEach(resourceSnapshot -> {
+                Cursor cpu = detailsCpuData.addObject();
+                cpu.setLong("unixms", resourceSnapshot.getTimestamp().toEpochMilli());
+                cpu.setDouble("value", resourceSnapshot.getCpuCores());
+
+                Cursor mem = detailsMemData.addObject();
+                mem.setLong("unixms", resourceSnapshot.getTimestamp().toEpochMilli());
+                mem.setDouble("value", resourceSnapshot.getMemoryGb());
+
+                Cursor disk = detailsDiskData.addObject();
+                disk.setLong("unixms", resourceSnapshot.getTimestamp().toEpochMilli());
+                disk.setDouble("value", resourceSnapshot.getDiskGb());
+            });
+        });
 
         return new SlimeJsonResponse(slime);
     }