Revoke com.yahoo.config.subscription as public API

Also remove some deprecated methods in ConfigGetter

2 files changed, 1 insertions, 70 deletions

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