From a4ce2b2eda8a2fea4263017e6868c327f22f5e47 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 28 Apr 2017 12:19:52 +0200
Subject: Removed the template argument from the write property mapper

---
 common/domain/typeimplementations.cpp | 80 +++++++++++++++++------------------
 common/domain/typeimplementations.h   | 11 +++--
 common/domainadaptor.h                | 16 +++----
 common/propertymapper.h               | 25 ++++++-----
 tests/domainadaptortest.cpp           |  8 ++--
 5 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/common/domain/typeimplementations.cpp b/common/domain/typeimplementations.cpp
index 5db35b7..598e5a7 100644
--- a/common/domain/typeimplementations.cpp
+++ b/common/domain/typeimplementations.cpp
@@ -81,24 +81,24 @@ void TypeImplementation<Mail>::configure(ReadPropertyMapper &propertyMapper)
     propertyMapper.addMapping<Mail::ParentMessageId, Buffer>(&Buffer::parentMessageId);
 }
 
-void TypeImplementation<Mail>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
-{
-    propertyMapper.addMapping<Mail::Sender>(&BufferBuilder::add_sender);
-    propertyMapper.addMapping<Mail::To>(&BufferBuilder::add_to);
-    propertyMapper.addMapping<Mail::Cc>(&BufferBuilder::add_cc);
-    propertyMapper.addMapping<Mail::Bcc>(&BufferBuilder::add_bcc);
-    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::FullPayloadAvailable>(&BufferBuilder::add_fullPayloadAvailable);
-    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);
+void TypeImplementation<Mail>::configure(WritePropertyMapper &propertyMapper)
+{
+    propertyMapper.addMapping<Mail::Sender, BufferBuilder>(&BufferBuilder::add_sender);
+    propertyMapper.addMapping<Mail::To, BufferBuilder>(&BufferBuilder::add_to);
+    propertyMapper.addMapping<Mail::Cc, BufferBuilder>(&BufferBuilder::add_cc);
+    propertyMapper.addMapping<Mail::Bcc, BufferBuilder>(&BufferBuilder::add_bcc);
+    propertyMapper.addMapping<Mail::Subject, BufferBuilder>(&BufferBuilder::add_subject);
+    propertyMapper.addMapping<Mail::Date, BufferBuilder>(&BufferBuilder::add_date);
+    propertyMapper.addMapping<Mail::Unread, BufferBuilder>(&BufferBuilder::add_unread);
+    propertyMapper.addMapping<Mail::Important, BufferBuilder>(&BufferBuilder::add_important);
+    propertyMapper.addMapping<Mail::Folder, BufferBuilder>(&BufferBuilder::add_folder);
+    propertyMapper.addMapping<Mail::MimeMessage, BufferBuilder>(&BufferBuilder::add_mimeMessage);
+    propertyMapper.addMapping<Mail::FullPayloadAvailable, BufferBuilder>(&BufferBuilder::add_fullPayloadAvailable);
+    propertyMapper.addMapping<Mail::Draft, BufferBuilder>(&BufferBuilder::add_draft);
+    propertyMapper.addMapping<Mail::Trash, BufferBuilder>(&BufferBuilder::add_trash);
+    propertyMapper.addMapping<Mail::Sent, BufferBuilder>(&BufferBuilder::add_sent);
+    propertyMapper.addMapping<Mail::MessageId, BufferBuilder>(&BufferBuilder::add_messageId);
+    propertyMapper.addMapping<Mail::ParentMessageId, BufferBuilder>(&BufferBuilder::add_parentMessageId);
 }
 
 
@@ -117,13 +117,13 @@ void TypeImplementation<Folder>::configure(ReadPropertyMapper &propertyMapper)
     propertyMapper.addMapping<Folder::Enabled, Buffer>(&Buffer::enabled);
 }
 
