diff options
author | Harald Musum <musum@yahooinc.com> | 2021-09-02 07:59:14 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2021-09-02 07:59:14 +0200 |
commit | 11dacd3d51573551da5152c94dd6ecddb8e24324 (patch) | |
tree | a288ee856672c66ccbfe34985e472f30dc5aad1c /config | |
parent | fea21574074ef447b57b15e190bca64b291eaec6 (diff) |
Deprecate and stop using ConfigDefinition constructor with version
Diffstat (limited to 'config')
7 files changed, 41 insertions, 40 deletions
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java index b58817305e9..9c535d7114f 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java @@ -149,7 +149,7 @@ public abstract class ConfigSubscription<T extends ConfigInstance> { dir = ((DirSource)source).getDir().toString(); } if (!dir.endsWith(File.separator)) dir = dir + File.separator; - String name = getConfigFilenameNoVersion(key); + String name = getConfigFilename(key); File file = new File(dir + name); if (!file.exists()) { throw new IllegalArgumentException("Could not find a config file for '" + key.getName() + "' in '" + dir + "'"); @@ -300,15 +300,13 @@ public abstract class ConfigSubscription<T extends ConfigInstance> { } /** - * Returns the file name corresponding to the given key's defName and version. + * Returns the file name corresponding to the given key's defName. * * @param key a {@link ConfigKey} - * @return file name with version number. + * @return file name */ - static <T extends ConfigInstance> String getConfigFilenameNoVersion(ConfigKey<T> key) { - StringBuilder filename = new StringBuilder(key.getName()); - filename.append(".cfg"); - return filename.toString(); + static <T extends ConfigInstance> String getConfigFilename(ConfigKey<T> key) { + return key.getName() + ".cfg"; } /** diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java index 05da9a72837..992f59bdece 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java @@ -81,16 +81,15 @@ public class JarConfigSubscription<T extends ConfigInstance> extends ConfigSubsc } /** - * Returns the entry corresponding to the ConfigInstance's defName/Version in the given directory in - * the given JarFile. - * If the file with correct version number does not exist, returns the filename without version number. + * Returns the entry corresponding to the ConfigInstance's defName in the given directory in + * the given jar file. * The file's existence is checked elsewhere. */ private ZipEntry getEntry(JarFile jarFile, String dir) { if (!dir.endsWith("/")) { dir = dir + '/'; } - return jarFile.getEntry(dir + getConfigFilenameNoVersion(key)); + return jarFile.getEntry(dir + getConfigFilename(key)); } @Override 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 0f04b4caf08..980bfab021d 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java @@ -24,7 +24,6 @@ public class ConfigDefinition { public static Logger log = Logger.getLogger(ConfigDefinition.class.getName()); private final String name; - private final String version; private final String namespace; ConfigDefinition parent = null; @@ -54,9 +53,15 @@ public class ConfigDefinition { private static final Double DOUBLE_MIN = -1e308d; private static final Double DOUBLE_MAX = 1e308d; + // TODO: Remove in Vespa 8 + @Deprecated public ConfigDefinition(String name, String version, String namespace) { this.name = name; - this.version = version; + this.namespace = namespace; + } + + public ConfigDefinition(String name, String namespace) { + this.name = name; this.namespace = namespace; } @@ -338,8 +343,8 @@ public class ConfigDefinition { * of as an inner array with only one element. */ public static class StructDef extends ConfigDefinition { - StructDef(String name, String version, ConfigDefinition parent) { - super(name, version, parent.getNamespace()); + StructDef(String name, ConfigDefinition parent) { + super(name, parent.getNamespace()); this.parent = parent; } } @@ -350,8 +355,8 @@ public class ConfigDefinition { * */ public static class InnerArrayDef extends ConfigDefinition { - InnerArrayDef(String name, String version, ConfigDefinition parent) { - super(name, version, parent.getNamespace()); + InnerArrayDef(String name, ConfigDefinition parent) { + super(name, parent.getNamespace()); this.parent = parent; } } @@ -363,8 +368,8 @@ public class ConfigDefinition { */ public static class ArrayDef extends ConfigDefinition { private TypeSpec typeSpec; - ArrayDef(String name, String version, ConfigDefinition parent) { - super(name, version, parent.getNamespace()); + ArrayDef(String name, ConfigDefinition parent) { + super(name, parent.getNamespace()); this.parent = parent; } public TypeSpec getTypeSpec() { @@ -389,8 +394,8 @@ public class ConfigDefinition { */ public static class LeafMapDef extends ConfigDefinition { private TypeSpec typeSpec; - LeafMapDef(String name, String version, ConfigDefinition parent) { - super(name, version, parent.getNamespace()); + LeafMapDef(String name, ConfigDefinition parent) { + super(name, parent.getNamespace()); this.parent = parent; } public TypeSpec getTypeSpec() { @@ -407,8 +412,8 @@ public class ConfigDefinition { * */ public static class StructMapDef extends ConfigDefinition { - StructMapDef(String name, String version, ConfigDefinition parent) { - super(name, version, parent.getNamespace()); + StructMapDef(String name, ConfigDefinition parent) { + super(name, parent.getNamespace()); this.parent = parent; } } @@ -598,11 +603,11 @@ public class ConfigDefinition { } public void addInnerArrayDef(String id) { - innerArrayDefs.put(id, new InnerArrayDef(id, version, this)); + innerArrayDefs.put(id, new InnerArrayDef(id, this)); } public void addLeafMapDef(String id) { - leafMapDefs.put(id, new LeafMapDef(id, version, this)); + leafMapDefs.put(id, new LeafMapDef(id, this)); } public void addEnumDef(String id, List<String> vals, String defVal) { @@ -751,7 +756,7 @@ public class ConfigDefinition { if (ret!=null) { return ret; } - ret = new InnerArrayDef(name, version, this); + ret = new InnerArrayDef(name, this); innerArrayDefs.put(name, ret); return ret; } @@ -765,7 +770,7 @@ public class ConfigDefinition { if (ret!=null) { return ret; } - ret = new StructDef(name, version, this); + ret = new StructDef(name, this); structDefs.put(name, ret); return ret; } @@ -779,7 +784,7 @@ public class ConfigDefinition { if (ret!=null) { return ret; } - ret = new ArrayDef(name, version, this); + ret = new ArrayDef(name, this); arrayDefs.put(name, ret); return ret; } @@ -793,7 +798,7 @@ public class ConfigDefinition { if (ret!=null) { return ret; } - ret = new StructMapDef(name, version, this); + ret = new StructMapDef(name, this); structMapDefs.put(name, ret); return ret; } @@ -803,7 +808,7 @@ public class ConfigDefinition { if (ret!=null) { return ret; } - ret = new LeafMapDef(name, version, this); + ret = new LeafMapDef(name, this); leafMapDefs.put(name, ret); return ret; } diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java index b265b13a6b6..ae41c735fb3 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java @@ -21,7 +21,7 @@ public class ConfigDefinitionBuilder { * @return a ConfigDefinition object */ public static ConfigDefinition createConfigDefinition(CNode root) { - ConfigDefinition def = new ConfigDefinition(root.getName(), root.getVersion(), root.getNamespace()); + ConfigDefinition def = new ConfigDefinition(root.getName(), root.getNamespace()); for (CNode node : root.getChildren()) { addNode(def, node); diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java index d24f09bda12..488cfb848ab 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java @@ -364,16 +364,16 @@ public class ConfigPayloadApplier<T extends ConfigInstance.Builder> { /** - * Checks whether or not this field is of type 'path', in which + * Checks if this field is of type 'path', in which * case some special handling might be needed. Caches the result. */ - private Set<String> pathFieldSet = new HashSet<>(); + private final Set<String> pathFieldSet = new HashSet<>(); private boolean isPathField(Object builder, String methodName) { // Paths are stored as FileReference in Builder. return isFieldType(pathFieldSet, builder, methodName, FileReference.class); } - private Set<String> urlFieldSet = new HashSet<>(); + private final Set<String> urlFieldSet = new HashSet<>(); private boolean isUrlField(Object builder, String methodName) { // Urls are stored as UrlReference in Builder. return isFieldType(urlFieldSet, builder, methodName, UrlReference.class); @@ -440,7 +440,6 @@ public class ConfigPayloadApplier<T extends ConfigInstance.Builder> { } catch (NoSuchMethodException e) { throw new RuntimeException("Could not create class '" + "'" + structBuilderClass.getName() + "'"); } - } /** 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 88e7e766974..7cedefadf7f 100755 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java @@ -48,7 +48,7 @@ public class ConfigDefinitionTest { @Test public void testIntDefaultValues() { - ConfigDefinition def = new ConfigDefinition("foo", "1", "namespace1"); + ConfigDefinition def = new ConfigDefinition("foo", "namespace1"); def.addIntDef("foo"); def.addIntDef("bar", 0); @@ -68,7 +68,7 @@ public class ConfigDefinitionTest { @Test public void testLongDefaultValues() { - ConfigDefinition def = new ConfigDefinition("foo", "1", "namespace1"); + ConfigDefinition def = new ConfigDefinition("foo", "namespace1"); def.addLongDef("foo"); def.addLongDef("bar", 1234567890123L); @@ -87,7 +87,7 @@ public class ConfigDefinitionTest { @Test @SuppressWarnings("serial") public void testDefaultsPayloadMap() { - ConfigDefinition def = new ConfigDefinition("foo", "1", "namespace1"); + ConfigDefinition def = new ConfigDefinition("foo", "namespace1"); def.addStringDef("mystring"); def.addStringDef("mystringdef", "foo"); def.addBoolDef("mybool"); @@ -116,7 +116,7 @@ public class ConfigDefinitionTest { @Test public void testVerification() { - ConfigDefinition def = new ConfigDefinition("foo", "1", "bar"); + ConfigDefinition def = new ConfigDefinition("foo", "bar"); def.addBoolDef("boolval"); def.addStringDef("stringval"); def.addIntDef("intval"); diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadBuilderTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadBuilderTest.java index c13d3ec9b9b..d45c505ebeb 100644 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadBuilderTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadBuilderTest.java @@ -31,7 +31,7 @@ public class ConfigPayloadBuilderTest { @Before public void setupBuilder() { - ConfigDefinition def = new ConfigDefinition("foo", "1", "bar"); + ConfigDefinition def = new ConfigDefinition("foo","bar"); def.addBoolDef("boolval"); ConfigDefinition mystruct = def.structDef("mystruct"); mystruct.addIntDef("foofield"); |