Remove on Vespa 8

2 files changed, 1 insertions, 41 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java b/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java
index ad797c283c6..13839dd82c1 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/ClustersStatus.java
@@ -51,11 +51,6 @@ public class ClustersStatus extends AbstractComponent {
         }
     }
 
-    /** @deprecated this is ignored */
-    @Deprecated // TODO: remove on Vespa 8
-    public void setReceiveTrafficByDefault(boolean receiveTrafficByDefault) {
-    }
-
     void setUp(String clusterIdentifier) {
         synchronized (mutex) {
             clusterStatus.put(clusterIdentifier, Boolean.TRUE);
@@ -68,23 +63,6 @@ public class ClustersStatus extends AbstractComponent {
         }
     }
 
-    /** @deprecated use setUp(String) instead */
-    @Deprecated // TODO: Remove on Vespa 8
-    public void setUp(Object clusterIdentifier) {
-        setUp((String) clusterIdentifier);
-    }
-
-    /** @deprecated use setDown(String) instead */
-    @Deprecated // TODO: Remove on Vespa 8
-    public void setDown(Object clusterIdentifier) {
-        setDown((String) clusterIdentifier);
-    }
-
-    @Deprecated // TODO: Remove on Vespa 8
-    public boolean containerShouldReceiveTraffic() {
-        return containerShouldReceiveTraffic(Require.ONE);
-    }
-
     /**
      *  Returns whether this container should receive traffic based on the state of this
      *
diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
index 559c097618f..3b54d098d13 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
@@ -54,7 +54,7 @@ public class VipStatus {
 
     /** For testing */
     public VipStatus(QrSearchersConfig dispatchers, ClustersStatus clustersStatus) {
-        this(dispatchers, new VipStatusConfig.Builder().build(), clustersStatus, StateMonitor.createForTesting());
+        this(dispatchers, new VipStatusConfig.Builder().build(), clustersStatus, StateMonitor.createForTesting(), new NullMetric());
     }
 
     @Inject
@@ -71,24 +71,6 @@ public class VipStatus {
         updateCurrentlyInRotation();
     }
 
-    @Deprecated // TODO: Remove on Vespa 8
-    public VipStatus(QrSearchersConfig dispatchers,
-                     VipStatusConfig vipStatusConfig,
-                     ClustersStatus clustersStatus,
-                     StateMonitor healthState) {
-        this(dispatchers, vipStatusConfig, clustersStatus, healthState, new NullMetric());
-    }
-
-    @Deprecated // TODO: Remove on Vespa 8
-    public VipStatus(QrSearchersConfig dispatchers, ClustersStatus clustersStatus, StateMonitor healthState) {
-        this(dispatchers, new VipStatusConfig.Builder().build(), clustersStatus, healthState);
-    }
-
-    @Deprecated // TODO: Remove on Vespa 8
-    public VipStatus(QrSearchersConfig dispatchers, VipStatusConfig ignored, ClustersStatus clustersStatus) {
-        this(dispatchers, clustersStatus);
-    }
-
     /**
      * Explicitly set this container in or out of rotation
      *