Use named constants instead of strings sprinkled all over.

4 files changed, 16 insertions, 39 deletions

diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp
index 0f0b9bd4504..61a8618556b 100644
--- a/documentapi/src/tests/policies/policies_test.cpp
+++ b/documentapi/src/tests/policies/policies_test.cpp
@@ -329,7 +329,7 @@ Test::testExternSend()
     mbus::DestinationSession::UP ds = dst.mb.createDestinationSession("session", true, dr);
 
     // Send message from local node to remote cluster and resolve route there.
-    mbus::Message::UP msg(new GetDocumentMessage(DocumentId("id:ns:testdoc::"), 0));
+    mbus::Message::UP msg = std::make_unique<GetDocumentMessage>(DocumentId("id:ns:testdoc::"));
     msg->getTrace().setLevel(9);
     msg->setRoute(mbus::Route::parse(vespalib::make_string("[Extern:tcp/localhost:%d;itr/session] default", slobrok.port())));
 
@@ -365,7 +365,7 @@ Test::testExternMultipleSlobroks()
                              std::make_shared<DocumentProtocol>(_loadTypes, _repo));
         mbus::DestinationSession::UP ds = dst.mb.createDestinationSession("session", true, dr);
 
-        mbus::Message::UP msg(new GetDocumentMessage(DocumentId("id:ns:testdoc::"), 0));
+        mbus::Message::UP msg = std::make_unique<GetDocumentMessage>(DocumentId("id:ns:testdoc::"));
         msg->setRoute(mbus::Route::parse(vespalib::make_string("[Extern:%s;dst/session]", spec.c_str())));
         ASSERT_TRUE(ss->send(std::move(msg)).isAccepted());
         ASSERT_TRUE((msg = dr.getMessage(TIMEOUT)));
@@ -381,7 +381,7 @@ Test::testExternMultipleSlobroks()
                              std::make_shared<DocumentProtocol>(_loadTypes, _repo));
         mbus::DestinationSession::UP ds = dst.mb.createDestinationSession("session", true, dr);
 
-        mbus::Message::UP msg(new GetDocumentMessage(DocumentId("id:ns:testdoc::"), 0));
+        mbus::Message::UP msg = std::make_unique<GetDocumentMessage>(DocumentId("id:ns:testdoc::"));
         msg->setRoute(mbus::Route::parse(vespalib::make_string("[Extern:%s;dst/session]", spec.c_str())));
         ASSERT_TRUE(ss->send(std::move(msg)).isAccepted());
         ASSERT_TRUE((msg = dr.getMessage(TIMEOUT)));
@@ -615,7 +615,7 @@ Test::testDocumentRouteSelector()
                  .addRecipient("foo")
                  .addRecipient("bar"));
 
-    frame.setMessage(make_unique<GetDocumentMessage>(DocumentId("id:ns:testdoc::"), 0));
+    frame.setMessage(make_unique<GetDocumentMessage>(DocumentId("id:ns:testdoc::")));
     EXPECT_TRUE(frame.testSelect(StringList().add("foo")));
 
     mbus::Message::UP put = make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("id:ns:testdoc::")));
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp
index 821af8e256b..acc3e61843e 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp
@@ -3,20 +3,21 @@
 #include "getdocumentmessage.h"
 #include "getdocumentreply.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
+#include <vespa/document/fieldset/fieldsets.h>
 
 namespace documentapi {
 
 GetDocumentMessage::GetDocumentMessage() :
     DocumentMessage(),
     _documentId(),
-    _fieldSet("[all]")
+    _fieldSet(document::AllFields::NAME)
 {}
 
-GetDocumentMessage::GetDocumentMessage(const document::DocumentId &documentId, int flags) :
+GetDocumentMessage::GetDocumentMessage(const document::DocumentId &documentId) :
     DocumentMessage(),
-    _documentId(documentId)
+    _documentId(documentId),
+    _fieldSet(document::AllFields::NAME)
 {
-    setFlags(flags);
 }
 
 GetDocumentMessage::GetDocumentMessage(const document::DocumentId &documentId,
@@ -27,13 +28,12 @@ GetDocumentMessage::GetDocumentMessage(const document::DocumentId &documentId,
 {
 }
 
-GetDocumentMessage::~GetDocumentMessage() {
-}
+GetDocumentMessage::~GetDocumentMessage() = default;
 
 DocumentReply::UP
 GetDocumentMessage::doCreateReply() const
 {
-    return DocumentReply::UP(new GetDocumentReply());
+    return std::make_unique<GetDocumentReply>();
 }
 
 uint32_t
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h
index 619367faf4d..d157b68c4ed 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h
@@ -21,11 +21,6 @@ public:
     typedef std::unique_ptr<GetDocumentMessage> UP;
     typedef std::shared_ptr<GetDocumentMessage> SP;
 
-    enum {
-        FLAG_NONE        = 0,
-        FLAG_ONLY_HEADER = 1
-    };
-
     /**
      * Constructs a new message for deserialization.
      */
@@ -35,9 +30,8 @@ public:
      * Constructs a new document get message.
      *
      * @param documentId The identifier of the document to retrieve.
-     * @param flags      How to retrieve the document.
      */
-    GetDocumentMessage(const document::DocumentId &documentId, int flags = 0);
+    explicit GetDocumentMessage(const document::DocumentId &documentId);
 
     /**
      * Constructs a new document get message.
@@ -45,8 +39,7 @@ public:
      * @param documentId The identifier of the document to retrieve.
      * @param fieldSet The fields to retrieve (comma-separated)
      */
-    GetDocumentMessage(const document::DocumentId &documentId,
-                       vespalib::stringref fieldSet);
+    GetDocumentMessage(const document::DocumentId &documentId, vespalib::stringref fieldSet);
 
     ~GetDocumentMessage();
 
@@ -65,23 +58,6 @@ public:
     void setDocumentId(const document::DocumentId &documentId);
 
     /**
-     * Returs the storage flags of this message.
-     *
-     * @return The storage flags.
-     */
-    int getFlags() const { return (_fieldSet == "[header]" ? FLAG_ONLY_HEADER :
-                                   FLAG_NONE); };
-
-    /**
-     * Sets the storage flags of this message.
-     *
-     * @param flags The flags to set.
-     */
-    void setFlags(int flags) {
-        _fieldSet = (flags == FLAG_ONLY_HEADER) ? "[header]" : "[all]";
-    }
-
-    /**
      * Returns the fields to be retrieved by the get.
      */
     const string& getFieldSet() const { return _fieldSet; }
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
index 453e93fd7eb..26e5344df2d 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
@@ -5,6 +5,7 @@
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/vespalib/util/growablebytebuffer.h>
 #include <vespa/document/util/bytebuffer.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <climits>
 
 using document::FixedBucketSpaces;
@@ -24,7 +25,7 @@ CreateVisitorMessage::CreateVisitorMessage() :
     _fromTime(0),
     _toTime(0),
     _visitRemoves(false),
-    _fieldSet("[all]"),
+    _fieldSet(document::AllFields::NAME),
     _visitInconsistentBuckets(false),
     _params(),
     _version(42),
@@ -47,7 +48,7 @@ CreateVisitorMessage::CreateVisitorMessage(const string& libraryName,
     _fromTime(0),
     _toTime(0),
     _visitRemoves(false),
-    _fieldSet("[all]"),
+    _fieldSet(document::AllFields::NAME),
     _visitInconsistentBuckets(false),
     _params(),
     _version(42),