Fixed genericresource so it works with the maildirresourcetest

2 files changed, 6 insertions, 11 deletions

diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 1708cc5..5f42262 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -126,16 +126,15 @@ class DummySynchronizer : public Sink::Synchronizer {
 };
 
 DummyResource::DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &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())
+    : Sink::GenericResource(PLUGIN_NAME, instanceIdentifier, pipeline)
 {
-    addType(ENTITY_TYPE_MAIL, mMailAdaptorFactory,
+    setupSynchronizer(QSharedPointer<DummySynchronizer>::create(PLUGIN_NAME, instanceIdentifier));
+    setupChangereplay(QSharedPointer<Sink::NullChangeReplay>::create());
+    setupPreprocessors(ENTITY_TYPE_MAIL,
             QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Mail>);
-    addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory,
+    setupPreprocessors(ENTITY_TYPE_FOLDER,
             QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Folder>);
-    addType(ENTITY_TYPE_EVENT, mEventAdaptorFactory,
+    setupPreprocessors(ENTITY_TYPE_EVENT,
             QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Event>);
 }
 
diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h
index f73eb32..e8757db 100644
--- a/examples/dummyresource/resourcefactory.h
+++ b/examples/dummyresource/resourcefactory.h
@@ -47,10 +47,6 @@ private:
     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 &);
     void 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);
-
-    QSharedPointer<DummyEventAdaptorFactory> mEventAdaptorFactory;
-    QSharedPointer<DummyMailAdaptorFactory> mMailAdaptorFactory;
-    QSharedPointer<DummyFolderAdaptorFactory> mFolderAdaptorFactory;
 };
 
 class DummyResourceFactory : public Sink::ResourceFactory