12 files changed, 184 insertions, 186 deletions

diff --git a/examples/client/main.cpp b/examples/client/main.cpp
index 0a1a725..2aeb328 100644
--- a/examples/client/main.cpp
+++ b/examples/client/main.cpp
@@ -20,21 +20,24 @@
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QCommandLineOption>
+#include <QElapsedTimer>
 
 #include "common/clientapi.h"
 #include "common/resource.h"
-#include "common/listmodelresult.h"
 #include "common/storage.h"
 #include "common/domain/event.h"
+#include "common/domain/folder.h"
 #include "common/resourceconfig.h"
+#include "common/log.h"
 #include "console.h"
 
 #include <QWidget>
-#include <QListView>
+#include <QTreeView>
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QPushButton>
 #include <QItemSelectionModel>
+#include <iostream>
 
 template <typename T>
 class View : public QWidget
@@ -43,8 +46,8 @@ public:
     View(QAbstractItemModel *model)
         : QWidget()
     {
-        auto listView = new QListView(this);
-        listView->setModel(model);
+        auto modelView = new QTreeView(this);
+        modelView->setModel(model);
         resize(1000, 1500);
 
         auto topLayout = new QVBoxLayout(this);
@@ -61,36 +64,59 @@ public:
         QObject::connect(syncButton, &QPushButton::pressed, []() {
             Akonadi2::Query query;
             query.resources << "org.kde.dummy.instance1";
-            Akonadi2::Store::synchronize(query);
+            query.syncOnDemand = true;
+            Akonadi2::Store::synchronize(query).exec();
         });
 
         auto removeButton = new QPushButton(this);
         removeButton->setText("Remove");
-        QObject::connect(removeButton, &QPushButton::pressed, [listView]() {
-            for (auto index :listView->selectionModel()->selectedIndexes()) {
-                auto object = index.data(DomainObjectRole).value<typename T::Ptr>();
+        QObject::connect(removeButton, &QPushButton::pressed, [modelView]() {
+            for (auto index : modelView->selectionModel()->selectedIndexes()) {
+                auto object = index.data(Akonadi2::Store::DomainObjectRole).value<typename T::Ptr>();
                 Akonadi2::Store::remove(*object).exec();
             }
         });
 
         topLayout->addWidget(titleLabel);
         topLayout->addWidget(syncButton);
-        topLayout->addWidget(listView, 10);
+        topLayout->addWidget(modelView, 10);
 
         show();
     }
 
 };
 
+
+class MyApplication : public QApplication
+{
+    QElapsedTimer t;
+public:
+    MyApplication(int& argc, char ** argv) : QApplication(argc, argv) { }
+    virtual ~MyApplication() { }
+
+    virtual bool notify(QObject* receiver, QEvent* event)
+    {
+        t.start();
+        bool ret = QApplication::notify(receiver, event);
+        if(t.elapsed() > 3)
+            qDebug("processing event type %d for object %s took %dms",
+                (int)event->type(), receiver->objectName().toLocal8Bit().data(),
+                (int)t.elapsed());
+        return ret;
+    }
+};
+
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
+    MyApplication app(argc, argv);
 
     QCommandLineParser cliOptions;
     cliOptions.addPositionalArgument(QObject::tr("[resource]"),
                                      QObject::tr("A resource to connect to"));
     cliOptions.addOption(QCommandLineOption("clear"));
     cliOptions.addOption(QCommandLineOption("debuglevel"));
+    cliOptions.addOption(QCommandLineOption("list"));
+    cliOptions.addOption(QCommandLineOption("count"));
     cliOptions.addHelpOption();
     cliOptions.process(app);
     QStringList resources = cliOptions.positionalArguments();
@@ -122,10 +148,43 @@ int main(int argc, char *argv[])
     }
     query.syncOnDemand = false;
     query.processAll = false;
+    query.requestedProperties << "name";
     query.liveQuery = true;
 
-    auto model = QSharedPointer<ListModelResult<Akonadi2::ApplicationDomain::Event::Ptr> >::create(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query), QList<QByteArray>() << "summary" << "uid");
-    auto view = QSharedPointer<View<Akonadi2::ApplicationDomain::Event> >::create(model.data());
-
-    return app.exec();
+    QTime time;
+    time.start();
+    auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(query);
+    qDebug() << "Loaded model in " << time.elapsed() << " ms";
+
+    if (cliOptions.isSet("list")) {
+        query.liveQuery = false;
+        qDebug() << "Listing";
+        QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, [model](const QModelIndex &index, int start, int end) {
+            for (int i = start; i <= end; i++) {
+                std::cout << "\tRow " << model->rowCount() << ": " << model->data(model->index(i, 0, index)).toString().toStdString() << std::endl;
+            }
+        });
+        QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [model, &app](const QModelIndex &, const QModelIndex &, const QVector<int> &roles) {
+            if (roles.contains(Akonadi2::Store::ChildrenFetchedRole)) {
+                app.quit();
+            }
+        });
+        if (!model->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool()) {
+            return app.exec();
+        }
+    } else if (cliOptions.isSet("count")) {
+        query.liveQuery = false;
+        QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [model, &app](const QModelIndex &, const QModelIndex &, const QVector<int> &roles) {
+            if (roles.contains(Akonadi2::Store::ChildrenFetchedRole)) {
+                std::cout << "\tCounted results " << model->rowCount(QModelIndex());
+                app.quit();
+            }
+        });
+        return app.exec();
+    } else {
+        query.liveQuery = true;
+        auto view = QSharedPointer<View<Akonadi2::ApplicationDomain::Folder> >::create(model.data());
+        return app.exec();
+    }
+    return 0;
 }
