Refactored the generic resource to use separate classes for

changereplay and synchronization.

This cleans up the API and avoids the excessive passing around of
transactions. It also provides more flexibility in eventually using
different synchronization strategies for different resources.

2 files changed, 93 insertions, 76 deletions

diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 48858da..609d23e 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -35,6 +35,7 @@
 #include "definitions.h"
 #include "facadefactory.h"
 #include "indexupdater.h"
+#include "adaptorfactoryregistry.h"
 #include <QDate>
 #include <QUuid>
 
@@ -43,8 +44,87 @@
 #define ENTITY_TYPE_MAIL "mail"
 #define ENTITY_TYPE_FOLDER "folder"
 
+class DummySynchronizer : public Sink::Synchronizer {
+    public:
+
+    DummySynchronizer(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier)
+        : Sink::Synchronizer(resourceType, resourceInstanceIdentifier)
+    {
+
+    }
+
+    Sink::ApplicationDomain::Event::Ptr createEvent(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data)
+    {
+        static uint8_t rawData[100];
+        auto event = Sink::ApplicationDomain::Event::Ptr::create();
+        event->setProperty("summary", data.value("summary").toString());
+        event->setProperty("remoteId", ridBuffer);
+        event->setProperty("description", data.value("description").toString());
+        event->setProperty("attachment", QByteArray::fromRawData(reinterpret_cast<const char*>(rawData), 100));
+        return event;
+    }
+
+    Sink::ApplicationDomain::Mail::Ptr createMail(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data)
+    {
+        auto mail = Sink::ApplicationDomain::Mail::Ptr::create();
+        mail->setProperty("subject", data.value("subject").toString());
+        mail->setProperty("senderEmail", data.value("senderEmail").toString());
+        mail->setProperty("senderName", data.value("senderName").toString());
+        mail->setProperty("date", data.value("date").toString());
+        mail->setProperty("folder", syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, data.value("parentFolder").toByteArray()));
+        mail->setProperty("unread", data.value("unread").toBool());
+        mail->setProperty("important", data.value("important").toBool());
+        return mail;
+    }
+
+    Sink::ApplicationDomain::Folder::Ptr createFolder(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data)
+    {
+        auto folder = Sink::ApplicationDomain::Folder::Ptr::create();
+        folder->setProperty("name", data.value("name").toString());
+        folder->setProperty("icon", data.value("icon").toString());
+        if (!data.value("parent").toString().isEmpty()) {
+            auto sinkId = syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, data.value("parent").toByteArray());
+            folder->setProperty("parent", sinkId);
+        }
+        return folder;
+    }
+
+    void synchronize(const QByteArray &bufferType, const QMap<QString, QMap<QString, QVariant> > &data, std::function<Sink::ApplicationDomain::ApplicationDomainType::Ptr(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data)> createEntity)
+    {
+        auto time = QSharedPointer<QTime>::create();
+        time->start();
+        //TODO find items to remove
+        int count = 0;
+        for (auto it = data.constBegin(); it != data.constEnd(); it++) {
+            count++;
+            const auto remoteId = it.key().toUtf8();
+            auto entity = createEntity(remoteId, it.value());
+            createOrModify(bufferType, remoteId, *entity);
+        }
+        Trace() << "Sync of " << count << " entities of type " << bufferType << " done." << Sink::Log::TraceTime(time->elapsed());
+    }
+
+    KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE
+    {
+        Log() << " Synchronizing with the source";
+        return KAsync::start<void>([this]() {
+            synchronize(ENTITY_TYPE_EVENT, DummyStore::instance().events(), [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data) {
+                return createEvent(ridBuffer, data);
+            });
+            synchronize(ENTITY_TYPE_MAIL, DummyStore::instance().mails(), [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data) {
+                return createMail(ridBuffer, data);
+            });
+            synchronize(ENTITY_TYPE_FOLDER, DummyStore::instance().folders(), [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data) {
+                return createFolder(ridBuffer, data);
+            });
+            Log() << "Done Synchronizing";
+        });
+    }
+
+};
+
 DummyResource::DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline)
-    : Sink::GenericResource(instanceIdentifier, pipeline),
+    : Sink::GenericResource(PLUGIN_NAME, instanceIdentifier, pipeline, QSharedPointer<Sink::NullChangeReplay>::create(), QSharedPointer<DummySynchronizer>::create(PLUGIN_NAME, instanceIdentifier)),
     mEventAdaptorFactory(QSharedPointer<DummyEventAdaptorFactory>::create()),
     mMailAdaptorFactory(QSharedPointer<DummyMailAdaptorFactory>::create()),
     mFolderAdaptorFactory(QSharedPointer<DummyFolderAdaptorFactory>::create())
@@ -57,80 +137,9 @@ DummyResource::DummyResource(const QByteArray &instanceIdentifier, const QShared
             QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Event>);
 }
 
-Sink::ApplicationDomain::Event::Ptr DummyResource::createEvent(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &transaction)
-{
-    static uint8_t rawData[100];
-    auto event = Sink::ApplicationDomain::Event::Ptr::create();
-    event->setProperty("summary", data.value("summary").toString());
-    event->setProperty("remoteId", ridBuffer);
-    event->setProperty("description", data.value("description").toString());
-    event->setProperty("attachment", QByteArray::fromRawData(reinterpret_cast<const char*>(rawData), 100));
-    return event;
-}
-
-Sink::ApplicationDomain::Mail::Ptr DummyResource::createMail(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &transaction)
+DummyResource::~DummyResource()
 {
-    auto mail = Sink::ApplicationDomain::Mail::Ptr::create();
-    mail->setProperty("subject", data.value("subject").toString());
-    mail->setProperty("senderEmail", data.value("senderEmail").toString());
-    mail->setProperty("senderName", data.value("senderName").toString());
-    mail->setProperty("date", data.value("date").toString());
-    mail->setProperty("folder", resolveRemoteId(ENTITY_TYPE_FOLDER, data.value("parentFolder").toByteArray(), transaction));
-    mail->setProperty("unread", data.value("unread").toBool());
-    mail->setProperty("important", data.value("important").toBool());
-    return mail;
-}
 
