8 files changed, 6 insertions, 106 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index e1e7a51..fd8e898 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -69,7 +69,6 @@ set(command_SRCS
     changereplay.cpp
     adaptorfactoryregistry.cpp
     synchronizer.cpp
-    entitystore.cpp
     remoteidmap.cpp
     sourcewriteback.cpp
     entityreader.cpp
diff --git a/common/entitystore.cpp b/common/entitystore.cpp
deleted file mode 100644
index b7b03aa..0000000
--- a/common/entitystore.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) version 3, or any
- * later version accepted by the membership of KDE e.V. (or its
- * successor approved by the membership of KDE e.V.), which shall
- * act as a proxy defined in Section 6 of version 3 of the license.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "entitystore.h"
-
-using namespace Sink;
-
-EntityStore::EntityStore(Storage::EntityStore &store_)
-    : store(store_)
-{
-
-}
-
diff --git a/common/entitystore.h b/common/entitystore.h
deleted file mode 100644
index 3d9ca36..0000000
--- a/common/entitystore.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) version 3, or any
- * later version accepted by the membership of KDE e.V. (or its
- * successor approved by the membership of KDE e.V.), which shall
- * act as a proxy defined in Section 6 of version 3 of the license.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "sink_export.h"
-
-#include "storage/entitystore.h"
-
-namespace Sink {
-
-class SINK_EXPORT EntityStore
-{
-public:
-    EntityStore(Storage::EntityStore &store);
-
-    template<typename T>
-    T read(const QByteArray &identifier) const
-    {
-        return store.readLatest<T>(identifier);
-    }
-
-    template<typename T>
-    T readFromKey(const QByteArray &key) const
-    {
-        return store.readEntity<T>(key);
-    }
-
-    template<typename T>
-    T readPrevious(const QByteArray &uid, qint64 revision) const
-    {
-        return store.readPrevious<T>(uid, revision);
-    }
-
-    /* template<typename T> */
-    /* EntityReader<T> reader() */
-    /* { */
-    /*     return EntityReader<T>(mResourceType, mResourceInstanceIdentifier, mTransaction); */
-    /* } */
-
-private:
-    Sink::Storage::EntityStore &store;
-};
-
-}
diff --git a/common/sourcewriteback.cpp b/common/sourcewriteback.cpp
index 204793e..e2994d1 100644
--- a/common/sourcewriteback.cpp
+++ b/common/sourcewriteback.cpp
@@ -41,12 +41,9 @@ SourceWriteBack::SourceWriteBack(const ResourceContext &context)
 
 }
 
-EntityStore &SourceWriteBack::store()
+Storage::EntityStore &SourceWriteBack::store()
 {
-    if (!mEntityStoreWrapper) {
-        mEntityStoreWrapper = QSharedPointer<EntityStore>::create(*mEntityStore);
-    }
-    return *mEntityStoreWrapper;
+    return *mEntityStore;
 }
 
 RemoteIdMap &SourceWriteBack::syncStore()
@@ -78,7 +75,6 @@ KAsync::Job<void> SourceWriteBack::replay(const QByteArray &type, const QByteArr
     const auto metadataBuffer = Sink::EntityBuffer::readBuffer<Sink::Metadata>(entity.metadata());
     Q_ASSERT(metadataBuffer);
     Q_ASSERT(!mSyncStore);
-    Q_ASSERT(!mEntityStoreWrapper);
     Q_ASSERT(!mSyncTransaction);
     mEntityStore->startTransaction(Storage::DataStore::ReadOnly);
     mSyncTransaction = mSyncStorage.createTransaction(Sink::Storage::DataStore::ReadWrite);
@@ -100,10 +96,10 @@ KAsync::Job<void> SourceWriteBack::replay(const QByteArray &type, const QByteArr
 
     KAsync::Job<QByteArray> job = KAsync::null<QByteArray>();
     if (type == ENTITY_TYPE_FOLDER) {
-        auto folder = store().readFromKey<ApplicationDomain::Folder>(key);
+        auto folder = store().readEntity<ApplicationDomain::Folder>(key);
         job = replay(folder, operation, oldRemoteId, modifiedProperties);
     } else if (type == ENTITY_TYPE_MAIL) {
-        auto mail = store().readFromKey<ApplicationDomain::Mail>(key);
+        auto mail = store().readEntity<ApplicationDomain::Mail>(key);
         job = replay(mail, operation, oldRemoteId, modifiedProperties);
     }
 
@@ -134,7 +130,6 @@ KAsync::Job<void> SourceWriteBack::replay(const QByteArray &type, const QByteArr
             SinkWarning() << "Failed to replay change: " << error.errorMessage;
         }
         mSyncStore.clear();
-        mEntityStoreWrapper.clear();
         mSyncTransaction.commit();
         mEntityStore->abortTransaction();
     });
diff --git a/common/sourcewriteback.h b/common/sourcewriteback.h
index 327d1ad..cf393e4 100644
--- a/common/sourcewriteback.h
+++ b/common/sourcewriteback.h
@@ -23,7 +23,7 @@
 
 #include "changereplay.h"
 #include "storage.h"
-#include "entitystore.h"
+#include "storage/entitystore.h"
 #include "remoteidmap.h"
 #include "metadata_generated.h"
 
@@ -58,12 +58,11 @@ protected:
 
 private:
     //Read only access to main storage
-    EntityStore &store();
+    Storage::EntityStore &store();
     ResourceContext mResourceContext;
     Sink::Storage::DataStore mSyncStorage;
     QSharedPointer<RemoteIdMap> mSyncStore;
     QSharedPointer<Storage::EntityStore> mEntityStore;
-    QSharedPointer<EntityStore> mEntityStoreWrapper;
     Sink::Storage::DataStore::Transaction mSyncTransaction;
     QByteArray mResourceType;
     QByteArray mResourceInstanceIdentifier;
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index 5ddd77c..9bba9cf 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -22,7 +22,6 @@
 #include "definitions.h"
 #include "commands.h"
 #include "bufferutils.h"
-#include "entitystore.h"
 #include "remoteidmap.h"
 #include "entityreader.h"
 #include "createentity_generated.h"
diff --git a/common/synchronizer.h b/common/synchronizer.h
index f3319f6..0a1efe1 100644
--- a/common/synchronizer.h
+++ b/common/synchronizer.h
@@ -28,7 +28,6 @@
 #include <storage.h>
 
 namespace Sink {
-class EntityStore;
 class RemoteIdMap;
 
 /**
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 0ea07bf..90dae7a 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -37,7 +37,6 @@
 #include "inspection.h"
 #include "synchronizer.h"
 #include "sourcewriteback.h"
-#include "entitystore.h"
 #include "remoteidmap.h"
 #include "query.h"