Deprecate load types from Java APIs

Load types have not been used in practice for years, and supporting
them in backend metrics etc. has long since been lacking. Prepare for
removing these on Vespa 8.

Most callsites are unchanged, aside from presumed safe changes such
as constructors used by dependency injection. Have added new overloads
without load types where these did not already exist to allow for
an orderly transition.

3 files changed, 13 insertions, 2 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 489214bebf8..71a93607b4b 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
@@ -90,6 +90,7 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher {
         }
 
         @Override
+        @SuppressWarnings("removal") // TODO: Remove on Vespa 8
         public LoadTypeSet getLoadTypeSet() {
             return ((MessageBusDocumentAccess) access.delegate()).getParams().getLoadTypes();
         }
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 b2e4821f164..9330e43eaf7 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
@@ -76,6 +76,12 @@ 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();
     }
 
@@ -119,6 +125,7 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
         return query.properties().getString(streamingSelection);
     }
 
+    @SuppressWarnings("removal") // TODO: Remove on Vespa 8
     private void setVisitorParameters(String searchCluster, Route route, String documentType) {
         params.setDocumentSelection(createSelectionString(documentType, createQuerySelectionString()));
         params.setTimeoutMs(query.getTimeout()); // Per bucket visitor timeout
@@ -134,6 +141,7 @@ 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) {
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 1d07cafeda9..b1bc926daed 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
@@ -31,8 +31,9 @@ import static org.junit.Assert.*;
 /**
  * @author <a href="mailto:ulf@yahoo-inc.com">Ulf Carlin</a>
  */
+@SuppressWarnings("removal") // TODO: Remove on Vespa 8
 public class VdsVisitorTestCase {
-    private LoadTypeSet loadTypeSet = new LoadTypeSet();
+    private LoadTypeSet loadTypeSet = new LoadTypeSet(); // TODO remove on Vespa 8
 
     public VdsVisitorTestCase() {
         loadTypeSet.addLoadType(1, "low", DocumentProtocol.Priority.LOW_1);
@@ -489,7 +490,7 @@ public class VdsVisitorTestCase {
 
     private static class MockVisitorSessionFactory implements VdsVisitor.VisitorSessionFactory {
         private VisitorParameters params;
-        private LoadTypeSet loadTypeSet;
+        private LoadTypeSet loadTypeSet; // TODO remove on Vespa 8
         private boolean timeoutQuery = false;
         private boolean failQuery = false;
 
@@ -504,6 +505,7 @@ public class VdsVisitorTestCase {
         }
 
         @Override
+        // TODO: Remove on Vespa 8
         public LoadTypeSet getLoadTypeSet() {
             return loadTypeSet;
         }