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.

3 files changed, 6 insertions, 69 deletions

diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
index 71a93607b4b..7f4de2e43f5 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
@@ -7,8 +7,6 @@ import com.yahoo.document.select.parser.ParseException;
 import com.yahoo.document.select.parser.TokenMgrException;
 import com.yahoo.documentapi.VisitorParameters;
 import com.yahoo.documentapi.VisitorSession;
-import com.yahoo.documentapi.messagebus.MessageBusDocumentAccess;
-import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet;
 import com.yahoo.fs4.DocsumPacket;
 import com.yahoo.messagebus.routing.Route;
 import com.yahoo.prelude.Ping;
@@ -90,12 +88,6 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher {
         }
 
         @Override
-        @SuppressWarnings("removal") // TODO: Remove on Vespa 8
-        public LoadTypeSet getLoadTypeSet() {
-            return ((MessageBusDocumentAccess) access.delegate()).getParams().getLoadTypes();
-        }
-
-        @Override
         public Visitor createVisitor(Query query, String searchCluster, Route route, String documentType, int traceLevelOverride) {
             return new VdsVisitor(query, searchCluster, route, documentType, this, traceLevelOverride);
         }
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
index 9330e43eaf7..e6a5d0c7e35 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
@@ -7,8 +7,6 @@ import com.yahoo.documentapi.VisitorControlHandler;
 import com.yahoo.documentapi.VisitorDataHandler;
 import com.yahoo.documentapi.VisitorParameters;
 import com.yahoo.documentapi.VisitorSession;
-import com.yahoo.documentapi.messagebus.loadtypes.LoadType;
-import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import com.yahoo.documentapi.messagebus.protocol.DocumentSummaryMessage;
 import com.yahoo.documentapi.messagebus.protocol.QueryResultMessage;
