TypeImplementation cleanup

10 files changed, 80 insertions, 161 deletions

diff --git a/common/domain/event.cpp b/common/domain/event.cpp
index 41ec625..a8098b7 100644
--- a/common/domain/event.cpp
+++ b/common/domain/event.cpp
@@ -21,48 +21,32 @@
 #include <QVector>
 #include <QByteArray>
 #include <QString>
-#include <QMutex>
-#include <QMutexLocker>
 
-#include "../resultset.h"
-#include "../index.h"
-#include "../storage.h"
-#include "../log.h"
 #include "../propertymapper.h"
-#include "../query.h"
-#include "../definitions.h"
 #include "../typeindex.h"
-#include "entitybuffer.h"
-#include "datastorequery.h"
 #include "entity_generated.h"
 
 #include "event_generated.h"
 
-static QMutex sMutex;
-
 using namespace Sink::ApplicationDomain;
 
-void TypeImplementation<Event>::configureIndex(TypeIndex &index)
+void TypeImplementation<Event>::configure(TypeIndex &index)
 {
     index.addProperty<QByteArray>(Event::Uid::name);
 }
 
-QSharedPointer<ReadPropertyMapper<TypeImplementation<Event>::Buffer> > TypeImplementation<Event>::initializeReadPropertyMapper()
+void TypeImplementation<Event>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
 {
-    auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
-    propertyMapper->addMapping<Event::Summary, Buffer>(&Buffer::summary);
-    propertyMapper->addMapping<Event::Description, Buffer>(&Buffer::description);
-    propertyMapper->addMapping<Event::Uid, Buffer>(&Buffer::uid);
-    propertyMapper->addMapping<Event::Attachment, Buffer>(&Buffer::attachment);
-    return propertyMapper;
+    propertyMapper.addMapping<Event::Summary, Buffer>(&Buffer::summary);
+    propertyMapper.addMapping<Event::Description, Buffer>(&Buffer::description);
+    propertyMapper.addMapping<Event::Uid, Buffer>(&Buffer::uid);
+    propertyMapper.addMapping<Event::Attachment, Buffer>(&Buffer::attachment);
 }
 
-QSharedPointer<WritePropertyMapper<TypeImplementation<Event>::BufferBuilder> > TypeImplementation<Event>::initializeWritePropertyMapper()
+void TypeImplementation<Event>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
 {
-    auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
-    propertyMapper->addMapping<Event::Summary>(&BufferBuilder::add_summary);
-    propertyMapper->addMapping<Event::Description>(&BufferBuilder::add_description);
-    propertyMapper->addMapping<Event::Uid>(&BufferBuilder::add_uid);
-    propertyMapper->addMapping<Event::Attachment>(&BufferBuilder::add_attachment);
-    return propertyMapper;
+    propertyMapper.addMapping<Event::Summary>(&BufferBuilder::add_summary);
+    propertyMapper.addMapping<Event::Description>(&BufferBuilder::add_description);
+    propertyMapper.addMapping<Event::Uid>(&BufferBuilder::add_uid);
+    propertyMapper.addMapping<Event::Attachment>(&BufferBuilder::add_attachment);
 }
diff --git a/common/domain/event.h b/common/domain/event.h
index fbaf4ed..d85b9b3 100644
--- a/common/domain/event.h
+++ b/common/domain/event.h
@@ -20,10 +20,6 @@
 
 #include "applicationdomaintype.h"
 
-#include "storage.h"
-#include "storage/entitystore.h"
-
-class ResultSet;
 class QByteArray;
 
 template<typename T>
@@ -31,13 +27,9 @@ class ReadPropertyMapper;
 template<typename T>
 class WritePropertyMapper;
 