diff --git a/examples/dummyresource/CMakeLists.txt b/examples/dummyresource/CMakeLists.txt
index e4b51dd..1e80f81 100644
--- a/examples/dummyresource/CMakeLists.txt
+++ b/examples/dummyresource/CMakeLists.txt
@@ -4,7 +4,7 @@ add_definitions(-DQT_PLUGIN)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 
-add_library(${PROJECT_NAME} SHARED facade.cpp resourcefactory.cpp domainadaptor.cpp resourcefacade.cpp dummystore.cpp)
+add_library(${PROJECT_NAME} SHARED facade.cpp resourcefactory.cpp domainadaptor.cpp dummystore.cpp)
 generate_flatbuffers(${PROJECT_NAME} dummycalendar)
 qt5_use_modules(${PROJECT_NAME} Core Network)
 target_link_libraries(${PROJECT_NAME} akonadi2common)
diff --git a/examples/dummyresource/domainadaptor.cpp b/examples/dummyresource/domainadaptor.cpp
index d08a783..74b170d 100644
--- a/examples/dummyresource/domainadaptor.cpp
+++ b/examples/dummyresource/domainadaptor.cpp
@@ -51,3 +51,9 @@ DummyMailAdaptorFactory::DummyMailAdaptorFactory()
 
 }
 
+DummyFolderAdaptorFactory::DummyFolderAdaptorFactory()
+    : DomainTypeAdaptorFactory()
+{
+
+}
+
diff --git a/examples/dummyresource/domainadaptor.h b/examples/dummyresource/domainadaptor.h
index add3e8e..e5856f8 100644
--- a/examples/dummyresource/domainadaptor.h
+++ b/examples/dummyresource/domainadaptor.h
@@ -21,6 +21,8 @@
 #include "common/domainadaptor.h"
 #include "event_generated.h"
 #include "mail_generated.h"
+#include "folder_generated.h"
+#include "dummy_generated.h"
 #include "dummycalendar_generated.h"
 #include "entity_generated.h"
 
@@ -31,10 +33,16 @@ public:
     virtual ~DummyEventAdaptorFactory() {};
 };
 
-//TODO replace the resource specific event class by a mail class or a dummy class if no resource type is required.
-class DummyMailAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Mail, DummyCalendar::DummyEvent, DummyCalendar::DummyEventBuilder>
+class DummyMailAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Mail, Akonadi2::ApplicationDomain::Buffer::Dummy, Akonadi2::ApplicationDomain::Buffer::DummyBuilder>
 {
 public:
     DummyMailAdaptorFactory();
     virtual ~DummyMailAdaptorFactory() {};
 };
