Use DocumentOnly-fieldset by default

Also remove deprecated and unsupported header-only visitor parameter

4 files changed, 6 insertions, 12 deletions

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;