Don't use operation= in array user config

Remove unnecessary config in one test, update other test to have
2 items in list

5 files changed, 33 insertions, 47 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
index 6f94b9295ae..b9ed8a3c97c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/UserConfigBuilder.java
@@ -1,16 +1,19 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.builder;
 
-import com.yahoo.config.model.deploy.ConfigDefinitionStore;
 import com.yahoo.config.application.api.DeployLogger;
+import com.yahoo.config.model.deploy.ConfigDefinitionStore;
 import com.yahoo.config.model.producer.UserConfigRepo;
-import java.util.logging.Level;
 import com.yahoo.text.XML;
-import com.yahoo.vespa.config.*;
+import com.yahoo.vespa.config.ConfigDefinition;
+import com.yahoo.vespa.config.ConfigDefinitionKey;
+import com.yahoo.vespa.config.ConfigPayloadBuilder;
 import com.yahoo.vespa.model.builder.xml.dom.DomConfigPayloadBuilder;
 import org.w3c.dom.Element;
-
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -39,7 +42,7 @@ public class UserConfigBuilder {
             logger.logApplicationPackage(Level.WARNING, "Unable to find config definition '" + key.asFileName() +
                                          "'. Please ensure that the name is spelled correctly, and that the def file is included in a bundle.");
         }
