Use named constants instead of strings sprinkled all over.

2 files changed, 4 insertions, 2 deletions

diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java
index 8f0e70f554c..3d3a8fc52ad 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/OperationHandlerImpl.java
@@ -6,6 +6,7 @@ import com.yahoo.document.DocumentId;
 import com.yahoo.document.DocumentRemove;
 import com.yahoo.document.FixedBucketSpaces;
 import com.yahoo.document.TestAndSetCondition;
+import com.yahoo.document.fieldset.AllFields;
 import com.yahoo.document.json.JsonWriter;
 import com.yahoo.document.DocumentPut;
 import com.yahoo.documentapi.DocumentAccess;
@@ -424,7 +425,7 @@ public class OperationHandlerImpl implements OperationHandler {
         // document types in which case we can't explicitly state a single document type.
         // This matches legacy /visit API and vespa-visit tool behavior.
         params.fieldSet(options.fieldSet.orElse(
-                restUri.isRootOnly() ? "[all]" : restUri.getDocumentType() + ":[document]"));
+                restUri.isRootOnly() ? AllFields.NAME : restUri.getDocumentType() + ":[document]"));
         params.setMaxBucketsPerVisitor(1);
         params.setMaxPending(32);
         params.setMaxFirstPassHits(1);
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/OperationHandlerImplTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/OperationHandlerImplTest.java
index 91c52c4b98b..efb25f0e2b3 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/OperationHandlerImplTest.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/OperationHandlerImplTest.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.restapi;
 
+import com.yahoo.document.fieldset.AllFields;
 import com.yahoo.documentapi.DocumentAccess;
 import com.yahoo.documentapi.ProgressToken;
 import com.yahoo.documentapi.SyncParameters;
@@ -419,7 +420,7 @@ public class OperationHandlerImplTest {
     @Test
     public void api_root_visiting_uses_all_fieldset_by_default() throws Exception {
         VisitorParameters parameters = generatedVisitParametersFrom(apiRootVisitUri(), "", optionsBuilder().cluster("foo").build());
-        assertEquals("[all]", parameters.getFieldSet());
+        assertEquals(AllFields.NAME, parameters.getFieldSet());
     }
 
     @Test