-class DataStoreQuery;
-
 class TypeIndex;
 
 namespace Sink {
-    class Query;
-
 namespace ApplicationDomain {
     namespace Buffer {
         struct Event;
@@ -54,10 +46,9 @@ class TypeImplementation<Sink::ApplicationDomain::Event> {
 public:
     typedef Sink::ApplicationDomain::Buffer::Event Buffer;
     typedef Sink::ApplicationDomain::Buffer::EventBuilder BufferBuilder;
-    static void configureIndex(TypeIndex &index);
-    static QSet<QByteArray> indexedProperties();
-    static QSharedPointer<ReadPropertyMapper<Buffer> > initializeReadPropertyMapper();
-    static QSharedPointer<WritePropertyMapper<BufferBuilder> > initializeWritePropertyMapper();
+    static void configure(TypeIndex &);
+    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(WritePropertyMapper<BufferBuilder> &);
 };
 
 }
diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
index 058035a..e6701ac 100644
--- a/common/domain/folder.cpp
+++ b/common/domain/folder.cpp
@@ -18,54 +18,36 @@
  */
 #include "folder.h"
 
-#include <QVector>
 #include <QByteArray>
 #include <QString>
-#include <QMutex>
-#include <QMutexLocker>
 
-#include "../resultset.h"
-#include "../index.h"
-#include "../storage.h"
-#include "../log.h"
 #include "../propertymapper.h"
-#include "../query.h"
-#include "../definitions.h"
 #include "../typeindex.h"
 #include "entitybuffer.h"
-#include "datastorequery.h"
 #include "entity_generated.h"
 
 #include "folder_generated.h"
 
-SINK_DEBUG_AREA("folder");
-
-static QMutex sMutex;
-
 using namespace Sink::ApplicationDomain;
 
-void TypeImplementation<Folder>::configureIndex(TypeIndex &index)
+void TypeImplementation<Folder>::configure(TypeIndex &index)
 {
     index.addProperty<QByteArray>(Folder::Parent::name);
     index.addProperty<QString>(Folder::Name::name);
 }
 
-QSharedPointer<ReadPropertyMapper<TypeImplementation<Folder>::Buffer> > TypeImplementation<Folder>::initializeReadPropertyMapper()
+void TypeImplementation<Folder>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
 {
-    auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
-    propertyMapper->addMapping<Folder::Parent, Buffer>(&Buffer::parent);
-    propertyMapper->addMapping<Folder::Name, Buffer>(&Buffer::name);
-    propertyMapper->addMapping<Folder::Icon, Buffer>(&Buffer::icon);
-    propertyMapper->addMapping<Folder::SpecialPurpose, Buffer>(&Buffer::specialpurpose);
-    return propertyMapper;
+    propertyMapper.addMapping<Folder::Parent, Buffer>(&Buffer::parent);
+    propertyMapper.addMapping<Folder::Name, Buffer>(&Buffer::name);
+    propertyMapper.addMapping<Folder::Icon, Buffer>(&Buffer::icon);
+    propertyMapper.addMapping<Folder::SpecialPurpose, Buffer>(&Buffer::specialpurpose);
 }
 
-QSharedPointer<WritePropertyMapper<TypeImplementation<Folder>::BufferBuilder> > TypeImplementation<Folder>::initializeWritePropertyMapper()
+void TypeImplementation<Folder>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
 {
-    auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
-    propertyMapper->addMapping<Folder::Parent>(&BufferBuilder::add_parent);
-    propertyMapper->addMapping<Folder::Name>(&BufferBuilder::add_name);
-    propertyMapper->addMapping<Folder::Icon>(&BufferBuilder::add_icon);
-    propertyMapper->addMapping<Folder::SpecialPurpose>(&BufferBuilder::add_specialpurpose);
-    return propertyMapper;
+    propertyMapper.addMapping<Folder::Parent>(&BufferBuilder::add_parent);
+    propertyMapper.addMapping<Folder::Name>(&BufferBuilder::add_name);
+    propertyMapper.addMapping<Folder::Icon>(&BufferBuilder::add_icon);
+    propertyMapper.addMapping<Folder::SpecialPurpose>(&BufferBuilder::add_specialpurpose);
 }
diff --git a/common/domain/folder.h b/common/domain/folder.h
index 47a544b..3c83794 100644
--- a/common/domain/folder.h
+++ b/common/domain/folder.h
@@ -20,13 +20,6 @@
 
 #include "applicationdomaintype.h"
 
-#include "storage.h"
-#include "storage/entitystore.h"
-
-class ResultSet;
-class QByteArray;
-class DataStoreQuery;
-
 template<typename T>
 class ReadPropertyMapper;
 template<typename T>
@@ -35,7 +28,6 @@ class WritePropertyMapper;
 class TypeIndex;
 
 namespace Sink {
-    class Query;
 
 namespace ApplicationDomain {
     namespace Buffer {
@@ -48,10 +40,9 @@ class TypeImplementation<Sink::ApplicationDomain::Folder> {
 public:
     typedef Sink::ApplicationDomain::Buffer::Folder Buffer;
     typedef Sink::ApplicationDomain::Buffer::FolderBuilder BufferBuilder;
-    static void configureIndex(TypeIndex &index);
-    static QSet<QByteArray> indexedProperties();
-    static QSharedPointer<ReadPropertyMapper<Buffer> > initializeReadPropertyMapper();
-    static QSharedPointer<WritePropertyMapper<BufferBuilder> > initializeWritePropertyMapper();
+    static void configure(TypeIndex &);
+    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(WritePropertyMapper<BufferBuilder> &);
 };
 
 }
diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 4b33f06..8abe259 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -21,32 +21,19 @@
 #include <QVector>
 #include <QByteArray>
 #include <QString>
-#include <QMutex>
-#include <QMutexLocker>
 
-#include "../resultset.h"
-#include "../index.h"
-#include "../storage.h"
-#include "../log.h"
 #include "../propertymapper.h"
-#include "../query.h"
-#include "../definitions.h"
 #include "../typeindex.h"
 #include "entitybuffer.h"
-#include "datastorequery.h"
 #include "entity_generated.h"
 #include "mail/threadindexer.h"
 
 #include "mail_generated.h"
 
-SINK_DEBUG_AREA("mail");
-
-static QMutex sMutex;
-
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
 
-void TypeImplementation<Mail>::configureIndex(TypeIndex &index)
+void TypeImplementation<Mail>::configure(TypeIndex &index)
 {
     index.addProperty<QByteArray>(Mail::Uid::name);
     index.addProperty<QByteArray>(Mail::Sender::name);
@@ -66,56 +53,41 @@ void TypeImplementation<Mail>::configureIndex(TypeIndex &index)
     index.addSecondaryProperty<Mail::ThreadId, Mail::MessageId>();
 }
 
-static TypeIndex &getIndex()
-{
-    QMutexLocker locker(&sMutex);
-    static TypeIndex *index = 0;
-    if (!index) {
-        index = new TypeIndex("mail");
-        TypeImplementation<Mail>::configureIndex(*index);
-    }
-    return *index;
-}
 
-QSharedPointer<ReadPropertyMapper<TypeImplementation<Mail>::Buffer> > TypeImplementation<Mail>::initializeReadPropertyMapper()
+void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
 {
-    auto propertyMapper = QSharedPointer<ReadPropertyMapper<Buffer> >::create();
-    propertyMapper->addMapping<Mail::Uid, Buffer>(&Buffer::uid);
-    propertyMapper->addMapping<Mail::Sender, Buffer>(&Buffer::sender);
-    propertyMapper->addMapping<Mail::SenderName, Buffer>(&Buffer::senderName);
-    propertyMapper->addMapping<Mail::Subject, Buffer>(&Buffer::subject);
-    propertyMapper->addMapping<Mail::Date, Buffer>(&Buffer::date);
-    propertyMapper->addMapping<Mail::Unread, Buffer>(&Buffer::unread);
-    propertyMapper->addMapping<Mail::Important, Buffer>(&Buffer::important);
-    propertyMapper->addMapping<Mail::Folder, Buffer>(&Buffer::folder);
-    propertyMapper->addMapping<Mail::MimeMessage, Buffer>(&Buffer::mimeMessage);
-    propertyMapper->addMapping<Mail::Draft, Buffer>(&Buffer::draft);
-    propertyMapper->addMapping<Mail::Trash, Buffer>(&Buffer::trash);
-    propertyMapper->addMapping<Mail::Sent, Buffer>(&Buffer::sent);
-    propertyMapper->addMapping<Mail::MessageId, Buffer>(&Buffer::messageId);
-    propertyMapper->addMapping<Mail::ParentMessageId, Buffer>(&Buffer::parentMessageId);
-    return propertyMapper;
-}
 
-QSharedPointer<WritePropertyMapper<TypeImplementation<Mail>::BufferBuilder> > TypeImplementation<Mail>::initializeWritePropertyMapper()
-{
-    auto propertyMapper = QSharedPointer<WritePropertyMapper<BufferBuilder> >::create();
 
-    propertyMapper->addMapping<Mail::Uid>(&BufferBuilder::add_uid);
-    propertyMapper->addMapping<Mail::Sender>(&BufferBuilder::add_sender);
-    propertyMapper->addMapping<Mail::SenderName>(&BufferBuilder::add_senderName);
-    propertyMapper->addMapping<Mail::Subject>(&BufferBuilder::add_subject);
-    propertyMapper->addMapping<Mail::Date>(&BufferBuilder::add_date);
-    propertyMapper->addMapping<Mail::Unread>(&BufferBuilder::add_unread);
-    propertyMapper->addMapping<Mail::Important>(&BufferBuilder::add_important);
-    propertyMapper->addMapping<Mail::Folder>(&BufferBuilder::add_folder);
-    propertyMapper->addMapping<Mail::MimeMessage>(&BufferBuilder::add_mimeMessage);
-    propertyMapper->addMapping<Mail::Draft>(&BufferBuilder::add_draft);
-    propertyMapper->addMapping<Mail::Trash>(&BufferBuilder::add_trash);
-    propertyMapper->addMapping<Mail::Sent>(&BufferBuilder::add_sent);
-    propertyMapper->addMapping<Mail::MessageId>(&BufferBuilder::add_messageId);
-    propertyMapper->addMapping<Mail::ParentMessageId>(&BufferBuilder::add_parentMessageId);
-    return propertyMapper;
+    propertyMapper.addMapping<Mail::Uid, Buffer>(&Buffer::uid);
+    propertyMapper.addMapping<Mail::Sender, Buffer>(&Buffer::sender);
+    propertyMapper.addMapping<Mail::SenderName, Buffer>(&Buffer::senderName);
+    propertyMapper.addMapping<Mail::Subject, Buffer>(&Buffer::subject);
+    propertyMapper.addMapping<Mail::Date, Buffer>(&Buffer::date);
+    propertyMapper.addMapping<Mail::Unread, Buffer>(&Buffer::unread);
+    propertyMapper.addMapping<Mail::Important, Buffer>(&Buffer::important);
+    propertyMapper.addMapping<Mail::Folder, Buffer>(&Buffer::folder);
+    propertyMapper.addMapping<Mail::MimeMessage, Buffer>(&Buffer::mimeMessage);
+    propertyMapper.addMapping<Mail::Draft, Buffer>(&Buffer::draft);
+    propertyMapper.addMapping<Mail::Trash, Buffer>(&Buffer::trash);
+    propertyMapper.addMapping<Mail::Sent, Buffer>(&Buffer::sent);
+    propertyMapper.addMapping<Mail::MessageId, Buffer>(&Buffer::messageId);
+    propertyMapper.addMapping<Mail::ParentMessageId, Buffer>(&Buffer::parentMessageId);
 }
 
-
+void TypeImplementation<Mail>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+{
+    propertyMapper.addMapping<Mail::Uid>(&BufferBuilder::add_uid);
+    propertyMapper.addMapping<Mail::Sender>(&BufferBuilder::add_sender);
+    propertyMapper.addMapping<Mail::SenderName>(&BufferBuilder::add_senderName);
+    propertyMapper.addMapping<Mail::Subject>(&BufferBuilder::add_subject);
+    propertyMapper.addMapping<Mail::Date>(&BufferBuilder::add_date);
+    propertyMapper.addMapping<Mail::Unread>(&BufferBuilder::add_unread);
+    propertyMapper.addMapping<Mail::Important>(&BufferBuilder::add_important);
+    propertyMapper.addMapping<Mail::Folder>(&BufferBuilder::add_folder);
+    propertyMapper.addMapping<Mail::MimeMessage>(&BufferBuilder::add_mimeMessage);
+    propertyMapper.addMapping<Mail::Draft>(&BufferBuilder::add_draft);
+    propertyMapper.addMapping<Mail::Trash>(&BufferBuilder::add_trash);
+    propertyMapper.addMapping<Mail::Sent>(&BufferBuilder::add_sent);
+    propertyMapper.addMapping<Mail::MessageId>(&BufferBuilder::add_messageId);
+    propertyMapper.addMapping<Mail::ParentMessageId>(&BufferBuilder::add_parentMessageId);
+}
diff --git a/common/domain/mail.h b/common/domain/mail.h
index c0cfc55..c12976a 100644
--- a/common/domain/mail.h
+++ b/common/domain/mail.h
@@ -20,12 +20,7 @@
 
 #include "applicationdomaintype.h"
 
-#include "storage.h"
-#include "storage/entitystore.h"
-
-class ResultSet;
 class QByteArray;
-class DataStoreQuery;
 
 template<typename T>
 class ReadPropertyMapper;
@@ -35,8 +30,6 @@ class WritePropertyMapper;
 class TypeIndex;
 
 namespace Sink {
-    class Query;
-
 namespace ApplicationDomain {
     namespace Buffer {
         struct Mail;
@@ -48,10 +41,9 @@ class TypeImplementation<Sink::ApplicationDomain::Mail> {
 public:
     typedef Sink::ApplicationDomain::Buffer::Mail Buffer;
     typedef Sink::ApplicationDomain::Buffer::MailBuilder BufferBuilder;
-    static void configureIndex(TypeIndex &index);
-    static QSet<QByteArray> indexedProperties();
-    static QSharedPointer<ReadPropertyMapper<Buffer> > initializeReadPropertyMapper();
-    static QSharedPointer<WritePropertyMapper<BufferBuilder> > initializeWritePropertyMapper();
+    static void configure(TypeIndex &index);
+    static void configure(ReadPropertyMapper<Buffer> &propertyMapper);
+    static void configure(WritePropertyMapper<BufferBuilder> &propertyMapper);
 };
 
 }
diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index 195d5ec..0eb90b3 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -139,10 +139,14 @@ class SINK_EXPORT DomainTypeAdaptorFactory : public DomainTypeAdaptorFactoryInte
 
 public:
     DomainTypeAdaptorFactory()
-        : mLocalMapper(Sink::ApplicationDomain::TypeImplementation<DomainType>::initializeReadPropertyMapper()),
+        : mLocalMapper(QSharedPointer<ReadPropertyMapper<LocalBuffer>>::create()),
           mResourceMapper(QSharedPointer<ReadPropertyMapper<ResourceBuffer>>::create()),
-          mLocalWriteMapper(Sink::ApplicationDomain::TypeImplementation<DomainType>::initializeWritePropertyMapper()),
-          mResourceWriteMapper(QSharedPointer<WritePropertyMapper<ResourceBuilder>>::create()){};
+          mLocalWriteMapper(QSharedPointer<WritePropertyMapper<LocalBuilder>>::create()),
+          mResourceWriteMapper(QSharedPointer<WritePropertyMapper<ResourceBuilder>>::create())
+    {
+        Sink::ApplicationDomain::TypeImplementation<DomainType>::configure(*mLocalMapper);
+        Sink::ApplicationDomain::TypeImplementation<DomainType>::configure(*mLocalWriteMapper);
+    }
     virtual ~DomainTypeAdaptorFactory(){};
 
     /**
diff --git a/common/storage/entitystore.cpp b/common/storage/entitystore.cpp
index a3d9997..f7f235e 100644
--- a/common/storage/entitystore.cpp
+++ b/common/storage/entitystore.cpp
@@ -64,7 +64,7 @@ public:
     /*         return *indexByType.value(type); */
     /*     } */
     /*     auto index = QSharedPointer<TypeIndex>::create(type); */
-    /*     ApplicationDomain::TypeImplementation<T>::configureIndex(*index); */
+    /*     ApplicationDomain::TypeImplementation<T>::configure(*index); */
     /*     indexByType.insert(type, index); */
     /*     return *index; */
     /* } */
@@ -81,11 +81,11 @@ public:
         // Try this: (T would i.e. become
         // TypeHelper<ApplicationDomain::TypeImplementation>::T::configureIndex(*index);
         if (type == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) {
-            ApplicationDomain::TypeImplementation<ApplicationDomain::Folder>::configureIndex(*index);
+            ApplicationDomain::TypeImplementation<ApplicationDomain::Folder>::configure(*index);
         } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) {
-            ApplicationDomain::TypeImplementation<ApplicationDomain::Mail>::configureIndex(*index);
+            ApplicationDomain::TypeImplementation<ApplicationDomain::Mail>::configure(*index);
         } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Event>()) {
-            ApplicationDomain::TypeImplementation<ApplicationDomain::Event>::configureIndex(*index);
+            ApplicationDomain::TypeImplementation<ApplicationDomain::Event>::configure(*index);
         } else {
             Q_ASSERT(false);
             SinkError() << "Unkonwn type " << type;
diff --git a/common/synchronizer.h b/common/synchronizer.h
index 0a1efe1..12bb587 100644
--- a/common/synchronizer.h
+++ b/common/synchronizer.h
@@ -26,6 +26,7 @@
 #include <query.h>
 #include <messagequeue.h>
 #include <storage.h>
+#include <storage/entitystore.h>
 
 namespace Sink {
 class RemoteIdMap;
diff --git a/tests/domainadaptortest.cpp b/tests/domainadaptortest.cpp
index f4ac008..c29e61b 100644
--- a/tests/domainadaptortest.cpp
+++ b/tests/domainadaptortest.cpp
@@ -18,7 +18,8 @@ class TestFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Eve
 public:
     TestFactory()
     {
-        mResourceWriteMapper = Sink::ApplicationDomain::TypeImplementation<Sink::ApplicationDomain::Event>::initializeWritePropertyMapper();
+        mResourceWriteMapper = QSharedPointer<WritePropertyMapper<Sink::ApplicationDomain::Buffer::EventBuilder>>::create();
+        Sink::ApplicationDomain::TypeImplementation<Sink::ApplicationDomain::Event>::configure(*mResourceWriteMapper);
     }
 };
 
@@ -39,7 +40,8 @@ private slots:
 
     void testCreateBufferPart()
     {
-        auto writeMapper = Sink::ApplicationDomain::TypeImplementation<Sink::ApplicationDomain::Event>::initializeWritePropertyMapper();
+        auto writeMapper = QSharedPointer<WritePropertyMapper<Sink::ApplicationDomain::Buffer::EventBuilder>>::create();
+        Sink::ApplicationDomain::TypeImplementation<Sink::ApplicationDomain::Event>::configure(*writeMapper);
 
         Sink::ApplicationDomain::Event event;
         event.setProperty("summary", "foo");