Revoke com.yahoo.config.subscription as public API

Also remove some deprecated methods in ConfigGetter

1 files changed, 1 insertions, 33 deletions

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);
-    }
 }