diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-10 15:57:13 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-10 15:57:13 +0200 |
commit | f8bfef4eddc54c0f8f8e37a116b7cc24c4abe2bb (patch) | |
tree | 76bec35855dcc93a745327f479d724ed14473643 | |
parent | ff25d69b1164bcc39a218e24545f8974c87b3501 (diff) |
add override in documentapi module
39 files changed, 218 insertions, 218 deletions
diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp index 92668de675a..4e7620dac05 100644 --- a/documentapi/src/tests/messagebus/messagebus_test.cpp +++ b/documentapi/src/tests/messagebus/messagebus_test.cpp @@ -17,7 +17,7 @@ class Test : public vespalib::TestApp { DocumentTypeRepo::SP _repo; public: - int Main(); + int Main() override; private: void testMessage(); diff --git a/documentapi/src/tests/messages/messages50test.h b/documentapi/src/tests/messages/messages50test.h index 515a61e59fc..ec44ab77a4b 100644 --- a/documentapi/src/tests/messages/messages50test.h +++ b/documentapi/src/tests/messages/messages50test.h @@ -5,8 +5,8 @@ class Messages50Test : public TestBase { protected: - const vespalib::Version getVersion() const { return vespalib::Version(5, 0); } - bool shouldTestCoverage() const { return FALSE; } + const vespalib::Version getVersion() const override { return vespalib::Version(5, 0); } + bool shouldTestCoverage() const override { return FALSE; } bool tryDocumentReply(const string &filename, uint32_t type); bool tryVisitorReply(const string &filename, uint32_t type); diff --git a/documentapi/src/tests/messages/messages51test.h b/documentapi/src/tests/messages/messages51test.h index 9cf57a44b29..c7874d26a33 100644 --- a/documentapi/src/tests/messages/messages51test.h +++ b/documentapi/src/tests/messages/messages51test.h @@ -5,8 +5,8 @@ class Messages51Test : public Messages50Test { protected: - const vespalib::Version getVersion() const { return vespalib::Version(5, 1); } - bool shouldTestCoverage() const { return TRUE; } + const vespalib::Version getVersion() const override { return vespalib::Version(5, 1); } + bool shouldTestCoverage() const override { return TRUE; } public: Messages51Test(); diff --git a/documentapi/src/tests/messages/testbase.h b/documentapi/src/tests/messages/testbase.h index 6b802f30066..6c3675bd5f9 100644 --- a/documentapi/src/tests/messages/testbase.h +++ b/documentapi/src/tests/messages/testbase.h @@ -42,7 +42,7 @@ protected: virtual const vespalib::Version getVersion() const = 0; virtual bool shouldTestCoverage() const = 0; TestBase &putTest(uint32_t type, TEST_METHOD_PT test); - int Main(); + int Main() override; public: const document::DocumentTypeRepo &getTypeRepo() { return *_repo; } diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index ba5cc280bce..b1135a30032 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -63,7 +63,7 @@ private: mbus::Message::UP newPutDocumentMessage(const string &documentId); public: - int Main(); + int Main() override; void testAND(); void testDocumentRouteSelector(); void testDocumentRouteSelectorIgnore(); diff --git a/documentapi/src/tests/policies/testframe.cpp b/documentapi/src/tests/policies/testframe.cpp index 0c4fd90a5c4..8d5b6585529 100644 --- a/documentapi/src/tests/policies/testframe.cpp +++ b/documentapi/src/tests/policies/testframe.cpp @@ -40,17 +40,17 @@ public: // empty } - bool allocServiceAddress(mbus::RoutingNode &recipient) { + bool allocServiceAddress(mbus::RoutingNode &recipient) override { string hop = recipient.getRoute().getHop(0).toString(); recipient.setServiceAddress(mbus::IServiceAddress::UP(new MyServiceAddress(hop))); return true; } - void freeServiceAddress(mbus::RoutingNode &recipient) { + void freeServiceAddress(mbus::RoutingNode &recipient) override { recipient.setServiceAddress(mbus::IServiceAddress::UP()); } - void send(const mbus::Message &, const std::vector<mbus::RoutingNode*> &nodes) { + void send(const mbus::Message &, const std::vector<mbus::RoutingNode*> &nodes) override { _nodes.insert(_nodes.begin(), nodes.begin(), nodes.end()); } diff --git a/documentapi/src/tests/policies/testframe.h b/documentapi/src/tests/policies/testframe.h index 26039cf951e..e0780733331 100644 --- a/documentapi/src/tests/policies/testframe.h +++ b/documentapi/src/tests/policies/testframe.h @@ -199,7 +199,7 @@ public: documentapi::SystemStateHandle getSystemState(); // Implements IReplyHandler. - void handleReply(mbus::Reply::UP reply); + void handleReply(mbus::Reply::UP reply) override; }; class UIntList : public std::vector<uint32_t> { diff --git a/documentapi/src/tests/policyfactory/policyfactory.cpp b/documentapi/src/tests/policyfactory/policyfactory.cpp index d8db57c9ecb..cba4e6cf70f 100644 --- a/documentapi/src/tests/policyfactory/policyfactory.cpp +++ b/documentapi/src/tests/policyfactory/policyfactory.cpp @@ -23,8 +23,8 @@ private: string _param; public: MyPolicy(const string ¶m); - void select(mbus::RoutingContext &ctx); - void merge(mbus::RoutingContext &ctx); + void select(mbus::RoutingContext &ctx) override; + void merge(mbus::RoutingContext &ctx) override; }; MyPolicy::MyPolicy(const string ¶m) : @@ -48,7 +48,7 @@ MyPolicy::merge(mbus::RoutingContext &ctx) class MyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; mbus::IRoutingPolicy::UP diff --git a/documentapi/src/tests/replymerger/replymerger_test.cpp b/documentapi/src/tests/replymerger/replymerger_test.cpp index 2e1551e8dca..8803994b0cf 100644 --- a/documentapi/src/tests/replymerger/replymerger_test.cpp +++ b/documentapi/src/tests/replymerger/replymerger_test.cpp @@ -19,7 +19,7 @@ class Test : public vespalib::TestApp static void assertReplyErrorsMatch(const mbus::Reply& r, const std::vector<mbus::Error>& errors); public: - int Main(); + int Main() override; void mergingGenericRepliesWithNoErrorsPicksFirstReply(); void mergingSingleReplyWithOneErrorReturnsEmptyReplyWithError(); diff --git a/documentapi/src/tests/routablefactory/routablefactory.cpp b/documentapi/src/tests/routablefactory/routablefactory.cpp index fff7d84a197..620142e803b 100644 --- a/documentapi/src/tests/routablefactory/routablefactory.cpp +++ b/documentapi/src/tests/routablefactory/routablefactory.cpp @@ -40,23 +40,23 @@ public: getTrace().setLevel(9); } - DocumentReply::UP doCreateReply() const { + DocumentReply::UP doCreateReply() const override { return DocumentReply::UP(new MyReply()); } - uint32_t getType() const { + uint32_t getType() const override { return TYPE; } }; class MyMessageFactory : public RoutableFactories51::DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const { + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override { (void)buf; return DocumentMessage::UP(new MyMessage()); } - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const { + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override { (void)msg; (void)buf; return true; @@ -65,12 +65,12 @@ protected: class MyReplyFactory : public RoutableFactories51::DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const { + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override { (void)buf; return DocumentReply::UP(new MyReply()); } - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const { + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override { (void)reply; (void)buf; return true; @@ -109,7 +109,7 @@ protected: void testFactory(TestData &data); public: - int Main(); + int Main() override; }; TEST_APPHOOK(Test); diff --git a/documentapi/src/tests/systemstate/systemstate.cpp b/documentapi/src/tests/systemstate/systemstate.cpp index b8f6c04fa2b..a797f55c625 100644 --- a/documentapi/src/tests/systemstate/systemstate.cpp +++ b/documentapi/src/tests/systemstate/systemstate.cpp @@ -11,7 +11,7 @@ using namespace documentapi; class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; void testParser(); void testPathing(); void testState(); diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h index 59aeb51589e..b35cce81b40 100644 --- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h +++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h @@ -305,16 +305,16 @@ public: SystemState &getSystemState() { return *_systemState; } // Implements IProtocol. - const mbus::string &getName() const { return NAME; } + const mbus::string &getName() const override { return NAME; } // Implements IProtocol. - mbus::IRoutingPolicy::UP createPolicy(const mbus::string &name, const mbus::string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const mbus::string &name, const mbus::string ¶m) const override; // Implements IProtocol. - mbus::Blob encode(const vespalib::Version &version, const mbus::Routable &routable) const; + mbus::Blob encode(const vespalib::Version &version, const mbus::Routable &routable) const override; // Implements IProtocol. - mbus::Routable::UP decode(const vespalib::Version &version, mbus::BlobRef data) const; + mbus::Routable::UP decode(const vespalib::Version &version, mbus::BlobRef data) const override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h index 98277cac427..b4adf41ca79 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h @@ -57,7 +57,7 @@ public: */ Priority::Value getPriority() const { return _priority; }; - uint8_t priority() const { return (uint8_t)_priority; }; + uint8_t priority() const override { return (uint8_t)_priority; } /** * Sets the priority tag for this message. @@ -83,7 +83,7 @@ public: } // Implements mbus::Message. - const mbus::string& getProtocol() const; + const mbus::string& getProtocol() const override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h index c1e13ccbc16..2850c412807 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h @@ -42,7 +42,7 @@ public: */ Priority::Value getPriority() const { return _priority; } - uint8_t priority() const { return (uint8_t)_priority; }; + uint8_t priority() const override { return (uint8_t)_priority; } /** * Sets the priority tag for this message. @@ -52,10 +52,10 @@ public: void setPriority(Priority::Value p) { _priority = p; } // Implements mbus::Reply. - const mbus::string& getProtocol() const; + const mbus::string& getProtocol() const override; // Implements mbus::Reply. - uint32_t getType() const { return _type; } + uint32_t getType() const override { return _type; } }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h index cac631a3f1e..ac5e141da23 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h @@ -10,7 +10,7 @@ class DocumentSummaryMessage : public VisitorMessage, public vdslib::DocumentSummary { protected: // Implements VisitorMessage. - DocumentReply::UP doCreateReply() const; + DocumentReply::UP doCreateReply() const override; public: /** @@ -32,12 +32,12 @@ public: DocumentSummaryMessage(const vdslib::DocumentSummary &summary); // Overrides VisitorMessage. - uint32_t getApproxSize() const; + uint32_t getApproxSize() const override; // Implements VisitorMessage. - uint32_t getType() const; + uint32_t getType() const override; - string toString() const { return "documentsummarymessage"; } + string toString() const override { return "documentsummarymessage"; } }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h index cbd0d7c35ab..54ce4e8de4c 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h @@ -17,7 +17,7 @@ private: std::vector<document::BucketId> _bucketIds; protected: - DocumentReply::UP doCreateReply() const; + DocumentReply::UP doCreateReply() const override; public: EmptyBucketsMessage(); // must be serialized into @@ -31,9 +31,9 @@ public: void resize(uint32_t size); - uint32_t getType() const; + uint32_t getType() const override; - string toString() const { return "emptybucketsmessage"; } + string toString() const override { return "emptybucketsmessage"; } }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h index b8cf4f72293..c08e36aa3fd 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h @@ -12,7 +12,7 @@ private: protected: // Implements DocumentMessage. - DocumentReply::UP doCreateReply() const; + DocumentReply::UP doCreateReply() const override; public: /** @@ -42,15 +42,15 @@ public: void setBucketId(const document::BucketId& id) { _bucketId = id; } // Overrides DocumentMessage. - bool hasSequenceId() const; + bool hasSequenceId() const override; // Overrides DocumentMessage. - uint64_t getSequenceId() const; + uint64_t getSequenceId() const override; // Implements DocumentMessage. - uint32_t getType() const; + uint32_t getType() const override; - string toString() const { return "getbucketlistmessage"; } + string toString() const override { return "getbucketlistmessage"; } }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h index 3193a525640..a207ef206e4 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h @@ -42,7 +42,7 @@ public: */ const std::vector<BucketInfo> &getBuckets() const { return _buckets; } - string toString() const { return "getbucketlistreply"; } + string toString() const override { return "getbucketlistreply"; } }; std::ostream & operator<<(std::ostream &out, const GetBucketListReply::BucketInfo &info); diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatemessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatemessage.h index b34b7cc476b..ed27ed11212 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatemessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatemessage.h @@ -12,7 +12,7 @@ private: protected: // Implements DocumentMessage. - DocumentReply::UP doCreateReply() const; + DocumentReply::UP doCreateReply() const override; public: /** @@ -42,15 +42,15 @@ public: void setBucketId(document::BucketId bucket) { _bucket = bucket; } // Overrides DocumentMessage. - bool hasSequenceId() const; + bool hasSequenceId() const override; // Overrides DocumentMessage. - uint64_t getSequenceId() const; + uint64_t getSequenceId() const override; // Implements DocumentMessage. - uint32_t getType() const; + uint32_t getType() const override; - string toString() const { return "getbucketstatemessage"; } + string toString() const override { return "getbucketstatemessage"; } }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatereply.h b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatereply.h index ece8e4e69a1..7763adfa4ac 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatereply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatereply.h @@ -46,7 +46,7 @@ public: */ const std::vector<DocumentState> &getBucketState() const { return _state; } - string toString() const { return "getbucketstatereply"; } + string toString() const override { return "getbucketstatereply"; } }; } // documentapi diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h index 5b116ab81e6..ac78aea6251 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h @@ -25,7 +25,7 @@ private: bool _keepTimeStamps; protected: - DocumentReply::UP doCreateReply() const; + DocumentReply::UP doCreateReply() const override; public: typedef std::unique_ptr<MultiOperationMessage> UP; @@ -47,15 +47,15 @@ public: void serialize(document::ByteBuffer& buf) const; - uint32_t getApproxSize() const; + uint32_t getApproxSize() const override; - uint32_t getType() const; + uint32_t getType() const override; const document::BucketId& getBucketId() const { return _bucketId; } bool keepTimeStamps() const { return _keepTimeStamps;} void keepTimeStamps(bool b) { _keepTimeStamps = b;} - string toString() const { return "multioperationmessage"; } + string toString() const override { return "multioperationmessage"; } private: void verifyBucketId() const; diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h index 8d5bfbae1f8..acaf3357d4d 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h @@ -18,14 +18,14 @@ public: const string& getDocumentSelection() const { return _documentSelection; } - uint32_t getType() const; + uint32_t getType() const override; const document::BucketId& getBucketId() const { return _bucketId; }; - string toString() const { return "removelocationmessage"; } + string toString() const override { return "removelocationmessage"; } protected: - DocumentReply::UP doCreateReply() const; + DocumentReply::UP doCreateReply() const override; private: string _documentSelection; diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h index e63696cd7ea..43045fd44c6 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h @@ -46,7 +46,7 @@ private: uint32_t _maxBucketsPerVisitor; protected: - DocumentReply::UP doCreateReply() const; + DocumentReply::UP doCreateReply() const override; public: typedef std::unique_ptr<CreateVisitorMessage> UP; @@ -114,12 +114,12 @@ public: uint32_t getMaxBucketsPerVisitor() const { return _maxBucketsPerVisitor; } void setMaxBucketsPerVisitor(uint32_t max) { _maxBucketsPerVisitor = max; } - uint32_t getType() const; + uint32_t getType() const override; void setVisitorDispatcherVersion(uint32_t version) { _version = version; }; uint32_t getVisitorDispatcherVersion() const { return _version; }; - string toString() const { return "createvisitormessage"; } + string toString() const override { return "createvisitormessage"; } }; /** @@ -133,7 +133,7 @@ private: string _instanceId; protected: - DocumentReply::UP doCreateReply() const; + DocumentReply::UP doCreateReply() const override; public: typedef std::unique_ptr<DestroyVisitorMessage> UP; @@ -145,9 +145,9 @@ public: const string& getInstanceId() const { return _instanceId; } void setInstanceId(const string& id) { _instanceId = id; } - uint32_t getType() const; + uint32_t getType() const override; - string toString() const { return "destroyvisitormessage"; } + string toString() const override { return "destroyvisitormessage"; } }; /** @@ -183,7 +183,7 @@ public: const vdslib::VisitorStatistics& getVisitorStatistics() const { return _visitorStatistics; } void setVisitorStatistics(const vdslib::VisitorStatistics& stats) { _visitorStatistics = stats; } - string toString() const { return "createvisitorreply"; } + string toString() const override { return "createvisitorreply"; } }; /** @@ -200,7 +200,7 @@ private: string _errorMessage; protected: - DocumentReply::UP doCreateReply() const; + DocumentReply::UP doCreateReply() const override; public: typedef std::unique_ptr<VisitorInfoMessage> UP; @@ -213,9 +213,9 @@ public: const string& getErrorMessage() const { return _errorMessage; } void setErrorMessage(const string& errorMessage) { _errorMessage = errorMessage; }; - uint32_t getType() const; + uint32_t getType() const override; - string toString() const { return "visitorinfomessage"; } + string toString() const override { return "visitorinfomessage"; } }; /** @@ -229,7 +229,7 @@ private: vdslib::Parameters _data; protected: - DocumentReply::UP doCreateReply() const; + DocumentReply::UP doCreateReply() const override; public: typedef std::unique_ptr<MapVisitorMessage> UP; @@ -239,10 +239,10 @@ public: vdslib::Parameters& getData() { return _data; }; const vdslib::Parameters& getData() const { return _data; }; - uint32_t getApproxSize() const; - uint32_t getType() const; + uint32_t getApproxSize() const override; + uint32_t getType() const override; - string toString() const { return "mapvisitormessage"; } + string toString() const override { return "mapvisitormessage"; } }; /** @@ -280,7 +280,7 @@ private: std::vector<Entry> _documents; protected: - DocumentReply::UP doCreateReply() const; + DocumentReply::UP doCreateReply() const override; public: DocumentListMessage(); @@ -292,9 +292,9 @@ public: std::vector<Entry>& getDocuments() { return _documents; }; const std::vector<Entry>& getDocuments() const { return _documents; }; - uint32_t getType() const; + uint32_t getType() const override; - string toString() const { return "documentlistmessage"; } + string toString() const override { return "documentlistmessage"; } }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.h index 740413a4958..0edba2c0872 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.h @@ -35,10 +35,10 @@ public: virtual ~ANDPolicy(); // Inherit doc from IRoutingPolicy. - virtual void select(mbus::RoutingContext &context); + virtual void select(mbus::RoutingContext &context) override; // Inherit doc from IRoutingPolicy. - virtual void merge(mbus::RoutingContext &context); + virtual void merge(mbus::RoutingContext &context) override; private: ANDPolicy(const ANDPolicy &); // hide diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.h index 2d13ea59991..2f901ebad2d 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.h @@ -10,7 +10,7 @@ class ContentPolicy : public StoragePolicy public: ContentPolicy(const string& param); private: - virtual string createConfigId(const string & clusterName) const; + virtual string createConfigId(const string & clusterName) const override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h index 4bddc6a1ecf..678210b1416 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h @@ -66,13 +66,13 @@ public: const string &getError() const; // Implements Subscriber. - void configure(std::unique_ptr<messagebus::protocol::DocumentrouteselectorpolicyConfig> cfg); + void configure(std::unique_ptr<messagebus::protocol::DocumentrouteselectorpolicyConfig> cfg) override; // Implements IRoutingPolicy. - void select(mbus::RoutingContext &context); + void select(mbus::RoutingContext &context) override; // Implements IRoutingPolicy. - void merge(mbus::RoutingContext &context); + void merge(mbus::RoutingContext &context) override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h index 75c697331d3..790e0ab923c 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h @@ -24,10 +24,10 @@ public: ErrorPolicy(const string &msg); // Implements IRoutingPolicy. - void select(mbus::RoutingContext &context); + void select(mbus::RoutingContext &context) override; // Implements IRoutingPolicy. - void merge(mbus::RoutingContext &context); + void merge(mbus::RoutingContext &context) override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h index 629c3c861b8..d1e01cdbe59 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h @@ -76,10 +76,10 @@ public: slobrok::api::IMirrorAPI &getMirror() { return *_mirror; } // Overrides IRoutingPolicy. - void select(mbus::RoutingContext &ctx); + void select(mbus::RoutingContext &ctx) override; // Overrides IRoutingPolicy. - void merge(mbus::RoutingContext &ctx); + void merge(mbus::RoutingContext &ctx) override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h index 3686c5b6ca9..6a2a673807f 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h @@ -42,7 +42,7 @@ public: /** * Initializes the policy */ - virtual string init(); + virtual string init() override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h index b782abbef27..0541b784b1f 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h @@ -11,7 +11,7 @@ class LoadBalancerPolicy : public ExternSlobrokPolicy public: LoadBalancerPolicy(const string& param); - virtual void doSelect(mbus::RoutingContext &context); + virtual void doSelect(mbus::RoutingContext &context) override; /** Finds the TCP address of the target docproc. @@ -22,7 +22,7 @@ public: return _loadBalancer->getRecipient(lookup(context, _pattern)); } - virtual void merge(mbus::RoutingContext &context); + virtual void merge(mbus::RoutingContext &context) override; private: string _pattern; diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h index 49b8d195740..af63403a8b1 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h @@ -83,10 +83,10 @@ public: virtual ~LocalServicePolicy(); // Inherit doc from IRoutingPolicy. - virtual void select(mbus::RoutingContext &context); + virtual void select(mbus::RoutingContext &context) override; // Inherit doc from IRoutingPolicy. - virtual void merge(mbus::RoutingContext &context); + virtual void merge(mbus::RoutingContext &context) override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h index aee4e1bc071..d29439db50c 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h @@ -45,13 +45,13 @@ public: MessageTypePolicy(const config::ConfigUri & configUri); // Implements Subscriber. - void configure(std::unique_ptr<vespa::config::content::MessagetyperouteselectorpolicyConfig> cfg); + void configure(std::unique_ptr<vespa::config::content::MessagetyperouteselectorpolicyConfig> cfg) override; // Implements IRoutingPolicy. - void select(mbus::RoutingContext &context); + void select(mbus::RoutingContext &context) override; // Implements IRoutingPolicy. - void merge(mbus::RoutingContext &context); + void merge(mbus::RoutingContext &context) override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h index 7bd839f762c..3a3a22090f9 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h @@ -70,10 +70,10 @@ public: virtual ~RoundRobinPolicy(); // Inherit doc from IRoutingPolicy. - virtual void select(mbus::RoutingContext &context); + virtual void select(mbus::RoutingContext &context) override; // Inherit doc from IRoutingPolicy. - virtual void merge(mbus::RoutingContext &context); + virtual void merge(mbus::RoutingContext &context) override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h index 1b786a10696..ef6478e368a 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h @@ -42,10 +42,10 @@ public: virtual ~StoragePolicy(); // Inherit doc from IRoutingPolicy. - virtual void doSelect(mbus::RoutingContext &context); + virtual void doSelect(mbus::RoutingContext &context) override; // Inherit doc from IRoutingPolicy. - virtual void merge(mbus::RoutingContext &context); + virtual void merge(mbus::RoutingContext &context) override; void updateStateFromReply(WrongDistributionReply& reply); @@ -57,7 +57,7 @@ public: virtual void configure(std::unique_ptr<storage::lib::Distribution::DistributionConfig> config); - string init(); + string init() override; private: virtual string createConfigId(const string & clusterName) const; diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h index 03f5165eed3..49724785361 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h @@ -74,10 +74,10 @@ public: virtual ~SubsetServicePolicy(); // Inherit doc from IRoutingPolicy. - virtual void select(mbus::RoutingContext &context); + virtual void select(mbus::RoutingContext &context) override; // Inherit doc from IRoutingPolicy. - virtual void merge(mbus::RoutingContext &context); + virtual void merge(mbus::RoutingContext &context) override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h index 6e164ec6286..aed43b8b2e5 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h @@ -101,10 +101,10 @@ public: typedef std::shared_ptr<IRoutableFactory> SP; // Implements IRoutableFactory. - bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const; + bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; // Implements IRoutableFactory. - mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const; + mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; }; /** @@ -144,10 +144,10 @@ public: typedef std::shared_ptr<IRoutableFactory> SP; // Implements IRoutableFactory. - bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const; + bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; // Implements IRoutableFactory. - mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const; + mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; }; /** @@ -164,8 +164,8 @@ public: */ class FeedReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; virtual uint32_t getType() const = 0; }; @@ -177,113 +177,113 @@ public: class BatchDocumentUpdateMessageFactory : public DocumentMessageFactory { const document::DocumentTypeRepo &_repo; - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: BatchDocumentUpdateMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class BatchDocumentUpdateReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class CreateVisitorMessageFactory : public DocumentMessageFactory { const document::DocumentTypeRepo &_repo; protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: CreateVisitorMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class CreateVisitorReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class DestroyVisitorMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class DestroyVisitorReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class DocBlockMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class DocBlockReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class DocumentListMessageFactory : public DocumentMessageFactory { const document::DocumentTypeRepo &_repo; - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: DocumentListMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class DocumentListReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class DocumentSummaryMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class DocumentSummaryReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class EmptyBucketsMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class EmptyBucketsReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class GetBucketListMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class GetBucketListReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class GetBucketStateMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class GetBucketStateReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class GetDocumentMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class GetDocumentReplyFactory : public DocumentReplyFactory { const document::DocumentTypeRepo &_repo; - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &msg, vespalib::GrowableByteBuffer &buf) const override; public: GetDocumentReplyFactory(const document::DocumentTypeRepo &r) : _repo(r) {} @@ -291,39 +291,39 @@ public: class MapVisitorMessageFactory : public DocumentMessageFactory { const document::DocumentTypeRepo &_repo; protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: MapVisitorMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class MapVisitorReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class MultiOperationMessageFactory : public DocumentMessageFactory { document::DocumentTypeRepo::SP _repo; protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: MultiOperationMessageFactory(const document::DocumentTypeRepo::SP &r) : _repo(r) {} }; class MultiOperationReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class PutDocumentMessageFactory : public DocumentMessageFactory { protected: const document::DocumentTypeRepo &_repo; - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const { + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override { return decodeMessage<PutDocumentMessage>(this, buf); } - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: void decodeInto(PutDocumentMessage & msg, document::ByteBuffer & buf) const; PutDocumentMessageFactory(const document::DocumentTypeRepo &r) @@ -331,75 +331,75 @@ public: }; class PutDocumentReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class RemoveDocumentMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const { + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override { return decodeMessage<RemoveDocumentMessage>(this, buf); } - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: void decodeInto(RemoveDocumentMessage & msg, document::ByteBuffer & buf) const; }; class RemoveDocumentReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class RemoveLocationMessageFactory : public DocumentMessageFactory { const document::DocumentTypeRepo &_repo; - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: RemoveLocationMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class RemoveLocationReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class SearchResultMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class SearchResultReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class StatBucketMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class StatBucketReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class StatDocumentMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class StatDocumentReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class UpdateDocumentMessageFactory : public DocumentMessageFactory { protected: const document::DocumentTypeRepo &_repo; - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const { + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override { return decodeMessage<UpdateDocumentMessage>(this, buf); } - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: void decodeInto(UpdateDocumentMessage & msg, document::ByteBuffer & buf) const; UpdateDocumentMessageFactory(const document::DocumentTypeRepo &r) @@ -407,33 +407,33 @@ public: }; class UpdateDocumentReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class VisitorInfoMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class VisitorInfoReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class WrongDistributionReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; class QueryResultMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; class QueryResultReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; /////////////////////////////////////////////////////////////////////////// diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h index 7dc51e45a4f..bfa25c21d84 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h @@ -59,10 +59,10 @@ public: typedef std::shared_ptr<IRoutableFactory> SP; // Implements IRoutableFactory. - bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const; + bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; // Implements IRoutableFactory. - mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const; + mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; }; /** @@ -102,16 +102,16 @@ public: typedef std::shared_ptr<IRoutableFactory> SP; // Implements IRoutableFactory. - bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const; + bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; // Implements IRoutableFactory. - mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const; + mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; }; class DocumentIgnoredReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; }; /** @@ -128,8 +128,8 @@ public: */ class FeedReplyFactory : public DocumentReplyFactory { protected: - DocumentReply::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const; + DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override; virtual uint32_t getType() const = 0; }; @@ -142,8 +142,8 @@ public: class CreateVisitorMessageFactory : public DocumentMessageFactory { const document::DocumentTypeRepo &_repo; protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: CreateVisitorMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} @@ -151,8 +151,8 @@ public: class GetDocumentMessageFactory : public DocumentMessageFactory { protected: - DocumentMessage::UP doDecode(document::ByteBuffer &buf) const; - bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const; + DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; + bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; }; /////////////////////////////////////////////////////////////////////////// diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h index 281ab899aa6..3d9303cdf09 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h @@ -44,7 +44,7 @@ public: return decodeMessage<RemoveDocumentMessage>(this, buf); } - bool doEncode(const DocumentMessage & msg, vespalib::GrowableByteBuffer & buf) const; + bool doEncode(const DocumentMessage & msg, vespalib::GrowableByteBuffer & buf) const override; public: void decodeInto(RemoveDocumentMessage & msg, document::ByteBuffer & buf) const; }; @@ -56,7 +56,7 @@ public: return decodeMessage<UpdateDocumentMessage>(this, buf); } - bool doEncode(const DocumentMessage & msg, vespalib::GrowableByteBuffer & buf) const; + bool doEncode(const DocumentMessage & msg, vespalib::GrowableByteBuffer & buf) const override; public: void decodeInto(UpdateDocumentMessage & msg, document::ByteBuffer & buf) const; UpdateDocumentMessageFactory(const document::DocumentTypeRepo & r) : super::UpdateDocumentMessageFactory(r) {} diff --git a/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h b/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h index 75e9ef1ab18..906fc508bd7 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h +++ b/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h @@ -13,23 +13,23 @@ private: public: class AndPolicyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class StoragePolicyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class MessageTypePolicyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class ContentPolicyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class LoadBalancerPolicyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class DocumentRouteSelectorPolicyFactory : public IRoutingPolicyFactory { private: @@ -39,31 +39,31 @@ public: DocumentRouteSelectorPolicyFactory( const document::DocumentTypeRepo &repo, const string &configId); - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class ExternPolicyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class LocalServicePolicyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class RoundRobinPolicyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class SearchColumnPolicyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class SearchRowPolicyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class SubsetServicePolicyFactory : public IRoutingPolicyFactory { public: - mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const; + mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; }; |