Fix stylefeature/protect_published_services

2 files changed, 8 insertions, 11 deletions

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 e198cc0fcd..2c6ba414e0 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
@@ -64,17 +64,15 @@ void OnAppServiceDataNotification::Run() {
 
   std::string service_id =
       (*message_)[strings::msg_params][strings::service_data]
-                 [strings::service_id]
-                     .asString();
-  auto service = application_manager_.GetAppServiceManager().FindServiceByID(service_id);
-  
+                 [strings::service_id].asString();
+  auto service =
+      application_manager_.GetAppServiceManager().FindServiceByID(service_id);
+
   if (!service) {
     LOG4CXX_ERROR(logger_, "Service sending OnAppServiceData is not published");
     return;
-  } else if (!service
-                 ->record[strings::service_manifest]
-                         [strings::allow_app_consumers]
-                 .asBool()) {
+  } else if (!service->record[strings::service_manifest]
+                             [strings::allow_app_consumers].asBool()) {
     LOG4CXX_ERROR(logger_,
                   "Service does not allow for app consumers, skipping mobile "
                   "OnAppServiceData notification");
@@ -83,8 +81,7 @@ void OnAppServiceDataNotification::Run() {
 
   std::string service_type =
       (*message_)[strings::msg_params][strings::service_data]
-                 [strings::service_type]
-                     .asString();
+                 [strings::service_type].asString();
 
   auto subscribed_to_app_service_predicate =
       [service_type](const ApplicationSharedPtr app) {
diff --git a/src/components/application_manager/src/app_service_manager.cc b/src/components/application_manager/src/app_service_manager.cc
index 494d3d61bf..24c21dc201 100644
--- a/src/components/application_manager/src/app_service_manager.cc
+++ b/src/components/application_manager/src/app_service_manager.cc
@@ -109,7 +109,7 @@ smart_objects::SmartObject AppServiceManager::PublishAppService(
       std::pair<std::string, AppService>(service_id, app_service));
   smart_objects::SmartObject& published_record = ret.first->second.record;
   published_services_lock_.Release();
-  
+
   smart_objects::SmartObject msg_params;
   msg_params[strings::system_capability][strings::system_capability_type] =
       mobile_apis::SystemCapabilityType::APP_SERVICES;