diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-11-29 13:39:48 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-11-29 13:39:48 +0100 |
commit | 2a1ef08ab314866268c69edaf8235f6aa635bfcb (patch) | |
tree | e917cee281d8e63c01365a992c86dfc6d9d85922 /configgen/src/main/java/com/yahoo/config | |
parent | 4dd991a350eb2fb75ac5e9a5fdfc517c2025adba (diff) |
Revert "Merge pull request #15510 from vespa-engine/revert-15508-bratseth/apply-on-restart-take-3"
This reverts commit 3c95d11418e3ebffc1260207932b7e8f3955e1a0, reversing
changes made to 7a1a70055770a82bf42bff668abaf011af3f6e55.
Diffstat (limited to 'configgen/src/main/java/com/yahoo/config')
-rw-r--r-- | configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java b/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java index b3c4d0c5ff8..2ebe7ad03bf 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java @@ -44,7 +44,7 @@ public class BuilderGenerator { } private static String getSpecialRootBuilderCode(InnerCNode node) { - return (node.getParent() == null) ? "\n" + getDispatchCode() + "\n" : ""; + return (node.getParent() == null) ? "\n" + getRootDeclarations() + "\n" : ""; } private static String getBuildMethod(InnerCNode node) { @@ -53,26 +53,36 @@ public class BuilderGenerator { "}\n"; } - private static String getDispatchCode() { + private static String getRootDeclarations() { // Use full path to @Override, as users are free to define an inner node called // 'override'. (summarymap.def does) // The generated inner 'Override' class would otherwise be mistaken for the // annotation. - return "@java.lang.Override\n" + // - "public final boolean dispatchGetConfig(ConfigInstance.Producer producer) {\n" + // - " if (producer instanceof Producer) {\n" + // - " ((Producer)producer).getConfig(this);\n" + // - " return true;\n" + // + return "private boolean _applyOnRestart = false;\n" + + "\n" + + "@java.lang.Override\n" + + "public final boolean dispatchGetConfig(ConfigInstance.Producer producer) {\n" + + " if (producer instanceof Producer) {\n" + + " ((Producer)producer).getConfig(this);\n" + + " return true;\n" + " }\n" + // - " return false;\n" + // - "}\n" + // - "\n" + // - "@java.lang.Override\n" + // - "public final String getDefMd5() { return CONFIG_DEF_MD5; }\n" + // - "@java.lang.Override\n" + // - "public final String getDefName() { return CONFIG_DEF_NAME; }\n" + // - "@java.lang.Override\n" + // - "public final String getDefNamespace() { return CONFIG_DEF_NAMESPACE; }"; + " return false;\n" + + "}\n" + + "\n" + + "@java.lang.Override\n" + + "public final String getDefMd5() { return CONFIG_DEF_MD5; }\n" + + "\n" + + "@java.lang.Override\n" + + "public final String getDefName() { return CONFIG_DEF_NAME; }\n" + + "\n" + + "@java.lang.Override\n" + + "public final String getDefNamespace() { return CONFIG_DEF_NAMESPACE; }\n" + + "\n" + + "@java.lang.Override\n" + + "public final boolean getApplyOnRestart() { return _applyOnRestart; }\n" + + "\n" + + "@java.lang.Override\n" + + "public final void setApplyOnRestart(boolean applyOnRestart) { _applyOnRestart = applyOnRestart; }"; } private static String getUninitializedScalars(InnerCNode node) { |