Merge remote-tracking branch 'origin/feature/base_app_services_implementation' into feature/app_service_policies

8 files changed, 20 insertions, 19 deletions

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 1e235c1282..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));
   }
@@ -86,10 +86,10 @@ void ASPublishAppServiceRequest::Run() {
     return;
   }
   smart_objects::SmartObject service_record =
-      application_manager_.GetAppServiceManager().PublishAppService(manifest);
+      application_manager_.GetAppServiceManager().PublishAppService(
+          manifest, false, UINT32_MAX);
 
   response_params[strings::app_service_record] = service_record;
-  // TODO: Add AppServiceRecord to response
   SendResponse(true,
                (*message_)[strings::params][strings::correlation_id].asUInt(),
                hmi_apis::FunctionID::AppService_PublishAppService,
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 d4396d49a8..6c69eae3b6 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 03c1b91785..052ad9751a 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));
   }
@@ -90,7 +90,8 @@ void PublishAppServiceRequest::Run() {
     return;
   }
   smart_objects::SmartObject service_record =
-      application_manager_.GetAppServiceManager().PublishAppService(manifest);
+      application_manager_.GetAppServiceManager().PublishAppService(
+          manifest, true, connection_key());
 
   std::string requested_service_name =
       (*message_)[strings::msg_params][strings::app_service_manifest]
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));
   }