diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-06 16:21:07 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:46 +0100 |
commit | 738913b64e69db175491dece5ccab5c3199e69f9 (patch) | |
tree | ecb5d3c039d2b147f6ee918005a5bf0ac64009ec /persistence | |
parent | e45ac38beb6629683b8dee78d17ebd6aeac48215 (diff) |
Avoid pulling in confige everywhere through documenttypes config.
Diffstat (limited to 'persistence')
5 files changed, 12 insertions, 15 deletions
diff --git a/persistence/src/tests/dummyimpl/dummyimpltest.cpp b/persistence/src/tests/dummyimpl/dummyimpltest.cpp index 1215303f9e6..764eb08af83 100644 --- a/persistence/src/tests/dummyimpl/dummyimpltest.cpp +++ b/persistence/src/tests/dummyimpl/dummyimpltest.cpp @@ -13,10 +13,9 @@ namespace spi { struct DummyImplTest : public ConformanceTest { struct Factory : public PersistenceFactory { - + using Repo = document::DocumentTypeRepo; PersistenceProvider::UP - getPersistenceImplementation(const document::DocumentTypeRepo::SP& repo, - const document::DocumenttypesConfig&) { + getPersistenceImplementation(const Repo::SP& repo, const Repo::DocumenttypesConfig&) { return PersistenceProvider::UP(new dummy::DummyPersistence(repo, 4)); } diff --git a/persistence/src/tests/proxy/providerproxy_conformancetest.cpp b/persistence/src/tests/proxy/providerproxy_conformancetest.cpp index cd2f711ffd5..8fca5303a53 100644 --- a/persistence/src/tests/proxy/providerproxy_conformancetest.cpp +++ b/persistence/src/tests/proxy/providerproxy_conformancetest.cpp @@ -17,7 +17,7 @@ namespace { struct DummyFactory : Factory { PersistenceProvider::UP getPersistenceImplementation(const Repo::SP& repo, - const document::DocumenttypesConfig &) { + const Repo::DocumenttypesConfig &) { return PersistenceProvider::UP(new dummy::DummyPersistence(repo, 4)); } diff --git a/persistence/src/tests/proxy/proxy_factory_wrapper.h b/persistence/src/tests/proxy/proxy_factory_wrapper.h index 10f251f2beb..19f763201c4 100644 --- a/persistence/src/tests/proxy/proxy_factory_wrapper.h +++ b/persistence/src/tests/proxy/proxy_factory_wrapper.h @@ -40,10 +40,9 @@ struct ProxyFactoryWrapper : ConformanceTest::PersistenceFactory }; virtual Provider::UP - getPersistenceImplementation(const document::DocumentTypeRepo::SP &repo, - const document::DocumenttypesConfig &typesCfg) { - DummyProviderFactory::UP provider(new DummyProviderFactory(factory->getPersistenceImplementation(repo, - typesCfg))); + getPersistenceImplementation(const Repo::SP &repo, + const Repo::DocumenttypesConfig &typesCfg) override{ + DummyProviderFactory::UP provider(new DummyProviderFactory(factory->getPersistenceImplementation(repo, typesCfg))); Server::UP server(new Server(0, 8, *repo, *provider)); return Provider::UP(new Wrapper(std::move(provider), std::move(server), *repo)); } diff --git a/persistence/src/tests/proxy/proxyfactory.h b/persistence/src/tests/proxy/proxyfactory.h index 9de9a39e873..dd19a80dc35 100644 --- a/persistence/src/tests/proxy/proxyfactory.h +++ b/persistence/src/tests/proxy/proxyfactory.h @@ -19,15 +19,14 @@ namespace spi { **/ struct ProxyFactory : ConformanceTest::PersistenceFactory { - typedef storage::spi::PersistenceProvider Provider; - typedef storage::spi::ProviderProxy Client; - typedef document::DocumentTypeRepo Repo; + using Provider = storage::spi::PersistenceProvider; + using Client = storage::spi::ProviderProxy; + using Repo = document::DocumentTypeRepo; ProxyFactory() {} - virtual Provider::UP - getPersistenceImplementation(const document::DocumentTypeRepo::SP &repo, - const document::DocumenttypesConfig &) { + Provider::UP + getPersistenceImplementation(const Repo::SP &repo, const Repo::DocumenttypesConfig &) { return Provider::UP(new Client("tcp/localhost:3456", *repo)); } diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.h b/persistence/src/vespa/persistence/conformancetest/conformancetest.h index ff1127079d7..bd1899994a0 100644 --- a/persistence/src/vespa/persistence/conformancetest/conformancetest.h +++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.h @@ -78,7 +78,7 @@ struct ConformanceTest : public CppUnit::TestFixture { virtual ~PersistenceFactory() {} virtual PersistenceProvider::UP getPersistenceImplementation( const document::DocumentTypeRepo::SP &repo, - const document::DocumenttypesConfig &typesCfg) = 0; + const document::DocumentTypeRepo::DocumenttypesConfig &typesCfg) = 0; virtual void clear(void) |