Remove dead code

1 files changed, 1 insertions, 34 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 283d6a75178..f8c7319fabc 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
@@ -54,7 +54,7 @@ public class ApplicationList {
 
     /** Returns the subset of applications which are currently upgrading (to any version) */
     public ApplicationList upgrading() {
-        return listOf(list.stream().filter(application -> isUpgrading(application)));
+        return listOf(list.stream().filter(ApplicationList::isUpgrading));
     }
 
     /** Returns the subset of applications which are currently upgrading to the given version */
@@ -62,11 +62,6 @@ public class ApplicationList {
         return listOf(list.stream().filter(application -> isUpgradingTo(version, application)));
     }
 
-    /** Returns the subset of applications which are currently upgrading to a version lower than the given version */
-    public ApplicationList upgradingToLowerThan(Version version) {
-        return listOf(list.stream().filter(application -> isUpgradingToLowerThan(version, application)));
-    }
-
     /** Returns the subset of applications which are currently not upgrading to the given version */
     public ApplicationList notUpgradingTo(Version version) {
         return listOf(list.stream().filter(application -> ! isUpgradingTo(version, application)));
@@ -81,11 +76,6 @@ public class ApplicationList {
         return notUpgradingTo(version.get());
     }
 
-    /** Returns the subset of applications which is currently not deploying a new application revision */
-    public ApplicationList notDeployingApplication() {
-        return listOf(list.stream().filter(application -> ! isDeployingApplicationChange(application)));
-    }
-
     /** Returns the subset of applications which is currently not deploying a change */
     public ApplicationList notDeploying() {
         return listOf(list.stream().filter(application -> ! application.deploying().isPresent()));
@@ -178,11 +168,6 @@ public class ApplicationList {
         return listOf(list.stream().sorted(Comparator.comparing(application -> application.oldestDeployedVersion().orElse(Version.emptyVersion))));
     }
 
-    /** Returns the subset of applications that are not currently upgrading */
-    public ApplicationList notCurrentlyUpgrading(Change.VersionChange change, Instant jobTimeoutLimit) {
-        return listOf(list.stream().filter(a -> ! currentlyUpgrading(change, a, jobTimeoutLimit)));
-    }
-
     // ----------------------------------- Internal helpers
 
     private static boolean isUpgrading(Application application) {
@@ -197,17 +182,6 @@ public class ApplicationList {
         return ((Change.VersionChange)application.deploying().get()).version().equals(version);
     }
 
-    private static boolean isUpgradingToLowerThan(Version version, Application application) {
-        if ( ! application.deploying().isPresent()) return false;
-        if ( ! (application.deploying().get() instanceof Change.VersionChange) ) return false;
-        return ((Change.VersionChange)application.deploying().get()).version().isBefore(version);
-    }
-
-    private static boolean isDeployingApplicationChange(Application application) {
-        if ( ! application.deploying().isPresent()) return false;
-        return application.deploying().get() instanceof Change.ApplicationChange;
-    }
-
     private static boolean failingOn(Version version, Application application) {
         return ! JobList.from(application)
                 .failing()
@@ -215,13 +189,6 @@ public class ApplicationList {
                 .isEmpty();
     }
 
-    private static boolean currentlyUpgrading(Change.VersionChange change, Application application, Instant jobTimeoutLimit) {
-        return ! JobList.from(application)
-                .running(jobTimeoutLimit)
-                .lastTriggered().on(change.version())
-                .isEmpty();
-    }
-
     private static boolean failingUpgradeToVersionSince(Application application, Version version, Instant threshold) {
         return ! JobList.from(application)
                 .not().failingApplicationChange()