Refactor how the storage is used.

This is the initial refactoring to improve how we deal with the storage.

It does a couple of things:
* Rename Sink::Storage to Sink::Storage::DataStore to free up the
  Sink::Storage namespace
* Introduce a Sink::ResourceContext to have a single object that can be
  passed around containing everything that is necessary to operate on a
  resource. This is a lot better than the multiple separate parameters
  that we used to pass around all over the place, while still allowing
  for dependency injection for tests.
* Tie storage access together using the new EntityStore that directly
  works with ApplicationDomainTypes. This gives us a central place where
  main storage, indexes and buffer adaptors are tied together, which
  will also give us a place to implement external indexes, such as a
  fulltextindex using xapian.
* Use ApplicationDomainTypes as the default way to pass around entities.
  Instead of using various ways to pass around entities (buffers,
  buffer adaptors, ApplicationDomainTypes), only use a single way.
  The old approach was confusing, and was only done as:
  * optimization; really shouldn't be necessary and otherwise I'm sure
  we can find better ways to optimize ApplicationDomainType itself.
  * a way to account for entities that have multiple buffers, a concept
  that I no longer deem relevant.

While this commit does the bulk of the work to get there, the following
commits will refactor more stuff to get things back to normal.

1 files changed, 6 insertions, 5 deletions

diff --git a/common/changereplay.h b/common/changereplay.h
index 88d6ce3..e86c4f2 100644
--- a/common/changereplay.h
+++ b/common/changereplay.h
@@ -24,6 +24,7 @@
 #include <Async/Async>
 
 #include "storage.h"
+#include "resourcecontext.h"
 
 namespace Sink {
 
@@ -38,7 +39,7 @@ class SINK_EXPORT ChangeReplay : public QObject
 {
     Q_OBJECT
 public:
-    ChangeReplay(const QByteArray &resourceName);
+    ChangeReplay(const ResourceContext &resourceContext);
 
     qint64 getLastReplayedRevision();
     bool allChangesReplayed();
@@ -53,20 +54,20 @@ public slots:
 protected:
     virtual KAsync::Job<void> replay(const QByteArray &type, const QByteArray &key, const QByteArray &value) = 0;
     virtual bool canReplay(const QByteArray &type, const QByteArray &key, const QByteArray &value) = 0;
-    Sink::Storage mStorage;
+    Sink::Storage::DataStore mStorage;
 
 private:
     void recordReplayedRevision(qint64 revision);
     KAsync::Job<void> replayNextRevision();
-    Sink::Storage mChangeReplayStore;
+    Sink::Storage::DataStore mChangeReplayStore;
     bool mReplayInProgress;
-    Sink::Storage::Transaction mMainStoreTransaction;
+    Sink::Storage::DataStore::Transaction mMainStoreTransaction;
 };
 
 class NullChangeReplay : public ChangeReplay
 {
 public:
-    NullChangeReplay(const QByteArray &resourceName) : ChangeReplay(resourceName) {}
+    NullChangeReplay(const ResourceContext &resourceContext) : ChangeReplay(resourceContext) {}
     KAsync::Job<void> replay(const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE { return KAsync::null<void>(); }
     bool canReplay(const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE { return false; }
 };