Moved more entitystorage functionality back to facade.

To avoid unnecessary abstraction layers that don't solve a problem,
and to allow facades to customize how entities are loaded.

1 files changed, 28 insertions, 35 deletions

diff --git a/common/entitystorage.h b/common/entitystorage.h
index 6b09cad..8e73083 100644
--- a/common/entitystorage.h
+++ b/common/entitystorage.h
@@ -32,41 +32,44 @@
 /**
  * Wraps storage, entity adaptor factory and indexes into one.
  * 
- * TODO: customize with readEntity instead of adaptor factory
  */
 class EntityStorageBase
 {
+public:
+    typedef std::function<ResultSet (const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters)> InitialResultLoader;
+    typedef std::function<ResultSet (qint64 baseRevision, const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters)> IncrementalResultLoader;
+    typedef std::function<void(const Akonadi2::Storage::Transaction &transaction, const QByteArray &key, const std::function<void(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &, Akonadi2::Operation)> &resultCallback)> EntityReader;
+
+    /**
+     * Returns the initial result set that still needs to be filtered.
+     *
+     * To make this efficient indexes should be chosen that are as selective as possible.
+     */
+    InitialResultLoader loadInitialResultSet;
+    /**
+     * Returns the incremental result set that still needs to be filtered.
+     */
+    IncrementalResultLoader loadIncrementalResultSet;
+
+    /**
+     * Loads a single entity by uid from storage.
+     */
+    EntityReader readEntity;
+
 protected:
-    EntityStorageBase(const QByteArray &instanceIdentifier, const DomainTypeAdaptorFactoryInterface::Ptr &adaptorFactory)
-        : mResourceInstanceIdentifier(instanceIdentifier),
-        mDomainTypeAdaptorFactory(adaptorFactory)
+    EntityStorageBase(const QByteArray &instanceIdentifier)
+        : mResourceInstanceIdentifier(instanceIdentifier)
     {
 
     }
 
-    virtual Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr create(const QByteArray &key, qint64 revision, const QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor> &adaptor) = 0;
     virtual Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr copy(const Akonadi2::ApplicationDomain::ApplicationDomainType &) = 0;
-    virtual ResultSet queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet<QByteArray> &appliedFilters, Akonadi2::Storage::Transaction &transaction) = 0;
 
-    /**
-     * Loads a single entity by uid from storage.
-     * 
-     * TODO: Resources should be able to customize this for cases where an entity is not the same as a single buffer.
-     */
-    void readEntity(const Akonadi2::Storage::Transaction &transaction, const QByteArray &key, const std::function<void(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &, Akonadi2::Operation)> &resultCallback);
     ResultSet getResultSet(const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, qint64 baseRevision);
 
-protected:
     QByteArray mResourceInstanceIdentifier;
-    QByteArray mBufferType;
-    DomainTypeAdaptorFactoryInterface::Ptr mDomainTypeAdaptorFactory;
+
 private:
-    /**
-     * Returns the initial result set that still needs to be filtered.
-     *
-     * To make this efficient indexes should be chosen that are as selective as possible.
-     */
-    ResultSet loadInitialResultSet(const Akonadi2::Query &query, Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters);
     ResultSet filteredSet(const ResultSet &resultSet, const std::function<bool(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &domainObject)> &filter, const Akonadi2::Storage::Transaction &transaction, bool isInitialQuery);
 };
 
@@ -75,28 +78,18 @@ class EntityStorage : public EntityStorageBase
 {
 
 public:
-    EntityStorage(const QByteArray &instanceIdentifier, const DomainTypeAdaptorFactoryInterface::Ptr &adaptorFactory, const QByteArray &bufferType)
-        : EntityStorageBase(instanceIdentifier, adaptorFactory)
-    {
-        mBufferType = bufferType;
-    }
 
-protected:
-    Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr create(const QByteArray &key, qint64 revision, const QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor> &adaptor) Q_DECL_OVERRIDE
+    EntityStorage(const QByteArray &instanceIdentifier)
+        : EntityStorageBase(instanceIdentifier)
     {
-        return DomainType::Ptr::create(mResourceInstanceIdentifier, key, revision, adaptor);
     }
 
+protected:
     Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr copy(const Akonadi2::ApplicationDomain::ApplicationDomainType &object) Q_DECL_OVERRIDE
     {
         return Akonadi2::ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<DomainType>(object);
     }
 
-    ResultSet queryIndexes(const Akonadi2::Query &query, const QByteArray &resourceInstanceIdentifier, QSet<QByteArray> &appliedFilters, Akonadi2::Storage::Transaction &transaction) Q_DECL_OVERRIDE
-    {
-        return Akonadi2::ApplicationDomain::TypeImplementation<DomainType>::queryIndexes(query, resourceInstanceIdentifier, appliedFilters, transaction);
-    }
-
 public:
 
     virtual qint64 read(const Akonadi2::Query &query, qint64 baseRevision, const QSharedPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > &resultProvider)
@@ -108,7 +101,7 @@ public:
 
         auto transaction = storage.createTransaction(Akonadi2::Storage::ReadOnly);
 
-        Log() << "Querying" << baseRevision;
+        Log() << "Querying" << baseRevision << Akonadi2::Storage::maxRevision(transaction);
         auto resultSet = getResultSet(query, transaction, baseRevision);
         while(resultSet.next([this, resultProvider](const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &value, Akonadi2::Operation operation) -> bool {
             switch (operation) {