-Sink::ApplicationDomain::Folder::Ptr DummyResource::createFolder(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &transaction)
-{
-    auto folder = Sink::ApplicationDomain::Folder::Ptr::create();
-    folder->setProperty("name", data.value("name").toString());
-    folder->setProperty("icon", data.value("icon").toString());
-    if (!data.value("parent").toString().isEmpty()) {
-        auto sinkId = resolveRemoteId(ENTITY_TYPE_FOLDER, data.value("parent").toByteArray(), transaction);
-        folder->setProperty("parent", sinkId);
-    }
-    return folder;
-}
-
-void DummyResource::synchronize(const QByteArray &bufferType, const QMap<QString, QMap<QString, QVariant> > &data, Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function<Sink::ApplicationDomain::ApplicationDomainType::Ptr(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &)> createEntity)
-{
-    auto time = QSharedPointer<QTime>::create();
-    time->start();
-    //TODO find items to remove
-    int count = 0;
-    for (auto it = data.constBegin(); it != data.constEnd(); it++) {
-        count++;
-        const auto remoteId = it.key().toUtf8();
-        auto entity = createEntity(remoteId, it.value(), synchronizationTransaction);
-        createOrModify(transaction, synchronizationTransaction, adaptorFactory, bufferType, remoteId, *entity);
-    }
-    Trace() << "Sync of " << count << " entities of type " << bufferType << " done." << Sink::Log::TraceTime(time->elapsed());
-}
-
-KAsync::Job<void> DummyResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore)
-{
-    Log() << " Synchronizing";
-    return KAsync::start<void>([this, &mainStore, &synchronizationStore]() {
-        auto transaction = mainStore.createTransaction(Sink::Storage::ReadOnly);
-        auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadWrite);
-        synchronize(ENTITY_TYPE_EVENT, DummyStore::instance().events(), transaction, synchronizationTransaction, *mEventAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &synchronizationTransaction) {
-            return createEvent(ridBuffer, data, synchronizationTransaction);
-        });
-        synchronize(ENTITY_TYPE_MAIL, DummyStore::instance().mails(), transaction, synchronizationTransaction, *mMailAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &synchronizationTransaction) {
-            return createMail(ridBuffer, data, synchronizationTransaction);
-        });
-        synchronize(ENTITY_TYPE_FOLDER, DummyStore::instance().folders(), transaction, synchronizationTransaction, *mFolderAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &synchronizationTransaction) {
-            return createFolder(ridBuffer, data, synchronizationTransaction);
-        });
-        Log() << "Done Synchronizing";
-    });
-}
-
-KAsync::Job<void> DummyResource::replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value)
-{
-    Trace() << "Replaying " << key;
-    return KAsync::null<void>();
 }
 
 void DummyResource::removeDataFromDisk()
@@ -160,6 +169,7 @@ KAsync::Job<void> DummyResource::inspect(int inspectionType, const QByteArray &i
     return KAsync::null<void>();
 }
 
+
 DummyResourceFactory::DummyResourceFactory(QObject *parent)
     : Sink::ResourceFactory(parent)
 {
@@ -178,3 +188,10 @@ void DummyResourceFactory::registerFacades(Sink::FacadeFactory &factory)
     factory.registerFacade<Sink::ApplicationDomain::Folder, DummyResourceFolderFacade>(PLUGIN_NAME);
 }
 
+void DummyResourceFactory::registerAdaptorFactories(Sink::AdaptorFactoryRegistry &registry)
+{
+    registry.registerFactory<Sink::ApplicationDomain::Folder, DummyFolderAdaptorFactory>(PLUGIN_NAME);
+    registry.registerFactory<Sink::ApplicationDomain::Mail, DummyMailAdaptorFactory>(PLUGIN_NAME);
+    registry.registerFactory<Sink::ApplicationDomain::Event, DummyEventAdaptorFactory>(PLUGIN_NAME);
+}
+
diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h
index 865f6e5..f73eb32 100644
--- a/examples/dummyresource/resourcefactory.h
+++ b/examples/dummyresource/resourcefactory.h
@@ -37,13 +37,12 @@ class DummyResource : public Sink::GenericResource
 {
 public:
     DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline = QSharedPointer<Sink::Pipeline>());
-    KAsync::Job<void> synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore) Q_DECL_OVERRIDE;
-    using GenericResource::synchronizeWithSource;
+    virtual ~DummyResource();
+
     void removeDataFromDisk() Q_DECL_OVERRIDE;
     static void removeFromDisk(const QByteArray &instanceIdentifier);
     KAsync::Job<void> inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE;
 private:
-    KAsync::Job<void> replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE;
     Sink::ApplicationDomain::Event::Ptr createEvent(const QByteArray &rid, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &);
     Sink::ApplicationDomain::Mail::Ptr createMail(const QByteArray &rid, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &);
     Sink::ApplicationDomain::Folder::Ptr createFolder(const QByteArray &rid, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &);
@@ -65,5 +64,6 @@ public:
 
     Sink::Resource *createResource(const QByteArray &instanceIdentifier) Q_DECL_OVERRIDE;
     void registerFacades(Sink::FacadeFactory &factory) Q_DECL_OVERRIDE;
+    void registerAdaptorFactories(Sink::AdaptorFactoryRegistry &registry) Q_DECL_OVERRIDE;
 };