1 files changed, 1 insertions, 22 deletions
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
index 30d117ab105..df847852c83 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
@@ -8,8 +8,6 @@ import com.yahoo.document.DocumentId;
 import com.yahoo.document.fieldset.AllFields;
 import com.yahoo.documentapi.messagebus.MessageBusDocumentAccess;
 import com.yahoo.documentapi.messagebus.MessageBusSyncSession;
-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.GetDocumentMessage;
 import com.yahoo.documentapi.messagebus.protocol.GetDocumentReply;
@@ -101,7 +99,6 @@ public class DocumentRetrieverTest {
                 .setPrintIdsOnly(false)
                 .setHelp(false)
                 .setShowDocSize(false)
-                .setLoadTypeName("")
                 .setNoRetry(false)
                 .setTraceLevel(0)
                 .setTimeout(0)
@@ -139,24 +136,19 @@ public class DocumentRetrieverTest {
                 .setDocumentIds(asIterator(DOC_ID_1))
                 .setPriority(DocumentProtocol.Priority.HIGH_1)
                 .setNoRetry(true)
-                .setLoadTypeName("loadtype")
                 .build();
 
         when(mockedSession.syncSend(any())).thenReturn(createDocumentReply(DOC_ID_1));
 
-        LoadTypeSet loadTypeSet = new LoadTypeSet(); // TODO remove on Vespa 8
-        loadTypeSet.addLoadType(1, "loadtype", DocumentProtocol.Priority.HIGH_1);
         DocumentRetriever documentRetriever = new DocumentRetriever(
                 new ClusterList(),
                 mockedFactory,
-                loadTypeSet,
                 params);
         documentRetriever.retrieveDocuments();
 
         verify(mockedSession, times(1)).syncSend(argThat((ArgumentMatcher<GetDocumentMessage>) o ->
                 o.getPriority().equals(DocumentProtocol.Priority.HIGH_1) &&
-                !o.getRetryEnabled() &&
-                o.getLoadType().equals(new LoadType(1, "loadtype", DocumentProtocol.Priority.HIGH_1)))); // TODO: Remove on Vespa 8
+                !o.getRetryEnabled()));
         assertContainsDocument(DOC_ID_1);
     }
 
@@ -221,19 +213,6 @@ public class DocumentRetrieverTest {
     }
 
     @Test
-    public void testInvalidLoadType() throws DocumentRetrieverException {
-        exception.expect(DocumentRetrieverException.class);
-        exception.expectMessage("Loadtype with name 'undefinedloadtype' does not exist.\n");
-
-        ClientParameters params = createParameters()
-                .setLoadTypeName("undefinedloadtype")
-                .build();
-
-        DocumentRetriever documentRetriever = createDocumentRetriever(params);
-        documentRetriever.retrieveDocuments();
-    }
-
-    @Test
     public void testClusterLookup() throws DocumentRetrieverException {
         final String cluster = "storage",
                 expectedRoute = "[Content:cluster=storage]";