summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-10-10 11:43:21 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-10-10 11:43:21 +0200
commit98116d3e5479b5a18e1d6ee80537542b214bb1aa (patch)
tree2bb74eb732450662aa46625827cc77b1f679ce6c /controller-server
parentee50b94007bc3d01aba497f33bcd687e640ad2a4 (diff)
Remove dead code
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationList.java24
1 files changed, 0 insertions, 24 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 9bb21864b0f..8998a47e07f 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
@@ -69,15 +69,6 @@ public class ApplicationList {
return listOf(list.stream().filter(application -> ! isDeployingApplicationChange(application)));
}
- public ApplicationList notDeploying() {
- return listOf(list.stream().filter(application -> ! application.deploying().isPresent()));
- }
-
- /** Returns the subset of applications which has a different revision in staging tests than in any prod deployment */
- public ApplicationList hasUndeployedSuccessfulRevisionChange() {
- return listOf(list.stream().filter(application -> hasUndeployedSuccessfulRevisionChange(application)));
- }
-
/** Returns the subset of applications which currently does not have any failing jobs */
public ApplicationList notFailing() {
return listOf(list.stream().filter(application -> ! application.deploymentJobs().hasFailures()));
@@ -189,21 +180,6 @@ public class ApplicationList {
.anyMatch(jobRun -> jobRun.version().equals(change.version()));
}
- private static boolean hasUndeployedSuccessfulRevisionChange(Application application) {
- JobStatus stagingStatus = application.deploymentJobs().jobStatus().get(DeploymentJobs.JobType.stagingTest);
- if (stagingStatus == null) return false;
- if ( ! stagingStatus.lastSuccess().isPresent()) return false;
- Optional<ApplicationRevision> lastStagingSuccessRevision = stagingStatus.lastSuccess().get().revision();
- if ( ! lastStagingSuccessRevision.isPresent()) return false;
-
- for (Deployment deployment : application.deployments().values()) {
- if ( ! deployment.zone().environment().equals(Environment.prod)) continue;
-
- if ( ! deployment.revision().equals(lastStagingSuccessRevision.get())) return true;
- }
- return false;
- }
-
/** Convenience converter from a stream to an ApplicationList */
private static ApplicationList listOf(Stream<Application> applications) {
ImmutableList.Builder<Application> b = new ImmutableList.Builder<>();