diff options
author | Harald Musum <musum@yahooinc.com> | 2022-07-07 12:19:09 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-07-07 12:19:09 +0200 |
commit | 2a64c712743594812dbf96ec5ff8d3b7482c4748 (patch) | |
tree | eda8cc27689fb90afb644a12976441642f898012 /config | |
parent | 6c0b98634aad1e3ea60a5680afb5943391716b12 (diff) |
Deprecate ConfigGetter
Diffstat (limited to 'config')
5 files changed, 6 insertions, 5 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 aabfd211fac..316edda1ee8 100755 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java @@ -1,7 +1,6 @@ // 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.config.ConfigInstance; /** @@ -13,7 +12,9 @@ import com.yahoo.config.ConfigInstance; * command-line tools. * * @author gjoranv + * @deprecated Use config builders where possible */ +@Deprecated public class ConfigGetter<T extends ConfigInstance> { private final Class<T> clazz; 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 fb116729640..68b5d6a37d3 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertTrue; * * @author gjoranv */ +@SuppressWarnings("deprecation") public class ConfigGetterTest { private final ConfigSourceSet sourceSet = new ConfigSourceSet("config-getter-test"); diff --git a/config/src/test/java/com/yahoo/config/subscription/FunctionTest.java b/config/src/test/java/com/yahoo/config/subscription/FunctionTest.java index 42c2c599899..8656c0e945f 100644 --- a/config/src/test/java/com/yahoo/config/subscription/FunctionTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/FunctionTest.java @@ -2,20 +2,16 @@ package com.yahoo.config.subscription; import com.yahoo.foo.FunctionTestConfig; - import org.junit.Before; import org.junit.Test; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -28,6 +24,7 @@ import static org.junit.Assert.fail; * * @author gjoranv */ +@SuppressWarnings("deprecation") public class FunctionTest { public static final String PATH = "src/test/resources/configs/function-test/"; diff --git a/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java b/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java index 963f3de5e43..2e7beb0f0f4 100644 --- a/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertEquals; public class NamespaceTest { @Test + @SuppressWarnings("deprecation") public void verifyConfigClassWithExplicitNamespace() { NamespaceConfig config = new ConfigGetter<>(NamespaceConfig.class).getConfig("raw: a 0\n"); assertEquals(0, config.a()); diff --git a/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java b/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java index 8864f114d87..c1d98ac7e3e 100644 --- a/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java @@ -22,6 +22,7 @@ public class UnicodeTest { * received correctly from the server */ @Test + @SuppressWarnings("deprecation") public void testUnicodeConfigReading() { ConfigGetter<UnicodeConfig> getter = new ConfigGetter<>(UnicodeConfig.class); UnicodeConfig config = getter.getConfig("file:src/test/resources/configs/unicode/unicode.cfg"); |