8 files changed, 12 insertions, 139 deletions

diff --git a/examples/maildirresource/CMakeLists.txt b/examples/maildirresource/CMakeLists.txt
index e4d113c..a8f0359 100644
--- a/examples/maildirresource/CMakeLists.txt
+++ b/examples/maildirresource/CMakeLists.txt
@@ -5,13 +5,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 find_package(KF5 COMPONENTS REQUIRED Mime)
 
-add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp domainadaptor.cpp)
+add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp libmaildir/maildir.cpp libmaildir/keycache.cpp)
 qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink maildir KF5::Mime)
+target_link_libraries(${PROJECT_NAME} sink KF5::Mime)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
 
 add_definitions(-DTESTDATAPATH="${CMAKE_CURRENT_SOURCE_DIR}/tests/data")
 
-add_subdirectory(libmaildir)
 add_subdirectory(tests)
diff --git a/examples/maildirresource/domainadaptor.cpp b/examples/maildirresource/domainadaptor.cpp
deleted file mode 100644
index 71b2354..0000000
--- a/examples/maildirresource/domainadaptor.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *   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.
- */
-
-#include "domainadaptor.h"
-
-using namespace flatbuffers;
-
-MaildirMailAdaptorFactory::MaildirMailAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-
-}
-
-MaildirFolderAdaptorFactory::MaildirFolderAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-
-}
-
diff --git a/examples/maildirresource/domainadaptor.h b/examples/maildirresource/domainadaptor.h
deleted file mode 100644
index 700d2e5..0000000
--- a/examples/maildirresource/domainadaptor.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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 <common/domainadaptor.h>
-#include "mail_generated.h"
-#include "folder_generated.h"
-#include "dummy_generated.h"
-
-class MaildirMailAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Mail, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    MaildirMailAdaptorFactory();
-    virtual ~MaildirMailAdaptorFactory() {};
-};
-
-class MaildirFolderAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Folder, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    MaildirFolderAdaptorFactory();
-    virtual ~MaildirFolderAdaptorFactory() {};
-};
diff --git a/examples/maildirresource/libmaildir/CMakeLists.txt b/examples/maildirresource/libmaildir/CMakeLists.txt
deleted file mode 100644
index e7803f5..0000000
--- a/examples/maildirresource/libmaildir/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# add_subdirectory( tests )
-
-set(maildir_LIB_SRCS keycache.cpp maildir.cpp)
-
-add_library(maildir ${LIBRARY_TYPE} ${maildir_LIB_SRCS})
-qt5_use_modules(maildir Core Network)
-# set_target_properties(maildir PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS maildir ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/examples/maildirresource/libmaildir/maildir.cpp b/examples/maildirresource/libmaildir/maildir.cpp
index a889ea2..203f6a6 100644
--- a/examples/maildirresource/libmaildir/maildir.cpp
+++ b/examples/maildirresource/libmaildir/maildir.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright (c) 2007 Till Adam <adam@kde.org>
+    Copyright (c) 2017 Christian Mollekopf <mollekopf@kolabsys.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
@@ -24,7 +25,6 @@
 #include <QDirIterator>
 #include <QFileInfo>
 #include <QHostInfo>
-#include <QUuid>
 #include <QLoggingCategory>
 
 Q_LOGGING_CATEGORY(log, "maildir");