-        ConfigPayloadBuilder payloadBuilder = new DomConfigPayloadBuilder(def.orElse(null), logger).build(element);
+        ConfigPayloadBuilder payloadBuilder = new DomConfigPayloadBuilder(def.orElse(null)).build(element);
         ConfigPayloadBuilder old = builderMap.get(key);
         if (old != null) {
             logger.logApplicationPackage(Level.WARNING, "Multiple overrides for " + key + " found. Applying in the order they are discovered");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
index d77bf28af30..7ff01cbf82e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
@@ -3,19 +3,14 @@ package com.yahoo.vespa.model.builder.xml.dom;
 
 import com.yahoo.collections.Tuple2;
 import com.yahoo.config.ConfigurationRuntimeException;
-import com.yahoo.config.application.api.DeployLogger;
+import com.yahoo.text.XML;
 import com.yahoo.vespa.config.ConfigDefinition;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.vespa.config.ConfigPayloadBuilder;
-import com.yahoo.yolean.Exceptions;
-import com.yahoo.text.XML;
-
 import com.yahoo.vespa.config.util.ConfigUtils;
+import com.yahoo.yolean.Exceptions;
 import org.w3c.dom.Element;
-
 import java.util.List;
-import java.util.Optional;
-import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -34,11 +29,9 @@ public class DomConfigPayloadBuilder {
 
     /** The config definition, not null if not found */
     private final ConfigDefinition configDefinition;
-    private final Optional<DeployLogger> logger;
 
-    public DomConfigPayloadBuilder(ConfigDefinition configDefinition, DeployLogger logger) {
+    public DomConfigPayloadBuilder(ConfigDefinition configDefinition) {
         this.configDefinition = configDefinition;
-        this.logger = Optional.ofNullable(logger);
     }
 
     /**
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java
index 3b2b022bbf9..55c10a28a01 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java
@@ -6,7 +6,6 @@ import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.builder.xml.XmlHelper;
 import com.yahoo.config.model.deploy.ConfigDefinitionStore;
 import com.yahoo.config.model.producer.UserConfigRepo;
-import com.yahoo.test.ArraytypesConfig;
 import com.yahoo.test.SimpletypesConfig;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.vespa.config.ConfigPayload;
@@ -15,7 +14,6 @@ import com.yahoo.vespa.configdefinition.SpecialtokensConfig;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.Optional;
@@ -56,11 +54,18 @@ public class UserConfigBuilderTest {
     public void require_that_arrays_of_structs_are_resolved() {
         Element configRoot = getDocument(
                 "  <config name='vespa.configdefinition.specialtokens'>" +
-                        "    <tokenlist operation='append'>" +
-                        "      <name>default</name>" +
-                        "      <tokens operation='append'>" +
-                        "        <token>dvd+-r</token>" +
-                        "      </tokens>" +
+                        "    <tokenlist>" +
+                        "      <item>" +
+                        "        <name>default</name>" +
+                        "        <tokens>" +
+                        "          <item>" +
+                        "            <token>dvd+-r</token>" +
+                        "          </item>" +
+                        "          <item>" +
+                        "            <token>c++</token>" +
+                        "          </item>" +
+                        "        </tokens>" +
+                        "      </item>" +
                         "    </tokenlist>" +
                         "  </config>"
         );
@@ -74,9 +79,10 @@ public class UserConfigBuilderTest {
         assertNotNull(map.get(key));
         SpecialtokensConfig config = createConfig(SpecialtokensConfig.class, map.get(key));
         assertEquals(1, config.tokenlist().size());
-        assertEquals("default", config.tokenlist().get(0).name());
-        assertEquals(1, config.tokenlist().get(0).tokens().size());
-        assertEquals("dvd+-r", config.tokenlist().get(0).tokens().get(0).token());
+        SpecialtokensConfig.Tokenlist tokenlist = config.tokenlist().get(0);
+        assertEquals("default", tokenlist.name());
+        assertEquals(2, tokenlist.tokens().size());
+        assertEquals("dvd+-r", tokenlist.tokens().get(0).token());
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
index 90b859e09a3..c0db0ac9e09 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model.builder.xml.dom;
 
 import com.yahoo.config.ConfigurationRuntimeException;
-import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.codegen.DefParser;
 import com.yahoo.config.model.builder.xml.XmlHelper;
 import com.yahoo.slime.JsonFormat;
@@ -14,13 +13,11 @@ import com.yahoo.vespa.config.ConfigPayloadBuilder;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.Reader;
 import java.io.StringReader;
-import java.util.logging.Level;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -33,10 +30,6 @@ import static org.junit.Assert.fail;
  */
 public class DomConfigPayloadBuilderTest {
 
-    private static final DeployLogger logger = (level, message) ->  {
-        if (level.intValue() > Level.INFO.intValue()) System.err.println(message);
-    };
-
     @Test
     public void testFunctionTest_DefaultValues() throws FileNotFoundException {
         Element configRoot = getDocument(new FileReader("src/test/cfg/admin/userconfigs/functiontest-defaultvalues.xml"));
@@ -135,7 +128,7 @@ public class DomConfigPayloadBuilderTest {
     public void testFailWrongTagName() {
         Element configRoot = getDocument(new StringReader("<configs name=\"foo\"/>"));
         try {
-            new DomConfigPayloadBuilder(null, logger).build(configRoot);
+            new DomConfigPayloadBuilder(null).build(configRoot);
             fail("Expected exception for wrong tag name.");
         } catch (ConfigurationRuntimeException e) {
             assertEquals("The root element must be 'config', but was 'configs'.", e.getMessage());
@@ -147,7 +140,7 @@ public class DomConfigPayloadBuilderTest {
     public void testFailNoNameAttribute() {
         Element configRoot = getDocument(new StringReader("<config/>"));
         try {
-            new DomConfigPayloadBuilder(null, logger).build(configRoot);
+            new DomConfigPayloadBuilder(null).build(configRoot);
             fail("Expected exception for mismatch between def-name and xml name attribute.");
         } catch (ConfigurationRuntimeException e) {
             assertEquals("The 'config' element must have a 'name' attribute that matches the name of the config definition.", e.getMessage());
@@ -229,7 +222,7 @@ public class DomConfigPayloadBuilderTest {
                 "<config name=\"test.arraytypes\" version=\"1\">" +
                 "    <item>13</item>" +
                 "</config>");
-        new DomConfigPayloadBuilder(null, logger).build(configRoot);
+        new DomConfigPayloadBuilder(null).build(configRoot);
     }
 
     @Test(expected=ConfigurationRuntimeException.class)
@@ -241,13 +234,12 @@ public class DomConfigPayloadBuilderTest {
         DefParser defParser = new DefParser("simpletypes",
                 new FileReader("src/test/resources/configdefinitions/test.simpletypes.def"));
         ConfigDefinition def = ConfigDefinitionBuilder.createConfigDefinition(defParser.getTree());
-        ConfigPayloadBuilder unused =  new DomConfigPayloadBuilder(def, logger).build(configRoot);
+        ConfigPayloadBuilder unused =  new DomConfigPayloadBuilder(def).build(configRoot);
     }
 
-
     private void assertPayload(String expected, Element configRoot) {
         ConfigPayload payload = ConfigPayload.fromBuilder(
-                new DomConfigPayloadBuilder(null, logger).build(configRoot));
+                new DomConfigPayloadBuilder(null).build(configRoot));
         try {
             ByteArrayOutputStream a = new ByteArrayOutputStream();
             new JsonFormat(true).encode(a, payload.getSlime());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
index d9dbd6eeca7..a39cbc60a89 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
@@ -45,14 +45,6 @@ public class IndexedTest extends ContentBaseTest {
                 "  <admin version='2.0'>" +
                 "    <adminserver hostalias='node0'/>" +
                 "  </admin>" +
-                "  <config name='vespa.configdefinition.specialtokens'>" +
-                "    <tokenlist operation='append'>" +
-                "      <name>default</name>" +
-                "      <tokens operation='append'>" +
-                "        <token>dvd+-r</token>" +
-                "      </tokens>" +
-                "    </tokenlist>" +
-                "  </config>" +
                 "  <container version='1.0'>" +
                 "    <search/>" +
                 "    <nodes>" +