Remove on Vespa 8

2 files changed, 1 insertions, 23 deletions

diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
index b71b2bc12fc..5d5ad1f1edc 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
@@ -24,7 +24,7 @@ import static java.util.stream.Collectors.toList;
  * Used for subscribing to one or more configs. Can optionally be given a {@link ConfigSource} for the configs
  * that will be used when {@link #subscribe(Class, String)} is called.
  *
- * {@link #subscribe(Class, String)} on the configs needed, call {@link #nextConfig(long)} and get the config from the
+ * {@link #subscribe(Class, String)} on the configs needed, call {@link #nextConfig(boolean)} and get the config from the
  * {@link ConfigHandle} which {@link #subscribe(Class, String)} returned.
  *
  * @author Vegard Havdal
@@ -187,11 +187,6 @@ public class ConfigSubscriber implements AutoCloseable {
         return acquireSnapshot(timeoutMillis, true, isInitializing);
     }
 
-    @Deprecated // TODO: Remove on Vespa 8
-    public boolean nextConfig(long timeoutMillis) {
-        return nextConfig(timeoutMillis, false);
-    }
-
     /**
      * Use this for waiting for a new config generation.
      *
@@ -219,11 +214,6 @@ public class ConfigSubscriber implements AutoCloseable {
         return nextGeneration(TimingValues.defaultNextConfigTimeout, isInitializing);
     }
 
-    @Deprecated // TODO: Remove on Vespa 8
-    public boolean nextGeneration() {
-        return nextGeneration(false);
-    }
-
     /**
      * Use this for waiting for a new config generation, with the given timeout
      *
@@ -251,11 +241,6 @@ public class ConfigSubscriber implements AutoCloseable {
         return acquireSnapshot(timeoutMillis, false, isInitializing);
     }
 
-    @Deprecated // TODO: Remove on Vespa 8
-    public boolean nextGeneration(long timeoutMillis) {
-        return nextGeneration(timeoutMillis, false);
-    }
-
     /**
      * Acquire a snapshot of all configs with the same generation within a timeout.
      *
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java
index c60f4ad9478..96046e64c1a 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java
@@ -54,13 +54,6 @@ public class ConfigDefinition {
     private static final Double DOUBLE_MIN = -1e308d;
     private static final Double DOUBLE_MAX = 1e308d;
 
-    // TODO: Remove in Vespa 8
-    @Deprecated
-    public ConfigDefinition(String name, String version, String namespace) {
-        this.name = name;
-        this.namespace = namespace;
-    }
-
     public ConfigDefinition(String name, String namespace) {
         this.name = name;
         this.namespace = namespace;