diff options
author | JackLivio <jack@livio.io> | 2019-02-19 15:29:55 -0500 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2019-02-19 15:29:55 -0500 |
commit | a090527479222dbb659d6e390d034dd5dc72a107 (patch) | |
tree | 7dfc487088f40338e3f3d5cc2c429a2fed979982 | |
parent | 2119d3fea64e2c7ea7b0600703907dd2d15652e7 (diff) | |
download | sdl_core-a090527479222dbb659d6e390d034dd5dc72a107.tar.gz |
Update AppServiceType to string
7 files changed, 18 insertions, 27 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 37474d75c2..df96ade313 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 mobile_apis::AppServiceType::eType& requested_service_type, + const std::string& 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 1a90572ecf..96b085c344 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,11 +68,9 @@ void OnAppServiceDataNotificationFromMobile::Run() { LOG4CXX_DEBUG(logger_, "Received an OnAppServiceData"); MessageHelper::PrintSmartObject(*message_); - // 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].asUInt()); + std::string service_type = + (*message_)[strings::msg_params][strings::app_service_manifest] + [strings::service_type].asString(); 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 06f7f4b13a..6ef63aa1b8 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 @@ -102,11 +102,9 @@ void PublishAppServiceRequest::Run() { [strings::service_name].asString(); } - // 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].asUInt()); + std::string requested_service_type = + (*message_)[strings::msg_params][strings::app_service_manifest] + [strings::service_type].asString(); smart_objects::SmartArray* requested_handled_rpcs; if ((*message_)[strings::msg_params][strings::app_service_manifest].keyExists( diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index 451a9087d5..9382a8580b 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 mobile_apis::AppServiceType::eType& requested_service_type, + const std::string& requested_service_type, smart_objects::SmartArray* requested_handled_rpcs) const { std::string service_name = std::string(); std::string service_type = std::string(); @@ -1958,11 +1958,7 @@ bool PolicyHandler::CheckAppServiceParameters( policy_table::AppServiceParameters(); this->GetAppServiceParameters(policy_app_id, &app_service_parameters); - 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) == + if (app_service_parameters.find(requested_service_type) == app_service_parameters.end()) { LOG4CXX_DEBUG(logger_, "Disallowed service type: " << requested_service_type); @@ -1971,7 +1967,7 @@ bool PolicyHandler::CheckAppServiceParameters( if (!requested_service_name.empty()) { auto service_names = - *(app_service_parameters[requested_service_type_str].service_names); + *(app_service_parameters[requested_service_type].service_names); auto find_name_result = std::find(service_names.begin(), service_names.end(), @@ -1983,7 +1979,7 @@ bool PolicyHandler::CheckAppServiceParameters( if (requested_handled_rpcs) { auto temp_rpcs = - *(app_service_parameters[requested_service_type_str].handled_rpcs); + *(app_service_parameters[requested_service_type].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 5f5449fe11..64f0b893b2 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 mobile_apis::AppServiceType::eType& requested_service_type, + const std::string& requested_service_type, smart_objects::SmartArray* requested_handled_rpcs) const = 0; #ifdef EXTERNAL_PROPRIETARY_MODE diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h index b817b7a361..1db0338caf 100644 --- a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h +++ b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h @@ -231,12 +231,11 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { GetAppServiceParameters, void(const std::string& policy_app_id, policy_table::AppServiceParameters* app_service_parameters)); - MOCK_CONST_METHOD4( - CheckAppServiceParameters, - bool(const std::string& policy_app_id, - const std::string& requested_service_name, - const mobile_apis::AppServiceType::eType& requested_service_type, - smart_objects::SmartArray* requested_handled_rpcs)); + MOCK_CONST_METHOD4(CheckAppServiceParameters, + bool(const std::string& policy_app_id, + const std::string& requested_service_name, + const std::string& requested_service_type, + smart_objects::SmartArray* requested_handled_rpcs)); #ifdef EXTERNAL_PROPRIETARY_MODE MOCK_CONST_METHOD0(GetMetaInfo, const policy::MetaInfo()); diff --git a/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml index 3b3bc2d7a6..7749c4ee8f 100644 --- a/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml +++ b/src/components/policy/policy_external/include/policy/policy_table_interface_ext.xml @@ -109,7 +109,7 @@ mandatory="false" /> <param name="hybrid_app_preference" type="HybridAppPreference" mandatory="false" /> <param name="service_name" type="String" mandatory="false" /> - <param name="service_type" type="AppServiceType" mandatory="false" /> + <param name="service_type" type="String" mandatory="false" /> <param name="handled_rpcs" array="true" mandatory="false"> </struct> |