From cc3fed3668a80616ec78bc872e21b7ac06bcde38 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 9 Apr 2015 15:21:06 +0200 Subject: Renamed Akonadi::Domain to Akonadi::ApplicationDomain Because it's really the application domain and not the akonadi domain. --- common/clientapi.cpp | 2 +- common/clientapi.h | 36 ++++++++++++++++++------------------ common/domain/event.fbs | 2 +- common/domainadaptor.h | 4 ++-- common/test/clientapitest.cpp | 18 +++++++++--------- dummyresource/domainadaptor.cpp | 25 +++++++++++-------------- dummyresource/domainadaptor.h | 6 +++--- dummyresource/facade.cpp | 29 +++++++++++++++-------------- dummyresource/facade.h | 14 +++++++------- dummyresource/resourcefactory.cpp | 2 +- synchronizer/listener.cpp | 2 +- tests/domainadaptortest.cpp | 36 ++++++++++++++++++------------------ tests/dummyresourcebenchmark.cpp | 10 +++++----- tests/dummyresourcetest.cpp | 20 ++++++++++---------- 14 files changed, 102 insertions(+), 104 deletions(-) diff --git a/common/clientapi.cpp b/common/clientapi.cpp index 0281b79..48de1b0 100644 --- a/common/clientapi.cpp +++ b/common/clientapi.cpp @@ -14,7 +14,7 @@ namespace async namespace Akonadi2 { -namespace Domain +namespace ApplicationDomain { template<> diff --git a/common/clientapi.h b/common/clientapi.h index 37fb185..5182547 100644 --- a/common/clientapi.h +++ b/common/clientapi.h @@ -163,7 +163,7 @@ namespace async { namespace Akonadi2 { /** - * Standardized Domain Types + * Standardized Application Domain Types * * They don't adhere to any standard and can be freely extended * Their sole purpose is providing a standardized interface to access data. @@ -172,7 +172,7 @@ namespace Akonadi2 { * * These types will be frequently modified (for every new feature that should be exposed to the any client) */ -namespace Domain { +namespace ApplicationDomain { /** * This class has to be implemented by resources and can be used as generic interface to access the buffer properties @@ -215,14 +215,14 @@ private: * * provide a unified interface to read buffers (for zero-copy reading) * * record changes to generate changesets for modifications */ -class AkonadiDomainType { +class ApplicationDomainType { public: - AkonadiDomainType() + ApplicationDomainType() :mAdaptor(new MemoryBufferAdaptor()) { } - AkonadiDomainType(const QByteArray &resourceName, const QByteArray &identifier, qint64 revision, const QSharedPointer &adaptor) + ApplicationDomainType(const QByteArray &resourceName, const QByteArray &identifier, qint64 revision, const QSharedPointer &adaptor) : mAdaptor(adaptor), mResourceName(resourceName), mIdentifier(identifier), @@ -230,7 +230,7 @@ public: { } - virtual ~AkonadiDomainType() {} + virtual ~ApplicationDomainType() {} virtual QVariant getProperty(const QByteArray &key) const { return mAdaptor->getProperty(key); } virtual void setProperty(const QByteArray &key, const QVariant &value){ mChangeSet.insert(key, value); mAdaptor->setProperty(key, value); } @@ -246,25 +246,25 @@ private: qint64 mRevision; }; -struct Event : public AkonadiDomainType { +struct Event : public ApplicationDomainType { typedef QSharedPointer Ptr; - using AkonadiDomainType::AkonadiDomainType; + using ApplicationDomainType::ApplicationDomainType; }; -struct Todo : public AkonadiDomainType { +struct Todo : public ApplicationDomainType { typedef QSharedPointer Ptr; - using AkonadiDomainType::AkonadiDomainType; + using ApplicationDomainType::ApplicationDomainType; }; -struct Calendar : public AkonadiDomainType { +struct Calendar : public ApplicationDomainType { typedef QSharedPointer Ptr; - using AkonadiDomainType::AkonadiDomainType; + using ApplicationDomainType::ApplicationDomainType; }; -class Mail : public AkonadiDomainType { +class Mail : public ApplicationDomainType { }; -class Folder : public AkonadiDomainType { +class Folder : public ApplicationDomainType { }; /** @@ -331,7 +331,7 @@ template class StoreFacade { public: virtual ~StoreFacade(){}; - QByteArray type() const { return Domain::getTypeName(); } + QByteArray type() const { return ApplicationDomain::getTypeName(); } virtual Async::Job create(const DomainType &domainObject) = 0; virtual Async::Job modify(const DomainType &domainObject) = 0; virtual Async::Job remove(const DomainType &domainObject) = 0; @@ -362,7 +362,7 @@ public: template void registerFacade(const QByteArray &resource) { - const QByteArray typeName = Domain::getTypeName(); + const QByteArray typeName = ApplicationDomain::getTypeName(); mFacadeRegistry.insert(key(resource, typeName), [](){ return new Facade; }); } @@ -378,14 +378,14 @@ public: template void registerFacade(const QByteArray &resource, const std::function &customFactoryFunction) { - const QByteArray typeName = Domain::getTypeName(); + const QByteArray typeName = ApplicationDomain::getTypeName(); mFacadeRegistry.insert(key(resource, typeName), customFactoryFunction); } template QSharedPointer > getFacade(const QByteArray &resource) { - const QByteArray typeName = Domain::getTypeName(); + const QByteArray typeName = ApplicationDomain::getTypeName(); auto factoryFunction = mFacadeRegistry.value(key(resource, typeName)); if (factoryFunction) { return QSharedPointer >(static_cast* >(factoryFunction())); diff --git a/common/domain/event.fbs b/common/domain/event.fbs index 49ff270..0c6628b 100644 --- a/common/domain/event.fbs +++ b/common/domain/event.fbs @@ -1,4 +1,4 @@ -namespace Akonadi2.Domain.Buffer; +namespace Akonadi2.ApplicationDomain.Buffer; table Event { uid:string; diff --git a/common/domainadaptor.h b/common/domainadaptor.h index 692c8c1..df3f8e5 100644 --- a/common/domainadaptor.h +++ b/common/domainadaptor.h @@ -68,8 +68,8 @@ class DomainTypeAdaptorFactory/* createAdaptor(const Akonadi2::Entity &entity) = 0; - virtual void createBuffer(const Akonadi2::Domain::Event &event, flatbuffers::FlatBufferBuilder &fbb) {}; + virtual QSharedPointer createAdaptor(const Akonadi2::Entity &entity) = 0; + virtual void createBuffer(const Akonadi2::ApplicationDomain::Event &event, flatbuffers::FlatBufferBuilder &fbb) {}; protected: QSharedPointer > mLocalMapper; diff --git a/common/test/clientapitest.cpp b/common/test/clientapitest.cpp index c9e4d6d..24b3fb9 100644 --- a/common/test/clientapitest.cpp +++ b/common/test/clientapitest.cpp @@ -4,14 +4,14 @@ #include "../clientapi.h" -class DummyResourceFacade : public Akonadi2::StoreFacade +class DummyResourceFacade : public Akonadi2::StoreFacade { public: ~DummyResourceFacade(){}; - virtual Async::Job create(const Akonadi2::Domain::Event &domainObject){ return Async::null(); }; - virtual Async::Job modify(const Akonadi2::Domain::Event &domainObject){ return Async::null(); }; - virtual Async::Job remove(const Akonadi2::Domain::Event &domainObject){ return Async::null(); }; - virtual Async::Job load(const Akonadi2::Query &query, const std::function &resultCallback) + virtual Async::Job create(const Akonadi2::ApplicationDomain::Event &domainObject){ return Async::null(); }; + virtual Async::Job modify(const Akonadi2::ApplicationDomain::Event &domainObject){ return Async::null(); }; + virtual Async::Job remove(const Akonadi2::ApplicationDomain::Event &domainObject){ return Async::null(); }; + virtual Async::Job load(const Akonadi2::Query &query, const std::function &resultCallback) { return Async::start([this, resultCallback](Async::Future &future) { qDebug() << "load called"; @@ -22,7 +22,7 @@ public: }); } - QList results; + QList results; }; class ClientAPITest : public QObject @@ -33,14 +33,14 @@ private Q_SLOTS: void testLoad() { DummyResourceFacade facade; - facade.results << QSharedPointer::create("resource", "id", 0, QSharedPointer()); + facade.results << QSharedPointer::create("resource", "id", 0, QSharedPointer()); - Akonadi2::FacadeFactory::instance().registerFacade("dummyresource", [facade](){ return new DummyResourceFacade(facade); }); + Akonadi2::FacadeFactory::instance().registerFacade("dummyresource", [facade](){ return new DummyResourceFacade(facade); }); Akonadi2::Query query; query.resources << "dummyresource"; - async::SyncListResult result(Akonadi2::Store::load(query)); + async::SyncListResult result(Akonadi2::Store::load(query)); result.exec(); QCOMPARE(result.size(), 1); } diff --git a/dummyresource/domainadaptor.cpp b/dummyresource/domainadaptor.cpp index 865a4c0..b133614 100644 --- a/dummyresource/domainadaptor.cpp +++ b/dummyresource/domainadaptor.cpp @@ -14,11 +14,8 @@ using namespace DummyCalendar; using namespace flatbuffers; -using namespace DummyCalendar; -using namespace flatbuffers; - //This will become a generic implementation that simply takes the resource buffer and local buffer pointer -class DummyEventAdaptor : public Akonadi2::Domain::BufferAdaptor +class DummyEventAdaptor : public Akonadi2::ApplicationDomain::BufferAdaptor { public: DummyEventAdaptor() @@ -55,10 +52,10 @@ public: return props; } - Akonadi2::Domain::Buffer::Event const *mLocalBuffer; + Akonadi2::ApplicationDomain::Buffer::Event const *mLocalBuffer; DummyEvent const *mResourceBuffer; - QSharedPointer > mLocalMapper; + QSharedPointer > mLocalMapper; QSharedPointer > mResourceMapper; }; @@ -73,14 +70,14 @@ DummyEventAdaptorFactory::DummyEventAdaptorFactory() } return QVariant(); }); - mLocalMapper = QSharedPointer >::create(); - mLocalMapper->mReadAccessors.insert("summary", [](Akonadi2::Domain::Buffer::Event const *buffer) -> QVariant { + mLocalMapper = QSharedPointer >::create(); + mLocalMapper->mReadAccessors.insert("summary", [](Akonadi2::ApplicationDomain::Buffer::Event const *buffer) -> QVariant { if (buffer->summary()) { return QString::fromStdString(buffer->summary()->c_str()); } return QVariant(); }); - mLocalMapper->mReadAccessors.insert("uid", [](Akonadi2::Domain::Buffer::Event const *buffer) -> QVariant { + mLocalMapper->mReadAccessors.insert("uid", [](Akonadi2::ApplicationDomain::Buffer::Event const *buffer) -> QVariant { if (buffer->uid()) { return QString::fromStdString(buffer->uid()->c_str()); } @@ -90,10 +87,10 @@ DummyEventAdaptorFactory::DummyEventAdaptorFactory() } //TODO pass EntityBuffer instead? -QSharedPointer DummyEventAdaptorFactory::createAdaptor(const Akonadi2::Entity &entity) +QSharedPointer DummyEventAdaptorFactory::createAdaptor(const Akonadi2::Entity &entity) { const auto resourceBuffer = Akonadi2::EntityBuffer::readBuffer(entity.resource()); - const auto localBuffer = Akonadi2::EntityBuffer::readBuffer(entity.local()); + const auto localBuffer = Akonadi2::EntityBuffer::readBuffer(entity.local()); // const auto metadataBuffer = Akonadi2::EntityBuffer::readBuffer(entity.metadata()); auto adaptor = QSharedPointer::create(); @@ -104,7 +101,7 @@ QSharedPointer DummyEventAdaptorFactory::create return adaptor; } -void DummyEventAdaptorFactory::createBuffer(const Akonadi2::Domain::Event &event, flatbuffers::FlatBufferBuilder &fbb) +void DummyEventAdaptorFactory::createBuffer(const Akonadi2::ApplicationDomain::Event &event, flatbuffers::FlatBufferBuilder &fbb) { flatbuffers::FlatBufferBuilder eventFbb; eventFbb.Clear(); @@ -119,10 +116,10 @@ void DummyEventAdaptorFactory::createBuffer(const Akonadi2::Domain::Event &event flatbuffers::FlatBufferBuilder localFbb; { auto uid = localFbb.CreateString(event.getProperty("uid").toString().toStdString()); - auto localBuilder = Akonadi2::Domain::Buffer::EventBuilder(localFbb); + auto localBuilder = Akonadi2::ApplicationDomain::Buffer::EventBuilder(localFbb); localBuilder.add_uid(uid); auto location = localBuilder.Finish(); - Akonadi2::Domain::Buffer::FinishEventBuffer(localFbb, location); + Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(localFbb, location); } Akonadi2::EntityBuffer::assembleEntityBuffer(fbb, 0, 0, eventFbb.GetBufferPointer(), eventFbb.GetSize(), localFbb.GetBufferPointer(), localFbb.GetSize()); diff --git a/dummyresource/domainadaptor.h b/dummyresource/domainadaptor.h index a2fb8a9..143121a 100644 --- a/dummyresource/domainadaptor.h +++ b/dummyresource/domainadaptor.h @@ -5,11 +5,11 @@ #include "dummycalendar_generated.h" #include "entity_generated.h" -class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory +class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory { public: DummyEventAdaptorFactory(); virtual ~DummyEventAdaptorFactory() {}; - virtual QSharedPointer createAdaptor(const Akonadi2::Entity &entity); - virtual void createBuffer(const Akonadi2::Domain::Event &event, flatbuffers::FlatBufferBuilder &fbb); + virtual QSharedPointer createAdaptor(const Akonadi2::Entity &entity); + virtual void createBuffer(const Akonadi2::ApplicationDomain::Event &event, flatbuffers::FlatBufferBuilder &fbb); }; diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp index 7c64675..980833f 100644 --- a/dummyresource/facade.cpp +++ b/dummyresource/facade.cpp @@ -38,7 +38,7 @@ using namespace flatbuffers; DummyResourceFacade::DummyResourceFacade() - : Akonadi2::GenericFacade("org.kde.dummy"), + : Akonadi2::GenericFacade("org.kde.dummy"), mFactory(new DummyEventAdaptorFactory) { } @@ -47,30 +47,30 @@ DummyResourceFacade::~DummyResourceFacade() { } -Async::Job DummyResourceFacade::create(const Akonadi2::Domain::Event &domainObject) +Async::Job DummyResourceFacade::create(const Akonadi2::ApplicationDomain::Event &domainObject) { flatbuffers::FlatBufferBuilder entityFbb; mFactory->createBuffer(domainObject, entityFbb); return sendCreateCommand("event", QByteArray::fromRawData(reinterpret_cast(entityFbb.GetBufferPointer()), entityFbb.GetSize())); } -Async::Job DummyResourceFacade::modify(const Akonadi2::Domain::Event &domainObject) +Async::Job DummyResourceFacade::modify(const Akonadi2::ApplicationDomain::Event &domainObject) { //Create message buffer and send to resource return Async::null(); } -Async::Job DummyResourceFacade::remove(const Akonadi2::Domain::Event &domainObject) +Async::Job DummyResourceFacade::remove(const Akonadi2::ApplicationDomain::Event &domainObject) { //Create message buffer and send to resource return Async::null(); } -static std::function prepareQuery(const Akonadi2::Query &query) +static std::function prepareQuery(const Akonadi2::Query &query) { //Compose some functions to make query matching fast. //This way we can process the query once, and convert all values into something that can be compared quickly - std::function preparedQuery; + std::function preparedQuery; if (!query.ids.isEmpty()) { //Match by id //TODO: for id's a direct lookup would be way faster @@ -81,7 +81,7 @@ static std::functionuid() && (QByteArray::fromRawData(local->uid()->c_str(), local->uid()->size()) == uid)) { return true; } @@ -99,14 +99,14 @@ static std::function storage, const QByteArray &key, const std::function &resultCallback, std::function preparedQuery) +void DummyResourceFacade::readValue(QSharedPointer storage, const QByteArray &key, const std::function &resultCallback, std::function preparedQuery) { storage->scan(key, [=](void *keyValue, int keySize, void *dataValue, int dataSize) -> bool { @@ -119,7 +119,7 @@ void DummyResourceFacade::readValue(QSharedPointer storage, c Akonadi2::EntityBuffer buffer(dataValue, dataSize); const auto resourceBuffer = Akonadi2::EntityBuffer::readBuffer(buffer.entity().resource()); - const auto localBuffer = Akonadi2::EntityBuffer::readBuffer(buffer.entity().local()); + const auto localBuffer = Akonadi2::EntityBuffer::readBuffer(buffer.entity().local()); const auto metadataBuffer = Akonadi2::EntityBuffer::readBuffer(buffer.entity().metadata()); if (!resourceBuffer || !metadataBuffer) { @@ -135,8 +135,8 @@ void DummyResourceFacade::readValue(QSharedPointer storage, c //Not i.e. for tags that are stored as flags in each entity of an imap store. auto adaptor = mFactory->createAdaptor(buffer.entity()); //TODO only copy requested properties - auto memoryAdaptor = QSharedPointer::create(*adaptor); - auto event = QSharedPointer::create("org.kde.dummy", QByteArray::fromRawData(static_cast(keyValue), keySize), revision, memoryAdaptor); + auto memoryAdaptor = QSharedPointer::create(*adaptor); + auto event = QSharedPointer::create("org.kde.dummy", QByteArray::fromRawData(static_cast(keyValue), keySize), revision, memoryAdaptor); resultCallback(event); } return true; @@ -146,7 +146,7 @@ void DummyResourceFacade::readValue(QSharedPointer storage, c }); } -Async::Job DummyResourceFacade::load(const Akonadi2::Query &query, const std::function &resultCallback) +Async::Job DummyResourceFacade::load(const Akonadi2::Query &query, const std::function &resultCallback) { return synchronizeResource(query.syncOnDemand, query.processAll).then([=](Async::Future &future) { //Now that the sync is complete we can execute the query @@ -154,6 +154,7 @@ Async::Job DummyResourceFacade::load(const Akonadi2::Query &query, const s auto storage = QSharedPointer::create(Akonadi2::Store::storageLocation(), "org.kde.dummy"); + //Index lookups QVector keys; if (query.propertyFilter.contains("uid")) { static Index uidIndex(Akonadi2::Store::storageLocation(), "org.kde.dummy.index.uid", Akonadi2::Storage::ReadOnly); diff --git a/dummyresource/facade.h b/dummyresource/facade.h index 195c50f..7bef2cc 100644 --- a/dummyresource/facade.h +++ b/dummyresource/facade.h @@ -29,17 +29,17 @@ #include "dummycalendar_generated.h" #include "common/domainadaptor.h" -class DummyResourceFacade : public Akonadi2::GenericFacade +class DummyResourceFacade : public Akonadi2::GenericFacade { public: DummyResourceFacade(); virtual ~DummyResourceFacade(); - virtual Async::Job create(const Akonadi2::Domain::Event &domainObject); - virtual Async::Job modify(const Akonadi2::Domain::Event &domainObject); - virtual Async::Job remove(const Akonadi2::Domain::Event &domainObject); - virtual Async::Job load(const Akonadi2::Query &query, const std::function &resultCallback); + virtual Async::Job create(const Akonadi2::ApplicationDomain::Event &domainObject); + virtual Async::Job modify(const Akonadi2::ApplicationDomain::Event &domainObject); + virtual Async::Job remove(const Akonadi2::ApplicationDomain::Event &domainObject); + virtual Async::Job load(const Akonadi2::Query &query, const std::function &resultCallback); private: - void readValue(QSharedPointer storage, const QByteArray &key, const std::function &resultCallback, std::function); - QSharedPointer > mFactory; + void readValue(QSharedPointer storage, const QByteArray &key, const std::function &resultCallback, std::function); + QSharedPointer > mFactory; }; diff --git a/dummyresource/resourcefactory.cpp b/dummyresource/resourcefactory.cpp index ea37466..04413c2 100644 --- a/dummyresource/resourcefactory.cpp +++ b/dummyresource/resourcefactory.cpp @@ -416,7 +416,7 @@ Akonadi2::Resource *DummyResourceFactory::createResource() void DummyResourceFactory::registerFacades(Akonadi2::FacadeFactory &factory) { - factory.registerFacade(PLUGIN_NAME); + factory.registerFacade(PLUGIN_NAME); } #include "resourcefactory.moc" diff --git a/synchronizer/listener.cpp b/synchronizer/listener.cpp index 00d9207..7481537 100644 --- a/synchronizer/listener.cpp +++ b/synchronizer/listener.cpp @@ -365,7 +365,7 @@ void Listener::loadResource() Log() << QString("Resource factory: %1").arg((qlonglong)resourceFactory); Log() << QString("\tResource: %1").arg((qlonglong)m_resource); //TODO: this doesn't really list all the facades .. fix - Log() << "\tFacades: " << Akonadi2::FacadeFactory::instance().getFacade(m_resourceName)->type(); + Log() << "\tFacades: " << Akonadi2::FacadeFactory::instance().getFacade(m_resourceName)->type(); m_resource->configurePipeline(m_pipeline); } else { Error() << "Failed to load resource " << m_resourceName; diff --git a/tests/domainadaptortest.cpp b/tests/domainadaptortest.cpp index e45a9a3..9cc3938 100644 --- a/tests/domainadaptortest.cpp +++ b/tests/domainadaptortest.cpp @@ -13,11 +13,11 @@ #include "metadata_generated.h" #include "entity_generated.h" -class TestEventAdaptor : public Akonadi2::Domain::BufferAdaptor +class TestEventAdaptor : public Akonadi2::ApplicationDomain::BufferAdaptor { public: TestEventAdaptor() - : Akonadi2::Domain::BufferAdaptor() + : Akonadi2::ApplicationDomain::BufferAdaptor() { } @@ -40,20 +40,20 @@ public: return QVariant(); } - Akonadi2::Domain::Buffer::Event const *mLocalBuffer; - Akonadi2::Domain::Buffer::Event const *mResourceBuffer; + Akonadi2::ApplicationDomain::Buffer::Event const *mLocalBuffer; + Akonadi2::ApplicationDomain::Buffer::Event const *mResourceBuffer; - QSharedPointer > mLocalMapper; - QSharedPointer > mResourceMapper; + QSharedPointer > mLocalMapper; + QSharedPointer > mResourceMapper; }; -class TestFactory : public DomainTypeAdaptorFactory +class TestFactory : public DomainTypeAdaptorFactory { public: TestFactory() { - mResourceMapper = QSharedPointer >::create(); - mResourceMapper->mReadAccessors.insert("summary", [](Akonadi2::Domain::Buffer::Event const *buffer) -> QVariant { + mResourceMapper = QSharedPointer >::create(); + mResourceMapper->mReadAccessors.insert("summary", [](Akonadi2::ApplicationDomain::Buffer::Event const *buffer) -> QVariant { if (buffer->summary()) { return QString::fromStdString(buffer->summary()->c_str()); } @@ -61,13 +61,13 @@ public: }); } - virtual QSharedPointer createAdaptor(const Akonadi2::Entity &entity) + virtual QSharedPointer createAdaptor(const Akonadi2::Entity &entity) { - Akonadi2::Domain::Buffer::Event const *resourceBuffer = 0; + Akonadi2::ApplicationDomain::Buffer::Event const *resourceBuffer = 0; if (auto resourceData = entity.resource()) { flatbuffers::Verifier verifyer(resourceData->Data(), resourceData->size()); - if (Akonadi2::Domain::Buffer::VerifyEventBuffer(verifyer)) { - resourceBuffer = Akonadi2::Domain::Buffer::GetEvent(resourceData->Data()); + if (Akonadi2::ApplicationDomain::Buffer::VerifyEventBuffer(verifyer)) { + resourceBuffer = Akonadi2::ApplicationDomain::Buffer::GetEvent(resourceData->Data()); if (resourceBuffer->summary()) { qDebug() << QString::fromStdString(std::string(resourceBuffer->summary()->c_str())); } @@ -82,11 +82,11 @@ public: // } // } - Akonadi2::Domain::Buffer::Event const *localBuffer = 0; + Akonadi2::ApplicationDomain::Buffer::Event const *localBuffer = 0; if (auto localData = entity.local()) { flatbuffers::Verifier verifyer(localData->Data(), localData->size()); - if (Akonadi2::Domain::Buffer::VerifyEventBuffer(verifyer)) { - localBuffer = Akonadi2::Domain::Buffer::GetEvent(localData); + if (Akonadi2::ApplicationDomain::Buffer::VerifyEventBuffer(verifyer)) { + localBuffer = Akonadi2::ApplicationDomain::Buffer::GetEvent(localData); } } @@ -127,12 +127,12 @@ private Q_SLOTS: static uint8_t rawData[100]; auto attachment = m_fbb.CreateVector(rawData, 100); - auto builder = Akonadi2::Domain::Buffer::EventBuilder(m_fbb); + auto builder = Akonadi2::ApplicationDomain::Buffer::EventBuilder(m_fbb); builder.add_summary(summary); builder.add_description(description); builder.add_attachment(attachment); auto buffer = builder.Finish(); - Akonadi2::Domain::Buffer::FinishEventBuffer(m_fbb, buffer); + Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(m_fbb, buffer); flatbuffers::FlatBufferBuilder fbb; Akonadi2::EntityBuffer::assembleEntityBuffer(fbb, metadataFbb.GetBufferPointer(), metadataFbb.GetSize(), m_fbb.GetBufferPointer(), m_fbb.GetSize(), m_fbb.GetBufferPointer(), m_fbb.GetSize()); diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp index 308a4e8..ea3f556 100644 --- a/tests/dummyresourcebenchmark.cpp +++ b/tests/dummyresourcebenchmark.cpp @@ -47,11 +47,11 @@ private Q_SLOTS: time.start(); int num = 10000; for (int i = 0; i < num; i++) { - Akonadi2::Domain::Event event; + Akonadi2::ApplicationDomain::Event event; event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); event.setProperty("summary", "summaryValue"); - Akonadi2::Store::create(event, "org.kde.dummy"); + Akonadi2::Store::create(event, "org.kde.dummy"); } auto appendTime = time.elapsed(); @@ -63,7 +63,7 @@ private Q_SLOTS: query.processAll = true; query.propertyFilter.insert("uid", "nonexistantuid"); - async::SyncListResult result(Akonadi2::Store::load(query)); + async::SyncListResult result(Akonadi2::Store::load(query)); result.exec(); } auto allProcessedTime = time.elapsed(); @@ -77,7 +77,7 @@ private Q_SLOTS: query.processAll = false; query.propertyFilter.insert("uid", "testuid"); - async::SyncListResult result(Akonadi2::Store::load(query)); + async::SyncListResult result(Akonadi2::Store::load(query)); result.exec(); QCOMPARE(result.size(), num); } @@ -146,7 +146,7 @@ private Q_SLOTS: } void testCreateCommand() { - Akonadi2::Domain::Event event; + Akonadi2::ApplicationDomain::Event event; QBENCHMARK { auto mFactory = new DummyEventAdaptorFactory; diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp index b185664..5fed7cd 100644 --- a/tests/dummyresourcetest.cpp +++ b/tests/dummyresourcetest.cpp @@ -49,26 +49,26 @@ private Q_SLOTS: eventFbb.Clear(); { auto summary = eventFbb.CreateString("summary"); - Akonadi2::Domain::Buffer::EventBuilder eventBuilder(eventFbb); + Akonadi2::ApplicationDomain::Buffer::EventBuilder eventBuilder(eventFbb); eventBuilder.add_summary(summary); auto eventLocation = eventBuilder.Finish(); - Akonadi2::Domain::Buffer::FinishEventBuffer(eventFbb, eventLocation); + Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(eventFbb, eventLocation); } flatbuffers::FlatBufferBuilder localFbb; { auto uid = localFbb.CreateString("testuid"); - auto localBuilder = Akonadi2::Domain::Buffer::EventBuilder(localFbb); + auto localBuilder = Akonadi2::ApplicationDomain::Buffer::EventBuilder(localFbb); localBuilder.add_uid(uid); auto location = localBuilder.Finish(); - Akonadi2::Domain::Buffer::FinishEventBuffer(localFbb, location); + Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(localFbb, location); } flatbuffers::FlatBufferBuilder entityFbb; Akonadi2::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, eventFbb.GetBufferPointer(), eventFbb.GetSize(), localFbb.GetBufferPointer(), localFbb.GetSize()); flatbuffers::FlatBufferBuilder fbb; - auto type = fbb.CreateString(Akonadi2::Domain::getTypeName().toStdString().data()); + auto type = fbb.CreateString(Akonadi2::ApplicationDomain::getTypeName().toStdString().data()); auto delta = fbb.CreateVector(entityFbb.GetBufferPointer(), entityFbb.GetSize()); Akonadi2::Commands::CreateEntityBuilder builder(fbb); builder.add_domainType(type); @@ -98,18 +98,18 @@ private Q_SLOTS: void testProperty() { - Akonadi2::Domain::Event event; + Akonadi2::ApplicationDomain::Event event; event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); } void testWriteToFacadeAndQueryByUid() { - Akonadi2::Domain::Event event; + Akonadi2::ApplicationDomain::Event event; event.setProperty("uid", "testuid"); QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid")); event.setProperty("summary", "summaryValue"); - Akonadi2::Store::create(event, "org.kde.dummy"); + Akonadi2::Store::create(event, "org.kde.dummy"); Akonadi2::Query query; query.resources << "org.kde.dummy"; @@ -117,7 +117,7 @@ private Q_SLOTS: query.processAll = true; query.propertyFilter.insert("uid", "testuid"); - async::SyncListResult result(Akonadi2::Store::load(query)); + async::SyncListResult result(Akonadi2::Store::load(query)); result.exec(); QCOMPARE(result.size(), 1); auto value = result.first(); @@ -147,7 +147,7 @@ private Q_SLOTS: query.syncOnDemand = true; query.processAll = true; - async::SyncListResult result(Akonadi2::Store::load(query)); + async::SyncListResult result(Akonadi2::Store::load(query)); result.exec(); QVERIFY(!result.isEmpty()); auto value = result.first(); -- cgit v1.2.3