diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-01-03 15:28:03 +0100 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-01-03 15:28:03 +0100 |
commit | dcf02a340bd2218d8a9105d6dda099ce92071165 (patch) | |
tree | 060f76c686031785eb295c9566700d93a2ad5a3a /controller-server/src | |
parent | 9565f8df80a0764878fe879c31865c29e7f69a76 (diff) |
Remove ugly method
Diffstat (limited to 'controller-server/src')
4 files changed, 13 insertions, 15 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java index 340bafb8926..d4baa7efcc4 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java @@ -123,7 +123,7 @@ public class ApplicationList { /** Returns the subset of applications which started failing after the given instant */ public ApplicationList startedFailingOnVersionAfter(Version version) { - return listOf(list.stream().filter(application -> JobList.from(application).firstFailing().on(version).anyMatch())); + return listOf(list.stream().filter(application -> ! JobList.from(application).firstFailing().on(version).isEmpty())); } /** Returns the subset of applications which has the given upgrade policy */ @@ -209,32 +209,32 @@ public class ApplicationList { } private static boolean failingOn(Version version, Application application) { - return JobList.from(application) + return ! JobList.from(application) .failing() .lastCompleted().on(version) - .anyMatch(); + .isEmpty(); } private static boolean currentlyUpgrading(Change.VersionChange change, Application application, Instant jobTimeoutLimit) { - return JobList.from(application) + return ! JobList.from(application) .running(jobTimeoutLimit) .lastTriggered().on(change.version()) - .anyMatch(); + .isEmpty(); } private static boolean failingUpgradeToVersionSince(Application application, Version version, Instant threshold) { - return JobList.from(application) + return ! JobList.from(application) .not().failingApplicationChange() .firstFailing().before(threshold) .lastCompleted().on(version) - .anyMatch(); + .isEmpty(); } private static boolean failingApplicationChangeSince(Application application, Instant threshold) { - return JobList.from(application) + return ! JobList.from(application) .failingApplicationChange() .firstFailing().before(threshold) - .anyMatch(); + .isEmpty(); } /** Convenience converter from a stream to an ApplicationList */ diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java index 5b104f19937..eea94411109 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java @@ -101,12 +101,12 @@ public class DeploymentJobs { /** Returns whether this has some job status which is not a success */ public boolean hasFailures() { - return JobList.from(status.values()).failing().anyMatch(); + return ! JobList.from(status.values()).failing().isEmpty(); } /** Returns whether any job is currently in progress */ public boolean isRunning(Instant timeoutLimit) { - return JobList.from(status.values()).running(timeoutLimit).anyMatch(); + return ! JobList.from(status.values()).running(timeoutLimit).isEmpty(); } /** Returns whether the given job type is currently running and was started after timeoutLimit */ diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobList.java index 6223b07d27a..161035b1164 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobList.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/JobList.java @@ -57,8 +57,6 @@ public class JobList { public boolean isEmpty() { return list.isEmpty(); } - public boolean anyMatch() { return ! isEmpty(); } - public int size() { return list.size(); } // ----------------------------------- Basic filters diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java index 6a9db3ae917..90237a17fb9 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java @@ -344,10 +344,10 @@ public class DeploymentTrigger { } private boolean isRunningProductionJob(Application application) { - return JobList.from(application) + return ! JobList.from(application) .production() .running(jobTimeoutLimit()) - .anyMatch(); + .isEmpty(); } /** |