Reduce visibility of document::Document

6 files changed, 13 insertions, 10 deletions

diff --git a/documentapi/src/tests/messages/messages60test.cpp b/documentapi/src/tests/messages/messages60test.cpp
index c0bdb71fb25..a7604888c69 100644
--- a/documentapi/src/tests/messages/messages60test.cpp
+++ b/documentapi/src/tests/messages/messages60test.cpp
@@ -10,6 +10,7 @@
 #include <vespa/document/update/fieldpathupdates.h>
 #include <vespa/documentapi/documentapi.h>
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
+#include <vespa/document/fieldvalue/document.h>
 
 using document::DataType;
 using document::DocumentTypeRepo;
diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp
index 61716e4ed6b..dfa9cbb581e 100644
--- a/documentapi/src/tests/policies/policies_test.cpp
+++ b/documentapi/src/tests/policies/policies_test.cpp
@@ -18,11 +18,11 @@
 #include <vespa/messagebus/testlib/testserver.h>
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/document/base/testdocrepo.h>
-#include <vespa/document/config/documenttypes_config_fwd.h>
 #include <vespa/document/fieldvalue/longfieldvalue.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/update/documentupdate.h>
+#include <vespa/document/fieldvalue/document.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <thread>
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
index 534a4c62efc..1717b687322 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
@@ -6,6 +6,7 @@
 #include <vespa/vespalib/util/growablebytebuffer.h>
 #include <vespa/document/util/bytebuffer.h>
 #include <vespa/document/fieldset/fieldsets.h>
+#include <vespa/document/fieldvalue/document.h>
 #include <climits>
 
 using document::FixedBucketSpaces;
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
index 48fece57064..0b43b37c0b7 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
@@ -9,9 +9,8 @@
 #include <vespa/vdslib/container/visitorstatistics.h>
 #include <vespa/document/bucket/bucketid.h>
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/document/fieldvalue/document.h>
-
 
+namespace document { class Document; }
 namespace documentapi {
 
 typedef uint64_t Timestamp;
@@ -237,25 +236,25 @@ public:
  */
 class DocumentListMessage : public VisitorMessage {
 public:
-    typedef std::unique_ptr<DocumentListMessage> UP;
+    using UP = std::unique_ptr<DocumentListMessage>;
+    using DocumentSP = std::shared_ptr<document::Document>;
 
     class Entry {
     public:
         Entry();
-        Entry(int64_t timestamp, document::Document::SP doc, bool removeEntry);
+        Entry(int64_t timestamp, DocumentSP doc, bool removeEntry);
         Entry(const Entry& other);
         Entry(const document::DocumentTypeRepo &repo, document::ByteBuffer& buf);
 
         int64_t getTimestamp() { return _timestamp; }
-        const document::Document::SP& getDocument() { return _document; }
+        const DocumentSP & getDocument() { return _document; }
         bool isRemoveEntry() { return _removeEntry; }
 
         void serialize(vespalib::GrowableByteBuffer& buf) const;
-        uint32_t getSerializedSize() const;
     private:
-        int64_t _timestamp;
-        document::Document::SP _document;
-        bool _removeEntry;
+        int64_t    _timestamp;
+        DocumentSP _document;
+        bool       _removeEntry;
     };
 
 private:
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.cpp
index 5fded6a6266..ae4041732a7 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.cpp
@@ -3,6 +3,7 @@
 #include "contentpolicy.h"
 #include <vespa/document/base/documentid.h>
 #include <vespa/document/update/documentupdate.h>
+#include <vespa/document/fieldvalue/document.h>
 #include <vespa/messagebus/emptyreply.h>
 #include <vespa/messagebus/error.h>
 #include <vespa/documentapi/documentapi.h>
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
index 8b7c56117b1..ad32a5b4fa7 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
@@ -6,6 +6,7 @@
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
 #include <vespa/document/select/parser.h>
 #include <vespa/document/update/documentupdate.h>
+#include <vespa/document/fieldvalue/document.h>
 #include <vespa/documentapi/documentapi.h>
 #include <vespa/vespalib/objects/nbostream.h>