diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2018-11-08 16:07:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-08 16:07:22 +0100 |
commit | b4cc9edbc9c4d157eef620d54c7cdc50c92255a5 (patch) | |
tree | 3f55184f1363723524d43b4b0bd973f67c96a752 | |
parent | 53bcb24569eba9b53b2a0d380dde8a291a852d09 (diff) | |
parent | 2bfa47ca041e1d68b06e2bfbe990ddd68c831b54 (diff) |
Merge pull request #7603 from vespa-engine/hmusum/support-replacing-array-when-overriding-config-part-1
Support flag for replacing an array when overriding config, part 1
-rw-r--r-- | config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java index bb974ddae42..ba30f885c74 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java @@ -275,6 +275,8 @@ public class ConfigPayloadBuilder { public class Array { private final Map<Integer, ConfigPayloadBuilder> elements = new LinkedHashMap<>(); private ArrayMode mode = ArrayMode.INDEX; + // If true, this array should completely replace parent array when config override resolving is done + private boolean overrideWillReplace = false; private final String name; private final ConfigDefinition configDefinition; @@ -386,6 +388,14 @@ public class ConfigPayloadBuilder { mode = ArrayMode.APPEND; } + public void replaceWhenOverriding(boolean overrideWillReplace) { + this.overrideWillReplace = overrideWillReplace; + } + + public boolean replaceWhenOverriding() { + return overrideWillReplace; + } + /** * Try and verify that index mode is possible. */ |