Remove top-level <clients> element and LoadType concept

Load types have not been properly supported for some time, so remove
the remaining API surfaces exposing them. Since load type config was
the last remaining use of <clients> in services.xml, remove that one
as well.

5 files changed, 1 insertions, 53 deletions

diff --git a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
index b1187d48374..9b1d8e83804 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
@@ -2,15 +2,12 @@
 package com.yahoo.documentapi;
 
 import com.yahoo.document.fieldset.AllFields;
-import com.yahoo.documentapi.messagebus.loadtypes.LoadType;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 @SuppressWarnings("removal") // TODO: Remove on Vespa 8
 public class VisitorParametersTestCase {
-    // TODO: Remove on Vespa 8
-    private LoadType loadType = new LoadType(3, "samnmax", DocumentProtocol.Priority.HIGH_3);
 
     @SuppressWarnings("removal")// TODO: Vespa 8: remove
     private VisitorParameters createVisitorParameters() {
@@ -28,7 +25,6 @@ public class VisitorParametersTestCase {
         params.setTimeoutMs(1337);
         params.setMaxPending(111);
         params.setFieldSet(AllFields.NAME);
-        params.setLoadType(loadType); // TODO: Remove on Vespa 8
         params.setVisitRemoves(true);
         params.setVisitInconsistentBuckets(true);
         params.setTraceLevel(9);
@@ -45,7 +41,6 @@ public class VisitorParametersTestCase {
         return params;
     }
 
-    @SuppressWarnings("removal")// TODO: Vespa 8: remove
     @Test
     public void testCopyConstructor() {
         VisitorParameters params = createVisitorParameters();
@@ -65,7 +60,6 @@ public class VisitorParametersTestCase {
         assertEquals(1337, copy.getTimeoutMs());
         assertEquals(111, copy.getMaxPending());
         assertEquals(AllFields.NAME, copy.getFieldSet());
-        assertEquals(loadType, copy.getLoadType());
         assertEquals(true, copy.getVisitRemoves());
         assertEquals(true, copy.getVisitInconsistentBuckets());
         assertEquals(9, copy.getTraceLevel());
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
index 53545510ae7..97c7147bd86 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
@@ -14,7 +14,6 @@ import com.yahoo.documentapi.VisitorDataHandler;
 import com.yahoo.documentapi.VisitorDataQueue;
 import com.yahoo.documentapi.VisitorParameters;
 import com.yahoo.documentapi.VisitorResponse;
-import com.yahoo.documentapi.messagebus.loadtypes.LoadType;
 import com.yahoo.documentapi.messagebus.protocol.CreateVisitorMessage;
 import com.yahoo.documentapi.messagebus.protocol.CreateVisitorReply;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
@@ -524,9 +523,6 @@ public class MessageBusVisitorSessionTestCase {
         if (msg.getMaxBucketsPerVisitor() != 1) {
             sb.append("max buckets per visitor=").append(msg.getMaxBucketsPerVisitor()).append("\n");
         }
-        if (msg.getLoadType() != LoadType.DEFAULT) {
-            sb.append("load type=").append(msg.getLoadType().getName()).append("\n");
-        }
         if (msg.getPriority() != DocumentProtocol.Priority.NORMAL_3) { // TODO: remove on Vespa 8
             sb.append("priority=").append(msg.getPriority()).append("\n");
         }
@@ -742,7 +738,6 @@ public class MessageBusVisitorSessionTestCase {
         params.setTimeoutMs(1337);
         params.setMaxPending(111);
         params.setFieldSet(DocIdOnly.NAME);
-        params.setLoadType(new LoadType(3, "samnmax", DocumentProtocol.Priority.HIGH_3)); // TODO: Remove on Vespa 8
         params.setVisitRemoves(true);
         params.setVisitInconsistentBuckets(true);
         params.setTraceLevel(9);
@@ -772,7 +767,6 @@ public class MessageBusVisitorSessionTestCase {
                 "]\n" +
                 "route=extraterrestrial/highway\n" +
                 "max buckets per visitor=55\n" +
-                "load type=samnmax\n" +
                 "priority=HIGHEST\n" +
                 "visitor library=CoolVisitor\n" +
                 "trace level=9\n" +
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java
deleted file mode 100644
index 18269971f88..00000000000
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.documentapi.messagebus.loadtypes.test;
-
-import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author thomasg
- */
-@SuppressWarnings("removal") // TODO: Remove on Vespa 8
-// TODO Vespa 8: remove test case once load types are gone
-public class LoadTypesTestCase {
-
-    @Test
-    public void testIdGeneration() {
-        LoadTypeSet set = new LoadTypeSet();
-        set.addType("vespagrim", "VERY_HIGH");
-        set.addType("slow", "VERY_LOW");
-        set.addType("test", null);
-
-        assertEquals("vespagrim", set.getNameMap().get("vespagrim").getName());
-        assertEquals("slow", set.getNameMap().get("slow").getName());
-        assertEquals("test", set.getNameMap().get("test").getName());
-        assertEquals("default", set.getNameMap().get("default").getName());
-
-        assertEquals(0xc21803d4, set.getNameMap().get("vespagrim").getId());
-    }
-
-}
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
index deecba96aa6..5e8439c9536 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
@@ -143,7 +143,6 @@ public class Messages60TestCase extends MessagesTestBase {
         private static final String BUCKET_SPACE = "beartato";
 
         @Override
-        @SuppressWarnings("removal") // TODO: Remove on Vespa 8
         public void run() {
             GetBucketListMessage msg = new GetBucketListMessage(new BucketId(16, 123));
             msg.setBucketSpace(BUCKET_SPACE);
@@ -152,7 +151,6 @@ public class Messages60TestCase extends MessagesTestBase {
             for (Language lang : LANGUAGES) {
                 msg = (GetBucketListMessage)deserialize("GetBucketListMessage", DocumentProtocol.MESSAGE_GETBUCKETLIST, lang);
                 assertEquals(new BucketId(16, 123), msg.getBucketId());
-                assertEquals("default", msg.getLoadType().getName()); // TODO: Remove on Vespa 8
                 assertEquals(BUCKET_SPACE, msg.getBucketSpace());
             }
         }
@@ -163,10 +161,8 @@ public class Messages60TestCase extends MessagesTestBase {
         private static final String BUCKET_SPACE = "andrei";
 
         @Override
-        @SuppressWarnings("removal") // TODO: Remove on Vespa 8
         public void run() {
             StatBucketMessage msg = new StatBucketMessage(new BucketId(16, 123), "id.user=123");
-            msg.setLoadType(null); // TODO: Remove on Vespa 8
             msg.setBucketSpace(BUCKET_SPACE);
             assertEquals(BASE_MESSAGE_LENGTH + 27 + serializedLength(BUCKET_SPACE), serialize("StatBucketMessage", msg));
 
@@ -174,7 +170,6 @@ public class Messages60TestCase extends MessagesTestBase {
                 msg = (StatBucketMessage)deserialize("StatBucketMessage", DocumentProtocol.MESSAGE_STATBUCKET, lang);
                 assertEquals(new BucketId(16, 123), msg.getBucketId());
                 assertEquals("id.user=123", msg.getDocumentSelection());
-                assertEquals("default", msg.getLoadType().getName()); // TODO: Remove on Vespa 8
                 assertEquals(BUCKET_SPACE, msg.getBucketSpace());
             }
         }
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java
index 74d06c05383..f43449646be 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java
@@ -4,7 +4,6 @@ package com.yahoo.documentapi.messagebus.protocol.test;
 import com.yahoo.component.Version;
 import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.document.DocumentTypeManagerConfigurer;
-import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import com.yahoo.messagebus.Routable;
 import org.junit.Test;
@@ -19,7 +18,6 @@ import static org.junit.Assert.*;
 /**
  * @author Simon Thoresen Hult
  */
-@SuppressWarnings("removal") // TODO: Remove on Vespa 8
 public abstract class MessagesTestBase {
 
     protected enum Language {
@@ -29,12 +27,10 @@ public abstract class MessagesTestBase {
     protected static final Set<Language> LANGUAGES = EnumSet.allOf(Language.class);
 
     protected final DocumentTypeManager docMan = new DocumentTypeManager();
-    protected final LoadTypeSet loadTypes = new LoadTypeSet(); // TODO remove on Vespa 8
-    protected final DocumentProtocol protocol = new DocumentProtocol(docMan, null, loadTypes);
+    protected final DocumentProtocol protocol = new DocumentProtocol(docMan, null);
 
     public MessagesTestBase() {
         DocumentTypeManagerConfigurer.configure(docMan, "file:./test/cfg/testdoc.cfg");
-        loadTypes.addLoadType(34, "foo", DocumentProtocol.Priority.NORMAL_2);
     }
 
     @Test