Remove (SearchResult|DocumentSummary)(Command|Reply) storage and documentapi messages.

2 files changed, 4 insertions, 40 deletions

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 70dff6730ff..409b807c833 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
@@ -9,9 +9,7 @@ import com.yahoo.documentapi.VisitorDataHandler;
 import com.yahoo.documentapi.VisitorParameters;
 import com.yahoo.documentapi.VisitorSession;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
-import com.yahoo.documentapi.messagebus.protocol.DocumentSummaryMessage;
 import com.yahoo.documentapi.messagebus.protocol.QueryResultMessage;
-import com.yahoo.documentapi.messagebus.protocol.SearchResultMessage;
 import com.yahoo.io.GrowableByteBuffer;
 
 import com.yahoo.messagebus.Message;
@@ -300,12 +298,8 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
     public void onMessage(Message m, AckToken token) {
         if (m instanceof QueryResultMessage qm) {
             onQueryResult(qm.getResult(), qm.getSummary());
-        } else if (m instanceof SearchResultMessage) {
-            onSearchResult(((SearchResultMessage) m).getResult());
-        } else if (m instanceof DocumentSummaryMessage dsm) {
-            onDocumentSummary(dsm.getResult());
         } else {
-            throw new UnsupportedOperationException("Received unsupported message " + m + ". VdsVisitor can only accept query result, search result, and documentsummary messages.");
+            throw new UnsupportedOperationException("Received unsupported message " + m + ". VdsVisitor can only accept query result messages.");
         }
         ack(token);
     }
@@ -320,13 +314,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
         handleSummary(summary);
     }
 
-    public void onSearchResult(SearchResult sr) {
-        if (log.isLoggable(Level.FINEST)) {
-            log.log(Level.FINEST, "Got SearchResult for query with selection " + params.getDocumentSelection());
-        }
-        handleSearchResult(sr);
-    }
-
     private void handleSearchResult(SearchResult sr) {
         final int hitCountTotal = sr.getTotalHitCount();
         final int hitCount = sr.getHitCount();
@@ -377,13 +364,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
         }
     }
 
-    public void onDocumentSummary(DocumentSummary ds) {
-        if (log.isLoggable(Level.FINEST)) {
-            log.log(Level.FINEST, "Got DocumentSummary for query with selection " + params.getDocumentSelection());
-        }
-        handleSummary(ds);
-    }
-
     private void handleSummary(DocumentSummary ds) {
         int summaryCount = ds.getSummaryCount();
         if (log.isLoggable(Level.FINE)) {
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 0e3ecf1c8cc..28a34ff2f6d 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
@@ -5,9 +5,7 @@ import com.yahoo.document.fieldset.AllFields;
 import com.yahoo.document.select.parser.ParseException;
 import com.yahoo.documentapi.*;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
-import com.yahoo.documentapi.messagebus.protocol.DocumentSummaryMessage;
 import com.yahoo.documentapi.messagebus.protocol.QueryResultMessage;
-import com.yahoo.documentapi.messagebus.protocol.SearchResultMessage;
 import com.yahoo.messagebus.Message;
 import com.yahoo.messagebus.Trace;
 import com.yahoo.messagebus.routing.Route;
@@ -63,18 +61,6 @@ public class VdsVisitorTestCase {
         return qrm;
     }
 
-    private SearchResultMessage createSRM(String docId, double rank) {
-        SearchResultMessage srm = new SearchResultMessage();
-        srm.setSearchResult(createSR(docId, rank));
-        return srm;
-    }
-
-    private DocumentSummaryMessage createDSM(String docId) {
-        DocumentSummaryMessage dsm = new DocumentSummaryMessage();
-        dsm.setDocumentSummary(createDS(docId));
-        return dsm;
-    }
-
     private Message createM() {
         return new Message() {
             @Override
@@ -357,15 +343,13 @@ public class VdsVisitorTestCase {
     private void supplyResults(VdsVisitor visitor) {
         AckToken ackToken = null;
         visitor.onMessage(createQRM("id:ns:type::0", 0.3), ackToken);
-        visitor.onMessage(createSRM("id:ns:type::1", 1.0), ackToken);
-        visitor.onMessage(createSRM("id:ns:type::2", 0.5), ackToken);
-        visitor.onMessage(createDSM("id:ns:type::1"), ackToken);
-        visitor.onMessage(createDSM("id:ns:type::2"), ackToken);
+        visitor.onMessage(createQRM("id:ns:type::1", 1.0), ackToken);
+        visitor.onMessage(createQRM("id:ns:type::2", 0.5), ackToken);
         try {
             visitor.onMessage(createM(), ackToken);
             assertTrue(false, "Unsupported message did not cause exception");
         } catch (UnsupportedOperationException uoe) {
-            assertTrue(uoe.getMessage().contains("VdsVisitor can only accept query result, search result, and documentsummary messages"));
+            assertTrue(uoe.getMessage().contains("VdsVisitor can only accept query result messages"));
         }
     }