ClientAPI: Don't require an explicit instance identifier

7 files changed, 82 insertions, 52 deletions

diff --git a/common/clientapi.h b/common/clientapi.h
index e467b8f..6237cfb 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -134,20 +134,25 @@ public:
     // {
 
     // }
+    template <class DomainType>
+    static std::shared_ptr<StoreFacade<DomainType> > getFacade(const QByteArray &resourceInstanceIdentifier)
+    {
+        if (auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceName(resourceInstanceIdentifier), resourceInstanceIdentifier)) {
+            return facade;
+        }
+        return std::make_shared<NullFacade<DomainType> >();
+    }
 
     /**
      * Create a new entity.
      */
     template <class DomainType>
-    static KAsync::Job<void> create(const DomainType &domainObject, const QByteArray &resourceIdentifier) {
+    static KAsync::Job<void> create(const DomainType &domainObject) {
         //Potentially move to separate thread as well
-        auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceName(resourceIdentifier), resourceIdentifier);
-        if (facade) {
-            return facade->create(domainObject).template then<void>([facade](){}, [](int errorCode, const QString &error) {
-                Warning() << "Failed to create";
-            });
-        }
-        return KAsync::error<void>(-1, "Failed to create a facade");
+        auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
+        return facade->create(domainObject).template then<void>([facade](){}, [](int errorCode, const QString &error) {
+            Warning() << "Failed to create";
+        });
     }
 
     /**
@@ -156,30 +161,24 @@ public:
      * This includes moving etc. since these are also simple settings on a property.
      */
     template <class DomainType>
-    static KAsync::Job<void> modify(const DomainType &domainObject, const QByteArray &resourceIdentifier) {
+    static KAsync::Job<void> modify(const DomainType &domainObject) {
         //Potentially move to separate thread as well
-        auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceName(resourceIdentifier), resourceIdentifier);
-        if (facade) {
-            return facade->modify(domainObject).template then<void>([facade](){}, [](int errorCode, const QString &error) {
-                Warning() << "Failed to modify";
-            });
-        }
-        return KAsync::error<void>(-1, "Failed to create a facade");
+        auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
+        return facade->modify(domainObject).template then<void>([facade](){}, [](int errorCode, const QString &error) {
+            Warning() << "Failed to modify";
+        });
     }
 
     /**
      * Remove an entity.
      */
     template <class DomainType>
-    static KAsync::Job<void> remove(const DomainType &domainObject, const QByteArray &resourceIdentifier) {
+    static KAsync::Job<void> remove(const DomainType &domainObject) {
         //Potentially move to separate thread as well
-        auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceName(resourceIdentifier), resourceIdentifier);
-        if (facade) {
-            return facade->remove(domainObject).template then<void>([facade](){}, [](int errorCode, const QString &error) {
-                Warning() << "Failed to remove";
-            });
-        }
-        return KAsync::error<void>(-1, "Failed to create a facade");
+        auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
+        return facade->remove(domainObject).template then<void>([facade](){}, [](int errorCode, const QString &error) {
+            Warning() << "Failed to remove";
+        });
     }
 
     static void shutdown(const QByteArray &resourceIdentifier);
@@ -213,20 +212,20 @@ public:
         return ApplicationDomain::AkonadiResource::Ptr::create();
     }
 
-    static void setConfiguration(const ApplicationDomain::AkonadiResource &resource, const QByteArray &resourceIdentifier)
+    static void setConfiguration(const ApplicationDomain::AkonadiResource &resource)
     {
-        Store::modify<ApplicationDomain::AkonadiResource>(resource, resourceIdentifier);
+        Store::modify<ApplicationDomain::AkonadiResource>(resource);
     }
 
-    static void createResource(const ApplicationDomain::AkonadiResource &resource, const QByteArray &resourceIdentifier)
+    static void createResource(const ApplicationDomain::AkonadiResource &resource)
     {
-        Store::create<ApplicationDomain::AkonadiResource>(resource, resourceIdentifier);
+        Store::create<ApplicationDomain::AkonadiResource>(resource);
     }
 
     static void removeResource(const QByteArray &resourceIdentifier)
     {
-        ApplicationDomain::AkonadiResource resource;
-        Store::remove<ApplicationDomain::AkonadiResource>(resource, resourceIdentifier);
+        ApplicationDomain::AkonadiResource resource(resourceIdentifier);
+        Store::remove<ApplicationDomain::AkonadiResource>(resource);
     }
 };
 
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 3cc34ec..bd7ff65 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -45,6 +45,13 @@ public:
 
     }
 