+
+class DummyFolderAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Folder, Akonadi2::ApplicationDomain::Buffer::Dummy, Akonadi2::ApplicationDomain::Buffer::DummyBuilder>
+{
+public:
+    DummyFolderAdaptorFactory();
+    virtual ~DummyFolderAdaptorFactory() {};
+};
diff --git a/examples/dummyresource/dummystore.cpp b/examples/dummyresource/dummystore.cpp
index 0356ec0..458695f 100644
--- a/examples/dummyresource/dummystore.cpp
+++ b/examples/dummyresource/dummystore.cpp
@@ -36,6 +36,13 @@ static QMap<QString, QVariant> createMail(int i)
     return mail;
 }
 
+static QMap<QString, QVariant> createFolder(int i)
+{
+    QMap<QString, QVariant> folder;
+    folder.insert("name", QString("folder%1").arg(i));
+    return folder;
+}
+
 QMap<QString, QMap<QString, QVariant> > populateEvents()
 {
     QMap<QString, QMap<QString, QVariant>> content;
@@ -54,8 +61,18 @@ QMap<QString, QMap<QString, QVariant> > populateMails()
     return content;
 }
 
+QMap<QString, QMap<QString, QVariant> > populateFolders()
+{
+    QMap<QString, QMap<QString, QVariant>> content;
+    for (int i = 0; i < 5; i++) {
+        content.insert(QString("key%1").arg(i), createFolder(i));
+    }
+    return content;
+}
+
 static QMap<QString, QMap<QString, QVariant> > s_eventSource = populateEvents();
 static QMap<QString, QMap<QString, QVariant> > s_mailSource = populateMails();
+static QMap<QString, QMap<QString, QVariant> > s_folderSource = populateFolders();
 
 QMap<QString, QMap<QString, QVariant> > DummyStore::events() const
 {
@@ -66,3 +83,8 @@ QMap<QString, QMap<QString, QVariant> > DummyStore::mails() const
 {
     return s_mailSource;
 }
+
+QMap<QString, QMap<QString, QVariant> > DummyStore::folders() const
+{
+    return s_folderSource;
+}
diff --git a/examples/dummyresource/dummystore.h b/examples/dummyresource/dummystore.h
index 4ecd5ea..c730118 100644
--- a/examples/dummyresource/dummystore.h
+++ b/examples/dummyresource/dummystore.h
@@ -23,7 +23,6 @@
 class DummyStore
 {
 public:
-    //TODO proper singleton
     static DummyStore &instance()
     {
         static DummyStore instance;
@@ -32,4 +31,5 @@ public:
 
     QMap<QString, QMap<QString, QVariant> > events() const;
     QMap<QString, QMap<QString, QVariant> > mails() const;
+    QMap<QString, QMap<QString, QVariant> > folders() const;
 };
diff --git a/examples/dummyresource/facade.cpp b/examples/dummyresource/facade.cpp
index 5a9d722..f337bdc 100644
--- a/examples/dummyresource/facade.cpp
+++ b/examples/dummyresource/facade.cpp
@@ -30,6 +30,7 @@ DummyResourceFacade::~DummyResourceFacade()
 {
 }
 
+
 DummyResourceMailFacade::DummyResourceMailFacade(const QByteArray &instanceIdentifier)
     : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Mail>(instanceIdentifier, QSharedPointer<DummyMailAdaptorFactory>::create())
 {
@@ -39,25 +40,12 @@ DummyResourceMailFacade::~DummyResourceMailFacade()
 {
 }
 
-static void addFolder(const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Folder::Ptr> > &resultProvider, QByteArray uid, QString name, QString icon)
+
+DummyResourceFolderFacade::DummyResourceFolderFacade(const QByteArray &instanceIdentifier)
+    : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Folder>(instanceIdentifier, QSharedPointer<DummyFolderAdaptorFactory>::create())
 {
-    auto folder = Akonadi2::ApplicationDomain::Folder::Ptr::create();
-    folder->setProperty("name", name);
-    folder->setProperty("uid", uid);
-    resultProvider->add(folder);
 }
 
-KAsync::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Folder::Ptr> > &resultProvider)
+DummyResourceFolderFacade::~DummyResourceFolderFacade()
 {
-    //Dummy implementation for a fixed set of folders
-    addFolder(resultProvider, "inbox", "INBOX", "mail-folder-inbox");
-    addFolder(resultProvider, "sent", "Sent", "mail-folder-sent");
-    addFolder(resultProvider, "trash", "Trash", "user-trash");
-    addFolder(resultProvider, "drafts", "Drafts", "document-edit");
-    addFolder(resultProvider, "1", "dragons", "folder");
-    addFolder(resultProvider, "1", "super mega long tailed dragons", "folder");
-    resultProvider->initialResultSetComplete();
-    resultProvider->complete();
-    return KAsync::null<void>();
 }
-
diff --git a/examples/dummyresource/facade.h b/examples/dummyresource/facade.h
index 948116b..b00e1d7 100644
--- a/examples/dummyresource/facade.h
+++ b/examples/dummyresource/facade.h
@@ -36,13 +36,9 @@ public:
     virtual ~DummyResourceMailFacade();
 };
 
-class DummyResourceFolderFacade : public Akonadi2::StoreFacade<Akonadi2::ApplicationDomain::Folder>
+class DummyResourceFolderFacade : public Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Folder>
 {
 public:
     DummyResourceFolderFacade(const QByteArray &instanceIdentifier);
     virtual ~DummyResourceFolderFacade();
-    virtual KAsync::Job<void> create(const Akonadi2::ApplicationDomain::Folder &domainObject) { return KAsync::null<void>(); };
-    virtual KAsync::Job<void> modify(const Akonadi2::ApplicationDomain::Folder &domainObject) { return KAsync::null<void>(); };
-    virtual KAsync::Job<void> remove(const Akonadi2::ApplicationDomain::Folder &domainObject) { return KAsync::null<void>(); };
-    virtual KAsync::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Folder::Ptr> > &resultProvider);
 };
