diff options
4 files changed, 2 insertions, 49 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java index f572f241ce0..5603ef2df51 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java @@ -782,7 +782,7 @@ public class SessionRepository { } } - // TODO: Remove in Vespa 8 (when we don't allow files in SEARCH_DEFINITIONS_DIR) + // TODO: Remove on Vespa 9 (when we don't allow files in SEARCH_DEFINITIONS_DIR) // Copies schemas from searchdefinitions/ to schemas/ if searchdefinitions/ exists private void moveSearchDefinitionsToSchemasDir(java.nio.file.Path applicationDir) throws IOException { File schemasDir = applicationDir.resolve(ApplicationPackage.SCHEMAS_DIR.getRelative()).toFile(); diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json index b476a99ed4b..17cd7e09b7d 100644 --- a/container-core/abi-spec.json +++ b/container-core/abi-spec.json @@ -171,10 +171,6 @@ "methods": [ "public void <init>()", "public void setClusters(java.util.Set)", - "public void setReceiveTrafficByDefault(boolean)", - "public void setUp(java.lang.Object)", - "public void setDown(java.lang.Object)", - "public boolean containerShouldReceiveTraffic()", "public boolean containerShouldReceiveTraffic(com.yahoo.container.handler.ClustersStatus$Require)" ], "fields": [] @@ -402,9 +398,6 @@ "public void <init>(com.yahoo.container.handler.ClustersStatus)", "public void <init>(com.yahoo.container.QrSearchersConfig, com.yahoo.container.handler.ClustersStatus)", "public void <init>(com.yahoo.container.QrSearchersConfig, com.yahoo.container.core.VipStatusConfig, com.yahoo.container.handler.ClustersStatus, com.yahoo.container.jdisc.state.StateMonitor, com.yahoo.jdisc.Metric)", - "public void <init>(com.yahoo.container.QrSearchersConfig, com.yahoo.container.core.VipStatusConfig, com.yahoo.container.handler.ClustersStatus, com.yahoo.container.jdisc.state.StateMonitor)", - "public void <init>(com.yahoo.container.QrSearchersConfig, com.yahoo.container.handler.ClustersStatus, com.yahoo.container.jdisc.state.StateMonitor)", - "public void <init>(com.yahoo.container.QrSearchersConfig, com.yahoo.container.core.VipStatusConfig, com.yahoo.container.handler.ClustersStatus)", "public void setInRotation(java.lang.Boolean)", "public void addToRotation(java.lang.String)", "public void removeFromRotation(java.lang.String)", 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 * |