Revoke com.yahoo.config.subscription as public API

Also remove some deprecated methods in ConfigGetter

22 files changed, 13 insertions, 469 deletions

diff --git a/config/abi-spec.json b/config/abi-spec.json
index e94749cfba8..9e26dfeeb6e 100644
--- a/config/abi-spec.json
+++ b/config/abi-spec.json
@@ -1,312 +1 @@
-{
-  "com.yahoo.config.subscription.CfgConfigPayloadBuilder": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public com.yahoo.vespa.config.ConfigPayload deserialize(java.util.List)",
-      "public com.yahoo.vespa.config.ConfigPayloadBuilder deserializeToBuilder(java.util.List)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.ConfigDebug": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public static void logDebug(java.util.logging.Logger, long, com.yahoo.vespa.config.ConfigKey, java.lang.String)",
-      "public static void logDebug(java.util.logging.Logger, com.yahoo.config.ConfigInstance$Builder, java.lang.String, java.lang.String)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.ConfigGetter": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.Class)",
-      "public void <init>(com.yahoo.config.subscription.ConfigSource, java.lang.Class)",
-      "public synchronized com.yahoo.config.ConfigInstance getConfig(java.lang.String)",
-      "public static com.yahoo.config.ConfigInstance getConfig(java.lang.Class, java.lang.String)",
-      "public static com.yahoo.config.ConfigInstance getConfig(java.lang.Class, java.lang.String, com.yahoo.config.subscription.ConfigSource)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.ConfigHandle": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "protected void <init>(com.yahoo.config.subscription.impl.ConfigSubscription)",
-      "public boolean isChanged()",
-      "public com.yahoo.config.ConfigInstance getConfig()",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.ConfigInstanceSerializer": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.Serializer"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.slime.Slime)",
-      "public void <init>(com.yahoo.slime.Slime, com.yahoo.slime.Cursor)",
-      "public com.yahoo.config.Serializer createInner(java.lang.String)",
-      "public com.yahoo.config.Serializer createArray(java.lang.String)",
-      "public com.yahoo.config.Serializer createInner()",
-      "public com.yahoo.config.Serializer createMap(java.lang.String)",
-      "public void serialize(java.lang.String, boolean)",
-      "public void serialize(java.lang.String, double)",
-      "public void serialize(java.lang.String, int)",
-      "public void serialize(java.lang.String, long)",
-      "public void serialize(java.lang.String, java.lang.String)",
-      "public void serialize(boolean)",
-      "public void serialize(double)",
-      "public void serialize(long)",
-      "public void serialize(int)",
-      "public void serialize(java.lang.String)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.ConfigInstanceUtil": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public static void setValues(com.yahoo.config.ConfigBuilder, com.yahoo.config.ConfigBuilder)",
-      "public static com.yahoo.config.ConfigInstance getNewInstance(java.lang.Class, java.lang.String, com.yahoo.vespa.config.ConfigPayload)",
-      "public static java.lang.Object getField(com.yahoo.config.ConfigBuilder, java.lang.String)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.ConfigInterruptedException": {
-    "superClass": "java.lang.RuntimeException",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.Throwable)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.ConfigSet": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.subscription.ConfigSource"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void addBuilder(java.lang.String, com.yahoo.config.ConfigInstance$Builder)",
-      "public com.yahoo.config.ConfigInstance$Builder get(com.yahoo.vespa.config.ConfigKey)",
-      "public boolean contains(com.yahoo.vespa.config.ConfigKey)",
-      "public java.lang.String toString()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.ConfigSource": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.ConfigSourceSet": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.subscription.ConfigSource"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(java.util.List)",
-      "public void <init>(java.lang.String[])",
-      "public void <init>(java.lang.String)",
-      "public java.util.Set getSources()",
-      "public boolean equals(java.lang.Object)",
-      "public int hashCode()",
-      "public java.lang.String toString()",
-      "public static com.yahoo.config.subscription.ConfigSourceSet createDefault()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.ConfigSubscriber$SingleSubscriber": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract void configure(com.yahoo.config.ConfigInstance)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.ConfigSubscriber$State": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.config.subscription.ConfigSubscriber$State[] values()",
-      "public static com.yahoo.config.subscription.ConfigSubscriber$State valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.config.subscription.ConfigSubscriber$State OPEN",
-      "public static final enum com.yahoo.config.subscription.ConfigSubscriber$State FROZEN",
-      "public static final enum com.yahoo.config.subscription.ConfigSubscriber$State CLOSED"
-    ]
-  },
-  "com.yahoo.config.subscription.ConfigSubscriber": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "java.lang.AutoCloseable"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(com.yahoo.config.subscription.ConfigSource)",
-      "public com.yahoo.config.subscription.ConfigHandle subscribe(java.lang.Class, java.lang.String)",
-      "public com.yahoo.config.subscription.ConfigHandle subscribe(java.lang.Class, java.lang.String, long)",
-      "protected void checkStateBeforeSubscribe()",
-      "protected void subscribeAndHandleErrors(com.yahoo.config.subscription.impl.ConfigSubscription, com.yahoo.vespa.config.ConfigKey, com.yahoo.config.subscription.ConfigHandle, com.yahoo.vespa.config.TimingValues)",
-      "public boolean nextConfig(boolean)",
-      "public boolean nextConfig()",
-      "public boolean nextConfig(long, boolean)",
-      "public boolean nextConfig(long)",
-      "public boolean nextGeneration(boolean)",
-      "public boolean nextGeneration()",
-      "public boolean nextGeneration(long, boolean)",
-      "public boolean nextGeneration(long)",
-      "protected void throwIfExceptionSet(com.yahoo.config.subscription.impl.ConfigSubscription)",
-      "public void close()",
-      "public java.lang.String toString()",
-      "public java.lang.Thread startConfigThread(java.lang.Runnable)",
-      "protected com.yahoo.config.subscription.ConfigSubscriber$State state()",
-      "public void reload(long)",
-      "public com.yahoo.config.subscription.ConfigSource getSource()",
-      "public boolean isClosed()",
-      "public com.yahoo.config.subscription.ConfigHandle subscribe(com.yahoo.config.subscription.ConfigSubscriber$SingleSubscriber, java.lang.Class, java.lang.String)",
-      "public long getGeneration()",
-      "protected void finalize()"
-    ],
-    "fields": [
-      "protected final java.util.List subscriptionHandles"
-    ]
-  },
-  "com.yahoo.config.subscription.ConfigURI": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public java.lang.String getConfigId()",
-      "public com.yahoo.config.subscription.ConfigSource getSource()",
-      "public static com.yahoo.config.subscription.ConfigURI createFromId(java.lang.String)",
-      "public static com.yahoo.config.subscription.ConfigURI createFromIdAndSource(java.lang.String, com.yahoo.config.subscription.ConfigSource)"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.DirSource": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.subscription.ConfigSource"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.io.File)",
-      "public java.io.File getDir()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.FileSource": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.subscription.ConfigSource"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.io.File)",
-      "public java.io.File getFile()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.JarSource": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.subscription.ConfigSource"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.util.jar.JarFile, java.lang.String)",
-      "public java.util.jar.JarFile getJarFile()",
-      "public java.lang.String getPath()"
-    ],
-    "fields": []
-  },
-  "com.yahoo.config.subscription.RawSource": {
-    "superClass": "java.lang.Object",
-    "interfaces": [
-      "com.yahoo.config.subscription.ConfigSource"
-    ],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(java.lang.String)"
-    ],
-    "fields": [
-      "public final java.lang.String payload"
-    ]
-  },
-  "com.yahoo.config.subscription.SubscriberClosedException": {
-    "superClass": "java.lang.RuntimeException",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()"
-    ],
-    "fields": []
-  }
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/config/pom.xml b/config/pom.xml
index 546e65c048c..4eceef8c748 100755
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -186,14 +186,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <!-- TODO Vespa 8: remove configuration.
-             Included to allow 'removal' warnings for classes in its own module -->
-        <configuration>
-          <compilerArgs>
-            <arg>-Xlint:all,-serial,-try,-processing,-removal</arg>
-            <arg>-Werror</arg>
-          </compilerArgs>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java b/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java
index 7d3fdad43c7..1a110fe8e6c 100644
--- a/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java
+++ b/config/src/main/java/com/yahoo/config/subscription/CfgConfigPayloadBuilder.java
@@ -17,9 +17,7 @@ import static java.util.logging.Level.FINEST;
  * Deserializes config payload (cfg format) to a ConfigPayload.
  *
  * @author hmusum
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class CfgConfigPayloadBuilder {
     private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(CfgConfigPayloadBuilder.class.getName());
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigDebug.java b/config/src/main/java/com/yahoo/config/subscription/ConfigDebug.java
index 2fcbdce7030..85aa7a05e17 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigDebug.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigDebug.java
@@ -9,7 +9,6 @@ import java.util.logging.Logger;
 import static java.util.logging.Level.INFO;
 
 // Debug class that provides useful helper routines
-@Deprecated(forRemoval = true, since = "7")
 public class ConfigDebug {
     public static void logDebug(Logger logger, long timestamp, ConfigKey<?> key, String logmessage) {
         if (key.getConfigId().matches(".*container.?\\d+.*") || key.getConfigId().matches(".*doc.api.*")) {
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java b/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java
index 305ecbd6483..aabfd211fac 100755
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java
@@ -17,7 +17,6 @@ import com.yahoo.config.ConfigInstance;
 public class ConfigGetter<T extends ConfigInstance> {
 
     private final Class<T> clazz;
-    private final ConfigSource source;
 
     /**
      * Creates a ConfigGetter for class <code>clazz</code>
@@ -25,22 +24,7 @@ public class ConfigGetter<T extends ConfigInstance> {
      * @param clazz a config class
      */
     public ConfigGetter(Class<T> clazz) {
-        this(null, clazz);
-    }
-
-    /**
-     * Creates a ConfigGetter for class <code>clazz</code> with the specified
-     * {@link ConfigSource}.
-     *
-     * @param source a {@link ConfigSource}
-     * @param clazz  a config class
-     *
-     * @deprecated Config should always be injected via the component class constructor. For unit tests, use config builders.
-     */
-    @Deprecated(forRemoval = true, since = "7")
-    public ConfigGetter(ConfigSource source, Class<T> clazz) {
         this.clazz = clazz;
-        this.source = source;
     }
 
     /**
@@ -50,8 +34,7 @@ public class ConfigGetter<T extends ConfigInstance> {
      * @return an instance of a config class
      */
     public synchronized T getConfig(String configId) {
-        try (ConfigSubscriber subscriber =
-                     source == null ? new ConfigSubscriber() : new ConfigSubscriber(source)) {
+        try (ConfigSubscriber subscriber = new ConfigSubscriber()) {
             ConfigHandle<T> handle = subscriber.subscribe(clazz, configId);
             subscriber.nextConfig(true);
             return handle.getConfig();
@@ -70,19 +53,4 @@ public class ConfigGetter<T extends ConfigInstance> {
         return getter.getConfig(configId);
     }
 
-    /**
-     * Creates a ConfigGetter instance and returns an instance of the config class <code>c</code>.
-     *
-     * @param c        a config class
-     * @param configId a config id to use when getting the config
-     * @param source   a {@link ConfigSource}
-     * @return an instance of a config class
-     *
-     * @deprecated Config should always be injected via the component class constructor. For unit tests, use config builders.
-     */
-    @Deprecated(forRemoval = true, since = "7")
-    public static <T extends ConfigInstance> T getConfig(Class<T> c, String configId, ConfigSource source) {
-        ConfigGetter<T> getter = new ConfigGetter<>(source, c);
-        return getter.getConfig(configId);
-    }
 }
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java b/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java
index 6b832205211..4ae6122becd 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigHandle.java
@@ -6,13 +6,11 @@ import com.yahoo.config.subscription.impl.ConfigSubscription;
 
 /**
  * A config handle represents one config in the context of one active subscription on a {@link ConfigSubscriber}.
- * It will contain meta data of the subscription of that particular config, as well as access to the {@link com.yahoo.config.ConfigInstance} itself.
+ * It will contain metadata of the subscription of that particular config, as well as access to the {@link com.yahoo.config.ConfigInstance} itself.
  *
  * @param <T> the type of the config
  * @author vegardh
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class ConfigHandle<T extends ConfigInstance> {
 
     private final ConfigSubscription<T> sub;
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java
index d8062a9f95b..e035991abf4 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java
@@ -9,9 +9,7 @@ import com.yahoo.slime.Slime;
  * Implements a config instance serializer, serializing a config instance to a slime object.
  *
  * @author Ulf Lilleengen
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class ConfigInstanceSerializer implements Serializer {
     private final Slime slime;
     private final Cursor root;
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java
index 5831753eacb..61b421b30e0 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java
@@ -1,22 +1,19 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.subscription;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
 import com.yahoo.config.ConfigBuilder;
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.ConfigurationRuntimeException;
-import com.yahoo.yolean.Exceptions;
-import com.yahoo.vespa.config.*;
+import com.yahoo.vespa.config.ConfigPayload;
+import com.yahoo.vespa.config.ConfigTransformer;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 /**
  * @author gjoranv
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class ConfigInstanceUtil {
 
     /**
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java b/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java
index 050b7a81fa2..a7c2c2d9127 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java
@@ -4,10 +4,8 @@ package com.yahoo.config.subscription;
 /**
  * This exception is thrown when any blocking call within the Config API is interrupted.
  * @author Ulf Lilleengen
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
 @SuppressWarnings("serial")
-@Deprecated(forRemoval = true, since = "7")
 public class ConfigInterruptedException extends RuntimeException {
     public ConfigInterruptedException(Throwable cause) {
         super(cause);
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java
index 36d9047aa87..1b86db6b299 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java
@@ -1,19 +1,16 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.subscription;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.vespa.config.ConfigKey;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Config source as a programmatically built set of {@link com.yahoo.config.ConfigInstance}s
  *
  * @author Vegard Havdal
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class ConfigSet implements ConfigSource {
     private final Map<ConfigKey<?>, ConfigInstance.Builder> configs = new ConcurrentHashMap<>();
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java
index b8abeb48c3d..5814a004216 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java
@@ -5,9 +5,7 @@ package com.yahoo.config.subscription;
  * A type of source of config
  *
  * @author Vegard Havdal
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public interface ConfigSource {
 
 }
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java
index 37f91605a54..81aeda52b54 100755
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSourceSet.java
@@ -18,9 +18,7 @@ import static java.util.logging.Level.INFO;
  * upper/lower-casing and whitespaces.
  *
  * @author gjoranv
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class ConfigSourceSet implements ConfigSource {
 
     private static final Logger log = Logger.getLogger(ConfigSourceSet.class.getName());
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 ee6ce37036c..1c516b37783 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
@@ -28,9 +28,7 @@ import static java.util.stream.Collectors.toList;
  * {@link ConfigHandle} which {@link #subscribe(Class, String)} returned.
  *
  * @author Vegard Havdal
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class ConfigSubscriber implements AutoCloseable {
 
     private static final Logger log = Logger.getLogger(ConfigSubscriber.class.getName());
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java b/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java
index 46db3c6c83a..f0257457902 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigURI.java
@@ -1,18 +1,15 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.subscription;
 
-import java.io.File;
-
 import com.yahoo.config.subscription.impl.JRTConfigRequester;
+import java.io.File;
 
 /**
  * A Config URI is a class that can be used to encapsulate a config source and a config id into one
  * object to simplify parameter passing.
  *
  * @author Ulf Lilleengen
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class ConfigURI {
 
     private String configId;
diff --git a/config/src/main/java/com/yahoo/config/subscription/DirSource.java b/config/src/main/java/com/yahoo/config/subscription/DirSource.java
index 48d52bd49f3..fbd65ccf597 100644
--- a/config/src/main/java/com/yahoo/config/subscription/DirSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/DirSource.java
@@ -6,9 +6,7 @@ import java.io.File;
 /**
  * Source specifying config from a local directory
  * @author Vegard Havdal
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class DirSource implements ConfigSource {
     private final File dir;
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/FileSource.java b/config/src/main/java/com/yahoo/config/subscription/FileSource.java
index bbad7286b4c..2178c64cca3 100644
--- a/config/src/main/java/com/yahoo/config/subscription/FileSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/FileSource.java
@@ -7,9 +7,7 @@ import java.io.File;
  * Source specifying config from one local file
  *
  * @author Vegard Havdal
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class FileSource implements ConfigSource {
 
     private final File file;
diff --git a/config/src/main/java/com/yahoo/config/subscription/JarSource.java b/config/src/main/java/com/yahoo/config/subscription/JarSource.java
index f39ee5e9262..c106823b52d 100644
--- a/config/src/main/java/com/yahoo/config/subscription/JarSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/JarSource.java
@@ -6,9 +6,7 @@ import java.util.jar.JarFile;
 /**
  * Source specifying config as a jar file entry
  * @author Vegard Havdal
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class JarSource implements ConfigSource {
     private final String path;
     private final JarFile jarFile;
diff --git a/config/src/main/java/com/yahoo/config/subscription/RawSource.java b/config/src/main/java/com/yahoo/config/subscription/RawSource.java
index 28b249c6ece..8b73d2058f5 100644
--- a/config/src/main/java/com/yahoo/config/subscription/RawSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/RawSource.java
@@ -5,9 +5,7 @@ package com.yahoo.config.subscription;
  * Source specifying raw config, where payload is given programmatically
  *
  * @author Vegard Havdal
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class RawSource implements ConfigSource {
 
     public final String payload;
diff --git a/config/src/main/java/com/yahoo/config/subscription/SubscriberClosedException.java b/config/src/main/java/com/yahoo/config/subscription/SubscriberClosedException.java
index f7051ab1b38..1e6ebdbd752 100644
--- a/config/src/main/java/com/yahoo/config/subscription/SubscriberClosedException.java
+++ b/config/src/main/java/com/yahoo/config/subscription/SubscriberClosedException.java
@@ -5,7 +5,5 @@ package com.yahoo.config.subscription;
  * Thrown when {@link ConfigSubscriber} is closed
  *
  * @author bjorncs
- * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-@Deprecated(forRemoval = true, since = "7")
 public class SubscriberClosedException extends RuntimeException {}
diff --git a/config/src/main/java/com/yahoo/config/subscription/package-info.java b/config/src/main/java/com/yahoo/config/subscription/package-info.java
index 6798809dee2..bda7649d184 100644
--- a/config/src/main/java/com/yahoo/config/subscription/package-info.java
+++ b/config/src/main/java/com/yahoo/config/subscription/package-info.java
@@ -1,10 +1,8 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
-@PublicApi
 /**
  * Classes for subscribing to Vespa config.
  */
 package com.yahoo.config.subscription;
 
-import com.yahoo.api.annotations.PublicApi;
 import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java
index 68cadb33ecd..fb116729640 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java
@@ -2,11 +2,8 @@
 package com.yahoo.config.subscription;
 
 import com.yahoo.foo.AppConfig;
-
 import org.junit.Test;
 
-import java.io.File;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -16,7 +13,7 @@ import static org.junit.Assert.assertTrue;
  * @author gjoranv
  */
 public class ConfigGetterTest {
-    private ConfigSourceSet sourceSet = new ConfigSourceSet("config-getter-test");
+    private final ConfigSourceSet sourceSet = new ConfigSourceSet("config-getter-test");
 
     @Test
     public void testGetConfig() {
@@ -41,13 +38,6 @@ public class ConfigGetterTest {
     }
 
     @Test
-    public void testGetFromRawSource() {
-        ConfigGetter<AppConfig> getter = new ConfigGetter<>(new RawSource("message \"one\""), AppConfig.class);
-        AppConfig config = getter.getConfig("test");
-        assertEquals("one", config.message());
-    }
-
-    @Test
     public void testGetTwice() {
         ConfigGetter<AppConfig> getter = new ConfigGetter<>(AppConfig.class);
         AppConfig config = getter.getConfig("raw:message \"one\"");
@@ -63,13 +53,6 @@ public class ConfigGetterTest {
         verifyFooValues(config);
     }
 
-     @Test
-    public void testGetFromFileSource() {
-        ConfigGetter<AppConfig> getter = new ConfigGetter<>(new FileSource(new File("src/test/resources/configs/foo/app.cfg")), AppConfig.class);
-        AppConfig config = getter.getConfig("test");
-        verifyFooValues(config);
-    }
-
     @Test
     public void testGetFromDir() {
         ConfigGetter<AppConfig> getter = new ConfigGetter<>(AppConfig.class);
@@ -77,12 +60,6 @@ public class ConfigGetterTest {
         verifyFooValues(config);
     }
 
-    @Test
-    public void testGetFromDirSource() {
-        AppConfig config = ConfigGetter.getConfig(AppConfig.class, "test", new DirSource(new File("src/test/resources/configs/foo/")));
-        verifyFooValues(config);
-    }
-
     private void verifyFooValues(AppConfig config) {
         assertEquals("msg1", config.message());
         assertEquals(3, config.times());
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigSourceTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigSourceTest.java
deleted file mode 100644
index e7baab407f6..00000000000
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigSourceTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.config.subscription;
-
-import com.yahoo.foo.SimpletypesConfig;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import java.io.File;
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-/**
- * @author Ulf Lilleengen
- */
-public class ConfigSourceTest {
-
-    @Test(expected = IllegalArgumentException.class)
-    public void require_that_FileSource_throws_exception_on_invalid_file() {
-        new FileSource(new File("invalid"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void require_that_DirSource_throws_exception_on_invalid_dir() {
-        new DirSource(new File("invalid"));
-    }
-
-    @Rule
-    public TemporaryFolder tmpDir = new TemporaryFolder();
-
-    @Test
-    public void require_that_DirSource_throws_exception_on_missing_file() throws IOException {
-        File folder = tmpDir.newFolder();
-        DirSource dirSource = new DirSource(folder);
-        try {
-            ConfigGetter.getConfig(SimpletypesConfig.class, "dir:" + tmpDir, dirSource);
-            fail();
-        } catch (IllegalArgumentException e) {
-            assertEquals("Could not find a config file for '" + SimpletypesConfig.getDefName() + "' in '" + folder + "/'",
-                         e.getMessage());
-        }
-    }
-
-}