Use DocumentOnly-fieldset by default

Also remove deprecated and unsupported header-only visitor parameter

8 files changed, 12 insertions, 30 deletions

diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json
index 5fe2121e5d6..3b4ffb11ca6 100644
--- a/documentapi/abi-spec.json
+++ b/documentapi/abi-spec.json
@@ -869,7 +869,6 @@
       "public long getToTimestamp()",
       "public boolean visitRemoves()",
       "public boolean getVisitRemoves()",
-      "public boolean getVisitHeadersOnly()",
       "public java.lang.String fieldSet()",
       "public java.lang.String getFieldSet()",
       "public boolean visitInconsistentBuckets()",
@@ -893,7 +892,6 @@
       "public void setToTimestamp(long)",
       "public void visitRemoves(boolean)",
       "public void setVisitRemoves(boolean)",
-      "public void setVisitHeadersOnly(boolean)",
       "public void fieldSet(java.lang.String)",
       "public void setFieldSet(java.lang.String)",
       "public void visitInconsistentBuckets(boolean)",
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
index 76387710c0a..503def16c21 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
@@ -3,9 +3,8 @@ package com.yahoo.documentapi;
 
 import com.yahoo.document.BucketId;
 import com.yahoo.document.FixedBucketSpaces;
-import com.yahoo.document.fieldset.AllFields;
+import com.yahoo.document.fieldset.DocumentOnly;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
-import com.yahoo.messagebus.ThrottlePolicy;
 import com.yahoo.messagebus.routing.Route;
 import com.yahoo.text.Utf8;
 
@@ -18,7 +17,6 @@ import java.util.TreeMap;
  *
  * @author Håkon Humberset
  */