-void TypeImplementation<Folder>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+void TypeImplementation<Folder>::configure(WritePropertyMapper &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);
-    propertyMapper.addMapping<Folder::Enabled>(&BufferBuilder::add_enabled);
+    propertyMapper.addMapping<Folder::Parent, BufferBuilder>(&BufferBuilder::add_parent);
+    propertyMapper.addMapping<Folder::Name, BufferBuilder>(&BufferBuilder::add_name);
+    propertyMapper.addMapping<Folder::Icon, BufferBuilder>(&BufferBuilder::add_icon);
+    propertyMapper.addMapping<Folder::SpecialPurpose, BufferBuilder>(&BufferBuilder::add_specialpurpose);
+    propertyMapper.addMapping<Folder::Enabled, BufferBuilder>(&BufferBuilder::add_enabled);
 }
 
 void TypeImplementation<Folder>::configure(IndexPropertyMapper &)
@@ -148,15 +148,15 @@ void TypeImplementation<Contact>::configure(ReadPropertyMapper &propertyMapper)
     propertyMapper.addMapping<Contact::Lastname, Buffer>(&Buffer::lastname);
 }
 
-void TypeImplementation<Contact>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+void TypeImplementation<Contact>::configure(WritePropertyMapper &propertyMapper)
 {
-    propertyMapper.addMapping<Contact::Uid>(&BufferBuilder::add_uid);
-    propertyMapper.addMapping<Contact::Fn>(&BufferBuilder::add_fn);
-    propertyMapper.addMapping<Contact::Emails>(&BufferBuilder::add_emails);
-    propertyMapper.addMapping<Contact::Vcard>(&BufferBuilder::add_vcard);
-    propertyMapper.addMapping<Contact::Addressbook>(&BufferBuilder::add_addressbook);
-    propertyMapper.addMapping<Contact::Firstname>(&BufferBuilder::add_firstname);
-    propertyMapper.addMapping<Contact::Lastname>(&BufferBuilder::add_lastname);
+    propertyMapper.addMapping<Contact::Uid, BufferBuilder>(&BufferBuilder::add_uid);
+    propertyMapper.addMapping<Contact::Fn, BufferBuilder>(&BufferBuilder::add_fn);
+    propertyMapper.addMapping<Contact::Emails, BufferBuilder>(&BufferBuilder::add_emails);
+    propertyMapper.addMapping<Contact::Vcard, BufferBuilder>(&BufferBuilder::add_vcard);
+    propertyMapper.addMapping<Contact::Addressbook, BufferBuilder>(&BufferBuilder::add_addressbook);
+    propertyMapper.addMapping<Contact::Firstname, BufferBuilder>(&BufferBuilder::add_firstname);
+    propertyMapper.addMapping<Contact::Lastname, BufferBuilder>(&BufferBuilder::add_lastname);
 }
 
 void TypeImplementation<Contact>::configure(IndexPropertyMapper &)
@@ -177,10 +177,10 @@ void TypeImplementation<Addressbook>::configure(ReadPropertyMapper &propertyMapp
     propertyMapper.addMapping<Addressbook::Name, Buffer>(&Buffer::name);
 }
 
-void TypeImplementation<Addressbook>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+void TypeImplementation<Addressbook>::configure(WritePropertyMapper &propertyMapper)
 {
-    propertyMapper.addMapping<Addressbook::Parent>(&BufferBuilder::add_parent);
-    propertyMapper.addMapping<Addressbook::Name>(&BufferBuilder::add_name);
+    propertyMapper.addMapping<Addressbook::Parent, BufferBuilder>(&BufferBuilder::add_parent);
+    propertyMapper.addMapping<Addressbook::Name, BufferBuilder>(&BufferBuilder::add_name);
 }
 
 void TypeImplementation<Addressbook>::configure(IndexPropertyMapper &)
@@ -202,12 +202,12 @@ void TypeImplementation<Event>::configure(ReadPropertyMapper &propertyMapper)
     propertyMapper.addMapping<Event::Attachment, Buffer>(&Buffer::attachment);
 }
 
