Removed ServiceStatusEvent from DBusServiceRegistry. Also removed an

unused empty constructor.

diff --git a/src/CommonAPI/DBus/DBusServiceRegistry.cpp b/src/CommonAPI/DBus/DBusServiceRegistry.cpp
index 1ca5360..482efde 100644 (file)
--- a/src/CommonAPI/DBus/DBusServiceRegistry.cpp
+++ b/src/CommonAPI/DBus/DBusServiceRegistry.cpp
@@ -13,17 +13,10 @@ namespace CommonAPI {
 namespace DBus {
 
 
-DBusServiceRegistry::DBusServiceRegistry() :
-                dbusServicesStatus_(AvailabilityStatus::UNKNOWN),
-                serviceStatusEvent_(std::shared_ptr<DBusServiceRegistry>(this))
-{
-}
+DBusServiceRegistry::DBusServiceRegistry(std::shared_ptr<DBusProxyConnection> dbusProxyConnection):
+                dbusDaemonProxy_(std::make_shared<CommonAPI::DBus::DBusDaemonProxy>(dbusProxyConnection)),
+                dbusServicesStatus_(AvailabilityStatus::UNKNOWN) {
 
-DBusServiceRegistry::DBusServiceRegistry(std::shared_ptr<DBusDaemonProxy> dbusDaemonProxy) :
-                dbusDaemonProxy_(dbusDaemonProxy),
-                dbusServicesStatus_(AvailabilityStatus::UNKNOWN),
-                serviceStatusEvent_(std::shared_ptr<DBusServiceRegistry>(this))
-{
     dbusDaemonProxyStatusEventSubscription_ =
                     dbusDaemonProxy_->getProxyStatusEvent().subscribeCancellableListener(
                                     std::bind(&DBusServiceRegistry::onDBusDaemonProxyStatusEvent, this, std::placeholders::_1));
@@ -223,9 +216,6 @@ size_t DBusServiceRegistry::getAvailableServiceInstances(const std::string& dbus
     return dbusServicesResolvedCount;
 }
 
-DBusServiceStatusEvent& DBusServiceRegistry::getServiceStatusEvent() {
-    return serviceStatusEvent_;
-}
 
 DBusServiceRegistry::Subscription DBusServiceRegistry::subscribeAvailabilityListener(const std::string& commonApiAddress,
                                                                                      DBusServiceListener serviceListener) {

diff --git a/src/CommonAPI/DBus/DBusServiceRegistry.h b/src/CommonAPI/DBus/DBusServiceRegistry.h
index 6635ae5..9cc781d 100644 (file)
--- a/src/CommonAPI/DBus/DBusServiceRegistry.h
+++ b/src/CommonAPI/DBus/DBusServiceRegistry.h
@@ -61,9 +61,7 @@ class DBusServiceRegistry {
     typedef std::unordered_map<std::string, std::pair<DBusServiceState, DBusInstanceList> > DBusServiceList;
 
 
-    DBusServiceRegistry();
-
-    DBusServiceRegistry(std::shared_ptr<DBusDaemonProxy> dbusDaemonProxy);
+    DBusServiceRegistry(std::shared_ptr<DBusProxyConnection> dbusProxyConnection);
 
     virtual ~DBusServiceRegistry();
 
@@ -75,9 +73,7 @@ class DBusServiceRegistry {
                                          Subscription& listenerSubscription);
 
     virtual std::vector<std::string> getAvailableServiceInstances(const std::string& interfaceName,
-                                                          const std::string& domainName = "local");
-
-    virtual DBusServiceStatusEvent& getServiceStatusEvent();
+                                                                  const std::string& domainName = "local");
 
  private:
     DBusServiceRegistry(const DBusServiceRegistry&) = delete;
@@ -120,8 +116,6 @@ class DBusServiceRegistry {
 
     ProxyStatusEvent::Subscription dbusDaemonProxyStatusEventSubscription_;
     NameOwnerChangedEvent::Subscription dbusDaemonProxyNameOwnerChangedEventSubscription_;
-
-    DBusServiceStatusEvent serviceStatusEvent_;
 };
 
 } // namespace DBus