make DocsumReply a proper class

2 files changed, 12 insertions, 14 deletions

diff --git a/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp b/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp
index 973d2bcc15c..7eb7d1d0d80 100644
--- a/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp
+++ b/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp
@@ -478,14 +478,13 @@ TEST_F(DocsumRequestTest, require_that_global_ids_are_converted) {
 //-----------------------------------------------------------------------------
 
 struct DocsumReplyTest : ::testing::Test {
-    DocsumReply reply;
+    DocsumReply reply{std::make_unique<vespalib::Slime>()};
     Converter::ProtoDocsumReply proto;
     void convert() { Converter::docsum_reply_to_proto(reply, proto); }
 };
 
 TEST_F(DocsumReplyTest, require_that_slime_summaries_are_converted) {
-    reply._root = std::make_unique<Slime>();
-    auto &list = reply._root->setArray();
+    auto &list = reply.slime().setArray();
     auto &doc0 = list.addObject();
     doc0.setLong("my_field", 42);
     convert();
@@ -496,18 +495,18 @@ TEST_F(DocsumReplyTest, require_that_slime_summaries_are_converted) {
 }
 
 TEST_F(DocsumReplyTest, require_that_missing_root_slime_gives_empty_payload) {
-    reply._root.reset();
+    reply.releaseSlime();
     convert();
     EXPECT_EQ(proto.slime_summaries().size(), 0);
 }
 
 TEST_F(DocsumReplyTest, require_that_issues_are_converted_to_errors) {
-    reply.my_issues = std::make_unique<UniqueIssues>();
-    reply.my_issues->handle(vespalib::Issue("a"));
-    reply.my_issues->handle(vespalib::Issue("b"));
-    reply.my_issues->handle(vespalib::Issue("c"));
-    reply.my_issues->handle(vespalib::Issue("a"));
-    reply.my_issues->handle(vespalib::Issue("b"));
+    reply.setIssues(std::make_unique<UniqueIssues>());
+    reply.issues().handle(vespalib::Issue("a"));
+    reply.issues().handle(vespalib::Issue("b"));
+    reply.issues().handle(vespalib::Issue("c"));
+    reply.issues().handle(vespalib::Issue("a"));
+    reply.issues().handle(vespalib::Issue("b"));
     convert();
     ASSERT_EQ(proto.errors_size(), 3);
     EXPECT_EQ(proto.errors(0).message(), "a");
diff --git a/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp b/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp
index 41f471f0a7a..7aa72b50ba4 100644
--- a/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp
+++ b/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp
@@ -49,12 +49,11 @@ struct MyDocsumServer : DocsumServer {
     DocsumReply::UP getDocsums(DocsumRequest::Source src, DocsumClient &client) override {
         auto req = src.release();
         assert(req);
-        auto reply = std::make_unique<DocsumReply>();
-        reply->_root = std::make_unique<Slime>();
-        auto &list = reply->_root->setArray();
+        auto reply = std::make_unique<DocsumReply>(std::make_unique<Slime>());
+        auto &list = reply->slime().setArray();
         list.addObject().setBool("use_root_slime", true);
         list.addObject().setString("ranking", req->ranking);
-        reply->request = std::move(req);
+        reply->setRequest(std::move(req));
         std::this_thread::sleep_for(std::chrono::milliseconds(5));
         client.getDocsumsDone(std::move(reply)); // simplified async response
         return std::unique_ptr<DocsumReply>();