-void TypeImplementation<Event>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+void TypeImplementation<Event>::configure(WritePropertyMapper &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);
+    propertyMapper.addMapping<Event::Summary, BufferBuilder>(&BufferBuilder::add_summary);
+    propertyMapper.addMapping<Event::Description, BufferBuilder>(&BufferBuilder::add_description);
+    propertyMapper.addMapping<Event::Uid, BufferBuilder>(&BufferBuilder::add_uid);
+    propertyMapper.addMapping<Event::Attachment, BufferBuilder>(&BufferBuilder::add_attachment);
 }
 
 void TypeImplementation<Event>::configure(IndexPropertyMapper &)
diff --git a/common/domain/typeimplementations.h b/common/domain/typeimplementations.h
index 705b059..8acea58 100644
--- a/common/domain/typeimplementations.h
+++ b/common/domain/typeimplementations.h
@@ -27,7 +27,6 @@
 #include "addressbook_generated.h"
 
 class ReadPropertyMapper;
-template<typename T>
 class WritePropertyMapper;
 class IndexPropertyMapper;
 
@@ -48,7 +47,7 @@ public:
     typedef Sink::ApplicationDomain::Buffer::MailBuilder BufferBuilder;
     static void configure(TypeIndex &index);
     static void configure(ReadPropertyMapper &propertyMapper);
-    static void configure(WritePropertyMapper<BufferBuilder> &propertyMapper);
+    static void configure(WritePropertyMapper &propertyMapper);
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
@@ -59,7 +58,7 @@ public:
     typedef Sink::ApplicationDomain::Buffer::FolderBuilder BufferBuilder;
     static void configure(TypeIndex &);
     static void configure(ReadPropertyMapper &);
-    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(WritePropertyMapper &);
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
@@ -70,7 +69,7 @@ public:
     typedef Sink::ApplicationDomain::Buffer::ContactBuilder BufferBuilder;
     static void configure(TypeIndex &);
     static void configure(ReadPropertyMapper &);
-    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(WritePropertyMapper &);
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
@@ -81,7 +80,7 @@ public:
     typedef Sink::ApplicationDomain::Buffer::AddressbookBuilder BufferBuilder;
     static void configure(TypeIndex &);
     static void configure(ReadPropertyMapper &);
-    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(WritePropertyMapper &);
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
@@ -92,7 +91,7 @@ public:
     typedef Sink::ApplicationDomain::Buffer::EventBuilder BufferBuilder;
     static void configure(TypeIndex &);
     static void configure(ReadPropertyMapper &);
-    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(WritePropertyMapper &);
     static void configure(IndexPropertyMapper &indexPropertyMapper);
 };
 
diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index 9182001..2a7924a 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -40,10 +40,10 @@
  */
 template <class Builder, class Buffer>
 flatbuffers::Offset<Buffer>
