diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-07-25 07:53:28 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-07-25 07:53:28 +0200 |
commit | 80dda20918caeee849df00ba9795457e7676c3a2 (patch) | |
tree | ac810b25cc3d5ee5699abfa97a5d263dac3123b8 /config | |
parent | 29a0aa78101c9bb16dd2386438721e8128362f06 (diff) |
Remove unused code
Diffstat (limited to 'config')
-rw-r--r-- | config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionSet.java | 63 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java | 34 |
2 files changed, 0 insertions, 97 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionSet.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionSet.java deleted file mode 100644 index 6d732ad1a72..00000000000 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionSet.java +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.config; - -import com.yahoo.config.codegen.CNode; -import com.yahoo.log.LogLevel; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Class to hold config definitions and resolving requests for the correct definition - * - * @author hmusum - */ -public class ConfigDefinitionSet { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(ConfigDefinitionSet.class.getName()); - - private final Map<ConfigDefinitionKey, ConfigDefinition> defs = new ConcurrentHashMap<>(); - - public ConfigDefinitionSet() { - - } - - public void add(ConfigDefinitionKey key, ConfigDefinition def) { - log.log(LogLevel.DEBUG, "Adding to set: " + key); - defs.put(key, def); - } - - /** - * Returns a ConfigDefinition from the set matching the given <code>key</code>. If no ConfigDefinition - * is found in the set, it will try to find a ConfigDefinition with same name in the default namespace. - * @param key a {@link ConfigDefinitionKey} - * @return a ConfigDefinition if found, else null - */ - public ConfigDefinition get(ConfigDefinitionKey key) { - log.log(LogLevel.DEBUG, "Getting from set " + defs + " for key " + key); - ConfigDefinition ret = defs.get(key); - if (ret == null) { - // Return entry if we fallback to default namespace - log.log(LogLevel.DEBUG, "Found no def for key " + key + ", trying to find def with same name in default namespace"); - for (Map.Entry<ConfigDefinitionKey, ConfigDefinition> entry : defs.entrySet()) { - if (key.getName().equals(entry.getKey().getName()) && entry.getKey().getNamespace().equals(CNode.DEFAULT_NAMESPACE)) { - return entry.getValue(); - } - } - } - return ret; - } - - public int size() { - return defs.size(); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - for (ConfigDefinitionKey key : defs.keySet()) { - sb.append(key.toString()).append("\n"); - } - return sb.toString(); - } - -} diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java deleted file mode 100644 index 4137e94aba9..00000000000 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.config; - -import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -/** - * Class to hold config definitions and resolving requests for the correct definition - * - * @author hmusum - */ -public class ConfigDefinitionSetTest { - - @Test - public void testBasic() { - ConfigDefinitionSet configDefinitionSet = new ConfigDefinitionSet(); - ConfigDefinition def2 = new ConfigDefinition("foo", "1", "namespace1"); - ConfigDefinition def3 = new ConfigDefinition("foo", "1", "namespace2"); - ConfigDefinitionKey key2 = new ConfigDefinitionKey(def2.getName(), def2.getNamespace()); - configDefinitionSet.add(key2, def2); - ConfigDefinitionKey key3 = new ConfigDefinitionKey(def3.getName(), def3.getNamespace()); - configDefinitionSet.add(key3, def3); - assertEquals(2, configDefinitionSet.size()); - assertEquals(def2, configDefinitionSet.get(key2)); - assertEquals(def3, configDefinitionSet.get(key3)); - - String str = configDefinitionSet.toString(); - assertTrue(str.contains("namespace1.foo")); - assertTrue(str.contains("namespace2.foo")); - } - -} |