From 31d311e5dd91f877751e723ad67a9fcb2811a0ba Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Wed, 24 Jul 2019 11:26:25 +0200 Subject: Remove constructor that uses default namespace (deprecated) --- .../com/yahoo/vespa/config/ConfigDefinition.java | 31 +++++----------------- .../vespa/config/ConfigDefinitionSetTest.java | 23 +--------------- .../yahoo/vespa/config/ConfigDefinitionTest.java | 21 +++------------ 3 files changed, 10 insertions(+), 65 deletions(-) (limited to 'config') diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java index 3259e2d3ea2..0f04b4caf08 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java @@ -1,7 +1,6 @@ // 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.yolean.Exceptions; import java.util.ArrayList; @@ -16,11 +15,10 @@ import java.util.regex.Pattern; /** * Represents one legal def file, or (internally) one array or inner array definition in a def file. - * Definitions are comparable based on version. * @author vegardh * */ -public class ConfigDefinition implements Comparable { +public class ConfigDefinition { public static final Pattern namePattern = Pattern.compile("[a-zA-Z][a-zA-Z0-9-_]*"); public static final Pattern namespacePattern = Pattern.compile("[a-zA-Z][a-zA-Z0-9-._]*"); @@ -62,18 +60,10 @@ public class ConfigDefinition implements Comparable { this.namespace = namespace; } - public ConfigDefinition(String name, String version) { - this(name, version, CNode.DEFAULT_NAMESPACE); - } - public String getName() { return name; } - private String getVersion() { - return version; - } - public String getNamespace() { return namespace; } @@ -349,7 +339,7 @@ public class ConfigDefinition implements Comparable { */ public static class StructDef extends ConfigDefinition { StructDef(String name, String version, ConfigDefinition parent) { - super(name, version); + super(name, version, parent.getNamespace()); this.parent = parent; } } @@ -361,7 +351,7 @@ public class ConfigDefinition implements Comparable { */ public static class InnerArrayDef extends ConfigDefinition { InnerArrayDef(String name, String version, ConfigDefinition parent) { - super(name, version); + super(name, version, parent.getNamespace()); this.parent = parent; } } @@ -374,7 +364,7 @@ public class ConfigDefinition implements Comparable { public static class ArrayDef extends ConfigDefinition { private TypeSpec typeSpec; ArrayDef(String name, String version, ConfigDefinition parent) { - super(name, version); + super(name, version, parent.getNamespace()); this.parent = parent; } public TypeSpec getTypeSpec() { @@ -400,7 +390,7 @@ public class ConfigDefinition implements Comparable { public static class LeafMapDef extends ConfigDefinition { private TypeSpec typeSpec; LeafMapDef(String name, String version, ConfigDefinition parent) { - super(name, version); + super(name, version, parent.getNamespace()); this.parent = parent; } public TypeSpec getTypeSpec() { @@ -418,7 +408,7 @@ public class ConfigDefinition implements Comparable { */ public static class StructMapDef extends ConfigDefinition { StructMapDef(String name, String version, ConfigDefinition parent) { - super(name, version); + super(name, version, parent.getNamespace()); this.parent = parent; } } @@ -1061,15 +1051,6 @@ public class ConfigDefinition implements Comparable { return ret.toString(); } - @Override - public int compareTo(ConfigDefinition other) { - Objects.requireNonNull(other); - if (!getName().equals(other.getName())) { - throw new IllegalArgumentException("Different def names used to compare: "+getName()+"/"+other.getName()); - } - return new VersionComparator().compare(getVersion(),other.getVersion()); - } - @Override public String toString() { return getNamespace() + "." + getName(); 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 @@ -46,24 +46,9 @@ public class ConfigDefinitionTest { assertEquals(solution, versions); } - @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"); -- cgit v1.2.3