Remove constructor that uses default namespace (deprecated)

2 files changed, 4 insertions, 40 deletions

diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java
index 1dc70f3c1a5..4137e94aba9 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionSetTest.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.config;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -17,39 +16,19 @@ public class ConfigDefinitionSetTest {
     @Test
     public void testBasic() {
         ConfigDefinitionSet configDefinitionSet = new ConfigDefinitionSet();
-        ConfigDefinition def1 = new ConfigDefinition("foo", "1");
         ConfigDefinition def2 = new ConfigDefinition("foo", "1", "namespace1");
         ConfigDefinition def3 = new ConfigDefinition("foo", "1", "namespace2");
-        final ConfigDefinitionKey key1 = new ConfigDefinitionKey(def1.getName(), def1.getNamespace());
-        configDefinitionSet.add(key1, def1);
         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(3, configDefinitionSet.size());
-        assertEquals(def1, configDefinitionSet.get(key1));
+        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"));
-        assertTrue(str.contains("config.foo"));
-    }
-
-    @Test
-    public void testFallbackToDefaultNamespace() {
-        ConfigDefinitionSet configDefinitionSet = new ConfigDefinitionSet();
-        ConfigDefinition def1 = new ConfigDefinition("foo", "1");
-        ConfigDefinition def2 = new ConfigDefinition("bar", "1", "namespace");
-
-        configDefinitionSet.add(new ConfigDefinitionKey(def1.getName(), def1.getNamespace()), def1);
-        configDefinitionSet.add(new ConfigDefinitionKey(def2.getName(), def2.getNamespace()), def2);
-
-        // fallback to default namespace
-        assertEquals(def1, configDefinitionSet.get(new ConfigDefinitionKey("foo", "namespace")));
-        // Should not fallback to some other config with same name, but different namespace (not default namespace)
-        assertNull(configDefinitionSet.get(new ConfigDefinitionKey("bar", "someothernamespace")));
     }
 
 }
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java
index 845092fccb5..88e7e766974 100755
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java
@@ -47,23 +47,8 @@ public class ConfigDefinitionTest {
     }
 
     @Test
-    public void testDefNumberCompare() {
-        ConfigDefinition df1 = new ConfigDefinition("d", "25");
-        ConfigDefinition df2 = new ConfigDefinition("d", "5");
-        ConfigDefinition df3 = new ConfigDefinition("d", "1-1");
-        ConfigDefinition df4 = new ConfigDefinition("d", "0-2-3");
-        ConfigDefinition df5 = new ConfigDefinition("d", "1");
-        ConfigDefinition df6 = new ConfigDefinition("d", "1-0");
-        assertTrue(df1.compareTo(df2) > 0);
-        assertTrue(df2.compareTo(df4) > 0);
-        assertEquals(1, df3.compareTo(df4));
-        assertEquals(-1, df4.compareTo(df5));
-        assertEquals(0, df5.compareTo(df6));
-    }
-
-    @Test
     public void testIntDefaultValues() {
-        ConfigDefinition def = new ConfigDefinition("foo", "1");
+        ConfigDefinition def = new ConfigDefinition("foo", "1", "namespace1");
 
         def.addIntDef("foo");
         def.addIntDef("bar", 0);
@@ -83,7 +68,7 @@ public class ConfigDefinitionTest {
 
     @Test
     public void testLongDefaultValues() {
-        ConfigDefinition def = new ConfigDefinition("foo", "1");
+        ConfigDefinition def = new ConfigDefinition("foo", "1", "namespace1");
 
         def.addLongDef("foo");
         def.addLongDef("bar", 1234567890123L);
@@ -102,7 +87,7 @@ public class ConfigDefinitionTest {
     @Test
     @SuppressWarnings("serial")
     public void testDefaultsPayloadMap() {
-        ConfigDefinition def = new ConfigDefinition("foo", "1");
+        ConfigDefinition def = new ConfigDefinition("foo", "1", "namespace1");
         def.addStringDef("mystring");
         def.addStringDef("mystringdef", "foo");
         def.addBoolDef("mybool");