Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller

1 files changed, 6 insertions, 7 deletions

diff --git a/storage/src/vespa/storage/storageserver/documentapiconverter.h b/storage/src/vespa/storage/storageserver/documentapiconverter.h
index 98c3bd66dbc..96b119ff44e 100644
--- a/storage/src/vespa/storage/storageserver/documentapiconverter.h
+++ b/storage/src/vespa/storage/storageserver/documentapiconverter.h
@@ -1,4 +1,4 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
 #include <vespa/documentapi/messagebus/messages/documentmessage.h>
@@ -22,18 +22,17 @@ class PriorityConverter;
 class DocumentApiConverter
 {
 public:
-    DocumentApiConverter(const config::ConfigUri &configUri,
-                         std::shared_ptr<const BucketResolver> bucketResolver);
+    explicit DocumentApiConverter(std::shared_ptr<const BucketResolver> bucketResolver);
     ~DocumentApiConverter();
 
-    std::unique_ptr<api::StorageCommand> toStorageAPI(documentapi::DocumentMessage& msg);
-    std::unique_ptr<api::StorageReply> toStorageAPI(documentapi::DocumentReply& reply, api::StorageCommand& originalCommand);
+    [[nodiscard]] std::unique_ptr<api::StorageCommand> toStorageAPI(documentapi::DocumentMessage& msg);
+    [[nodiscard]] std::unique_ptr<api::StorageReply> toStorageAPI(documentapi::DocumentReply& reply, api::StorageCommand& originalCommand);
     void transferReplyState(storage::api::StorageReply& from, mbus::Reply& to);
-    std::unique_ptr<mbus::Message> toDocumentAPI(api::StorageCommand& cmd);
+    [[nodiscard]] std::unique_ptr<mbus::Message> toDocumentAPI(api::StorageCommand& cmd);
     const PriorityConverter& getPriorityConverter() const { return *_priConverter; }
 
     // BucketResolver getter and setter are both thread safe.
-    std::shared_ptr<const BucketResolver> bucketResolver() const;
+    [[nodiscard]] std::shared_ptr<const BucketResolver> bucketResolver() const;
     void setBucketResolver(std::shared_ptr<const BucketResolver> resolver);
 private:
     mutable std::mutex _mutex;