Deprecate and stop using ConfigDefinition constructor with version

4 files changed, 13 insertions, 21 deletions

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();