From 28c40c63f557fa05c402c9c88ffbe9bfdca20648 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 22 Nov 2016 14:43:23 +0100
Subject: Never remove the static facades.

This fixes the clientapitest.
---
 common/facadefactory.cpp | 1 +
 common/facadefactory.h   | 6 ++++++
 common/store.cpp         | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/facadefactory.cpp b/common/facadefactory.cpp
index 9342831..c26c0a1 100644
--- a/common/facadefactory.cpp
+++ b/common/facadefactory.cpp
@@ -51,6 +51,7 @@ void FacadeFactory::resetFactory()
 {
     QMutexLocker locker(&sMutex);
     mFacadeRegistry.clear();
+    registerStaticFacades();
 }
 
 void FacadeFactory::registerStaticFacades()
diff --git a/common/facadefactory.h b/common/facadefactory.h
index 8d41705..afd08b6 100644
--- a/common/facadefactory.h
+++ b/common/facadefactory.h
@@ -92,6 +92,12 @@ public:
         return std::static_pointer_cast<StoreFacade<DomainType>>(ptr);
     }
 
+    template <class DomainType>
+    std::shared_ptr<StoreFacade<DomainType>> getFacade()
+    {
+        return getFacade<DomainType>(QByteArray(), QByteArray());
+    }
+
 private:
     FacadeFactory();
     std::shared_ptr<void> getFacade(const QByteArray &resource, const QByteArray &instanceIdentifier, const QByteArray &typeName);
diff --git a/common/store.cpp b/common/store.cpp
index 5e0c327..6aae00f 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -146,7 +146,7 @@ QSharedPointer<QAbstractItemModel> Store::loadModel(Query query)
 
     if (query.liveQuery() && query.getResourceFilter().ids.isEmpty() && !ApplicationDomain::isGlobalType(ApplicationDomain::getTypeName<DomainType>())) {
         SinkTrace() << "Listening for new resources";
-        auto facade = FacadeFactory::instance().getFacade<ApplicationDomain::SinkResource>("", "");
+        auto facade = FacadeFactory::instance().getFacade<ApplicationDomain::SinkResource>();
         Q_ASSERT(facade);
         Sink::Query resourceQuery;
         query.setFlags(Query::LiveQuery);
@@ -187,7 +187,7 @@ template <class DomainType>
 static std::shared_ptr<StoreFacade<DomainType>> getFacade(const QByteArray &resourceInstanceIdentifier)
 {
     if (ApplicationDomain::isGlobalType(ApplicationDomain::getTypeName<DomainType>())) {
-        if (auto facade = FacadeFactory::instance().getFacade<DomainType>("", "")) {
+        if (auto facade = FacadeFactory::instance().getFacade<DomainType>()) {
             return facade;
         }
     }
-- 
cgit v1.2.3