diff --git a/examples/dummyresource/resourcefacade.cpp b/examples/dummyresource/resourcefacade.cpp
deleted file mode 100644
index df805e4..0000000
--- a/examples/dummyresource/resourcefacade.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-#include "resourcefacade.h"
-
-#include <QSettings>
-#include <QStandardPaths>
-
-DummyResourceConfigFacade::DummyResourceConfigFacade()
-    : Akonadi2::StoreFacade<Akonadi2::ApplicationDomain::AkonadiResource>()
-{
-
-}
-
-DummyResourceConfigFacade::~DummyResourceConfigFacade()
-{
-
-}
-
-QSharedPointer<QSettings> DummyResourceConfigFacade::getSettings()
-{
-    //FIXME deal with resource instances
-    const QString instanceIdentifier = "dummyresource.instance1";
-    //FIXME Use config location
-    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/akonadi2/" + "org.kde." + instanceIdentifier + "/settings.ini", QSettings::IniFormat);
-}
-
-KAsync::Job<void> DummyResourceConfigFacade::create(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject)
-{
-    //TODO create resource instance
-    //This can be generalized in a base implementation
-    return KAsync::null<void>();
-}
-
-KAsync::Job<void> DummyResourceConfigFacade::modify(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject)
-{
-    //modify configuration
-    //This part is likely resource specific, but could be partially generalized
-    return KAsync::start<void>([domainObject, this]() {
-        auto settings = getSettings();
-        //TODO Write properties to file
-    });
-}
-
-KAsync::Job<void> DummyResourceConfigFacade::remove(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject)
-{
-    //TODO remove resource instance
-    //This can be generalized in a base implementation
-    return KAsync::null<void>();
-}
-
-KAsync::Job<void> DummyResourceConfigFacade::load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<typename Akonadi2::ApplicationDomain::AkonadiResource::Ptr> > &resultProvider)
-{
-    //Read configuration and list all available instances.
-    //This includes runtime information about runing instances etc.
-    //Part of this is generic, and part is accessing the resource specific configuration.
-    //FIXME this currently does not support live queries (because we're not inheriting from GenericFacade)
-    //FIXME only read what was requested in the query?
-    return KAsync::start<void>([resultProvider, this]() {
-        auto settings = getSettings();
-        auto memoryAdaptor = QSharedPointer<Akonadi2::ApplicationDomain::MemoryBufferAdaptor>::create();
-        //TODO copy settings to adaptor
-        //
-        //TODO use correct instance identifier
-        //TODO key == instance identifier ?
-        resultProvider->add(QSharedPointer<Akonadi2::ApplicationDomain::AkonadiResource>::create("org.kde.dummy.instance1", "org.kde.dummy.config", 0, memoryAdaptor));
-    });
-}
diff --git a/examples/dummyresource/resourcefacade.h b/examples/dummyresource/resourcefacade.h
deleted file mode 100644
index 5a5f46b..0000000
--- a/examples/dummyresource/resourcefacade.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2014 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 <Async/Async>
-#include <common/domain/applicationdomaintype.h>
-#include <common/resultprovider.h>
-#include <common/facadeinterface.h>
-
-namespace Akonadi2 {
-    class Query;
-}
-
-class QSettings;
-
-class DummyResourceConfigFacade : public Akonadi2::StoreFacade<Akonadi2::ApplicationDomain::AkonadiResource>
-{
-public:
-    DummyResourceConfigFacade();
-    ~DummyResourceConfigFacade();
-    //Create an instance
-    KAsync::Job<void> create(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) Q_DECL_OVERRIDE;
-    //Modify configuration
-    KAsync::Job<void> modify(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) Q_DECL_OVERRIDE;
-    //Remove instance
-    KAsync::Job<void> remove(const Akonadi2::ApplicationDomain::AkonadiResource &domainObject) Q_DECL_OVERRIDE;
-    //Read configuration and available instances
-    KAsync::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<typename Akonadi2::ApplicationDomain::AkonadiResource::Ptr> > &resultProvider) Q_DECL_OVERRIDE;
-
-private:
-    QSharedPointer<QSettings> getSettings();
-};
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 397ca5f..e524c3f 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -40,6 +40,7 @@
 //This is the resources entity type, and not the domain type
 #define ENTITY_TYPE_EVENT "event"
 #define ENTITY_TYPE_MAIL "mail"
