Minor formatting fix

9 files changed, 46 insertions, 17 deletions

diff --git a/src/components/application_manager/include/application_manager/app_service_manager.h b/src/components/application_manager/include/application_manager/app_service_manager.h
index 736302dbc2..201fb88954 100644
--- a/src/components/application_manager/include/application_manager/app_service_manager.h
+++ b/src/components/application_manager/include/application_manager/app_service_manager.h
@@ -40,6 +40,7 @@ namespace application_manager {
 struct AppService {
   uint32_t connection_key;
   bool mobile_service;
+  bool default_service = false;
   smart_objects::SmartObject record;
 };
 
@@ -54,7 +55,8 @@ class AppServiceManager {
    * @brief Class constructor
    * @param app_manager
    */
-  AppServiceManager(ApplicationManager& app_manager);
+  AppServiceManager(ApplicationManager& app_manager,
+                    resumption::LastState& last_state);
 
   /**
    * @brief Class destructor
@@ -78,6 +80,30 @@ class AppServiceManager {
 
   /**
    * @brief TODO
+   * @param service_id
+   */
+  bool SetDefaultService(const std::string service_id);
+
+  /**
+   * @brief TODO
+   * @param service_id
+   */
+  bool RemoveDefaultService(const std::string service_id);
+
+  /**
+   * @brief TODO
+   * @param service_id
+   */
+  bool ActivateAppService(const std::string service_id);
+
+  /**
+   * @brief TODO
+   * @param service_id
+   */
+  bool DeactivateAppService(const std::string service_id);
+
+  /**
+   * @brief TODO
    * @param manifest
    */
   std::vector<smart_objects::SmartObject> GetAllServices();
@@ -87,8 +113,11 @@ class AppServiceManager {
 
   std::pair<std::string, AppService> FindServiceByName(std::string name);
 
+  std::string DefaultServiceByType(std::string service_type);
+
  private:
   ApplicationManager& app_manager_;
+  resumption::LastState& last_state_;
   std::map<std::string, AppService> published_services_;
 };
 
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc
index ff69c90029..89da1e744c 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc
@@ -49,9 +49,9 @@ ASPublishAppServiceRequest::ASPublishAppServiceRequest(
                      hmi_capabilities,
                      policy_handler)
     , plugin_(NULL) {
-  auto plugin = (application_manager.GetPluginManager().FindPluginToProcess(
+  auto plugin = application_manager.GetPluginManager().FindPluginToProcess(
       hmi_apis::FunctionID::AppService_PublishAppService,
-      app_mngr::commands::Command::CommandSource::SOURCE_HMI));
+      app_mngr::commands::Command::CommandSource::SOURCE_HMI);
   if (plugin) {
     plugin_ = dynamic_cast<AppServiceRpcPlugin*>(&(*plugin));
   }
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_response.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_response.cc
index 2513a92f15..1191b07abe 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_response.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_response.cc
@@ -49,9 +49,9 @@ ASPublishAppServiceResponse::ASPublishAppServiceResponse(
                     hmi_capabilities,
                     policy_handler)
     , plugin_(NULL) {
-  auto plugin = (application_manager.GetPluginManager().FindPluginToProcess(
+  auto plugin = application_manager.GetPluginManager().FindPluginToProcess(
       hmi_apis::FunctionID::AppService_PublishAppService,
-      app_mngr::commands::Command::CommandSource::SOURCE_HMI));
+      app_mngr::commands::Command::CommandSource::SOURCE_HMI);
   if (plugin) {
     plugin_ = dynamic_cast<AppServiceRpcPlugin*>(&(*plugin));
   }
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification.cc
index 0cd269b04e..29562d3086 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification.cc
@@ -49,9 +49,9 @@ OnASAppServiceDataNotification::OnASAppServiceDataNotification(
                         hmi_capabilities,
                         policy_handler)
     , plugin_(NULL) {
-  auto plugin = (application_manager.GetPluginManager().FindPluginToProcess(
+  auto plugin = application_manager.GetPluginManager().FindPluginToProcess(
       hmi_apis::FunctionID::AppService_OnAppServiceData,
-      app_mngr::commands::Command::CommandSource::SOURCE_HMI));
+      app_mngr::commands::Command::CommandSource::SOURCE_HMI);
   if (plugin) {
     plugin_ = dynamic_cast<AppServiceRpcPlugin*>(&(*plugin));
   }
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification_from_hmi.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification_from_hmi.cc
index 01a8e817a2..ce68192d13 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification_from_hmi.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification_from_hmi.cc
@@ -49,9 +49,9 @@ OnASAppServiceDataNotificationFromHMI::OnASAppServiceDataNotificationFromHMI(
                           hmi_capabilities,
                           policy_handler)
     , plugin_(NULL) {
-  auto plugin = (application_manager.GetPluginManager().FindPluginToProcess(
+  auto plugin = application_manager.GetPluginManager().FindPluginToProcess(
       hmi_apis::FunctionID::AppService_OnAppServiceData,
-      app_mngr::commands::Command::CommandSource::SOURCE_HMI));
+      app_mngr::commands::Command::CommandSource::SOURCE_HMI);
   if (plugin) {
     plugin_ = dynamic_cast<AppServiceRpcPlugin*>(&(*plugin));
   }
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification.cc
index 33ab1a7246..ef2ab7a4ab 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification.cc
@@ -52,9 +52,9 @@ OnAppServiceDataNotification::OnAppServiceDataNotification(
                               hmi_capabilities,
                               policy_handler)
     , plugin_(NULL) {
-  auto plugin = (application_manager.GetPluginManager().FindPluginToProcess(
+  auto plugin = application_manager.GetPluginManager().FindPluginToProcess(
       mobile_apis::FunctionID::OnAppServiceDataID,
-      app_mngr::commands::Command::CommandSource::SOURCE_MOBILE));
+      app_mngr::commands::Command::CommandSource::SOURCE_MOBILE);
   if (plugin) {
     plugin_ = dynamic_cast<AppServiceRpcPlugin*>(&(*plugin));
   }
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification_from_mobile.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification_from_mobile.cc
index a7a8042fee..0b0ac0b68c 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification_from_mobile.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification_from_mobile.cc
@@ -52,9 +52,9 @@ OnAppServiceDataNotificationFromMobile::OnAppServiceDataNotificationFromMobile(
                                         hmi_capabilities,
                                         policy_handler)
     , plugin_(NULL) {
-  auto plugin = (application_manager.GetPluginManager().FindPluginToProcess(
+  auto plugin = application_manager.GetPluginManager().FindPluginToProcess(
       mobile_apis::FunctionID::OnAppServiceDataID,
-      app_mngr::commands::Command::CommandSource::SOURCE_MOBILE));
+      app_mngr::commands::Command::CommandSource::SOURCE_MOBILE);
   if (plugin) {
     plugin_ = dynamic_cast<AppServiceRpcPlugin*>(&(*plugin));
   }
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc
index 78372661dc..7a0333e763 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc
@@ -52,9 +52,9 @@ PublishAppServiceRequest::PublishAppServiceRequest(
                          hmi_capabilities,
                          policy_handler)
     , plugin_(NULL) {
-  auto plugin = (application_manager.GetPluginManager().FindPluginToProcess(
+  auto plugin = application_manager.GetPluginManager().FindPluginToProcess(
       mobile_apis::FunctionID::PublishAppServiceID,
-      app_mngr::commands::Command::CommandSource::SOURCE_MOBILE));
+      app_mngr::commands::Command::CommandSource::SOURCE_MOBILE);
   if (plugin) {
     plugin_ = dynamic_cast<AppServiceRpcPlugin*>(&(*plugin));
   }
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_response.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_response.cc
index 6c3e9344bf..b302189ef7 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_response.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_response.cc
@@ -52,9 +52,9 @@ PublishAppServiceResponse::PublishAppServiceResponse(
                           hmi_capabilities,
                           policy_handler)
     , plugin_(NULL) {
-  auto plugin = (application_manager.GetPluginManager().FindPluginToProcess(
+  auto plugin = application_manager.GetPluginManager().FindPluginToProcess(
       mobile_apis::FunctionID::PublishAppServiceID,
-      app_mngr::commands::Command::CommandSource::SOURCE_MOBILE));
+      app_mngr::commands::Command::CommandSource::SOURCE_MOBILE);
   if (plugin) {
     plugin_ = dynamic_cast<AppServiceRpcPlugin*>(&(*plugin));
   }