diff options
author | JackLivio <jack@livio.io> | 2019-01-30 15:52:59 -0500 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2019-01-30 15:52:59 -0500 |
commit | b978621cc24a49dbe6c59bb59a8406f52fc2c9db (patch) | |
tree | 8a2d6727aa179e5319b086f3ee5758de8279fbf8 /src/components | |
parent | 59e638c2ae6722b07e70423eff9d3eb44c9581bb (diff) | |
download | sdl_core-b978621cc24a49dbe6c59bb59a8406f52fc2c9db.tar.gz |
Change request type to enum
Diffstat (limited to 'src/components')
5 files changed, 17 insertions, 10 deletions
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h index df96ade313..37474d75c2 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_handler.h +++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h @@ -469,7 +469,7 @@ class PolicyHandler : public PolicyHandlerInterface, bool CheckAppServiceParameters( const std::string& policy_app_id, const std::string& requested_service_name, - const std::string& requested_service_type, + const mobile_apis::AppServiceType::eType& requested_service_type, smart_objects::SmartArray* requested_handled_rpcs) const OVERRIDE; virtual void OnUpdateHMIAppType( 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 6a9dc8f1a7..d4396d49a8 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 @@ -68,9 +68,10 @@ void OnAppServiceDataNotificationFromMobile::Run() { LOG4CXX_DEBUG(logger_, "Received an OnAppServiceData"); MessageHelper::PrintSmartObject(*message_); - std::string service_type = + // Todo: revision make service type string. + mobile_apis::AppServiceType::eType service_type = static_cast<mobile_apis::AppServiceType::eType>( (*message_)[strings::msg_params][strings::app_service_manifest] - [strings::service_type].asString(); + [strings::service_type].asUInt()); ApplicationSharedPtr app = application_manager_.application(connection_key()); 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 f975cb0543..03c1b91785 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 @@ -95,9 +95,10 @@ void PublishAppServiceRequest::Run() { std::string requested_service_name = (*message_)[strings::msg_params][strings::app_service_manifest] [strings::service_name].asString(); - std::string requested_service_type = + // Todo: revision make service type string. + mobile_apis::AppServiceType::eType requested_service_type = static_cast<mobile_apis::AppServiceType::eType>( (*message_)[strings::msg_params][strings::app_service_manifest] - [strings::service_type].asString(); + [strings::service_type].asUInt()); smart_objects::SmartArray* requested_handled_rpcs = (*message_)[strings::msg_params][strings::app_service_manifest] [strings::handled_rpcs].asArray(); diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index 456c127025..a9f69464b7 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -1948,7 +1948,7 @@ void PolicyHandler::GetAppServiceParameters( bool PolicyHandler::CheckAppServiceParameters( const std::string& policy_app_id, const std::string& requested_service_name, - const std::string& requested_service_type, + const mobile_apis::AppServiceType::eType& requested_service_type, smart_objects::SmartArray* requested_handled_rpcs) const { std::string service_name = std::string(); std::string service_type = std::string(); @@ -1958,7 +1958,12 @@ bool PolicyHandler::CheckAppServiceParameters( policy_table::AppServiceParameters(); this->GetAppServiceParameters(policy_app_id, &app_service_parameters); - if (app_service_parameters.find(requested_service_type) == + std::string requested_service_type_str = std::string(); + smart_objects::EnumConversionHelper< + mobile_apis::AppServiceType::eType>:: + EnumToString(requested_service_type, &requested_service_type_str); + + if (app_service_parameters.find(requested_service_type_str) == app_service_parameters.end()) { LOG4CXX_DEBUG(logger_, "Disallowed service type: " << requested_service_type); @@ -1967,7 +1972,7 @@ bool PolicyHandler::CheckAppServiceParameters( if (!requested_service_name.empty()) { auto service_names = - *(app_service_parameters[requested_service_type].service_names); + *(app_service_parameters[requested_service_type_str].service_names); auto find_name_result = std::find(service_names.begin(), service_names.end(), @@ -1980,7 +1985,7 @@ bool PolicyHandler::CheckAppServiceParameters( // todo handled rpcs check if (requested_handled_rpcs) { auto temp_rpcs = - *(app_service_parameters[requested_service_type].handled_rpcs); + *(app_service_parameters[requested_service_type_str].handled_rpcs); for (auto handled_it = temp_rpcs.begin(); handled_it != temp_rpcs.end(); ++handled_it) { handled_rpcs.push_back(handled_it->function_id); diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h index 64f0b893b2..5f5449fe11 100644 --- a/src/components/include/application_manager/policies/policy_handler_interface.h +++ b/src/components/include/application_manager/policies/policy_handler_interface.h @@ -511,7 +511,7 @@ class PolicyHandlerInterface { virtual bool CheckAppServiceParameters( const std::string& policy_app_id, const std::string& requested_service_name, - const std::string& requested_service_type, + const mobile_apis::AppServiceType::eType& requested_service_type, smart_objects::SmartArray* requested_handled_rpcs) const = 0; #ifdef EXTERNAL_PROPRIETARY_MODE |