Ported the pipeline to the entitystore

4 files changed, 21 insertions, 27 deletions

diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index e288be2..5513986 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -35,7 +35,6 @@
 #include "dummystore.h"
 #include "definitions.h"
 #include "facadefactory.h"
-#include "indexupdater.h"
 #include "adaptorfactoryregistry.h"
 #include "synchronizer.h"
 #include "mailpreprocessor.h"
@@ -135,11 +134,11 @@ DummyResource::DummyResource(const Sink::ResourceContext &resourceContext, const
     setupSynchronizer(QSharedPointer<DummySynchronizer>::create(resourceContext));
     setupChangereplay(QSharedPointer<Sink::NullChangeReplay>::create(resourceContext));
     setupPreprocessors(ENTITY_TYPE_MAIL,
-            QVector<Sink::Preprocessor*>() << new MailPropertyExtractor <<  new DefaultIndexUpdater<Sink::ApplicationDomain::Mail>);
+            QVector<Sink::Preprocessor*>() << new MailPropertyExtractor);
     setupPreprocessors(ENTITY_TYPE_FOLDER,
-            QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Folder>);
+            QVector<Sink::Preprocessor*>());
     setupPreprocessors(ENTITY_TYPE_EVENT,
-            QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Event>);
+            QVector<Sink::Preprocessor*>());
 }
 
 DummyResource::~DummyResource()
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 90dae7a..9656a04 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -33,7 +33,6 @@
 #include "domain/mail.h"
 #include "definitions.h"
 #include "facadefactory.h"
-#include "indexupdater.h"
 #include "inspection.h"
 #include "synchronizer.h"
 #include "sourcewriteback.h"
@@ -527,8 +526,8 @@ ImapResource::ImapResource(const ResourceContext &resourceContext, const QShared
     changereplay->mPassword = mPassword;
     setupChangereplay(changereplay);
 
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MimeMessageMover << new MailPropertyExtractor << new DefaultIndexUpdater<Sink::ApplicationDomain::Mail>);
-    setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Folder>);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MimeMessageMover << new MailPropertyExtractor);
+    setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>());
 }
 
 void ImapResource::removeFromDisk(const QByteArray &instanceIdentifier)
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index b89d78c..920bd28 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -33,7 +33,6 @@
 #include "domain/mail.h"
 #include "definitions.h"
 #include "facadefactory.h"
-#include "indexupdater.h"
 #include "libmaildir/maildir.h"
 #include "inspection.h"
 #include "synchronizer.h"
@@ -85,7 +84,7 @@ class MaildirMimeMessageMover : public Sink::Preprocessor
 public:
     MaildirMimeMessageMover(const QByteArray &resourceInstanceIdentifier, const QString &maildirPath) : mResourceInstanceIdentifier(resourceInstanceIdentifier), mMaildirPath(maildirPath) {}
 
