summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorØyvind Grønnesby <oyving@verizonmedia.com>2020-11-17 09:17:55 +0100
committerØyvind Grønnesby <oyving@verizonmedia.com>2020-11-17 09:17:55 +0100
commit1355fb48398eff02bea7eb12c46b22d68cd8c73c (patch)
treeb3eb98c115e59bfbf64353a986eb434d3cd24ca1
parent18ca0c8d0913bd4ac558c6e1fd6c40035b2aa9b5 (diff)
Remove unnecessary use of .stream()
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java50
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);
}