diff options
author | Tor Egge <Tor.Egge@oath.com> | 2018-04-04 11:29:32 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2018-04-04 11:29:32 +0000 |
commit | 7902239839a6f34e12ed7aa0f2b7a65114f8ee68 (patch) | |
tree | dd4acdb69101c6eb844d3d09a033aa54e8b4a402 /documentapi | |
parent | 4af2908b7854cbec1ee8173cc4a821d0482a978e (diff) |
Use shared pointer to const DocumentTypeRepo.
Diffstat (limited to 'documentapi')
14 files changed, 19 insertions, 18 deletions
diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp index 077ea52e255..cd2820d8c05 100644 --- a/documentapi/src/tests/messagebus/messagebus_test.cpp +++ b/documentapi/src/tests/messagebus/messagebus_test.cpp @@ -3,6 +3,7 @@ #include <vespa/document/base/testdocrepo.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/document/fieldvalue/document.h> +#include <vespa/document/repo/documenttyperepo.h> #include <vespa/documentapi/documentapi.h> #include <vespa/documentapi/loadtypes/loadtypeset.h> #include <vespa/vdslib/state/clusterstate.h> @@ -16,7 +17,7 @@ using mbus::Routable; using mbus::IRoutingPolicy; class Test : public vespalib::TestApp { - DocumentTypeRepo::SP _repo; + std::shared_ptr<const DocumentTypeRepo> _repo; public: Test(); diff --git a/documentapi/src/tests/messages/messages50test.cpp b/documentapi/src/tests/messages/messages50test.cpp index 161f976c3d5..0346cadbf9b 100644 --- a/documentapi/src/tests/messages/messages50test.cpp +++ b/documentapi/src/tests/messages/messages50test.cpp @@ -4,6 +4,7 @@ #include <vespa/document/bucket/bucketidfactory.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/document/select/parser.h> +#include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/update/fieldpathupdates.h> #include <vespa/documentapi/documentapi.h> diff --git a/documentapi/src/tests/messages/messages52test.cpp b/documentapi/src/tests/messages/messages52test.cpp index 642fbc2fc41..eaf8bbec8c4 100644 --- a/documentapi/src/tests/messages/messages52test.cpp +++ b/documentapi/src/tests/messages/messages52test.cpp @@ -4,6 +4,7 @@ #include "messages52test.h" #include <vespa/documentapi/documentapi.h> +#include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/update/fieldpathupdates.h> #include <vespa/document/datatype/documenttype.h> diff --git a/documentapi/src/tests/messages/testbase.cpp b/documentapi/src/tests/messages/testbase.cpp index 8f2729964a6..02c180853d4 100644 --- a/documentapi/src/tests/messages/testbase.cpp +++ b/documentapi/src/tests/messages/testbase.cpp @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "testbase.h" +#include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/base/testdocrepo.h> #include <vespa/vespalib/util/exception.h> #include <fcntl.h> diff --git a/documentapi/src/tests/messages/testbase.h b/documentapi/src/tests/messages/testbase.h index 2a1bb61c761..e47858cda4b 100644 --- a/documentapi/src/tests/messages/testbase.h +++ b/documentapi/src/tests/messages/testbase.h @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/document/repo/documenttyperepo.h> #include <vespa/documentapi/messagebus/documentprotocol.h> #include <vespa/documentapi/loadtypes/loadtypeset.h> #include <vespa/messagebus/routable.h> @@ -23,7 +22,7 @@ typedef bool (TestBase::*TEST_METHOD_PT)(); * tests to it. */ class TestBase : public vespalib::TestApp { - const document::DocumentTypeRepo::SP _repo; + std::shared_ptr<const document::DocumentTypeRepo> _repo; protected: const string _dataPath; LoadTypeSet _loadTypes; @@ -46,7 +45,7 @@ protected: public: const document::DocumentTypeRepo &getTypeRepo() { return *_repo; } - const document::DocumentTypeRepo::SP &getTypeRepoSp() { return _repo; } + std::shared_ptr<const document::DocumentTypeRepo> &getTypeRepoSp() { return _repo; } bool testCoverage(const std::vector<uint32_t> &expected, const std::vector<uint32_t> &actual, bool report = false) const; bool writeFile(const string &filename, const mbus::Blob& blob) const; diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index 13c3323175a..7852136dfc7 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -21,6 +21,7 @@ #include <vespa/document/base/testdocrepo.h> #include <vespa/document/fieldvalue/longfieldvalue.h> #include <vespa/document/datatype/documenttype.h> +#include <vespa/document/repo/documenttyperepo.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/stringfmt.h> @@ -42,7 +43,7 @@ using std::make_shared; class Test : public vespalib::TestApp { private: LoadTypeSet _loadTypes; - DocumentTypeRepo::SP _repo; + std::shared_ptr<const DocumentTypeRepo> _repo; const DataType *_docType; private: @@ -669,7 +670,7 @@ createDocumentRouteSelectorConfigWithTwoRoutes() } std::unique_ptr<TestFrame> -createFrameWithTwoRoutes(DocumentTypeRepo::SP repo) +createFrameWithTwoRoutes(std::shared_ptr<const DocumentTypeRepo> repo) { auto result = std::make_unique<TestFrame>(repo); result->setHop(mbus::HopSpec("test", createDocumentRouteSelectorConfigWithTwoRoutes()) diff --git a/documentapi/src/tests/policies/testframe.cpp b/documentapi/src/tests/policies/testframe.cpp index 877e3164a8c..024a0c2fdaa 100644 --- a/documentapi/src/tests/policies/testframe.cpp +++ b/documentapi/src/tests/policies/testframe.cpp @@ -61,7 +61,7 @@ public: } }; -TestFrame::TestFrame(const DocumentTypeRepo::SP &repo, const string &ident) : +TestFrame::TestFrame(const std::shared_ptr<const DocumentTypeRepo> &repo, const string &ident) : _identity(ident), _slobrok(new mbus::Slobrok()), _set(), diff --git a/documentapi/src/tests/policies/testframe.h b/documentapi/src/tests/policies/testframe.h index 9a43a7367ea..15ec61aff7b 100644 --- a/documentapi/src/tests/policies/testframe.h +++ b/documentapi/src/tests/policies/testframe.h @@ -9,7 +9,6 @@ #include <vespa/messagebus/testlib/receptor.h> #include <vespa/messagebus/testlib/slobrok.h> #include <vespa/documentapi/loadtypes/loadtypeset.h> -#include <vespa/document/repo/documenttyperepo.h> using documentapi::string; @@ -37,7 +36,7 @@ public: * * @param identity The identity to use for the server. */ - TestFrame(const document::DocumentTypeRepo::SP &repo, + TestFrame(const std::shared_ptr<const document::DocumentTypeRepo> &repo, const string &ident = "anonymous"); /** diff --git a/documentapi/src/tests/policyfactory/policyfactory.cpp b/documentapi/src/tests/policyfactory/policyfactory.cpp index f3dadab54ce..ef8c461ad02 100644 --- a/documentapi/src/tests/policyfactory/policyfactory.cpp +++ b/documentapi/src/tests/policyfactory/policyfactory.cpp @@ -78,7 +78,7 @@ Test::Main() { TEST_INIT("policyfactory_test"); - DocumentTypeRepo::SP repo(new DocumentTypeRepo); + std::shared_ptr<const DocumentTypeRepo> repo(new DocumentTypeRepo); mbus::Slobrok slobrok; LoadTypeSet loadTypes; mbus::TestServer diff --git a/documentapi/src/tests/routablefactory/routablefactory.cpp b/documentapi/src/tests/routablefactory/routablefactory.cpp index 7ab320c662d..1abecdbf6c5 100644 --- a/documentapi/src/tests/routablefactory/routablefactory.cpp +++ b/documentapi/src/tests/routablefactory/routablefactory.cpp @@ -83,7 +83,7 @@ protected: /////////////////////////////////////////////////////////////////////////////// class TestData { - const DocumentTypeRepo::SP _repo; + const std::shared_ptr<const DocumentTypeRepo> _repo; public: mbus::Slobrok _slobrok; diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp index fa3a8280f95..d92fbdfb941 100644 --- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp @@ -24,7 +24,7 @@ namespace documentapi { const mbus::string DocumentProtocol::NAME = "document"; DocumentProtocol::DocumentProtocol(const LoadTypeSet& loadTypes, - DocumentTypeRepo::SP repo, + std::shared_ptr<const DocumentTypeRepo> repo, const string &configId) : _routingPolicyRepository(new RoutingPolicyRepository()), _routableRepository(new RoutableRepository(loadTypes)), diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h index aea3f390c71..0a6c10ace77 100644 --- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h +++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h @@ -29,7 +29,7 @@ private: std::unique_ptr<RoutingPolicyRepository> _routingPolicyRepository; std::unique_ptr<RoutableRepository> _routableRepository; std::unique_ptr<SystemState> _systemState; - std::shared_ptr<document::DocumentTypeRepo> _repo; + std::shared_ptr<const document::DocumentTypeRepo> _repo; public: /** @@ -199,7 +199,7 @@ public: * @param configId The id to use when subscribing to config. */ DocumentProtocol(const LoadTypeSet& loadTypes, - std::shared_ptr<document::DocumentTypeRepo> repo, + std::shared_ptr<const document::DocumentTypeRepo> repo, const string &configId = ""); ~DocumentProtocol(); diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h index 37a7f6d7e61..e052eff78c3 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h @@ -6,9 +6,6 @@ #include <vespa/documentapi/messagebus/messages/putdocumentmessage.h> #include <vespa/documentapi/messagebus/messages/removedocumentmessage.h> #include <vespa/documentapi/messagebus/messages/updatedocumentmessage.h> -#include <vespa/document/repo/documenttyperepo.h> - - namespace document { class DocumentTypeRepo; } diff --git a/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h b/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h index 003768aedda..05202ad0de9 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h +++ b/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h @@ -3,7 +3,8 @@ #include "iroutingpolicyfactory.h" #include <vespa/documentapi/messagebus/systemstate/systemstate.h> -#include <vespa/document/repo/documenttyperepo.h> + +namespace document { class DocumentTypeRepo; } namespace documentapi { |