diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-09-07 16:13:18 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-09-07 16:13:18 +0200 |
commit | 7c96e6604e5120e4be6c680ecb9963e11df24e79 (patch) | |
tree | 699bc5235b4f510905ec0e9cdfaa6c7f6a7e781b /controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java | |
parent | 6566175df8d1f99fb9476df3ba5cc121f9f605c9 (diff) |
Minor simplification
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java index 098bac0c72c..a5df684912a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java @@ -13,6 +13,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.resource.ResourceSnapsh import java.time.Clock; import java.time.Duration; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -47,7 +48,7 @@ public class ResourceMeterMaintainer extends Maintainer { @Override protected void maintain() { - List<ResourceSnapshot> resourceSnapshots = getResourceSnapshots(allocatedNodes()); + Collection<ResourceSnapshot> resourceSnapshots = getResourceSnapshots(allocatedNodes()); meteringClient.consume(resourceSnapshots); @@ -68,12 +69,13 @@ public class ResourceMeterMaintainer extends Maintainer { .collect(Collectors.toList()); } - private List<ResourceSnapshot> getResourceSnapshots(List<Node> nodes) { - return new ArrayList<>(nodes.stream() - .collect(Collectors.groupingBy(node -> node.owner().get(), - Collectors.collectingAndThen(Collectors.toList(), - nodeList -> ResourceSnapshot.from(nodeList, clock.instant())) - )).values()); + private Collection<ResourceSnapshot> getResourceSnapshots(List<Node> nodes) { + return nodes.stream() + .collect(Collectors.groupingBy(node -> node.owner().get(), + Collectors.collectingAndThen(Collectors.toList(), + nodeList -> ResourceSnapshot.from(nodeList, + clock.instant())) + )).values(); } } |