Revert "Revert "Use existing bucket space instead of placeholder value""

5 files changed, 6 insertions, 9 deletions

diff --git a/documentapi/src/tests/messages/messages50test.cpp b/documentapi/src/tests/messages/messages50test.cpp
index f25e3f19b08..d4052f30958 100644
--- a/documentapi/src/tests/messages/messages50test.cpp
+++ b/documentapi/src/tests/messages/messages50test.cpp
@@ -12,7 +12,6 @@
 using document::DataType;
 using document::DocumentTypeRepo;
 using document::test::makeDocumentBucket;
-using document::BucketSpace;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -1113,7 +1112,7 @@ Messages50Test::testWrongDistributionReply()
 bool
 Messages50Test::testGetBucketListReply()
 {
-    GetBucketListReply reply(BucketSpace::placeHolder());
+    GetBucketListReply reply;
     reply.getBuckets().push_back(GetBucketListReply::BucketInfo(document::BucketId(16, 123), "foo"));
     reply.getBuckets().push_back(GetBucketListReply::BucketInfo(document::BucketId(17, 1123), "bar"));
     reply.getBuckets().push_back(GetBucketListReply::BucketInfo(document::BucketId(18, 11123), "zoink"));
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.cpp
index 974135972f6..49e8e048db5 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.cpp
@@ -16,7 +16,7 @@ GetBucketListMessage::GetBucketListMessage(const document::Bucket &bucket) :
 DocumentReply::UP
 GetBucketListMessage::doCreateReply() const
 {
-    return DocumentReply::UP(new GetBucketListReply(_bucket.getBucketSpace()));
+    return DocumentReply::UP(new GetBucketListReply());
 }
 
 uint32_t
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp
index e9f66ed1f2f..e144158e0ef 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp
@@ -23,9 +23,8 @@ GetBucketListReply::BucketInfo::operator==(const GetBucketListReply::BucketInfo
     return _bucket == rhs._bucket && _bucketInformation == rhs._bucketInformation;
 }
 
-GetBucketListReply::GetBucketListReply(document::BucketSpace bucketSpace) :
+GetBucketListReply::GetBucketListReply() :
     DocumentReply(DocumentProtocol::REPLY_GETBUCKETLIST),
-    _bucketSpace(bucketSpace),
     _buckets()
 {
     // empty
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h
index 3c6a2a25bfc..3ded7f7d08b 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "documentreply.h"
-#include <vespa/document/bucket/bucket.h>
+#include <vespa/document/bucket/bucketid.h>
 
 namespace documentapi {
 
@@ -20,14 +20,13 @@ public:
     };
 
 private:
-    document::BucketSpace   _bucketSpace;
     std::vector<BucketInfo> _buckets;
 
 public:
     /**
      * Constructs a new reply with no content.
      */
-    GetBucketListReply(document::BucketSpace bucketSpace);
+    GetBucketListReply();
 
     /**
      * Returns the bucket state contained in this.
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp
index fff46c0128d..6876b4c3a71 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp
@@ -424,7 +424,7 @@ RoutableFactories50::GetBucketListMessageFactory::doEncode(const DocumentMessage
 DocumentReply::UP
 RoutableFactories50::GetBucketListReplyFactory::doDecode(document::ByteBuffer &buf) const
 {
-    DocumentReply::UP ret(new GetBucketListReply(BucketSpace::placeHolder()));
+    DocumentReply::UP ret(new GetBucketListReply());
     GetBucketListReply &reply = static_cast<GetBucketListReply&>(*ret);
 
     int32_t len = decodeInt(buf);