summaryrefslogtreecommitdiffstats
path: root/configgen
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-08-23 11:13:50 +0200
committerHarald Musum <musum@yahooinc.com>2023-08-23 11:13:50 +0200
commitfb3f2fd29acab0f31e107a182ce0d334286871ce (patch)
tree2b2e84317bf876b4856563fc6ffbbc75c87eb929 /configgen
parent0b90f4fd3efc480d7fa2f46b037ccb6b3c5e13a9 (diff)
Deprecate getVersion and remove unused code related to version
Diffstat (limited to 'configgen')
-rw-r--r--configgen/src/main/java/com/yahoo/config/codegen/CNode.java7
-rw-r--r--configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java2
2 files changed, 2 insertions, 7 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 90bd8ded822..283479f0720 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/CNode.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/CNode.java
@@ -19,7 +19,6 @@ public abstract class CNode {
// TODO: remove! Only set for the root node, and root.getName() returns the same thing!
String defName = null;
- String defVersion = "";
String defNamespace = null;
String defPackage = null;
String defMd5 = "MISSING MD5";
@@ -69,9 +68,8 @@ public abstract class CNode {
defMd5 = md5;
}
- public String getVersion() {
- return defVersion;
- }
+ @Deprecated // TODO: Vespa 9: Remove
+ public String getVersion() { return ""; }
public String getNamespace() {
if (defNamespace != null) return defNamespace;
@@ -163,7 +161,6 @@ public abstract class CNode {
"namespace='" + defNamespace + '\'' +
", package='" + defPackage + '\'' +
", name='" + name + '\'' +
- ", version='" + defVersion + '\'' +
'}';
}
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java
index ca38a8fda47..1727d2b3396 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java
@@ -471,7 +471,6 @@ public class CppClassBuilder implements ClassBuilder {
void writeStaticMemberDeclarations(Writer w, String indent) throws IOException {
w.write(""
+ indent + "static const vespalib::string CONFIG_DEF_MD5;\n"
- + indent + "static const vespalib::string CONFIG_DEF_VERSION;\n"
+ indent + "static const vespalib::string CONFIG_DEF_NAME;\n"
+ indent + "static const vespalib::string CONFIG_DEF_NAMESPACE;\n"
+ indent + "static const ::config::StringVector CONFIG_DEF_SCHEMA;\n"
@@ -620,7 +619,6 @@ public class CppClassBuilder implements ClassBuilder {
void writeStaticMemberDefinitions(Writer w, CNode root, NormalizedDefinition nd) throws IOException {
String typeName = getInternalClassName(root);
w.write("const vespalib::string " + typeName + "::CONFIG_DEF_MD5(\"" + root.defMd5 + "\");\n"
- + "const vespalib::string " + typeName + "::CONFIG_DEF_VERSION(\"" + root.defVersion + "\");\n"
+ "const vespalib::string " + typeName + "::CONFIG_DEF_NAME(\"" + root.defName + "\");\n"
+ "const vespalib::string " + typeName + "::CONFIG_DEF_NAMESPACE(\"" + root.getNamespace() + "\");\n"
+ "const int64_t " + typeName + "::CONFIG_DEF_SERIALIZE_VERSION(1);\n");