4 files changed, 8 insertions, 102 deletions

diff --git a/examples/dummyresource/CMakeLists.txt b/examples/dummyresource/CMakeLists.txt
index 6400f0c..2bbaa47 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 dummystore.cpp)
+add_library(${PROJECT_NAME} SHARED resourcefactory.cpp domainadaptor.cpp dummystore.cpp)
 generate_flatbuffers(${PROJECT_NAME} dummycalendar)
 qt5_use_modules(${PROJECT_NAME} Core Network)
 target_link_libraries(${PROJECT_NAME} sink)
diff --git a/examples/dummyresource/facade.cpp b/examples/dummyresource/facade.cpp
deleted file mode 100644
index 4343eba..0000000
--- a/examples/dummyresource/facade.cpp
+++ /dev/null
@@ -1,51 +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 "facade.h"
-
-#include "domainadaptor.h"
-
-DummyResourceFacade::DummyResourceFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Event>(context)
-{
-}
-
-DummyResourceFacade::~DummyResourceFacade()
-{
-}
-
-
-DummyResourceMailFacade::DummyResourceMailFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Mail>(context)
-{
-}
-
-DummyResourceMailFacade::~DummyResourceMailFacade()
-{
-}
-
-
-DummyResourceFolderFacade::DummyResourceFolderFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Folder>(context)
-{
-}
-
-DummyResourceFolderFacade::~DummyResourceFolderFacade()
-{
-}
diff --git a/examples/dummyresource/facade.h b/examples/dummyresource/facade.h
deleted file mode 100644
index 1bb45fd..0000000
--- a/examples/dummyresource/facade.h
+++ /dev/null
@@ -1,44 +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 "common/facade.h"
-#include "common/domain/event.h"
-
-class DummyResourceFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Event>
-{
-public:
-    DummyResourceFacade(const Sink::ResourceContext &context);
-    virtual ~DummyResourceFacade();
-};
-
-class DummyResourceMailFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Mail>
-{
-public:
-    DummyResourceMailFacade(const Sink::ResourceContext &context);
-    virtual ~DummyResourceMailFacade();
-};
-
-class DummyResourceFolderFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Folder>
-{
-public:
-    DummyResourceFolderFacade(const Sink::ResourceContext &context);
-    virtual ~DummyResourceFolderFacade();
-};
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index e915710..c1f536e 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -26,8 +26,6 @@
 #include "mail_generated.h"
 #include "domainadaptor.h"
 #include "log.h"
-#include "domain/event.h"
-#include "domain/mail.h"
 #include "dummystore.h"
 #include "definitions.h"
 #include "facadefactory.h"
@@ -46,6 +44,8 @@
 
 SINK_DEBUG_AREA("dummyresource")
 
+using namespace Sink;
+
 class DummySynchronizer : public Sink::Synchronizer {
     public:
 
@@ -69,6 +69,7 @@ class DummySynchronizer : public Sink::Synchronizer {
     Sink::ApplicationDomain::Mail::Ptr createMail(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data)
     {
         auto mail = Sink::ApplicationDomain::Mail::Ptr::create();
+        mail->setExtractedMessageId(ridBuffer);
         mail->setExtractedSubject(data.value("subject").toString());
         mail->setExtractedSender(Sink::ApplicationDomain::Mail::Contact{data.value("senderName").toString(), data.value("senderEmail").toString()});
         mail->setExtractedDate(data.value("date").toDateTime());
@@ -163,7 +164,7 @@ DummyResource::DummyResource(const Sink::ResourceContext &resourceContext, const
     setupSynchronizer(QSharedPointer<DummySynchronizer>::create(resourceContext));
     setupInspector(QSharedPointer<DummyInspector>::create(resourceContext));
     setupPreprocessors(ENTITY_TYPE_MAIL,
-            QVector<Sink::Preprocessor*>() << new MailPropertyExtractor << new SpecialPurposeProcessor{resourceContext.resourceType, resourceContext.instanceId()});
+            QVector<Sink::Preprocessor*>() << new MailPropertyExtractor << new SpecialPurposeProcessor);
     setupPreprocessors(ENTITY_TYPE_FOLDER,
             QVector<Sink::Preprocessor*>());
     setupPreprocessors(ENTITY_TYPE_EVENT,
@@ -194,9 +195,9 @@ Sink::Resource *DummyResourceFactory::createResource(const Sink::ResourceContext
 
 void DummyResourceFactory::registerFacades(const QByteArray &resourceName, Sink::FacadeFactory &factory)
 {
-    factory.registerFacade<Sink::ApplicationDomain::Event, DummyResourceFacade>(resourceName);
-    factory.registerFacade<Sink::ApplicationDomain::Mail, DummyResourceMailFacade>(resourceName);
-    factory.registerFacade<Sink::ApplicationDomain::Folder, DummyResourceFolderFacade>(resourceName);
+    factory.registerFacade<ApplicationDomain::Event, DefaultFacade<ApplicationDomain::Event>>(resourceName);
+    factory.registerFacade<ApplicationDomain::Mail, DefaultFacade<ApplicationDomain::Mail>>(resourceName);
+    factory.registerFacade<ApplicationDomain::Folder, DefaultFacade<ApplicationDomain::Folder>>(resourceName);
 }
 
 void DummyResourceFactory::registerAdaptorFactories(const QByteArray &resourceName, Sink::AdaptorFactoryRegistry &registry)