Avoid duplication accross resource implementations

4 files changed, 103 insertions, 94 deletions

diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 3655a63..4250a02 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -285,6 +285,12 @@ GenericResource::~GenericResource()
     delete mSourceChangeReplay;
 }
 
+void GenericResource::addType(const QByteArray &type, DomainTypeAdaptorFactoryInterface::Ptr factory, const QVector<Akonadi2::Preprocessor*> &preprocessors)
+{
+    mPipeline->setPreprocessors(type, preprocessors);
+    mPipeline->setAdaptorFactory(type, factory);
+}
+
 KAsync::Job<void> GenericResource::replay(const QByteArray &type, const QByteArray &key, const QByteArray &value)
 {
     return KAsync::null<void>();
diff --git a/common/genericresource.h b/common/genericresource.h
index f756273..82c8a49 100644
--- a/common/genericresource.h
+++ b/common/genericresource.h
@@ -23,6 +23,7 @@
 #include <resource.h>
 #include <messagequeue.h>
 #include <flatbuffers/flatbuffers.h>
+#include <domainadaptor.h>
 #include <QTimer>
 
 class Processor;
@@ -31,6 +32,7 @@ class ChangeReplay;
 namespace Akonadi2
 {
 class Pipeline;
+class Preprocessor;
 
 /**
  * Generic Resource implementation.
@@ -54,6 +56,7 @@ private Q_SLOTS:
     void updateLowerBoundRevision();
 
 protected:
+    void addType(const QByteArray &type, DomainTypeAdaptorFactoryInterface::Ptr factory, const QVector<Akonadi2::Preprocessor*> &preprocessors);
     virtual KAsync::Job<void> replay(const QByteArray &type, const QByteArray &key, const QByteArray &value);
     void onProcessorError(int errorCode, const QString &errorMessage);
     void enqueueCommand(MessageQueue &mq, int commandId, const QByteArray &data);
diff --git a/common/indexupdater.h b/common/indexupdater.h
new file mode 100644
index 0000000..48144e6
--- /dev/null
+++ b/common/indexupdater.h
@@ -0,0 +1,87 @@
+/*
+ *   Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+#pragma once
+
+#include <pipeline.h>
+#include <index.h>
+
+class IndexUpdater : public Akonadi2::Preprocessor {
+public:
+    IndexUpdater(const QByteArray &index, const QByteArray &type, const QByteArray &property)
+        :mIndexIdentifier(index),
+        mBufferType(type),
+        mProperty(property)
+    {
+
+    }
+
+    void newEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &newEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
+    {
+        add(newEntity.getProperty(mProperty), uid, transaction);
+    }
+
+    void modifiedEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, const Akonadi2::ApplicationDomain::BufferAdaptor &newEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
+    {
+        remove(oldEntity.getProperty(mProperty), uid, transaction);
+        add(newEntity.getProperty(mProperty), uid, transaction);
+    }
+
+    void deletedEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
+    {
+        remove(oldEntity.getProperty(mProperty), uid, transaction);
+    }
+
+private:
+    void add(const QVariant &value, const QByteArray &uid, Akonadi2::Storage::Transaction &transaction)
+    {
+        if (value.isValid()) {
+            Index(mIndexIdentifier, transaction).add(value.toByteArray(), uid);
+        }
+    }
+
+    void remove(const QVariant &value, const QByteArray &uid, Akonadi2::Storage::Transaction &transaction)
+    {
+        //TODO hide notfound error
+        Index(mIndexIdentifier, transaction).remove(value.toByteArray(), uid);
+    }
+
+    QByteArray mIndexIdentifier;
+    QByteArray mBufferType;
+    QByteArray mProperty;
+};
+
+template<typename DomainType>
+class DefaultIndexUpdater : public Akonadi2::Preprocessor {
+public:
+    void newEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &newEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
+    {
+        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::index(uid, newEntity, transaction);
+    }
+
+    void modifiedEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, const Akonadi2::ApplicationDomain::BufferAdaptor &newEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
+    {
+        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::removeIndex(uid, oldEntity, transaction);
+        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::index(uid, newEntity, transaction);
+    }
+
+    void deletedEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
+    {
+        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::removeIndex(uid, oldEntity, transaction);
+    }
+};
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 67e36d1..51000a7 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -24,7 +24,6 @@
 #include "pipeline.h"
 #include "dummycalendar_generated.h"
 #include "mail_generated.h"
-#include "queuedcommand_generated.h"
 #include "createentity_generated.h"
 #include "domainadaptor.h"
 #include "commands.h"
@@ -35,6 +34,7 @@
 #include "dummystore.h"
 #include "definitions.h"
 #include "facadefactory.h"
+#include "indexupdater.h"
 #include <QDate>
 #include <QUuid>
 
@@ -43,102 +43,15 @@
 #define ENTITY_TYPE_MAIL "mail"
 #define ENTITY_TYPE_FOLDER "folder"
 
-/**
- * Index types:
- * * uid - property
- * 
- * * Property can be:
- *     * fixed value like uid
- *     * fixed value where we want to do smaller/greater-than comparisons. (like start date)
- *     * range indexes like what date range an event affects.
- *     * group indexes like tree hierarchies as nested sets
- */
-class IndexUpdater : public Akonadi2::Preprocessor {
-public:
-    IndexUpdater(const QByteArray &index, const QByteArray &type, const QByteArray &property)
-        :mIndexIdentifier(index),
-        mBufferType(type),
-        mProperty(property)
-    {
-
-    }
-
-    void newEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &newEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
-    {
-        add(newEntity.getProperty(mProperty), uid, transaction);
-    }
-
-    void modifiedEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, const Akonadi2::ApplicationDomain::BufferAdaptor &newEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
-    {
-        remove(oldEntity.getProperty(mProperty), uid, transaction);
-        add(newEntity.getProperty(mProperty), uid, transaction);
-    }
-
-    void deletedEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
-    {
-        remove(oldEntity.getProperty(mProperty), uid, transaction);
-    }
-
-private:
-    void add(const QVariant &value, const QByteArray &uid, Akonadi2::Storage::Transaction &transaction)
-    {
-        if (value.isValid()) {
-            Index(mIndexIdentifier, transaction).add(value.toByteArray(), uid);
-        }
-    }
-
-    void remove(const QVariant &value, const QByteArray &uid, Akonadi2::Storage::Transaction &transaction)
-    {
-        //TODO hide notfound error
-        Index(mIndexIdentifier, transaction).remove(value.toByteArray(), uid);
-    }
-
-    QByteArray mIndexIdentifier;
-    QByteArray mBufferType;
-    QByteArray mProperty;
-};
-
-template<typename DomainType>
-class DefaultIndexUpdater : public Akonadi2::Preprocessor {
-public:
-    void newEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &newEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
-    {
-        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::index(uid, newEntity, transaction);
-    }
-
-    void modifiedEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, const Akonadi2::ApplicationDomain::BufferAdaptor &newEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
-    {
-        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::removeIndex(uid, oldEntity, transaction);
-        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::index(uid, newEntity, transaction);
-    }
-
-    void deletedEntity(const QByteArray &uid, qint64 revision, const Akonadi2::ApplicationDomain::BufferAdaptor &oldEntity, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
-    {
-        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::removeIndex(uid, oldEntity, transaction);
-    }
-};
-
 DummyResource::DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer<Akonadi2::Pipeline> &pipeline)
     : Akonadi2::GenericResource(instanceIdentifier, pipeline)
 {
-    {
-        QVector<Akonadi2::Preprocessor*> eventPreprocessors;
-        eventPreprocessors << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Event>;
-        mPipeline->setPreprocessors(ENTITY_TYPE_EVENT, eventPreprocessors);
-        mPipeline->setAdaptorFactory(ENTITY_TYPE_EVENT, QSharedPointer<DummyEventAdaptorFactory>::create());
-    }
-    {
-        QVector<Akonadi2::Preprocessor*> mailPreprocessors;
-        mailPreprocessors << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Mail>;
-        mPipeline->setPreprocessors(ENTITY_TYPE_MAIL, mailPreprocessors);
-        mPipeline->setAdaptorFactory(ENTITY_TYPE_MAIL, QSharedPointer<DummyMailAdaptorFactory>::create());
-    }
-    {
-        QVector<Akonadi2::Preprocessor*> folderPreprocessors;
-        folderPreprocessors << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Folder>;
-        mPipeline->setPreprocessors(ENTITY_TYPE_FOLDER, folderPreprocessors);
-        mPipeline->setAdaptorFactory(ENTITY_TYPE_FOLDER, QSharedPointer<DummyFolderAdaptorFactory>::create());
-    }
+    addType(ENTITY_TYPE_MAIL, QSharedPointer<DummyMailAdaptorFactory>::create(),
+            QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Mail>);
+    addType(ENTITY_TYPE_FOLDER, QSharedPointer<DummyFolderAdaptorFactory>::create(),
+            QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Folder>);
+    addType(ENTITY_TYPE_EVENT, QSharedPointer<DummyEventAdaptorFactory>::create(),
+            QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Event>);
 }
 
 void DummyResource::createEvent(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb, Akonadi2::Storage::Transaction &transaction)