From f9afd10df97836dd806c02559b82a1318791f090 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 29 Jul 2019 10:59:58 +0200 Subject: Add TODOs --- configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java | 2 +- configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 216a6b50981..c5b75920586 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java @@ -313,7 +313,7 @@ public class CppClassBuilder implements ClassBuilder { void writeHeaderFunctionDeclarations(Writer w, String className, CNode node, String indent) throws IOException { w.write("" + indent + "const vespalib::string & defName() const override { return CONFIG_DEF_NAME; }\n" - + indent + "const vespalib::string & defVersion() const { return CONFIG_DEF_VERSION; }\n" + + indent + "const vespalib::string & defVersion() const { return CONFIG_DEF_VERSION; }\n" // TODO: Remove on Vespa 8 + indent + "const vespalib::string & defMd5() const override { return CONFIG_DEF_MD5; }\n" + indent + "const vespalib::string & defNamespace() const override { return CONFIG_DEF_NAMESPACE; }\n" + indent + "void serialize(::config::ConfigDataBuffer & __buffer) const override;\n"); 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 5c447191614..75149d7a50e 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java @@ -96,7 +96,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" + // + " public final static String CONFIG_DEF_VERSION = \"" + root.getVersion() + "\";\n" + // TODO: Remove on Vespa 8 " public final static String[] CONFIG_DEF_SCHEMA = {\n" + // "" + indentCode(INDENTATION + INDENTATION, getDefSchema()) + "\n" + // " };\n" + // -- cgit v1.2.3 From b70b62339ca000aaa95ba5c3331c27293d016d0d Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 29 Jul 2019 12:49:52 +0200 Subject: Remove unused constant --- configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java | 1 - 1 file changed, 1 deletion(-) 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 c5b75920586..14f1e15f4f2 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java @@ -313,7 +313,6 @@ public class CppClassBuilder implements ClassBuilder { void writeHeaderFunctionDeclarations(Writer w, String className, CNode node, String indent) throws IOException { w.write("" + indent + "const vespalib::string & defName() const override { return CONFIG_DEF_NAME; }\n" - + indent + "const vespalib::string & defVersion() const { return CONFIG_DEF_VERSION; }\n" // TODO: Remove on Vespa 8 + indent + "const vespalib::string & defMd5() const override { return CONFIG_DEF_MD5; }\n" + indent + "const vespalib::string & defNamespace() const override { return CONFIG_DEF_NAMESPACE; }\n" + indent + "void serialize(::config::ConfigDataBuffer & __buffer) const override;\n"); -- cgit v1.2.3