diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-11-17 10:41:54 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2021-11-17 10:41:54 +0100 |
| commit | 7a38e099a0c36bdfb5bab2b7caa7fffcc598fd2c (patch) | |
| tree | 686a0b51c535147df3904c35eda8b486007ef300 /controller-server/src | |
| parent | 19339fff868707dbcd08efa910d67ba20f7154d1 (diff) | |
Less Guava
Diffstat (limited to 'controller-server/src')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Run.java | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Run.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Run.java index 1c29bdd397f..2b9e3dd0733 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Run.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Run.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.deployment; -import com.google.common.collect.ImmutableList; import com.yahoo.vespa.hosted.controller.api.integration.deployment.RunId; import java.security.cert.X509Certificate; @@ -267,26 +266,26 @@ public class Run { /** Returns the list of unfinished steps whose prerequisites have all succeeded. */ private List<Step> normalSteps() { - return ImmutableList.copyOf(steps.entrySet().stream() - .filter(entry -> entry.getValue().status() == unfinished - && entry.getKey().prerequisites().stream() - .allMatch(step -> steps.get(step) == null - || steps.get(step).status() == succeeded)) - .map(Map.Entry::getKey) - .iterator()); + return steps.entrySet().stream() + .filter(entry -> entry.getValue().status() == unfinished + && entry.getKey().prerequisites().stream() + .allMatch(step -> steps.get(step) == null + || steps.get(step).status() == succeeded)) + .map(Map.Entry::getKey) + .collect(Collectors.toUnmodifiableList()); } /** Returns the list of not-yet-run run-always steps whose run-always prerequisites have all run. */ private List<Step> forcedSteps() { - return ImmutableList.copyOf(steps.entrySet().stream() - .filter(entry -> entry.getValue().status() == unfinished - && entry.getKey().alwaysRun() - && entry.getKey().prerequisites().stream() - .filter(Step::alwaysRun) - .allMatch(step -> steps.get(step) == null - || steps.get(step).status() != unfinished)) - .map(Map.Entry::getKey) - .iterator()); + return steps.entrySet().stream() + .filter(entry -> entry.getValue().status() == unfinished + && entry.getKey().alwaysRun() + && entry.getKey().prerequisites().stream() + .filter(Step::alwaysRun) + .allMatch(step -> steps.get(step) == null + || steps.get(step).status() != unfinished)) + .map(Map.Entry::getKey) + .collect(Collectors.toUnmodifiableList()); } private void requireActive() { |