-    QString getPath(const QByteArray &folderIdentifier, Sink::Storage::DataStore::Transaction &transaction)
+    QString getPath(const QByteArray &folderIdentifier)
     {
         if (folderIdentifier.isEmpty()) {
             return mMaildirPath;
@@ -108,10 +107,10 @@ public:
         return folderPath;
     }
 
-    QString moveMessage(const QString &oldPath, const QByteArray &folder, Sink::Storage::DataStore::Transaction &transaction)
+    QString moveMessage(const QString &oldPath, const QByteArray &folder)
     {
         if (oldPath.startsWith(Sink::temporaryFileLocation())) {
-            const auto path = getPath(folder, transaction);
+            const auto path = getPath(folder);
             KPIM::Maildir maildir(path, false);
             if (!maildir.isValid(true)) {
                 SinkWarning() << "Maildir is not existing: " << path;
@@ -120,7 +119,7 @@ public:
             return path + "/" + identifier;
         } else {
             //Handle moves
-            const auto path = getPath(folder, transaction);
+            const auto path = getPath(folder);
             KPIM::Maildir maildir(path, false);
             if (!maildir.isValid(true)) {
                 SinkWarning() << "Maildir is not existing: " << path;
@@ -141,16 +140,15 @@ public:
         }
     }
 
-    void newEntity(const QByteArray &uid, qint64 revision, Sink::ApplicationDomain::BufferAdaptor &newEntity, Sink::Storage::DataStore::Transaction &transaction) Q_DECL_OVERRIDE
+    void newEntity(Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
     {
         const auto mimeMessage = newEntity.getProperty("mimeMessage");
         if (mimeMessage.isValid()) {
-            newEntity.setProperty("mimeMessage", moveMessage(mimeMessage.toString(), newEntity.getProperty("folder").toByteArray(), transaction));
+            newEntity.setProperty("mimeMessage", moveMessage(mimeMessage.toString(), newEntity.getProperty("folder").toByteArray()));
         }
     }
 
-    void modifiedEntity(const QByteArray &uid, qint64 revision, const Sink::ApplicationDomain::BufferAdaptor &oldEntity, Sink::ApplicationDomain::BufferAdaptor &newEntity,
-        Sink::Storage::DataStore::Transaction &transaction) Q_DECL_OVERRIDE
+    void modifiedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity, Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
     {
         const auto mimeMessage = newEntity.getProperty("mimeMessage");
         const auto newFolder = newEntity.getProperty("folder");
@@ -158,7 +156,7 @@ public:
         const bool folderChanged = newFolder.isValid() && newFolder.toString() != oldEntity.getProperty("mimeMessage").toString();
         if (mimeMessageChanged || folderChanged) {
             SinkTrace() << "Moving mime message: " << mimeMessageChanged << folderChanged;
-            auto newPath = moveMessage(mimeMessage.toString(), newEntity.getProperty("folder").toByteArray(), transaction);
+            auto newPath = moveMessage(mimeMessage.toString(), newEntity.getProperty("folder").toByteArray());
             if (newPath != oldEntity.getProperty("mimeMessage").toString()) {
                 const auto oldPath = getFilePathFromMimeMessagePath(oldEntity.getProperty("mimeMessage").toString());
                 newEntity.setProperty("mimeMessage", newPath);
@@ -168,7 +166,7 @@ public:
         }
 
         auto mimeMessagePath = newEntity.getProperty("mimeMessage").toString();
-        const auto maildirPath = getPath(newEntity.getProperty("folder").toByteArray(), transaction);
+        const auto maildirPath = getPath(newEntity.getProperty("folder").toByteArray());
         KPIM::Maildir maildir(maildirPath, false);
         const auto file = getFilePathFromMimeMessagePath(mimeMessagePath);
         QString identifier = KPIM::Maildir::getKeyFromFile(file);
@@ -185,7 +183,7 @@ public:
         maildir.changeEntryFlags(identifier, flags);
     }
 
-    void deletedEntity(const QByteArray &uid, qint64 revision, const Sink::ApplicationDomain::BufferAdaptor &oldEntity, Sink::Storage::DataStore::Transaction &transaction) Q_DECL_OVERRIDE
+    void deletedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity) Q_DECL_OVERRIDE
     {
         const auto filePath = getFilePathFromMimeMessagePath(oldEntity.getProperty("mimeMessage").toString());
         QFile::remove(filePath);
@@ -199,7 +197,7 @@ class FolderPreprocessor : public Sink::Preprocessor
 public:
     FolderPreprocessor(const QString maildirPath) : mMaildirPath(maildirPath) {}
 
-    void newEntity(const QByteArray &uid, qint64 revision, Sink::ApplicationDomain::BufferAdaptor &newEntity, Sink::Storage::DataStore::Transaction &transaction) Q_DECL_OVERRIDE
+    void newEntity(Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
     {
         auto folderName = newEntity.getProperty("name").toString();
         const auto path = mMaildirPath + "/" + folderName;
@@ -207,12 +205,11 @@ public:
         maildir.create();
     }
 
-    void modifiedEntity(const QByteArray &uid, qint64 revision, const Sink::ApplicationDomain::BufferAdaptor &oldEntity, Sink::ApplicationDomain::BufferAdaptor &newEntity,
-        Sink::Storage::DataStore::Transaction &transaction) Q_DECL_OVERRIDE
+    void modifiedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity, Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
     {
     }
 
-    void deletedEntity(const QByteArray &uid, qint64 revision, const Sink::ApplicationDomain::BufferAdaptor &oldEntity, Sink::Storage::DataStore::Transaction &transaction) Q_DECL_OVERRIDE
+    void deletedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity) Q_DECL_OVERRIDE
     {
     }
     QString mMaildirPath;
@@ -440,8 +437,8 @@ MaildirResource::MaildirResource(const Sink::ResourceContext &resourceContext, c
     changereplay->mMaildirPath = mMaildirPath;
     setupChangereplay(changereplay);
 
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MaildirMimeMessageMover(resourceContext.instanceId(), mMaildirPath) << new MaildirMailPropertyExtractor << new DefaultIndexUpdater<Sink::ApplicationDomain::Mail>);
-    setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>() << new FolderPreprocessor(mMaildirPath) << new DefaultIndexUpdater<Sink::ApplicationDomain::Folder>);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MaildirMimeMessageMover(resourceContext.instanceId(), mMaildirPath) << new MaildirMailPropertyExtractor);
+    setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>() << new FolderPreprocessor(mMaildirPath));
 
     KPIM::Maildir dir(mMaildirPath, true);
     SinkTrace() << "Started maildir resource for maildir: " << mMaildirPath;
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index 9a22c41..25231c8 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -40,7 +40,6 @@
 #include <resourceconfig.h>
 #include <pipeline.h>
 #include <mailpreprocessor.h>
-#include <indexupdater.h>
 #include <adaptorfactoryregistry.h>
 
 #define ENTITY_TYPE_MAIL "mail"
@@ -162,7 +161,7 @@ MailtransportResource::MailtransportResource(const Sink::ResourceContext &resour
     changereplay->mSettings = mSettings;
     setupChangereplay(changereplay);
 
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new MimeMessageMover << new MailPropertyExtractor << new DefaultIndexUpdater<Sink::ApplicationDomain::Mail>);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new MimeMessageMover << new MailPropertyExtractor);
 }
 
 void MailtransportResource::removeFromDisk(const QByteArray &instanceIdentifier)