-createBufferPart(const Sink::ApplicationDomain::ApplicationDomainType &domainObject, flatbuffers::FlatBufferBuilder &fbb, const WritePropertyMapper<Builder> &mapper)
+createBufferPart(const Sink::ApplicationDomain::ApplicationDomainType &domainObject, flatbuffers::FlatBufferBuilder &fbb, const WritePropertyMapper &mapper)
 {
     // First create a primitives such as strings using the mappings
-    QList<std::function<void(Builder &)>> propertiesToAddToResource;
+    QList<std::function<void(void *builder)>> propertiesToAddToResource;
     for (const auto &property : domainObject.changedProperties()) {
         // SinkTrace() << "copying property " << property;
         const auto value = domainObject.getProperty(property);
@@ -57,7 +57,7 @@ createBufferPart(const Sink::ApplicationDomain::ApplicationDomainType &domainObj
     // Then create all porperties using the above generated builderCalls
     Builder builder(fbb);
     for (auto propertyBuilder : propertiesToAddToResource) {
-        propertyBuilder(builder);
+        propertyBuilder(&builder);
     }
     return builder.Finish();
 }
@@ -68,7 +68,7 @@ createBufferPart(const Sink::ApplicationDomain::ApplicationDomainType &domainObj
  * After this the buffer can be extracted from the FlatBufferBuilder object.
  */
 template <typename Buffer, typename BufferBuilder>
-static void createBufferPartBuffer(const Sink::ApplicationDomain::ApplicationDomainType &domainObject, flatbuffers::FlatBufferBuilder &fbb, WritePropertyMapper<BufferBuilder> &mapper)
+static void createBufferPartBuffer(const Sink::ApplicationDomain::ApplicationDomainType &domainObject, flatbuffers::FlatBufferBuilder &fbb, WritePropertyMapper &mapper)
 {
     auto pos = createBufferPart<BufferBuilder, Buffer>(domainObject, fbb, mapper);
     // Because we cannot template the following call
@@ -178,8 +178,8 @@ public:
     DomainTypeAdaptorFactory()
         : mLocalMapper(QSharedPointer<ReadPropertyMapper>::create()),
           mResourceMapper(QSharedPointer<ReadPropertyMapper>::create()),
-          mLocalWriteMapper(QSharedPointer<WritePropertyMapper<LocalBuilder>>::create()),
-          mResourceWriteMapper(QSharedPointer<WritePropertyMapper<ResourceBuilder>>::create()),
+          mLocalWriteMapper(QSharedPointer<WritePropertyMapper>::create()),
+          mResourceWriteMapper(QSharedPointer<WritePropertyMapper>::create()),
           mIndexMapper(QSharedPointer<IndexPropertyMapper>::create())
     {
         Sink::ApplicationDomain::TypeImplementation<DomainType>::configure(*mLocalMapper);
@@ -238,8 +238,8 @@ public:
 protected:
     QSharedPointer<ReadPropertyMapper> mLocalMapper;
     QSharedPointer<ReadPropertyMapper> mResourceMapper;
-    QSharedPointer<WritePropertyMapper<LocalBuilder>> mLocalWriteMapper;
-    QSharedPointer<WritePropertyMapper<ResourceBuilder>> mResourceWriteMapper;
+    QSharedPointer<WritePropertyMapper> mLocalWriteMapper;
+    QSharedPointer<WritePropertyMapper> mResourceWriteMapper;
     QSharedPointer<IndexPropertyMapper> mIndexMapper;
 };
 
diff --git a/common/propertymapper.h b/common/propertymapper.h
index bca45aa..fa4592b 100644
--- a/common/propertymapper.h
+++ b/common/propertymapper.h
@@ -104,13 +104,12 @@ private:
     QHash<QByteArray, std::function<QVariant(void const *)>> mReadAccessors;
 };
 
-template <typename BufferBuilder>
 class WritePropertyMapper
 {
 public:
     virtual ~WritePropertyMapper(){};
 
-    virtual void setProperty(const QByteArray &key, const QVariant &value, QList<std::function<void(BufferBuilder &)>> &builderCalls, flatbuffers::FlatBufferBuilder &fbb) const
+    virtual void setProperty(const QByteArray &key, const QVariant &value, QList<std::function<void(void *builder)>> &builderCalls, flatbuffers::FlatBufferBuilder &fbb) const
     {
         if (mWriteAccessors.contains(key)) {
             auto accessor = mWriteAccessors.value(key);
@@ -123,36 +122,36 @@ public:
         return mWriteAccessors.contains(key);
     }
 
-    void addMapping(const QByteArray &property, const std::function<std::function<void(BufferBuilder &)>(const QVariant &, flatbuffers::FlatBufferBuilder &)> &mapping)
+    void addMapping(const QByteArray &property, const std::function<std::function<void(void *builder)>(const QVariant &, flatbuffers::FlatBufferBuilder &)> &mapping)
     {
         mWriteAccessors.insert(property, mapping);
     }
 
-    template <typename T>
+    template <typename T, typename BufferBuilder>
     void addMapping(void (BufferBuilder::*f)(uint8_t))
     {
-        addMapping(T::name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
-            return [value, f](BufferBuilder &builder) { (builder.*f)(value.value<typename T::Type>()); };
+        addMapping(T::name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(void *builder)> {
+            return [value, f](void *builder) { (static_cast<BufferBuilder*>(builder)->*f)(value.value<typename T::Type>()); };
         });
     }
 
-    template <typename T>
+    template <typename T, typename BufferBuilder>
     void addMapping(void (BufferBuilder::*f)(bool))
     {
-        addMapping(T::name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
-            return [value, f](BufferBuilder &builder) { (builder.*f)(value.value<typename T::Type>()); };
+        addMapping(T::name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(void *builder)> {
+            return [value, f](void *builder) { (static_cast<BufferBuilder*>(builder)->*f)(value.value<typename T::Type>()); };
         });
     }
 
-    template <typename T, typename Arg>
+    template <typename T, typename BufferBuilder, typename Arg>
     void addMapping(void (BufferBuilder::*f)(flatbuffers::Offset<Arg>))
     {
-        addMapping(T::name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
+        addMapping(T::name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(void *builder)> {
             auto offset = variantToProperty<typename T::Type>(value, fbb);
-            return [offset, f](BufferBuilder &builder) { (builder.*f)(offset); };
+            return [offset, f](void *builder) { (static_cast<BufferBuilder*>(builder)->*f)(offset); };
         });
     }
 
 private:
-    QHash<QByteArray, std::function<std::function<void(BufferBuilder &)>(const QVariant &, flatbuffers::FlatBufferBuilder &)>> mWriteAccessors;
+    QHash<QByteArray, std::function<std::function<void(void *builder)>(const QVariant &, flatbuffers::FlatBufferBuilder &)>> mWriteAccessors;
 };
diff --git a/tests/domainadaptortest.cpp b/tests/domainadaptortest.cpp
index a17152e..c5f6e3b 100644
--- a/tests/domainadaptortest.cpp
+++ b/tests/domainadaptortest.cpp
@@ -19,7 +19,7 @@ class TestFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Eve
 public:
     TestFactory()
     {
-        mResourceWriteMapper = QSharedPointer<WritePropertyMapper<Sink::ApplicationDomain::Buffer::EventBuilder>>::create();
+        mResourceWriteMapper = QSharedPointer<WritePropertyMapper>::create();
         Sink::ApplicationDomain::TypeImplementation<Sink::ApplicationDomain::Event>::configure(*mResourceWriteMapper);
     }
 };
@@ -29,7 +29,7 @@ class TestMailFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain:
 public:
     TestMailFactory()
     {
-        mResourceWriteMapper = QSharedPointer<WritePropertyMapper<Sink::ApplicationDomain::Buffer::MailBuilder>>::create();
+        mResourceWriteMapper = QSharedPointer<WritePropertyMapper>::create();
         Sink::ApplicationDomain::TypeImplementation<Sink::ApplicationDomain::Mail>::configure(*mResourceWriteMapper);
     }
 };
@@ -51,7 +51,7 @@ private slots:
 
     void testCreateBufferPart()
     {
-        auto writeMapper = QSharedPointer<WritePropertyMapper<Sink::ApplicationDomain::Buffer::EventBuilder>>::create();
+        auto writeMapper = QSharedPointer<WritePropertyMapper>::create();
         Sink::ApplicationDomain::TypeImplementation<Sink::ApplicationDomain::Event>::configure(*writeMapper);
 
         Sink::ApplicationDomain::Event event;
@@ -104,7 +104,7 @@ private slots:
 
     void testMail()
     {
-        auto writeMapper = QSharedPointer<WritePropertyMapper<Sink::ApplicationDomain::Buffer::MailBuilder>>::create();
+        auto writeMapper = QSharedPointer<WritePropertyMapper>::create();
         Sink::ApplicationDomain::TypeImplementation<Sink::ApplicationDomain::Mail>::configure(*writeMapper);
 
         Sink::ApplicationDomain::Mail mail;
-- 
cgit v1.2.3