Refactoring all hmi commands.

In all hmi command added rpc_service_, hmi_capabilities_ and
policy_handler_ fields. Also changed all constructors.

7 files changed, 30 insertions, 8 deletions

diff --git a/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h b/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h
index e8a0399c9d..8741dae540 100644
--- a/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h
+++ b/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h
@@ -42,8 +42,12 @@ namespace commands {
 
 class CommandNotificationFromMobileImpl : public CommandImpl {
  public:
-  CommandNotificationFromMobileImpl(const MessageSharedPtr& message,
-                                    ApplicationManager& application_manager);
+  CommandNotificationFromMobileImpl(
+      const MessageSharedPtr& message,
+      ApplicationManager& application_manager,
+      rpc_service::RPCService& rpc_service,
+      HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handler);
   virtual ~CommandNotificationFromMobileImpl();
   virtual bool Init();
   virtual bool CleanUp();
diff --git a/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h b/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h
index 6f8bf3a76b..6abd3d23c0 100644
--- a/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/notification_from_hmi.h
@@ -45,7 +45,10 @@ namespace commands {
 class NotificationFromHMI : public app_mngr::commands::CommandImpl {
  public:
   NotificationFromHMI(const app_mngr::commands::MessageSharedPtr& message,
-                      app_mngr::ApplicationManager& application_manager);
+                      app_mngr::ApplicationManager& application_manager,
+                      application_manager::rpc_service::RPCService& rpc_service,
+                      application_manager::HMICapabilities& hmi_capabilities,
+                      policy::PolicyHandlerInterface& policy_handle);
   virtual ~NotificationFromHMI();
   virtual bool Init();
   virtual bool CleanUp();
diff --git a/src/components/application_manager/include/application_manager/commands/notification_to_hmi.h b/src/components/application_manager/include/application_manager/commands/notification_to_hmi.h
index 3f59ae6234..7299a1a79c 100644
--- a/src/components/application_manager/include/application_manager/commands/notification_to_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/notification_to_hmi.h
@@ -43,7 +43,10 @@ namespace commands {
 class NotificationToHMI : public app_mngr::commands::CommandImpl {
  public:
   NotificationToHMI(const app_mngr::commands::MessageSharedPtr& message,
-                    app_mngr::ApplicationManager& application_manager);
+                    app_mngr::ApplicationManager& application_manager,
+                    app_mngr::rpc_service::RPCService& rpc_service,
+                    app_mngr::HMICapabilities& hmi_capabilities,
+                    policy::PolicyHandlerInterface& policy_handle);
   virtual ~NotificationToHMI();
   virtual bool Init();
   virtual bool CleanUp();
diff --git a/src/components/application_manager/include/application_manager/commands/request_from_hmi.h b/src/components/application_manager/include/application_manager/commands/request_from_hmi.h
index e9242c9fcf..c00805ec7f 100644
--- a/src/components/application_manager/include/application_manager/commands/request_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/request_from_hmi.h
@@ -46,7 +46,10 @@ namespace NsSmart = NsSmartDeviceLink::NsSmartObjects;
 class RequestFromHMI : public CommandImpl, public event_engine::EventObserver {
  public:
   RequestFromHMI(const MessageSharedPtr& message,
-                 ApplicationManager& application_manager);
+                 ApplicationManager& application_manager,
+                 rpc_service::RPCService& rpc_service,
+                 HMICapabilities& hmi_capabilities,
+                 policy::PolicyHandlerInterface& policy_handler);
   virtual ~RequestFromHMI();
   virtual bool Init();
   virtual bool CleanUp();
diff --git a/src/components/application_manager/include/application_manager/commands/request_to_hmi.h b/src/components/application_manager/include/application_manager/commands/request_to_hmi.h
index ecefafbb3e..dca44b457e 100644
--- a/src/components/application_manager/include/application_manager/commands/request_to_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/request_to_hmi.h
@@ -64,7 +64,10 @@ bool ChangeInterfaceState(ApplicationManager& application_manager,
 class RequestToHMI : public CommandImpl {
  public:
   RequestToHMI(const MessageSharedPtr& message,
-               ApplicationManager& application_manager);
+               ApplicationManager& application_manager,
+               rpc_service::RPCService& rpc_service,
+               HMICapabilities& hmi_capabilities,
+               policy::PolicyHandlerInterface& policy_handler);
   virtual ~RequestToHMI();
   virtual bool Init();
   virtual bool CleanUp();
diff --git a/src/components/application_manager/include/application_manager/commands/response_from_hmi.h b/src/components/application_manager/include/application_manager/commands/response_from_hmi.h
index 3006054d29..174d08f216 100644
--- a/src/components/application_manager/include/application_manager/commands/response_from_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/response_from_hmi.h
@@ -45,7 +45,10 @@ namespace commands {
 class ResponseFromHMI : public app_mngr::commands::CommandImpl {
  public:
   ResponseFromHMI(const app_mngr::commands::MessageSharedPtr& message,
-                  app_mngr::ApplicationManager& application_manager);
+                  app_mngr::ApplicationManager& application_manager,
+                  app_mngr::rpc_service::RPCService& rpc_service,
+                  app_mngr::HMICapabilities& hmi_capabilities,
+                  policy::PolicyHandlerInterface& policy_handle);
   virtual ~ResponseFromHMI();
   virtual bool Init();
   virtual bool CleanUp();
diff --git a/src/components/application_manager/include/application_manager/commands/response_to_hmi.h b/src/components/application_manager/include/application_manager/commands/response_to_hmi.h
index 47b09ef535..cdf06b22f4 100644
--- a/src/components/application_manager/include/application_manager/commands/response_to_hmi.h
+++ b/src/components/application_manager/include/application_manager/commands/response_to_hmi.h
@@ -48,7 +48,10 @@ namespace NsSmart = NsSmartDeviceLink::NsSmartObjects;
 class ResponseToHMI : public app_mngr::commands::CommandImpl {
  public:
   ResponseToHMI(const app_mngr::commands::MessageSharedPtr& message,
-                app_mngr::ApplicationManager& application_manager);
+                app_mngr::ApplicationManager& application_manager,
+                app_mngr::rpc_service::RPCService& rpc_service,
+                app_mngr::HMICapabilities& hmi_capabilities,
+                policy::PolicyHandlerInterface& policy_handle);
   virtual ~ResponseToHMI();
   virtual bool Init();
   virtual bool CleanUp();