3 files changed, 18 insertions, 7 deletions

diff --git a/dummyresource/domainadaptor.cpp b/dummyresource/domainadaptor.cpp
index 5d046ff..ae001cf 100644
--- a/dummyresource/domainadaptor.cpp
+++ b/dummyresource/domainadaptor.cpp
@@ -46,6 +46,14 @@ public:
         return QVariant();
     }
 
+    virtual QStringList availableProperties() const
+    {
+        QStringList props;
+        props << mResourceMapper->mReadAccessors.keys();
+        props << mLocalMapper->mReadAccessors.keys();
+        return props;
+    }
+
     Akonadi2::Domain::Buffer::Event const *mLocalBuffer;
     DummyEvent const *mResourceBuffer;
 
@@ -65,13 +73,14 @@ 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);
+            resourceBuffer = GetDummyEvent(resourceData->Data());
         }
     }
 
diff --git a/dummyresource/facade.cpp b/dummyresource/facade.cpp
index 5320216..f754c7e 100644
--- a/dummyresource/facade.cpp
+++ b/dummyresource/facade.cpp
@@ -128,7 +128,7 @@ void DummyResourceFacade::load(const Akonadi2::Query &query, const std::function
             Akonadi2::EntityBuffer buffer(dataValue, dataSize);
 
             DummyEvent const *resourceBuffer = 0;
-            if (auto resourceData = buffer.resourceBuffer()) {
+            if (auto resourceData = buffer.entity().resource()) {
                 flatbuffers::Verifier verifyer(resourceData->Data(), resourceData->size());
                 if (VerifyDummyEventBuffer(verifyer)) {
                     resourceBuffer = GetDummyEvent(resourceData);
@@ -136,7 +136,7 @@ void DummyResourceFacade::load(const Akonadi2::Query &query, const std::function
             }
 
             Akonadi2::Metadata const *metadataBuffer = 0;
-            if (auto metadataData = buffer.metadataBuffer()) {
+            if (auto metadataData = buffer.entity().metadata()) {
                 flatbuffers::Verifier verifyer(metadataData->Data(), metadataData->size());
                 if (Akonadi2::VerifyMetadataBuffer(verifyer)) {
                     metadataBuffer = Akonadi2::GetMetadata(metadataData);
@@ -153,7 +153,9 @@ void DummyResourceFacade::load(const Akonadi2::Query &query, const std::function
             if (preparedQuery && preparedQuery(std::string(static_cast<char*>(keyValue), keySize), resourceBuffer)) {
                 qint64 revision = metadataBuffer ? metadataBuffer->revision() : -1;
                 auto adaptor = mFactory->createAdaptor(buffer.entity());
-                auto event = QSharedPointer<Akonadi2::Domain::Event>::create("org.kde.dummy", QString::fromUtf8(static_cast<char*>(keyValue), keySize), revision, adaptor);
+                //TODO only copy requested properties
+                auto memoryAdaptor = QSharedPointer<Akonadi2::Domain::MemoryBufferAdaptor>::create(*adaptor);
+                auto event = QSharedPointer<Akonadi2::Domain::Event>::create("org.kde.dummy", QString::fromUtf8(static_cast<char*>(keyValue), keySize), revision, memoryAdaptor);
                 resultCallback(event);
             }
             return true;
diff --git a/dummyresource/resourcefactory.cpp b/dummyresource/resourcefactory.cpp
index 87a6048..e4f7e41 100644
--- a/dummyresource/resourcefactory.cpp
+++ b/dummyresource/resourcefactory.cpp
@@ -122,10 +122,10 @@ void findByRemoteId(QSharedPointer<Akonadi2::Storage> storage, const QString &ri
             return true;
         }
 
-        Akonadi2::EntityBuffer::extractResourceBuffer(dataValue, dataSize, [&](const flatbuffers::Vector<uint8_t> *buffer) {
-            flatbuffers::Verifier verifier(buffer->Data(), buffer->size());
+        Akonadi2::EntityBuffer::extractResourceBuffer(dataValue, dataSize, [&](const uint8_t *buffer, size_t size) {
+            flatbuffers::Verifier verifier(buffer, size);
             if (DummyCalendar::VerifyDummyEventBuffer(verifier)) {
-                DummyCalendar::DummyEvent const *resourceBuffer = DummyCalendar::GetDummyEvent(buffer->Data());
+                DummyCalendar::DummyEvent const *resourceBuffer = DummyCalendar::GetDummyEvent(buffer);
                 if (resourceBuffer && resourceBuffer->remoteId()) {
                     if (std::string(resourceBuffer->remoteId()->c_str(), resourceBuffer->remoteId()->size()) == ridString) {
                         callback(keyValue, keySize, dataValue, dataSize);