-@SuppressWarnings("removal") // TODO: Remove on Vespa 8
 public class VisitorParameters extends Parameters {
 
     private String documentSelection;
@@ -30,8 +28,7 @@ public class VisitorParameters extends Parameters {
     private long fromTimestamp = 0;
     private long toTimestamp = 0;
     boolean visitRemoves = false;
-    // TODO Vespa 8: change to DocumentOnly.NAME;
-    private String fieldSet = AllFields.NAME;
+    private String fieldSet = DocumentOnly.NAME;
     boolean visitInconsistentBuckets = false;
     private ProgressToken resumeToken = null;
     private String resumeFileName = "";
@@ -140,9 +137,6 @@ public class VisitorParameters extends Parameters {
 
     public boolean getVisitRemoves() { return visitRemoves; }
 
-    @Deprecated // TODO: Remove on Vespa 8
-    public boolean getVisitHeadersOnly() { return false; }
-
     /** @return The field set to use. */
     public String fieldSet() { return fieldSet; }
 
@@ -230,10 +224,6 @@ public class VisitorParameters extends Parameters {
 
     public void setVisitRemoves(boolean visitRemoves) { this.visitRemoves = visitRemoves; }
 
-    /** @deprecated this option is ignored */
-    @Deprecated // TODO: Remove on Vespa 8
-    public void setVisitHeadersOnly(boolean headersOnly) { }
-
     /** Set field set to use. */
     public void fieldSet(String fieldSet) { this.fieldSet = fieldSet; }
     public void setFieldSet(String fieldSet) { this.fieldSet = fieldSet; }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
index a4444d9fd50..f8cb71d7ba8 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java
@@ -6,7 +6,7 @@ import com.yahoo.document.DocumentId;
 import com.yahoo.document.DocumentPut;
 import com.yahoo.document.DocumentRemove;
 import com.yahoo.document.DocumentUpdate;
-import com.yahoo.document.fieldset.AllFields;
+import com.yahoo.document.fieldset.DocumentOnly;
 import com.yahoo.documentapi.AsyncParameters;
 import com.yahoo.documentapi.AsyncSession;
 import com.yahoo.documentapi.DocumentIdResponse;
@@ -122,8 +122,7 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession {
 
     @Override
     public Result get(DocumentId id, DocumentOperationParameters parameters) {
-        // TODO Vespa 8: change to DocumentOnly.NAME
-        GetDocumentMessage msg = new GetDocumentMessage(id, parameters.fieldSet().orElse(AllFields.NAME));
+        GetDocumentMessage msg = new GetDocumentMessage(id, parameters.fieldSet().orElse(DocumentOnly.NAME));
         return send(msg, parameters);
     }
 
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java
index 809d43bbb4d..bc6451b4b3a 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java
@@ -6,7 +6,7 @@ import com.yahoo.document.DocumentId;
 import com.yahoo.document.DocumentPut;
 import com.yahoo.document.DocumentRemove;
 import com.yahoo.document.DocumentUpdate;
-import com.yahoo.document.fieldset.AllFields;
+import com.yahoo.document.fieldset.DocumentOnly;
 import com.yahoo.documentapi.AsyncParameters;
 import com.yahoo.documentapi.DocumentAccessException;
 import com.yahoo.documentapi.DocumentOperationParameters;
@@ -141,8 +141,7 @@ public class MessageBusSyncSession implements MessageBusSession, SyncSession, Re
 
     @Override
     public Document get(DocumentId id, DocumentOperationParameters parameters, Duration timeout) {
-        // TODO Vespa 8: change to DocumentOnly.NAME
-        GetDocumentMessage msg = new GetDocumentMessage(id, parameters.fieldSet().orElse(AllFields.NAME));
+        GetDocumentMessage msg = new GetDocumentMessage(id, parameters.fieldSet().orElse(DocumentOnly.NAME));
 
         Reply reply = syncSend(msg, timeout != null ? timeout : defaultTimeout, parameters);
         if (reply.hasErrors()) {
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/CreateVisitorMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/CreateVisitorMessage.java
index 097632f609f..2ba764cd504 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/CreateVisitorMessage.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/CreateVisitorMessage.java
@@ -3,7 +3,6 @@ package com.yahoo.documentapi.messagebus.protocol;
 
 import com.yahoo.document.BucketId;
 import com.yahoo.document.FixedBucketSpaces;
-import com.yahoo.document.fieldset.AllFields;
 import com.yahoo.document.fieldset.DocumentOnly;
 
 import java.util.ArrayList;
@@ -25,8 +24,7 @@ public class CreateVisitorMessage extends DocumentMessage {
     private long fromTime = 0;
     private long toTime = 0;
     private boolean visitRemoves = false;
-    // TODO Vespa 8: change to DocumentOnly.NAME
-    private String fieldSet = AllFields.NAME;
+    private String fieldSet = DocumentOnly.NAME;
     private boolean visitInconsistentBuckets = false;
     private Map<String, byte[]> params = new TreeMap<>();
     private int maxBucketsPerVisitor = 1;
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/GetDocumentMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/GetDocumentMessage.java
index 0f6e738cb86..34ec26c2259 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/GetDocumentMessage.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/GetDocumentMessage.java
@@ -2,7 +2,6 @@
 package com.yahoo.documentapi.messagebus.protocol;
 
 import com.yahoo.document.DocumentId;
-import com.yahoo.document.fieldset.AllFields;
 import com.yahoo.document.fieldset.DocumentOnly;
 
 import java.util.Arrays;
@@ -12,8 +11,7 @@ import java.util.Arrays;
  */
 public class GetDocumentMessage extends DocumentMessage {
 
-    // TODO Vespa 8: change to DocumentOnly.NAME
-    final static String DEFAULT_FIELD_SET = AllFields.NAME;
+    final static String DEFAULT_FIELD_SET = DocumentOnly.NAME;
     private DocumentId documentId = null;
     private String fieldSet = DEFAULT_FIELD_SET;
 
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 97c7147bd86..2a723c3fa43 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
@@ -3,8 +3,8 @@ package com.yahoo.documentapi.messagebus;
 
 import com.yahoo.document.BucketId;
 import com.yahoo.document.DocumentId;
-import com.yahoo.document.fieldset.AllFields;
 import com.yahoo.document.fieldset.DocIdOnly;
+import com.yahoo.document.fieldset.DocumentOnly;
 import com.yahoo.document.select.parser.ParseException;
 import com.yahoo.documentapi.AckToken;
 import com.yahoo.documentapi.ProgressToken;
@@ -499,7 +499,7 @@ public class MessageBusVisitorSessionTestCase {
         if (msg.getMaxPendingReplyCount() != 32) {
             sb.append("max pending=").append(msg.getMaxPendingReplyCount()).append("\n");
         }
-        if (!AllFields.NAME.equals(msg.getFieldSet())) {
+        if (!DocumentOnly.NAME.equals(msg.getFieldSet())) {
             sb.append("fieldset=").append(msg.getFieldSet()).append("\n");
         }
         if (msg.getVisitInconsistentBuckets()) {
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
index 07456870977..1d92bcf4657 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
@@ -7,7 +7,7 @@ import com.yahoo.document.DocumentPut;
 import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.document.DocumentTypeManagerConfigurer;
 import com.yahoo.document.DocumentUpdate;
-import com.yahoo.document.fieldset.AllFields;
+import com.yahoo.document.fieldset.DocumentOnly;
 import com.yahoo.documentapi.messagebus.protocol.ANDPolicy;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import com.yahoo.documentapi.messagebus.protocol.DocumentRouteSelectorPolicy;
@@ -378,7 +378,7 @@ public class PolicyTestCase {
         PolicyTestFrame frame = new PolicyTestFrame(manager);
         frame.setHop(new HopSpec("test", getDocumentRouteSelectorRawConfig())
                 .addRecipient("foo").addRecipient("bar"));
-        frame.setMessage(new GetDocumentMessage(new DocumentId("id:ns:testdoc::yarn"), AllFields.NAME));
+        frame.setMessage(new GetDocumentMessage(new DocumentId("id:ns:testdoc::yarn"), DocumentOnly.NAME));
         List<RoutingNode> selected = frame.select(2);
         for (int i = 0, len = selected.size(); i < len; ++i) {
             Document doc = null;