Refactored buffer extraction from vector.

3 files changed, 25 insertions, 46 deletions

diff --git a/common/entitybuffer.h b/common/entitybuffer.h
index f22c84e..82152c9 100644
--- a/common/entitybuffer.h
+++ b/common/entitybuffer.h
@@ -23,6 +23,25 @@ public:
      */
     static void assembleEntityBuffer(flatbuffers::FlatBufferBuilder &fbb, void const *metadataData, size_t metadataSize, void const *resourceData, size_t resourceSize, void const *localData, size_t localSize);
     static flatbuffers::Offset<flatbuffers::Vector<uint8_t> > appendAsVector(flatbuffers::FlatBufferBuilder &fbb, void const *data, size_t size);
+    template<typename T>
+    static const T *readBuffer(const uint8_t *data, int size)
+    {
+        flatbuffers::Verifier verifier(data, size);
+        if (verifier.VerifyBuffer<T>()) {
+            return flatbuffers::GetRoot<T>(data);
+        }
+        return nullptr;
+    }
+
+    template<typename T>
+    static const T *readBuffer(const flatbuffers::Vector<uint8_t> *data)
+    {
+        if (data) {
+            return readBuffer<T>(data->Data(), data->size());
+        }
+        return nullptr;
+    }
+
 
 private:
     const Entity *mEntity;
diff --git a/dummyresource/domainadaptor.cpp b/dummyresource/domainadaptor.cpp
index 7a767ca..865a4c0 100644
--- a/dummyresource/domainadaptor.cpp
+++ b/dummyresource/domainadaptor.cpp
@@ -92,29 +92,9 @@ DummyEventAdaptorFactory::DummyEventAdaptorFactory()
 //TODO pass EntityBuffer instead?
 QSharedPointer<Akonadi2::Domain::BufferAdaptor> DummyEventAdaptorFactory::createAdaptor(const Akonadi2::Entity &entity)
 {
-    DummyEvent const *resourceBuffer = 0;
-    if (auto resourceData = entity.resource()) {
-        flatbuffers::Verifier verifyer(resourceData->Data(), resourceData->size());
-        if (VerifyDummyEventBuffer(verifyer)) {
-            resourceBuffer = GetDummyEvent(resourceData->Data());
-        }
-    }
-
-    // Akonadi2::Metadata const *metadataBuffer = 0;
-    // if (auto metadataData = entity.metadata()) {
-    //     flatbuffers::Verifier verifyer(metadataData->Data(), metadataData->size());
-    //     if (Akonadi2::VerifyMetadataBuffer(verifyer)) {
-    //         metadataBuffer = Akonadi2::GetMetadata(metadataData->Data());
-    //     }
-    // }
-
-    Akonadi2::Domain::Buffer::Event const *localBuffer = 0;
-    if (auto localData = entity.local()) {
-        flatbuffers::Verifier verifyer(localData->Data(), localData->size());
-        if (Akonadi2::Domain::Buffer::VerifyEventBuffer(verifyer)) {
-            localBuffer = Akonadi2::Domain::Buffer::GetEvent(localData->Data());
-        }
-    }
+    const auto resourceBuffer = Akonadi2::EntityBuffer::readBuffer<DummyEvent>(entity.resource());
+    const auto localBuffer = Akonadi2::EntityBuffer::readBuffer<Akonadi2::Domain::Buffer::Event>(entity.local());
+    // const auto metadataBuffer = Akonadi2::EntityBuffer::readBuffer<Akonadi2::Metadata>(entity.metadata());
 
     auto adaptor = QSharedPointer<DummyEventAdaptor>::create();
     adaptor->mLocalBuffer = localBuffer;
diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
index 209ad0d..7c64675 100644
--- a/dummyresource/facade.cpp
+++ b/dummyresource/facade.cpp
@@ -118,29 +118,9 @@ void DummyResourceFacade::readValue(QSharedPointer<Akonadi2::Storage> storage, c
         //Extract buffers
         Akonadi2::EntityBuffer buffer(dataValue, dataSize);
 
-        DummyEvent const *resourceBuffer = 0;
-        if (auto resourceData = buffer.entity().resource()) {
-            flatbuffers::Verifier verifyer(resourceData->Data(), resourceData->size());
-            if (VerifyDummyEventBuffer(verifyer)) {
-                resourceBuffer = GetDummyEvent(resourceData->Data());
-            }
-        }
-
-        Akonadi2::Domain::Buffer::Event const *localBuffer = 0;
-        if (auto localData = buffer.entity().local()) {
-            flatbuffers::Verifier verifyer(localData->Data(), localData->size());
-            if (Akonadi2::Domain::Buffer::VerifyEventBuffer(verifyer)) {
-                localBuffer = Akonadi2::Domain::Buffer::GetEvent(localData->Data());
-            }
-        }
-
-        Akonadi2::Metadata const *metadataBuffer = 0;
-        if (auto metadataData = buffer.entity().metadata()) {
-            flatbuffers::Verifier verifyer(metadataData->Data(), metadataData->size());
-            if (Akonadi2::VerifyMetadataBuffer(verifyer)) {
-                metadataBuffer = Akonadi2::GetMetadata(metadataData->Data());
-            }
-        }
+        const auto resourceBuffer = Akonadi2::EntityBuffer::readBuffer<DummyEvent>(buffer.entity().resource());
+        const auto localBuffer = Akonadi2::EntityBuffer::readBuffer<Akonadi2::Domain::Buffer::Event>(buffer.entity().local());
+        const auto metadataBuffer = Akonadi2::EntityBuffer::readBuffer<Akonadi2::Metadata>(buffer.entity().metadata());
 
         if (!resourceBuffer || !metadataBuffer) {
             qWarning() << "invalid buffer " << QByteArray::fromRawData(static_cast<char*>(keyValue), keySize);