Moved sendCommand implementations to ResourceAccess

So we have commands in one place, and not in a header file.

3 files changed, 64 insertions, 63 deletions

diff --git a/common/facade.h b/common/facade.h
index 52b2134..1715a7f 100644
--- a/common/facade.h
+++ b/common/facade.h
@@ -19,19 +19,13 @@
 
 #pragma once
 
-#include "clientapi.h"
-
 #include <QByteArray>
 
 #include <Async/Async>
 
 #include "resourceaccess.h"
 #include "commands.h"
-#include "createentity_generated.h"
-#include "modifyentity_generated.h"
-#include "deleteentity_generated.h"
 #include "domainadaptor.h"
-#include "entitybuffer.h"
 #include "log.h"
 #include "resultset.h"
 #include "entitystorage.h"
@@ -67,7 +61,7 @@ public:
     }
 
     /**
-     *
+     * Set the query to run
      */
     void setQuery(const QueryFunction &query)
     {
@@ -141,7 +135,7 @@ public:
         }
         flatbuffers::FlatBufferBuilder entityFbb;
         mDomainTypeAdaptorFactory->createBuffer(domainObject, entityFbb);
-        return sendCreateCommand(bufferTypeForDomainType(), QByteArray::fromRawData(reinterpret_cast<const char*>(entityFbb.GetBufferPointer()), entityFbb.GetSize()));
+        return mResourceAccess->sendCreateCommand(bufferTypeForDomainType(), QByteArray::fromRawData(reinterpret_cast<const char*>(entityFbb.GetBufferPointer()), entityFbb.GetSize()));
     }
 
     KAsync::Job<void> modify(const DomainType &domainObject) Q_DECL_OVERRIDE
@@ -152,12 +146,12 @@ public:
         }
         flatbuffers::FlatBufferBuilder entityFbb;
         mDomainTypeAdaptorFactory->createBuffer(domainObject, entityFbb);
-        return sendModifyCommand(domainObject.identifier(), domainObject.revision(), bufferTypeForDomainType(), QByteArrayList(), QByteArray::fromRawData(reinterpret_cast<const char*>(entityFbb.GetBufferPointer()), entityFbb.GetSize()));
+        return mResourceAccess->sendModifyCommand(domainObject.identifier(), domainObject.revision(), bufferTypeForDomainType(), QByteArrayList(), QByteArray::fromRawData(reinterpret_cast<const char*>(entityFbb.GetBufferPointer()), entityFbb.GetSize()));
     }
 
     KAsync::Job<void> remove(const DomainType &domainObject) Q_DECL_OVERRIDE
     {
-        return sendDeleteCommand(domainObject.identifier(), domainObject.revision(), bufferTypeForDomainType());
+        return mResourceAccess->sendDeleteCommand(domainObject.identifier(), domainObject.revision(), bufferTypeForDomainType());
     }
 
     //TODO JOBAPI return job from sync continuation to execute it as subjob?
@@ -202,55 +196,13 @@ public:
     }
 
 protected:
-    KAsync::Job<void> sendCreateCommand(const QByteArray &resourceBufferType, const QByteArray &buffer)
-    {
-        flatbuffers::FlatBufferBuilder fbb;
-        //This is the resource buffer type and not the domain type
-        auto type = fbb.CreateString(resourceBufferType.constData());
-        auto delta = Akonadi2::EntityBuffer::appendAsVector(fbb, buffer.constData(), buffer.size());
-        auto location = Akonadi2::Commands::CreateCreateEntity(fbb, type, delta);
-        Akonadi2::Commands::FinishCreateEntityBuffer(fbb, location);
-        mResourceAccess->open();
-        return mResourceAccess->sendCommand(Akonadi2::Commands::CreateEntityCommand, fbb);
-    }
-
-    KAsync::Job<void> sendModifyCommand(const QByteArray &uid, qint64 revision, const QByteArray &resourceBufferType, const QByteArrayList &deletedProperties, const QByteArray &buffer)
-    {
-        flatbuffers::FlatBufferBuilder fbb;
-        auto entityId = fbb.CreateString(uid.constData());
-        //This is the resource buffer type and not the domain type
-        auto type = fbb.CreateString(resourceBufferType.constData());
-        //FIXME
-        auto deletions = 0;
-        auto delta = Akonadi2::EntityBuffer::appendAsVector(fbb, buffer.constData(), buffer.size());
-        auto location = Akonadi2::Commands::CreateModifyEntity(fbb, revision, entityId, deletions, type, delta);
-        Akonadi2::Commands::FinishModifyEntityBuffer(fbb, location);
-        mResourceAccess->open();
-        return mResourceAccess->sendCommand(Akonadi2::Commands::ModifyEntityCommand, fbb);
-    }
-
-    KAsync::Job<void> sendDeleteCommand(const QByteArray &uid, qint64 revision, const QByteArray &resourceBufferType)
-    {
-        flatbuffers::FlatBufferBuilder fbb;
-        auto entityId = fbb.CreateString(uid.constData());
-        //This is the resource buffer type and not the domain type
-        auto type = fbb.CreateString(resourceBufferType.constData());
-        auto location = Akonadi2::Commands::CreateDeleteEntity(fbb, revision, entityId, type);
-        Akonadi2::Commands::FinishDeleteEntityBuffer(fbb, location);
-        mResourceAccess->open();
-        return mResourceAccess->sendCommand(Akonadi2::Commands::DeleteEntityCommand, fbb);
-    }
-
     KAsync::Job<void> synchronizeResource(bool sync, bool processAll)
     {
         //TODO check if a sync is necessary
         //TODO Only sync what was requested
         //TODO timeout
-        //TODO the synchronization should normally not be necessary: We just return what is already available.
-
         if (sync || processAll) {
             return KAsync::start<void>([=](KAsync::Future<void> &future) {
-                mResourceAccess->open();
                 mResourceAccess->synchronizeResource(sync, processAll).then<void>([&future]() {
                     future.setFinished();
                 }).exec();
@@ -259,7 +211,6 @@ protected:
         return KAsync::null<void>();
     }
 
-
 private:
     virtual KAsync::Job<qint64> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > &resultProvider, qint64 oldRevision, qint64 newRevision)
     {
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index a4a5795..ef4e64c 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -26,6 +26,10 @@
 #include "common/revisionupdate_generated.h"
 #include "common/synchronize_generated.h"
 #include "common/notification_generated.h"
+#include "common/createentity_generated.h"
+#include "common/modifyentity_generated.h"
+#include "common/deleteentity_generated.h"
+#include "common/entitybuffer.h"
 #include "log.h"
 
 #include <QCoreApplication>
@@ -79,7 +83,6 @@ public:
     QByteArray resourceInstanceIdentifier;
     QSharedPointer<QLocalSocket> socket;
     QByteArray partialMessageBuffer;
-    flatbuffers::FlatBufferBuilder fbb;
     QVector<QSharedPointer<QueuedCommand>> commandQueue;
     QMap<uint, QSharedPointer<QueuedCommand>> pendingCommands;
     QMultiMap<uint, std::function<void(int error, const QString &errorMessage)> > resultHandler;
@@ -276,10 +279,50 @@ KAsync::Job<void>  ResourceAccess::sendCommand(int commandId, flatbuffers::FlatB
 
 KAsync::Job<void> ResourceAccess::synchronizeResource(bool sourceSync, bool localSync)
 {
-    auto command = Akonadi2::CreateSynchronize(d->fbb, sourceSync, localSync);
-    Akonadi2::FinishSynchronizeBuffer(d->fbb, command);
-    return sendCommand(Commands::SynchronizeCommand, d->fbb);
-    d->fbb.Clear();
+    flatbuffers::FlatBufferBuilder fbb;
+    auto command = Akonadi2::CreateSynchronize(fbb, sourceSync, localSync);
+    Akonadi2::FinishSynchronizeBuffer(fbb, command);
+    open();
+    return sendCommand(Commands::SynchronizeCommand, fbb);
+}
+
+KAsync::Job<void> ResourceAccess::sendCreateCommand(const QByteArray &resourceBufferType, const QByteArray &buffer)
+{
+    flatbuffers::FlatBufferBuilder fbb;
+    //This is the resource buffer type and not the domain type
+    auto type = fbb.CreateString(resourceBufferType.constData());
+    auto delta = Akonadi2::EntityBuffer::appendAsVector(fbb, buffer.constData(), buffer.size());
+    auto location = Akonadi2::Commands::CreateCreateEntity(fbb, type, delta);
+    Akonadi2::Commands::FinishCreateEntityBuffer(fbb, location);
+    open();
+    return sendCommand(Akonadi2::Commands::CreateEntityCommand, fbb);
+}
+
+KAsync::Job<void> ResourceAccess::sendModifyCommand(const QByteArray &uid, qint64 revision, const QByteArray &resourceBufferType, const QByteArrayList &deletedProperties, const QByteArray &buffer)
+{
+    flatbuffers::FlatBufferBuilder fbb;
+    auto entityId = fbb.CreateString(uid.constData());
+    //This is the resource buffer type and not the domain type
+    auto type = fbb.CreateString(resourceBufferType.constData());
+    //FIXME
+    auto deletions = 0;
+    auto delta = Akonadi2::EntityBuffer::appendAsVector(fbb, buffer.constData(), buffer.size());
+    auto location = Akonadi2::Commands::CreateModifyEntity(fbb, revision, entityId, deletions, type, delta);
+    Akonadi2::Commands::FinishModifyEntityBuffer(fbb, location);
+    open();
+    return sendCommand(Akonadi2::Commands::ModifyEntityCommand, fbb);
+}
+
+KAsync::Job<void> ResourceAccess::sendDeleteCommand(const QByteArray &uid, qint64 revision, const QByteArray &resourceBufferType)
+{
+    flatbuffers::FlatBufferBuilder fbb;
+    auto entityId = fbb.CreateString(uid.constData());
+    //This is the resource buffer type and not the domain type
+    auto type = fbb.CreateString(resourceBufferType.constData());
+    auto location = Akonadi2::Commands::CreateDeleteEntity(fbb, revision, entityId, type);
+    Akonadi2::Commands::FinishDeleteEntityBuffer(fbb, location);
+    open();
+    return sendCommand(Akonadi2::Commands::DeleteEntityCommand, fbb);
 }
 
 void ResourceAccess::open()
@@ -346,11 +389,11 @@ void ResourceAccess::connected()
     log(QString("Connected: %1").arg(d->socket->fullServerName()));
 
     {
-        auto name = d->fbb.CreateString(QString::number(QCoreApplication::applicationPid()).toLatin1());
-        auto command = Akonadi2::CreateHandshake(d->fbb, name);
-        Akonadi2::FinishHandshakeBuffer(d->fbb, command);
-        Commands::write(d->socket.data(), ++d->messageId, Commands::HandshakeCommand, d->fbb);
-        d->fbb.Clear();
+        flatbuffers::FlatBufferBuilder fbb;
+        auto name = fbb.CreateString(QString::number(QCoreApplication::applicationPid()).toLatin1());
+        auto command = Akonadi2::CreateHandshake(fbb, name);
+        Akonadi2::FinishHandshakeBuffer(fbb, command);
+        Commands::write(d->socket.data(), ++d->messageId, Commands::HandshakeCommand, fbb);
     }
 
     processCommandQueue();
diff --git a/common/resourceaccess.h b/common/resourceaccess.h
index 55379f3..e6b9d91 100644
--- a/common/resourceaccess.h
+++ b/common/resourceaccess.h
@@ -43,6 +43,10 @@ public:
     virtual KAsync::Job<void> sendCommand(int commandId, flatbuffers::FlatBufferBuilder &fbb) = 0;
     virtual KAsync::Job<void> synchronizeResource(bool remoteSync, bool localSync) = 0;
 
+    virtual KAsync::Job<void> sendCreateCommand(const QByteArray &resourceBufferType, const QByteArray &buffer) { return KAsync::null<void>(); };
+    virtual KAsync::Job<void> sendModifyCommand(const QByteArray &uid, qint64 revision, const QByteArray &resourceBufferType, const QByteArrayList &deletedProperties, const QByteArray &buffer) { return KAsync::null<void>(); };
+    virtual KAsync::Job<void> sendDeleteCommand(const QByteArray &uid, qint64 revision, const QByteArray &resourceBufferType) { return KAsync::null<void>(); };
+
 Q_SIGNALS:
     void ready(bool isReady);
     void revisionChanged(unsigned long long revision);
@@ -65,6 +69,9 @@ public:
     KAsync::Job<void> sendCommand(int commandId) Q_DECL_OVERRIDE;
     KAsync::Job<void> sendCommand(int commandId, flatbuffers::FlatBufferBuilder &fbb) Q_DECL_OVERRIDE;
     KAsync::Job<void> synchronizeResource(bool remoteSync, bool localSync) Q_DECL_OVERRIDE;
+    KAsync::Job<void> sendCreateCommand(const QByteArray &resourceBufferType, const QByteArray &buffer);
+    KAsync::Job<void> sendModifyCommand(const QByteArray &uid, qint64 revision, const QByteArray &resourceBufferType, const QByteArrayList &deletedProperties, const QByteArray &buffer);
+    KAsync::Job<void> sendDeleteCommand(const QByteArray &uid, qint64 revision, const QByteArray &resourceBufferType);
     /**
      * Tries to connect to server, and returns a connected socket on success.
      */