+#define ENTITY_TYPE_FOLDER "folder"
 
 /**
  * Index types:
@@ -51,7 +52,6 @@
  *     * range indexes like what date range an event affects.
  *     * group indexes like tree hierarchies as nested sets
  */
-template<typename DomainType>
 class IndexUpdater : public Akonadi2::Preprocessor {
 public:
     IndexUpdater(const QByteArray &index, const QByteArray &type)
@@ -63,21 +63,17 @@ 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);
         add(newEntity.getProperty("remoteId"), 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
     {
-        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::removeIndex(uid, oldEntity, transaction);
-        Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::index(uid, newEntity, transaction);
         remove(oldEntity.getProperty("remoteId"), uid, transaction);
         add(newEntity.getProperty("remoteId"), uid, 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);
         remove(oldEntity.getProperty("remoteId"), uid, transaction);
     }
 
@@ -91,6 +87,7 @@ private:
 
     void remove(const QVariant &value, const QByteArray &uid, Akonadi2::Storage::Transaction &transaction)
     {
+        //TODO hide notfound error
         Index(mIndexIdentifier, transaction).remove(value.toByteArray(), uid);
     }
 
@@ -98,20 +95,49 @@ private:
     QByteArray mBufferType;
 };
 
+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)
 {
     {
-        auto eventFactory = QSharedPointer<DummyEventAdaptorFactory>::create();
-        auto eventIndexer = new IndexUpdater<Akonadi2::ApplicationDomain::Event>("event.index.rid", ENTITY_TYPE_EVENT);
-        mPipeline->setPreprocessors(ENTITY_TYPE_EVENT, QVector<Akonadi2::Preprocessor*>() << eventIndexer);
-        mPipeline->setAdaptorFactory(ENTITY_TYPE_EVENT, eventFactory);
+        QVector<Akonadi2::Preprocessor*> eventPreprocessors;
+        eventPreprocessors << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Event>;
+        eventPreprocessors << new IndexUpdater("event.index.rid", ENTITY_TYPE_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>;
+        mailPreprocessors << new IndexUpdater("mail.index.rid", ENTITY_TYPE_MAIL);
+        mPipeline->setPreprocessors(ENTITY_TYPE_MAIL, mailPreprocessors);
+        mPipeline->setAdaptorFactory(ENTITY_TYPE_MAIL, QSharedPointer<DummyMailAdaptorFactory>::create());
     }
     {
-        auto mailFactory = QSharedPointer<DummyMailAdaptorFactory>::create();
-        auto mailIndexer = new IndexUpdater<Akonadi2::ApplicationDomain::Mail>("mail.index.rid", ENTITY_TYPE_MAIL);
-        mPipeline->setPreprocessors(ENTITY_TYPE_MAIL, QVector<Akonadi2::Preprocessor*>() << mailIndexer);
-        mPipeline->setAdaptorFactory(ENTITY_TYPE_MAIL, mailFactory);
+        QVector<Akonadi2::Preprocessor*> folderPreprocessors;
+        folderPreprocessors << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Folder>;
+        folderPreprocessors << new IndexUpdater("folder.index.rid", ENTITY_TYPE_FOLDER);
+        mPipeline->setPreprocessors(ENTITY_TYPE_FOLDER, folderPreprocessors);
+        mPipeline->setAdaptorFactory(ENTITY_TYPE_FOLDER, QSharedPointer<DummyFolderAdaptorFactory>::create());
     }
 }
 
@@ -156,6 +182,27 @@ void DummyResource::createMail(const QByteArray &ridBuffer, const QMap<QString,
     Akonadi2::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, 0, 0, m_fbb.GetBufferPointer(), m_fbb.GetSize());
 }
 
