1 files changed, 20 insertions, 28 deletions

diff --git a/dummyresource/resourcefactory.cpp b/dummyresource/resourcefactory.cpp
index dda34ef..8f0a2bd 100644
--- a/dummyresource/resourcefactory.cpp
+++ b/dummyresource/resourcefactory.cpp
@@ -191,7 +191,7 @@ private slots:
                             return;
                         }
                         auto queuedCommand = Akonadi2::GetQueuedCommand(ptr);
-                        qDebug() << "Dequeued: " << queuedCommand->commandId();
+                        Trace() << "Dequeued: " << queuedCommand->commandId();
                         //TODO JOBAPI: job lifetime management
                         //Right now we're just leaking jobs. In this case we'd like jobs that are heap allocated and delete
                         //themselves once done. In other cases we'd like jobs that only live as long as their handle though.
@@ -256,29 +256,18 @@ void DummyResource::configurePipeline(Akonadi2::Pipeline *pipeline)
     //Eventually the order should be self configuring, for now it's hardcoded.
     auto eventIndexer = new SimpleProcessor("summaryprocessor", [eventFactory](const Akonadi2::PipelineState &state, const Akonadi2::Entity &entity) {
         auto adaptor = eventFactory->createAdaptor(entity);
-        // qDebug() << "Summary preprocessor: " << adaptor->getProperty("summary").toString();
+        // Log() << "Summary preprocessor: " << adaptor->getProperty("summary").toString();
     });
 
     auto uidIndexer = new SimpleProcessor("uidIndexer", [eventFactory](const Akonadi2::PipelineState &state, const Akonadi2::Entity &entity) {
         static Index uidIndex(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/storage", "org.kde.dummy.index.uid", Akonadi2::Storage::ReadWrite);
 
+        //TODO: Benchmark if this is performance wise acceptable, or if we have to access the buffer directly
         auto adaptor = eventFactory->createAdaptor(entity);
         const auto uid = adaptor->getProperty("uid");
         if (uid.isValid()) {
             uidIndex.add(uid.toByteArray(), state.key());
         }
-
-        //TODO would this be worthwhile for performance reasons?
-        // flatbuffers::Verifier verifyer(entity.local()->Data(), entity.local()->size());
-        // if (!Akonadi2::Domain::Buffer::VerifyEventBuffer(verifyer)) {
-        //     qWarning() << "invalid local buffer";
-        //     return;
-        // }
-        // auto localEvent = Akonadi2::Domain::Buffer::GetEvent(entity.local()->Data());
-        // if (localEvent && localEvent->uid()) {
-        //     qDebug() << "got uid: " << QByteArray::fromRawData(reinterpret_cast<const char *>(localEvent->uid()->Data()), localEvent->uid()->size());
-        //     uidIndex.add(QByteArray::fromRawData(reinterpret_cast<const char *>(localEvent->uid()->Data()), localEvent->uid()->size()), state.key());
-        // }
     });
 
     //event is the entitytype and not the domain type
@@ -289,7 +278,7 @@ void DummyResource::configurePipeline(Akonadi2::Pipeline *pipeline)
 
 void DummyResource::onProcessorError(int errorCode, const QString &errorMessage)
 {
-    qWarning() << "Received error from Processor: " << errorCode << errorMessage;
+    Warning() << "Received error from Processor: " << errorCode << errorMessage;
     mError = errorCode;
 }
 
@@ -325,11 +314,8 @@ void findByRemoteId(QSharedPointer<Akonadi2::Storage> storage, const QString &ri
 void DummyResource::enqueueCommand(MessageQueue &mq, int commandId, const QByteArray &data)
 {
     m_fbb.Clear();
-    auto commandData = m_fbb.CreateVector(reinterpret_cast<uint8_t const *>(data.data()), data.size());
-    auto builder = Akonadi2::QueuedCommandBuilder(m_fbb);
-    builder.add_commandId(commandId);
-    builder.add_command(commandData);
-    auto buffer = builder.Finish();
+    auto commandData = Akonadi2::EntityBuffer::appendAsVector(m_fbb, data.constData(), data.size());
+    auto buffer = Akonadi2::CreateQueuedCommand(m_fbb, commandId, commandData);
     Akonadi2::FinishQueuedCommandBuffer(m_fbb, buffer);
     mq.enqueue(m_fbb.GetBufferPointer(), m_fbb.GetSize());
 }
@@ -357,7 +343,7 @@ Async::Job<void> DummyResource::synchronizeWithSource(Akonadi2::Pipeline *pipeli
                 auto rid = m_fbb.CreateString(it.key().toStdString().c_str());
                 auto description = m_fbb.CreateString(it.key().toStdString().c_str());
                 static uint8_t rawData[100];
-                auto attachment = m_fbb.CreateVector(rawData, 100);
+                auto attachment = Akonadi2::EntityBuffer::appendAsVector(m_fbb, rawData, 100);
 
                 auto builder = DummyCalendar::DummyEventBuilder(m_fbb);
                 builder.add_summary(summary);
@@ -372,7 +358,7 @@ Async::Job<void> DummyResource::synchronizeWithSource(Akonadi2::Pipeline *pipeli
                 flatbuffers::FlatBufferBuilder fbb;
                 //This is the resource type and not the domain type
                 auto type = fbb.CreateString("event");
-                auto delta = fbb.CreateVector<uint8_t>(entityFbb.GetBufferPointer(), entityFbb.GetSize());
+                auto delta = Akonadi2::EntityBuffer::appendAsVector(fbb, entityFbb.GetBufferPointer(), entityFbb.GetSize());
                 auto location = Akonadi2::Commands::CreateCreateEntity(fbb, type, delta);
                 Akonadi2::Commands::FinishCreateEntityBuffer(fbb, location);
 
@@ -388,16 +374,22 @@ Async::Job<void> DummyResource::synchronizeWithSource(Akonadi2::Pipeline *pipeli
 
 Async::Job<void> DummyResource::processAllMessages()
 {
+    //We have to wait for all items to be processed to ensure the synced items are available when a query gets executed.
+    //TODO: report errors while processing sync?
+    //TODO JOBAPI: A helper that waits for n events and then continues?
     return Async::start<void>([this](Async::Future<void> &f) {
-        //We have to wait for all items to be processed to ensure the synced items are available when a query gets executed.
-        //TODO: report errors while processing sync?
-        //TODO: also check user-queue?
         if (mSynchronizerQueue.isEmpty()) {
-            qDebug() << "synchronizer queue is empty";
             f.setFinished();
         } else {
             QObject::connect(&mSynchronizerQueue, &MessageQueue::drained, [&f]() {
-                qDebug() << "synchronizer queue drained";
+                f.setFinished();
+            });
+        }
+    }).then<void>([this](Async::Future<void> &f) {
+        if (mUserQueue.isEmpty()) {
+            f.setFinished();
+        } else {
+            QObject::connect(&mUserQueue, &MessageQueue::drained, [&f]() {
                 f.setFinished();
             });
         }
@@ -425,7 +417,7 @@ Akonadi2::Resource *DummyResourceFactory::createResource()
 
 void DummyResourceFactory::registerFacades(Akonadi2::FacadeFactory &factory)
 {
-    factory.registerFacade<Akonadi2::Domain::Event, DummyResourceFacade>(PLUGIN_NAME);
+    factory.registerFacade<Akonadi2::ApplicationDomain::Event, DummyResourceFacade>(PLUGIN_NAME);
 }
 
 #include "resourcefactory.moc"