+    ApplicationDomainType(const QByteArray &resourceInstanceIdentifier)
+        :mAdaptor(new MemoryBufferAdaptor()),
+        mResourceInstanceIdentifier(resourceInstanceIdentifier)
+    {
+
+    }
+
     ApplicationDomainType(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor)
         : mAdaptor(adaptor),
         mResourceInstanceIdentifier(resourceInstanceIdentifier),
diff --git a/common/facadeinterface.h b/common/facadeinterface.h
index ac60ae4..cd43fa1 100644
--- a/common/facadeinterface.h
+++ b/common/facadeinterface.h
@@ -48,4 +48,29 @@ public:
     virtual KAsync::Job<void> load(const Query &query, const QSharedPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > &resultProvider) = 0;
 };
 
+template<class DomainType>
+class NullFacade : public StoreFacade<DomainType> {
+public:
+    virtual ~NullFacade(){};
+    KAsync::Job<void> create(const DomainType &domainObject)
+    {
+        return KAsync::error<void>(-1, "Failed to create a facade");
+    }
+
+    KAsync::Job<void> modify(const DomainType &domainObject)
+    {
+        return KAsync::error<void>(-1, "Failed to create a facade");
+    }
+
+    KAsync::Job<void> remove(const DomainType &domainObject)
+    {
+        return KAsync::error<void>(-1, "Failed to create a facade");
+    }
+
+    KAsync::Job<void> load(const Query &query, const QSharedPointer<Akonadi2::ResultProvider<typename DomainType::Ptr> > &resultProvider)
+    {
+        return KAsync::error<void>(-1, "Failed to create a facade");
+    }
+};
+
 }
diff --git a/examples/client/main.cpp b/examples/client/main.cpp
index 269f1aa..6bbec97 100644
--- a/examples/client/main.cpp
+++ b/examples/client/main.cpp
@@ -66,7 +66,7 @@ public:
         QObject::connect(removeButton, &QPushButton::pressed, [listView]() {
             for (auto index :listView->selectionModel()->selectedIndexes()) {
                 auto object = index.data(DomainObjectRole).value<typename T::Ptr>();
-                Akonadi2::Store::remove(*object, "org.kde.dummy.instance1").exec();
+                Akonadi2::Store::remove(*object).exec();
             }
         });
 
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 03cc732..8779716 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -95,8 +95,7 @@ private Q_SLOTS:
         res.setProperty("identifier", "dummyresource.identifier1");
         res.setProperty("type", "dummyresource");
 
-        Akonadi2::Store::create(res, "resourceconfig").exec().waitForFinished();
-
+        Akonadi2::Store::create(res).exec().waitForFinished();
         {
             Akonadi2::Query query;
             query.resources << "resourceconfig";
@@ -106,7 +105,7 @@ private Q_SLOTS:
             QCOMPARE(result.size(), 1);
         }
 
-        Akonadi2::Store::remove(res, "resourceconfig").exec().waitForFinished();
+        Akonadi2::Store::remove(res).exec().waitForFinished();
         {
             Akonadi2::Query query;
             query.resources << "resourceconfig";
diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp
index c020c6b..370acd2 100644
--- a/tests/dummyresourcebenchmark.cpp
+++ b/tests/dummyresourcebenchmark.cpp
@@ -72,11 +72,11 @@ private Q_SLOTS:
         int num = 100;
         QList<KAsync::Future<void> > waitCondition;
         for (int i = 0; i < num; i++) {
-            Akonadi2::ApplicationDomain::Event event;
+            Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1");
             event.setProperty("uid", "testuid");
             QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
             event.setProperty("summary", "summaryValue");
-            waitCondition << Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy.instance1").exec();
+            waitCondition << Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event).exec();
         }
         waitForCompletion(waitCondition).exec().waitForFinished();
         auto appendTime = time.elapsed();
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index 9d7d092..48bb7b0 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -48,11 +48,11 @@ private Q_SLOTS:
 
     void testWriteToFacadeAndQueryByUid()
     {
-        Akonadi2::ApplicationDomain::Event event;
+        Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1");
         event.setProperty("uid", "testuid");
         QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
         event.setProperty("summary", "summaryValue");
-        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy.instance1").exec().waitForFinished();
+        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event).exec().waitForFinished();
 
         Akonadi2::Query query;
         query.resources << "org.kde.dummy.instance1";