+void DummyResource::createFolder(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb)
+{
+    //Map the source format to the buffer format (which happens to be an exact copy here)
+    auto name = m_fbb.CreateString(data.value("name").toString().toStdString());
+    flatbuffers::Offset<flatbuffers::String> parent;
+    bool hasParent = false;
+    if (!data.value("parent").toString().isEmpty()) {
+        hasParent = true;
+        parent = m_fbb.CreateString(data.value("parent").toString().toStdString());
+    }
+
+    auto builder = Akonadi2::ApplicationDomain::Buffer::FolderBuilder(m_fbb);
+    builder.add_name(name);
+    if (hasParent) {
+        builder.add_parent(parent);
+    }
+    auto buffer = builder.Finish();
+    Akonadi2::ApplicationDomain::Buffer::FinishFolderBuffer(m_fbb, buffer);
+    Akonadi2::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, 0, 0, m_fbb.GetBufferPointer(), m_fbb.GetSize());
+}
+
 void DummyResource::synchronize(const QString &bufferType, const QMap<QString, QMap<QString, QVariant> > &data, Akonadi2::Storage::Transaction &transaction, std::function<void(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb)> createEntity)
 {
     Index uidIndex("index.uid", transaction);
@@ -202,6 +249,9 @@ KAsync::Job<void> DummyResource::synchronizeWithSource()
         synchronize(ENTITY_TYPE_MAIL, DummyStore::instance().mails(), transaction, [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb) {
             createMail(ridBuffer, data, entityFbb);
         });
+        synchronize(ENTITY_TYPE_FOLDER, DummyStore::instance().folders(), transaction, [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb) {
+            createFolder(ridBuffer, data, entityFbb);
+        });
 
         f.setFinished();
     });
@@ -228,5 +278,6 @@ void DummyResourceFactory::registerFacades(Akonadi2::FacadeFactory &factory)
 {
     factory.registerFacade<Akonadi2::ApplicationDomain::Event, DummyResourceFacade>(PLUGIN_NAME);
     factory.registerFacade<Akonadi2::ApplicationDomain::Mail, DummyResourceMailFacade>(PLUGIN_NAME);
+    factory.registerFacade<Akonadi2::ApplicationDomain::Folder, DummyResourceFolderFacade>(PLUGIN_NAME);
 }
 
diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h
index 196d29a..67681ae 100644
--- a/examples/dummyresource/resourcefactory.h
+++ b/examples/dummyresource/resourcefactory.h
@@ -38,6 +38,7 @@ public:
 private:
     void createEvent(const QByteArray &rid, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb);
     void createMail(const QByteArray &rid, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb);
+    void createFolder(const QByteArray &rid, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb);
     void synchronize(const QString &bufferType, const QMap<QString, QMap<QString, QVariant> > &data, Akonadi2::Storage::Transaction &transaction, std::function<void(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb)> createEntity);
 };