3 files changed, 71 insertions, 40 deletions

diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index c9a3a01..ca89fba 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -30,6 +30,7 @@
 #include "entitybuffer.h"
 #include "propertymapper.h"
 #include "domain/event.h"
+#include "log.h"
 
 /**
  * Create a buffer from a domain object using the provided mappings
@@ -58,6 +59,25 @@ flatbuffers::Offset<Buffer> createBufferPart(const Akonadi2::ApplicationDomain::
 }
 
 /**
+ * Create the buffer and finish the FlatBufferBuilder.
+ * 
+ * After this the buffer can be extracted from the FlatBufferBuilder object.
+ */
+template <typename Buffer, typename BufferBuilder>
+static void createBufferPartBuffer(const Akonadi2::ApplicationDomain::ApplicationDomainType &domainObject, flatbuffers::FlatBufferBuilder &fbb, WritePropertyMapper<BufferBuilder> &mapper)
+{
+    auto pos = createBufferPart<BufferBuilder, Buffer>(domainObject, fbb, mapper);
+    // Because we cannot template the following call
+    // Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(fbb, pos);
+    // FIXME: This means all buffers in here must have the AKFB identifier
+    fbb.Finish(pos, "AKFB");
+    flatbuffers::Verifier verifier(fbb.GetBufferPointer(), fbb.GetSize());
+    if (!verifier.VerifyBuffer<Buffer>()) {
+        Warning() << "Created invalid uffer";
+    }
+}
+
+/**
  * A generic adaptor implementation that uses a property mapper to read/write values.
  * 
  * TODO: this is the read-only part. Create a write only equivalent
@@ -149,7 +169,21 @@ public:
         return adaptor;
     }
 
-    virtual void createBuffer(const DomainType &domainType, flatbuffers::FlatBufferBuilder &fbb) Q_DECL_OVERRIDE {};
+    virtual void createBuffer(const DomainType &domainObject, flatbuffers::FlatBufferBuilder &fbb) Q_DECL_OVERRIDE
+    {
+        flatbuffers::FlatBufferBuilder localFbb;
+        if (mLocalWriteMapper) {
+            createBufferPartBuffer<LocalBuffer, LocalBuilder>(domainObject, localFbb, *mLocalWriteMapper);
+        }
+
+        flatbuffers::FlatBufferBuilder resFbb;
+        if (mResourceWriteMapper) {
+            createBufferPartBuffer<ResourceBuffer, ResourceBuilder>(domainObject, resFbb, *mResourceWriteMapper);
+        }
+
+        Akonadi2::EntityBuffer::assembleEntityBuffer(fbb, 0, 0, resFbb.GetBufferPointer(), resFbb.GetSize(), localFbb.GetBufferPointer(), localFbb.GetSize());
+    }
+
 
 protected:
     QSharedPointer<ReadPropertyMapper<LocalBuffer> > mLocalMapper;
diff --git a/examples/dummyresource/domainadaptor.cpp b/examples/dummyresource/domainadaptor.cpp
index 8649bc3..67595af 100644
--- a/examples/dummyresource/domainadaptor.cpp
+++ b/examples/dummyresource/domainadaptor.cpp
@@ -1,23 +1,29 @@
+/*
+ * 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"
 
-#include <QDebug>
-#include <functional>
-
 #include "dummycalendar_generated.h"
-#include "event_generated.h"
-#include "entity_generated.h"
-#include "metadata_generated.h"
-#include "domainadaptor.h"
-#include "log.h"
-#include <common/entitybuffer.h>
 
 using namespace DummyCalendar;
 using namespace flatbuffers;
 
-
-
-
 DummyEventAdaptorFactory::DummyEventAdaptorFactory()
     : DomainTypeAdaptorFactory()
 {
@@ -32,29 +38,3 @@ DummyEventAdaptorFactory::DummyEventAdaptorFactory()
     });
 }
 
-
-void DummyEventAdaptorFactory::createBuffer(const Akonadi2::ApplicationDomain::Event &event, flatbuffers::FlatBufferBuilder &fbb)
-{
-    flatbuffers::FlatBufferBuilder localFbb;
-    if (mLocalWriteMapper) {
-        auto pos = createBufferPart<Akonadi2::ApplicationDomain::Buffer::EventBuilder, Akonadi2::ApplicationDomain::Buffer::Event>(event, localFbb, *mLocalWriteMapper);
-        Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(localFbb, pos);
-        flatbuffers::Verifier verifier(localFbb.GetBufferPointer(), localFbb.GetSize());
-        if (!verifier.VerifyBuffer<Akonadi2::ApplicationDomain::Buffer::Event>()) {
-            Warning() << "Created invalid local buffer";
-        }
-    }
-
-    flatbuffers::FlatBufferBuilder resFbb;
-    if (mResourceWriteMapper) {
-        auto pos = createBufferPart<DummyEventBuilder, DummyEvent>(event, resFbb, *mResourceWriteMapper);
-        DummyCalendar::FinishDummyEventBuffer(resFbb, pos);
-        flatbuffers::Verifier verifier(resFbb.GetBufferPointer(), resFbb.GetSize());
-        if (!verifier.VerifyBuffer<DummyEvent>()) {
-            Warning() << "Created invalid resource buffer";
-        }
-    }
-
-    Akonadi2::EntityBuffer::assembleEntityBuffer(fbb, 0, 0, resFbb.GetBufferPointer(), resFbb.GetSize(), localFbb.GetBufferPointer(), localFbb.GetSize());
-}
-
diff --git a/examples/dummyresource/domainadaptor.h b/examples/dummyresource/domainadaptor.h
index 0490387..8b6d96b 100644
--- a/examples/dummyresource/domainadaptor.h
+++ b/examples/dummyresource/domainadaptor.h
@@ -1,3 +1,21 @@
+/*
+ * 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"
@@ -10,5 +28,4 @@ class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::Appli
 public:
     DummyEventAdaptorFactory();
     virtual ~DummyEventAdaptorFactory() {};
-    virtual void createBuffer(const Akonadi2::ApplicationDomain::Event &event, flatbuffers::FlatBufferBuilder &fbb);
 };