diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-11-30 14:33:23 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-11-30 14:33:23 +0100 |
commit | e3743e075e1eeb088fbb9b2f4146ef1faeb08d9a (patch) | |
tree | 373c0c96520bf1efabecda9e568a986fdf5572bb /configgen/src | |
parent | a3289b0060bd7a0e5eb2b6d638c05c9d76e3a8d4 (diff) |
Revert "Merge pull request #15532 from vespa-engine/revert-15527-bratseth/apply-on-restart-take-5"
This reverts commit d91c72c22cae12468103ed4c43729e745916943e, reversing
changes made to 9b47661ae5682e87cd963c63bdc2717896f468db.
Diffstat (limited to 'configgen/src')
-rw-r--r-- | configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java | 42 | ||||
-rw-r--r-- | configgen/src/test/resources/allfeatures.reference | 14 |
2 files changed, 38 insertions, 18 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) { diff --git a/configgen/src/test/resources/allfeatures.reference b/configgen/src/test/resources/allfeatures.reference index b84f01f380b..2008bbf6b52 100644 --- a/configgen/src/test/resources/allfeatures.reference +++ b/configgen/src/test/resources/allfeatures.reference @@ -601,6 +601,8 @@ public final class AllfeaturesConfig extends ConfigInstance { return this; } + private boolean _applyOnRestart = false; + @java.lang.Override public final boolean dispatchGetConfig(ConfigInstance.Producer producer) { if (producer instanceof Producer) { @@ -611,12 +613,20 @@ public final class AllfeaturesConfig extends ConfigInstance { } @java.lang.Override - public final String getDefMd5() { return CONFIG_DEF_MD5; } + public final String getDefMd5() { return CONFIG_DEF_MD5; } + @java.lang.Override - public final String getDefName() { return CONFIG_DEF_NAME; } + public final String getDefName() { return CONFIG_DEF_NAME; } + @java.lang.Override public final String getDefNamespace() { return CONFIG_DEF_NAMESPACE; } + @java.lang.Override + public final boolean getApplyOnRestart() { return _applyOnRestart; } + + @java.lang.Override + public final void setApplyOnRestart(boolean applyOnRestart) { _applyOnRestart = applyOnRestart; } + public AllfeaturesConfig build() { return new AllfeaturesConfig(this); } |