diff options
12 files changed, 55 insertions, 64 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java index 777217b03fa..34828202592 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java @@ -5,7 +5,6 @@ import com.yahoo.config.FileNode; import com.yahoo.config.FileReference; import com.yahoo.config.application.api.FileRegistry; import com.yahoo.config.model.application.provider.BaseDeployLogger; -import com.yahoo.config.model.application.provider.MockFileRegistry; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.config.model.producer.UserConfigRepo; import com.yahoo.config.model.test.MockRoot; @@ -29,7 +28,6 @@ import static org.junit.Assert.assertThat; /** * @author Ulf Lilleengen - * @since 5.1 */ public class FileSenderTest { @@ -75,7 +73,7 @@ public class FileSenderTest { serviceList = new ArrayList<>(); serviceList.add(service); ConfigDefinitionKey key = new ConfigDefinitionKey("myname", "mynamespace"); - def = new ConfigDefinition("myname", "1", "mynamespace"); + def = new ConfigDefinition("myname", "mynamespace"); builder = new ConfigPayloadBuilder(def); Map<ConfigDefinitionKey, ConfigPayloadBuilder> builderMap = new HashMap<>(); builderMap.put(key, builder); 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"); diff --git a/configgen/src/main/java/com/yahoo/config/codegen/CNode.java b/configgen/src/main/java/com/yahoo/config/codegen/CNode.java index 1c1fb5f5bce..72e5d4d5c49 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/CNode.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/CNode.java @@ -73,10 +73,6 @@ public abstract class CNode { return defVersion; } - void setVersion(String version) { - defVersion = version; - } - public String getNamespace() { if (defNamespace != null) return defNamespace; if (defPackage != null) return defPackage; diff --git a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java index 4822b0cf271..62ec08c7589 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java @@ -2,8 +2,8 @@ package com.yahoo.config.codegen; import java.io.*; -import java.util.List; import java.util.ArrayList; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -18,6 +18,7 @@ public class DefParser { public static final String DEFAULT_PACKAGE_PREFIX = "com.yahoo."; static final Pattern commentPattern = Pattern.compile("^\\s*#+\\s*(.*?)\\s*$"); + // TODO: Version is not used anymore, remove in Vespa 8 public static final Pattern versionPattern = Pattern.compile("^(version\\s*=\\s*)([0-9][0-9-]*)$"); // Namespace/package must start with a letter, since Java (Java language Spec, section 3.8) and C++ identifiers cannot start with a digit public static final Pattern namespacePattern = getNamespacePattern("namespace"); @@ -38,7 +39,7 @@ public class DefParser { /** * Creates a new parser for a .def file with the given name and that can be accessed by the given reader. * - * @param name The name of the .def file (not including version number and the '.def' suffix). + * @param name The name of the .def file (not including the '.def' suffix). * @param defReader A reader to the .def file. */ public DefParser(String name, Reader defReader) { @@ -126,7 +127,7 @@ public class DefParser { } Matcher versionMatch = versionPattern.matcher(line); if (versionMatch.matches()) { - parseVersionLine(versionMatch); + // Do nothing, versions are not used return; } Matcher namespaceMatcher = namespacePattern.matcher(line); @@ -141,7 +142,7 @@ public class DefParser { nd.addNormalizedLine(line); return; } - // Only add lines that are not version, namespace or comment lines + // Only add lines that are not namespace or comment lines nd.addNormalizedLine(line); DefLine defLine = new DefLine(line); root.setLeaf(root.getName() + "." + defLine.getName(), defLine, comment); @@ -155,12 +156,6 @@ public class DefParser { comment += addition; } - private void parseVersionLine(Matcher matcher) { - root.setVersion(matcher.group(2)); - root.setComment(comment); - comment = ""; - } - private void parseNamespaceLine(String namespace) { if (namespace.startsWith(DEFAULT_PACKAGE_PREFIX)) throw new IllegalArgumentException("Please use 'package' instead of 'namespace'."); diff --git a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java index 6df3ad5425a..76f5a6724be 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java @@ -86,7 +86,7 @@ public class JavaClassBuilder implements ClassBuilder { " public final static String CONFIG_DEF_MD5 = \"" + root.getMd5() + "\";\n" + // " public final static String CONFIG_DEF_NAME = \"" + root.getName() + "\";\n" + // " public final static String CONFIG_DEF_NAMESPACE = \"" + root.getNamespace() + "\";\n" + // - " public final static String CONFIG_DEF_VERSION = \"" + root.getVersion() + "\";\n" + // TODO: Remove in Vespa 8 + " public final static String CONFIG_DEF_VERSION = \"\";\n" + // TODO: Remove in Vespa 8 " public final static String[] CONFIG_DEF_SCHEMA = {\n" + // "" + indentCode(INDENTATION + INDENTATION, getDefSchema()) + "\n" + // " };\n" + // diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java index 8e52c1b4ece..af7e42589f4 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java @@ -86,15 +86,16 @@ public class DefParserTest { assertLineFails(line, "Could not create sting a"); } + // Note: Version is not used anymore, so will always be empty @Test public void testValidVersions() { try { - testExpectedVersion("version=8", "8"); - testExpectedVersion("version=8-1", "8-1"); - testExpectedVersion("version =8", "8"); - testExpectedVersion("version = 8", "8"); - testExpectedVersion("version = 8 ", "8"); - testExpectedVersion("version =\t8", "8"); + testExpectedVersion("version=8", ""); + testExpectedVersion("version=8-1", ""); + testExpectedVersion("version =8", ""); + testExpectedVersion("version = 8", ""); + testExpectedVersion("version = 8 ", ""); + testExpectedVersion("version =\t8", ""); } catch (Exception e) { e.printStackTrace(); fail(); |