@@ -76,13 +74,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
 
     public interface VisitorSessionFactory {
         VisitorSession createVisitorSession(VisitorParameters params) throws ParseException;
-
-        /**
-         * @deprecated load types are deprecated
-         */
-        @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8
-        @SuppressWarnings("removal") // TODO: Remove on Vespa 8
-        LoadTypeSet getLoadTypeSet();
     }
 
     public VdsVisitor(Query query, String searchCluster, Route route,
@@ -141,15 +132,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
         params.visitInconsistentBuckets(true);
         params.setPriority(DocumentProtocol.Priority.VERY_HIGH);
 
-        // TODO remove on Vespa 8
-        if (query.properties().getString(streamingLoadtype) != null) {
-            LoadType loadType = visitorSessionFactory.getLoadTypeSet().getNameMap().get(query.properties().getString(streamingLoadtype));
-            if (loadType != null) {
-                params.setLoadType(loadType);
-                params.setPriority(loadType.getPriority());
-            }
-        }
-
         if (query.properties().getString(streamingPriority) != null) {
             params.setPriority(DocumentProtocol.getPriorityByName(
                     query.properties().getString(streamingPriority)));
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
index b1bc926daed..5d135f825c2 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
@@ -3,8 +3,6 @@ package com.yahoo.vespa.streamingvisitors;
 
 import com.yahoo.document.select.parser.ParseException;
 import com.yahoo.documentapi.*;
-import com.yahoo.documentapi.messagebus.loadtypes.LoadType;
-import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import com.yahoo.documentapi.messagebus.protocol.DocumentSummaryMessage;
 import com.yahoo.documentapi.messagebus.protocol.QueryResultMessage;
@@ -33,12 +31,6 @@ import static org.junit.Assert.*;
  */
 @SuppressWarnings("removal") // TODO: Remove on Vespa 8
 public class VdsVisitorTestCase {
-    private LoadTypeSet loadTypeSet = new LoadTypeSet(); // TODO remove on Vespa 8
-
-    public VdsVisitorTestCase() {
-        loadTypeSet.addLoadType(1, "low", DocumentProtocol.Priority.LOW_1);
-        loadTypeSet.addLoadType(2, "normal", DocumentProtocol.Priority.NORMAL_1);
-    }
 
     private SearchResult createSR(String docId, double rank) {
         BufferSerializer serializer = new BufferSerializer();
@@ -116,7 +108,6 @@ public class VdsVisitorTestCase {
         String selection = null;
         long from = 0;
         long to = 0;
-        String loadTypeName = null;
         DocumentProtocol.Priority priority = null;
         int maxBucketsPerVisitor = 0;
 
@@ -140,7 +131,6 @@ public class VdsVisitorTestCase {
             selection = null;
             from = 123;
             to = 456;
-            loadTypeName = "low";
             priority = DocumentProtocol.Priority.HIGH_2;
             maxBucketsPerVisitor = 2;
 
@@ -194,9 +184,6 @@ public class VdsVisitorTestCase {
         if (qa.to != 0) {
             queryString.append("&streaming.totimestamp=").append(qa.to);
         }
-        if (qa.loadTypeName != null) {
-            queryString.append("&streaming.loadtype=").append(qa.loadTypeName);
-        }
         if (qa.priority != null) {
             queryString.append("&streaming.priority=").append(qa.priority);
         }
@@ -228,21 +215,10 @@ public class VdsVisitorTestCase {
         }
         assertEquals(qa.from, params.getFromTimestamp());
         assertEquals(qa.to, params.getToTimestamp());
-        if (qa.loadTypeName != null && loadTypeSet.getNameMap().get(qa.loadTypeName) != null) {
-            LoadType expectedLoadType = loadTypeSet.getNameMap().get(qa.loadTypeName);
-            assertEquals(expectedLoadType, params.getLoadType());
-            if (qa.priority != null) {
-                assertEquals(qa.priority, params.getPriority());
-            } else {
-                assertEquals(expectedLoadType.getPriority(), params.getPriority());
-            }
+        if (qa.priority != null) {
+            assertEquals(qa.priority, params.getPriority());
         } else {
-            assertEquals(LoadType.DEFAULT, params.getLoadType());
-            if (qa.priority != null) {
-                assertEquals(qa.priority, params.getPriority());
-            } else {
-                assertEquals(DocumentProtocol.Priority.VERY_HIGH, params.getPriority());
-            }
+            assertEquals(DocumentProtocol.Priority.VERY_HIGH, params.getPriority());
         }
         if (qa.maxBucketsPerVisitor != 0) {
             assertEquals(qa.maxBucketsPerVisitor, params.getMaxBucketsPerVisitor());
@@ -322,7 +298,7 @@ public class VdsVisitorTestCase {
     public void testBasics() throws Exception {
         Route route = Route.parse("storageClusterRouteSpec");
         String searchCluster = "searchClusterConfigId";
-        MockVisitorSessionFactory factory = new MockVisitorSessionFactory(loadTypeSet);
+        MockVisitorSessionFactory factory = new MockVisitorSessionFactory();
 
         // Default values and no selection
         QueryArguments qa = new QueryArguments();
@@ -331,10 +307,6 @@ public class VdsVisitorTestCase {
         // Groupdoc
         qa.groupName = "group";
         qa.maxBucketsPerVisitor = 2; // non-default maxBucketsPerVisitor
-        qa.loadTypeName = "normal"; // non-default loadTypeName, default priority
-        verifyVisitorOk(factory, qa, route, searchCluster);
-
-        qa.loadTypeName = "unknown"; // unknown loadTypeName, default priority
         verifyVisitorOk(factory, qa, route, searchCluster);
 
         qa.priority = DocumentProtocol.Priority.NORMAL_2; // unknown loadTypeName, non-default priority
@@ -349,7 +321,7 @@ public class VdsVisitorTestCase {
     public void testFailures() throws Exception {
         Route route = Route.parse("storageClusterRouteSpec");
         String searchCluster = "searchClusterConfigId";
-        MockVisitorSessionFactory factory = new MockVisitorSessionFactory(loadTypeSet);
+        MockVisitorSessionFactory factory = new MockVisitorSessionFactory();
 
         // Default values and no selection
         QueryArguments qa = new QueryArguments();
@@ -490,13 +462,10 @@ public class VdsVisitorTestCase {
 
     private static class MockVisitorSessionFactory implements VdsVisitor.VisitorSessionFactory {
         private VisitorParameters params;
-        private LoadTypeSet loadTypeSet; // TODO remove on Vespa 8
         private boolean timeoutQuery = false;
         private boolean failQuery = false;
 
-        private MockVisitorSessionFactory(LoadTypeSet loadTypeSet) {
-            this.loadTypeSet = loadTypeSet;
-        }
+        private MockVisitorSessionFactory() {}
 
         @Override
         public VisitorSession createVisitorSession(VisitorParameters params) throws ParseException {
@@ -504,12 +473,6 @@ public class VdsVisitorTestCase {
             return new MockVisitorSession(params, timeoutQuery, failQuery);
         }
 
-        @Override
-        // TODO: Remove on Vespa 8
-        public LoadTypeSet getLoadTypeSet() {
-            return loadTypeSet;
-        }
-
         public VisitorParameters getParams() {
             return params;
         }