@@ -69,14 +69,14 @@ private Q_SLOTS:
 
     void testWriteToFacadeAndQueryByUid2()
     {
-        Akonadi2::ApplicationDomain::Event event;
+        Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1");
         event.setProperty("summary", "summaryValue");
 
         event.setProperty("uid", "testuid");
-        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy.instance1").exec().waitForFinished();
+        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event).exec().waitForFinished();
 
         event.setProperty("uid", "testuid2");
-        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy.instance1").exec().waitForFinished();
+        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event).exec().waitForFinished();
 
         Akonadi2::Query query;
         query.resources << "org.kde.dummy.instance1";
@@ -94,15 +94,15 @@ private Q_SLOTS:
 
     void testWriteToFacadeAndQueryBySummary()
     {
-        Akonadi2::ApplicationDomain::Event event;
+        Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1");
 
         event.setProperty("uid", "testuid");
         event.setProperty("summary", "summaryValue1");
-        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy.instance1").exec().waitForFinished();
+        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event).exec().waitForFinished();
 
         event.setProperty("uid", "testuid2");
         event.setProperty("summary", "summaryValue2");
-        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy.instance1").exec().waitForFinished();
+        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event).exec().waitForFinished();
 
         Akonadi2::Query query;
         query.resources << "org.kde.dummy.instance1";
@@ -165,11 +165,11 @@ private Q_SLOTS:
 
     void testWriteModifyDelete()
     {
-        Akonadi2::ApplicationDomain::Event event;
+        Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1");
         event.setProperty("uid", "testuid");
         QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
         event.setProperty("summary", "summaryValue");
-        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy.instance1").exec().waitForFinished();
+        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event).exec().waitForFinished();
 
         Akonadi2::Query query;
         query.resources << "org.kde.dummy.instance1";
@@ -191,7 +191,7 @@ private Q_SLOTS:
 
         event2.setProperty("uid", "testuid");
         event2.setProperty("summary", "summaryValue2");
-        Akonadi2::Store::modify<Akonadi2::ApplicationDomain::Event>(event2, "org.kde.dummy.instance1").exec().waitForFinished();
+        Akonadi2::Store::modify<Akonadi2::ApplicationDomain::Event>(event2).exec().waitForFinished();
 
         //Test modify
         {
@@ -203,7 +203,7 @@ private Q_SLOTS:
             QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue2"));
         }
 
-        Akonadi2::Store::remove<Akonadi2::ApplicationDomain::Event>(event2, "org.kde.dummy.instance1").exec().waitForFinished();
+        Akonadi2::Store::remove<Akonadi2::ApplicationDomain::Event>(event2).exec().waitForFinished();
 
         //Test remove
         {
@@ -227,11 +227,11 @@ private Q_SLOTS:
         async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
         result.exec();
 
-        Akonadi2::ApplicationDomain::Event event;
+        Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1");
         event.setProperty("uid", "testuid");
         QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
         event.setProperty("summary", "summaryValue");
-        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy.instance1").exec().waitForFinished();
+        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event).exec().waitForFinished();
 
         //Test create
         Akonadi2::ApplicationDomain::Event event2;
@@ -245,7 +245,7 @@ private Q_SLOTS:
 
         event2.setProperty("uid", "testuid");
         event2.setProperty("summary", "summaryValue2");
-        Akonadi2::Store::modify<Akonadi2::ApplicationDomain::Event>(event2, "org.kde.dummy.instance1").exec().waitForFinished();
+        Akonadi2::Store::modify<Akonadi2::ApplicationDomain::Event>(event2).exec().waitForFinished();
 
         //Test modify
         {
@@ -255,7 +255,7 @@ private Q_SLOTS:
             QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue2"));
         }
 
-        Akonadi2::Store::remove<Akonadi2::ApplicationDomain::Event>(event2, "org.kde.dummy.instance1").exec().waitForFinished();
+        Akonadi2::Store::remove<Akonadi2::ApplicationDomain::Event>(event2).exec().waitForFinished();
 
         //Test remove
         {