From 4e4d4d3dc006d736247e86d9afdcde3f9d3711de Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 9 Nov 2018 12:04:22 +0100 Subject: Revert "Support flag for replacing an array when overriding config, part 1" --- .../main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'config/src') 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 ba30f885c74..bb974ddae42 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java @@ -275,8 +275,6 @@ public class ConfigPayloadBuilder { public class Array { private final Map 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; @@ -388,14 +386,6 @@ 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. */ -- cgit v1.2.3