diff --git a/examples/maildirresource/libmaildir/maildir.h b/examples/maildirresource/libmaildir/maildir.h
index c10b046..a72f2bc 100644
--- a/examples/maildirresource/libmaildir/maildir.h
+++ b/examples/maildirresource/libmaildir/maildir.h
@@ -1,5 +1,6 @@
 /*
     Copyright (c) 2007 Till Adam <adam@kde.org>
+    Copyright (c) 2017 Christian Mollekopf <mollekopf@kolabsys.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
@@ -20,9 +21,6 @@
 #ifndef MAILDIR_H
 #define MAILDIR_H
 
-
-#include "maildir_export.h"
-
 #include <QString>
 #include <QStringList>
 
@@ -30,7 +28,7 @@ class QDateTime;
 
 namespace KPIM {
 
-class MAILDIR_EXPORT Maildir
+class Maildir
 {
 public:
     /**
diff --git a/examples/maildirresource/libmaildir/maildir_export.h b/examples/maildirresource/libmaildir/maildir_export.h
deleted file mode 100644
index b330fd0..0000000
--- a/examples/maildirresource/libmaildir/maildir_export.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2007 David Faure <faure@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library 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
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef MAILDIR_EXPORT_H
-#define MAILDIR_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-// #include <kdemacros.h>
-
-#ifndef MAILDIR_EXPORT
-// # if defined(KDEPIM_STATIC_LIBS)
-//    #<{(| No export/import for static libraries |)}>#
-#  define MAILDIR_EXPORT
-// # elif defined(MAKE_MAILDIR_LIB)
-//    #<{(| We are building this library |)}># 
-// #  define MAILDIR_EXPORT KDE_EXPORT
-// # else
-//    #<{(| We are using this library |)}># 
-// #  define MAILDIR_EXPORT KDE_IMPORT
-// # endif
-#endif
-//
-// # ifndef MAILDIR_EXPORT_DEPRECATED
-// #  define MAILDIR_EXPORT_DEPRECATED KDE_DEPRECATED MAILDIR_EXPORT
-// # endif
-
-#endif
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 813d84f..40bab37 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -37,7 +37,7 @@
 
 #include <QDir>
 #include <QDirIterator>
-#include <KMime/KMime/KMimeMessage>
+#include <KMime/KMimeMessage>
 
 //This is the resources entity type, and not the domain type
 #define ENTITY_TYPE_MAIL "mail"
@@ -360,12 +360,12 @@ public:
 
     KAsync::Job<void> synchronizeWithSource(const Sink::QueryBase &query) Q_DECL_OVERRIDE
     {
-        auto job = KAsync::start<void>([this] {
+        auto job = KAsync::start([this] {
             KPIM::Maildir maildir(mMaildirPath, true);
             if (!maildir.isValid(false)) {
-                return KAsync::error<void>(1, "Maildir path doesn't point to a valid maildir: " + mMaildirPath);
+                return KAsync::error(ApplicationDomain::ConfigurationError, "Maildir path doesn't point to a valid maildir: " + mMaildirPath);
             }
-            return KAsync::null<void>();
+            return KAsync::null();
         });
 
         if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) {
@@ -551,7 +551,7 @@ MaildirResource::MaildirResource(const Sink::ResourceContext &resourceContext)
     setupSynchronizer(synchronizer);
     setupInspector(QSharedPointer<MaildirInspector>::create(resourceContext));
 
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MaildirMimeMessageMover(resourceContext.instanceId(), mMaildirPath) << new MaildirMailPropertyExtractor);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor << new MaildirMimeMessageMover(resourceContext.instanceId(), mMaildirPath) << new MaildirMailPropertyExtractor);
     setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>() << new FolderPreprocessor(mMaildirPath));
 
     KPIM::Maildir dir(mMaildirPath, true);
@@ -596,8 +596,8 @@ void MaildirResourceFactory::registerFacades(const QByteArray &name, Sink::Facad
 
 void MaildirResourceFactory::registerAdaptorFactories(const QByteArray &name, Sink::AdaptorFactoryRegistry &registry)
 {
-    registry.registerFactory<Sink::ApplicationDomain::Mail, MaildirMailAdaptorFactory>(name);
-    registry.registerFactory<Sink::ApplicationDomain::Folder, MaildirFolderAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Mail, DefaultAdaptorFactory<ApplicationDomain::Mail>>(name);
+    registry.registerFactory<ApplicationDomain::Folder, DefaultAdaptorFactory<ApplicationDomain::Folder>>(name);
 }
 
 void MaildirResourceFactory::removeDataFromDisk(const QByteArray &instanceIdentifier)