diff options
author | JackLivio <jack@livio.io> | 2019-04-08 12:57:06 -0400 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2019-04-08 12:57:06 -0400 |
commit | 6897d49d165e6a40450c6f662fec218ed6628f60 (patch) | |
tree | 1a0e0ef3db5cbe4085ef6d9043da297267568242 | |
parent | 839cdf8dbf3efaebeb43e905ccd0f067e165cf2b (diff) | |
download | sdl_core-6897d49d165e6a40450c6f662fec218ed6628f60.tar.gz |
Change pass through to passthrough
31 files changed, 71 insertions, 71 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 c722719dab..a33bb640ad 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 @@ -479,7 +479,7 @@ class PolicyHandler : public PolicyHandlerInterface, * provider * @param policy_app_id Unique application id */ - bool UnknownRPCPassThroughAllowed( + bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const OVERRIDE; virtual void OnUpdateHMIAppType( diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index e3eb56109e..aeb5a8bd01 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -2055,11 +2055,11 @@ bool PolicyHandler::CheckAppServiceParameters( return true; } -bool PolicyHandler::UnknownRPCPassThroughAllowed( +bool PolicyHandler::UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const { LOG4CXX_AUTO_TRACE(logger_); POLICY_LIB_CHECK(false); - return policy_manager_->UnknownRPCPassThroughAllowed(policy_app_id); + return policy_manager_->UnknownRPCPassthroughAllowed(policy_app_id); } uint32_t PolicyHandler::HeartBeatTimeout(const std::string& app_id) const { 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 924e992c34..c7caae1d28 100644 --- a/src/components/include/application_manager/policies/policy_handler_interface.h +++ b/src/components/include/application_manager/policies/policy_handler_interface.h @@ -520,7 +520,7 @@ class PolicyHandlerInterface { * provider * @param policy_app_id Unique application id */ - virtual bool UnknownRPCPassThroughAllowed( + virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const = 0; #ifdef EXTERNAL_PROPRIETARY_MODE diff --git a/src/components/include/policy/policy_external/policy/policy_manager.h b/src/components/include/policy/policy_external/policy/policy_manager.h index 81b5e8ad9b..a2eb2db0c9 100644 --- a/src/components/include/policy/policy_external/policy/policy_manager.h +++ b/src/components/include/policy/policy_external/policy/policy_manager.h @@ -630,7 +630,7 @@ class PolicyManager : public usage_statistics::StatisticsManager { * provider * @param policy_app_id Unique application id */ - virtual bool UnknownRPCPassThroughAllowed( + virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const = 0; /** diff --git a/src/components/include/policy/policy_regular/policy/policy_manager.h b/src/components/include/policy/policy_regular/policy/policy_manager.h index e4247df151..18fb3e1c2b 100644 --- a/src/components/include/policy/policy_regular/policy/policy_manager.h +++ b/src/components/include/policy/policy_regular/policy/policy_manager.h @@ -611,7 +611,7 @@ class PolicyManager : public usage_statistics::StatisticsManager { * provider * @param policy_app_id Unique application id */ - virtual bool UnknownRPCPassThroughAllowed( + virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const = 0; /** 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 fc6e735df5..3521d84a84 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 @@ -237,7 +237,7 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { const std::string& requested_service_name, const std::string& requested_service_type, smart_objects::SmartArray* requested_handled_rpcs)); - MOCK_CONST_METHOD1(UnknownRPCPassThroughAllowed, + MOCK_CONST_METHOD1(UnknownRPCPassthroughAllowed, bool(const std::string& policy_app_id)); #ifdef EXTERNAL_PROPRIETARY_MODE diff --git a/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h b/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h index 533714a86c..6f754ad2c9 100644 --- a/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h +++ b/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h @@ -108,7 +108,7 @@ class MockCacheManagerInterface : public ::policy::CacheManagerInterface { GetAppServiceParameters, void(const std::string& policy_app_id, policy_table::AppServiceParameters* app_service_parameters)); - MOCK_CONST_METHOD1(UnknownRPCPassThroughAllowed, + MOCK_CONST_METHOD1(UnknownRPCPassthroughAllowed, bool(const std::string& policy_app_id)); MOCK_CONST_METHOD1(GetDeviceConsent, DeviceConsent(const std::string& device_id)); diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h index 21585e4ee6..8fc8a9c358 100644 --- a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h +++ b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h @@ -217,7 +217,7 @@ class MockPolicyManager : public PolicyManager { GetAppServiceParameters, void(const std::string& policy_app_id, policy_table::AppServiceParameters* app_service_parameters)); - MOCK_CONST_METHOD1(UnknownRPCPassThroughAllowed, + MOCK_CONST_METHOD1(UnknownRPCPassthroughAllowed, bool(const std::string& policy_app_id)); MOCK_CONST_METHOD0(GetMetaInfo, const policy::MetaInfo()); MOCK_CONST_METHOD0(RetrieveCertificate, std::string()); diff --git a/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h b/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h index f954f14b77..dacdaf202f 100644 --- a/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h +++ b/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h @@ -100,7 +100,7 @@ class MockCacheManagerInterface : public CacheManagerInterface { GetAppServiceParameters, void(const std::string& policy_app_id, policy_table::AppServiceParameters* app_service_parameters)); - MOCK_CONST_METHOD1(UnknownRPCPassThroughAllowed, + MOCK_CONST_METHOD1(UnknownRPCPassthroughAllowed, bool(const std::string& policy_app_id)); MOCK_METHOD1( GetNotificationsNumber, diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h index 6dfa631247..b6fdc2c2c9 100644 --- a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h +++ b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h @@ -213,7 +213,7 @@ class MockPolicyManager : public PolicyManager { GetAppServiceParameters, void(const std::string& policy_app_id, policy_table::AppServiceParameters* app_service_parameters)); - MOCK_CONST_METHOD1(UnknownRPCPassThroughAllowed, + MOCK_CONST_METHOD1(UnknownRPCPassthroughAllowed, bool(const std::string& policy_app_id)); MOCK_CONST_METHOD0(GetMetaInfo, const policy::MetaInfo()); MOCK_CONST_METHOD0(RetrieveCertificate, std::string()); diff --git a/src/components/policy/policy_external/include/policy/cache_manager.h b/src/components/policy/policy_external/include/policy/cache_manager.h index 5e3e3bcb34..2c35b2a378 100644 --- a/src/components/policy/policy_external/include/policy/cache_manager.h +++ b/src/components/policy/policy_external/include/policy/cache_manager.h @@ -257,7 +257,7 @@ class CacheManager : public CacheManagerInterface { * provider * @param policy_app_id Unique application id */ - virtual bool UnknownRPCPassThroughAllowed( + virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const; /** diff --git a/src/components/policy/policy_external/include/policy/cache_manager_interface.h b/src/components/policy/policy_external/include/policy/cache_manager_interface.h index 1b6485c7b5..6465c79c05 100644 --- a/src/components/policy/policy_external/include/policy/cache_manager_interface.h +++ b/src/components/policy/policy_external/include/policy/cache_manager_interface.h @@ -266,7 +266,7 @@ class CacheManagerInterface { * provider * @param policy_app_id Unique application id */ - virtual bool UnknownRPCPassThroughAllowed( + virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const = 0; /** diff --git a/src/components/policy/policy_external/include/policy/policy_manager_impl.h b/src/components/policy/policy_external/include/policy/policy_manager_impl.h index e2920b1176..8a2e5b93f5 100644 --- a/src/components/policy/policy_external/include/policy/policy_manager_impl.h +++ b/src/components/policy/policy_external/include/policy/policy_manager_impl.h @@ -678,7 +678,7 @@ class PolicyManagerImpl : public PolicyManager { * @param policy_app_id Unique application id * @return bool true if allowed */ - bool UnknownRPCPassThroughAllowed( + bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const OVERRIDE; /** diff --git a/src/components/policy/policy_external/include/policy/policy_table/types.h b/src/components/policy/policy_external/include/policy/policy_table/types.h index c85405b3fc..994fd86579 100644 --- a/src/components/policy/policy_external/include/policy/policy_table/types.h +++ b/src/components/policy/policy_external/include/policy/policy_table/types.h @@ -236,7 +236,7 @@ struct ApplicationParams : PolicyBase { // App Service Params Optional<AppServiceParameters> app_service_parameters; - Optional<Boolean> allow_unknown_rpc_pass_through; + Optional<Boolean> allow_unknown_rpc_passthrough; public: ApplicationParams(); 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 f11706c03c..46c8f40a01 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 @@ -113,7 +113,7 @@ <param name="service_name" type="String" mandatory="false" /> <param name="service_type" type="String" mandatory="false" /> <param name="handled_rpcs" array="true" mandatory="false" /> - <param name="allow_unknown_rpc_pass_through" type="Boolean" mandatory="false" /> + <param name="allow_unknown_rpc_passthrough" type="Boolean" mandatory="false" /> </struct> <typedef name="HmiLevels" type="HmiLevel" array="true" diff --git a/src/components/policy/policy_external/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc index e87120e600..bc81b0c57d 100644 --- a/src/components/policy/policy_external/src/cache_manager.cc +++ b/src/components/policy/policy_external/src/cache_manager.cc @@ -1541,7 +1541,7 @@ void CacheManager::GetAppServiceParameters( } } -bool CacheManager::UnknownRPCPassThroughAllowed( +bool CacheManager::UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const { const policy_table::ApplicationPolicies& policies = pt_->policy_table.app_policies_section.apps; @@ -1549,8 +1549,8 @@ bool CacheManager::UnknownRPCPassThroughAllowed( policies.find(policy_app_id); if (policies.end() != policy_iter) { auto app_policy = (*policy_iter).second; - if (app_policy.allow_unknown_rpc_pass_through.is_initialized()) { - return *(app_policy.allow_unknown_rpc_pass_through); + if (app_policy.allow_unknown_rpc_passthrough.is_initialized()) { + return *(app_policy.allow_unknown_rpc_passthrough); } } return false; diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc index 08dc459433..742435098e 100644 --- a/src/components/policy/policy_external/src/policy_manager_impl.cc +++ b/src/components/policy/policy_external/src/policy_manager_impl.cc @@ -799,10 +799,10 @@ void PolicyManagerImpl::GetAppServiceParameters( cache_->GetAppServiceParameters(policy_app_id, app_service_parameters); } -bool PolicyManagerImpl::UnknownRPCPassThroughAllowed( +bool PolicyManagerImpl::UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const { LOG4CXX_AUTO_TRACE(logger_); - return cache_->UnknownRPCPassThroughAllowed(policy_app_id); + return cache_->UnknownRPCPassthroughAllowed(policy_app_id); } void PolicyManagerImpl::CheckPermissions(const PTString& app_id, diff --git a/src/components/policy/policy_external/src/policy_table/types.cc b/src/components/policy/policy_external/src/policy_table/types.cc index a01e8eee33..f95b270fdf 100644 --- a/src/components/policy/policy_external/src/policy_table/types.cc +++ b/src/components/policy/policy_external/src/policy_table/types.cc @@ -354,8 +354,8 @@ ApplicationParams::ApplicationParams(const Json::Value* value__) , cloud_transport_type(impl::ValueMember(value__, "cloud_transport_type")) , icon_url(impl::ValueMember(value__, "icon_url")) , app_service_parameters(impl::ValueMember(value__, "app_services")) - , allow_unknown_rpc_pass_through( - impl::ValueMember(value__, "allow_unknown_rpc_pass_through")) {} + , allow_unknown_rpc_passthrough( + impl::ValueMember(value__, "allow_unknown_rpc_passthrough")) {} Json::Value ApplicationParams::ToJsonValue() const { Json::Value result__(PolicyBase::ToJsonValue()); @@ -376,8 +376,8 @@ Json::Value ApplicationParams::ToJsonValue() const { impl::WriteJsonField("cloud_transport_type", cloud_transport_type, &result__); impl::WriteJsonField("icon_url", auth_token, &result__); impl::WriteJsonField("app_services", app_service_parameters, &result__); - impl::WriteJsonField("allow_unknown_rpc_pass_through", - allow_unknown_rpc_pass_through, + impl::WriteJsonField("allow_unknown_rpc_passthrough", + allow_unknown_rpc_passthrough, &result__); return result__; } @@ -427,7 +427,7 @@ bool ApplicationParams::is_valid() const { if (!app_service_parameters.is_valid()) { return false; } - if (!allow_unknown_rpc_pass_through.is_valid()) { + if (!allow_unknown_rpc_passthrough.is_valid()) { return false; } return Validate(); @@ -486,7 +486,7 @@ bool ApplicationParams::struct_empty() const { if (app_service_parameters.is_initialized()) { return false; } - if (allow_unknown_rpc_pass_through.is_initialized()) { + if (allow_unknown_rpc_passthrough.is_initialized()) { return false; } return true; @@ -563,9 +563,9 @@ void ApplicationParams::ReportErrors(rpc::ValidationReport* report__) const { app_service_parameters.ReportErrors( &report__->ReportSubobject("app_services")); } - if (!allow_unknown_rpc_pass_through.is_valid()) { - allow_unknown_rpc_pass_through.ReportErrors( - &report__->ReportSubobject("allow_unknown_rpc_pass_through")); + if (!allow_unknown_rpc_passthrough.is_valid()) { + allow_unknown_rpc_passthrough.ReportErrors( + &report__->ReportSubobject("allow_unknown_rpc_passthrough")); } } @@ -584,7 +584,7 @@ void ApplicationParams::SetPolicyTableType(PolicyTableType pt_type) { hybrid_app_preference.SetPolicyTableType(pt_type); icon_url.SetPolicyTableType(pt_type); app_service_parameters.SetPolicyTableType(pt_type); - allow_unknown_rpc_pass_through.SetPolicyTableType(pt_type); + allow_unknown_rpc_passthrough.SetPolicyTableType(pt_type); } // RpcParameters methods diff --git a/src/components/policy/policy_external/src/sql_pt_ext_queries.cc b/src/components/policy/policy_external/src/sql_pt_ext_queries.cc index 06527cd0ac..2ab9642d12 100644 --- a/src/components/policy/policy_external/src/sql_pt_ext_queries.cc +++ b/src/components/policy/policy_external/src/sql_pt_ext_queries.cc @@ -207,7 +207,7 @@ const std::string kInsertApplication = " `default_hmi`, `priority_value`, `is_revoked`, `memory_kb`, " " `heart_beat_timeout_ms`, `certificate`, `hybrid_app_preference_value`, " " `endpoint`, `enabled`, `auth_token`, " - " `cloud_transport_type`, `icon_url`, `allow_unknown_rpc_pass_through`) " + " `cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough`) " "VALUES " "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -238,7 +238,7 @@ const std::string kSelectAppPolicies = "SELECT `id`, `priority_value`, `default_hmi`, `keep_context`, " " `steal_focus`, `memory_kb`, `heart_beat_timeout_ms`, `certificate`, " " `hybrid_app_preference_value`, `endpoint`, `enabled`, `auth_token` " - " `cloud_transport_type`, `icon_url`, `allow_unknown_rpc_pass_through` " + " `cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough` " "FROM `application`"; const std::string kSelectFunctionalGroupNames = diff --git a/src/components/policy/policy_external/src/sql_pt_ext_representation.cc b/src/components/policy/policy_external/src/sql_pt_ext_representation.cc index 94ddac2250..b19feddee6 100644 --- a/src/components/policy/policy_external/src/sql_pt_ext_representation.cc +++ b/src/components/policy/policy_external/src/sql_pt_ext_representation.cc @@ -793,8 +793,8 @@ bool SQLPTExtRepresentation::SaveSpecificAppPolicy( app.second.icon_url.is_initialized() ? app_query.Bind(14, *app.second.icon_url) : app_query.Bind(14); - app.second.allow_unknown_rpc_pass_through.is_initialized() - ? app_query.Bind(15, *app.second.allow_unknown_rpc_pass_through) + app.second.allow_unknown_rpc_passthrough.is_initialized() + ? app_query.Bind(15, *app.second.allow_unknown_rpc_passthrough) : app_query.Bind(15); if (!app_query.Exec() || !app_query.Reset()) { @@ -939,7 +939,7 @@ bool SQLPTExtRepresentation::GatherApplicationPoliciesSection( *params.auth_token = query.GetString(11); *params.cloud_transport_type = query.GetString(12); *params.icon_url = query.GetString(13); - *params.allow_unknown_rpc_pass_through = query.GetBoolean(14); + *params.allow_unknown_rpc_passthrough = query.GetBoolean(14); const auto& gather_app_id = ((*policies).apps[app_id].is_string()) ? (*policies).apps[app_id].get_string() : app_id; diff --git a/src/components/policy/policy_external/src/sql_pt_queries.cc b/src/components/policy/policy_external/src/sql_pt_queries.cc index 479628b597..f4cac214a5 100644 --- a/src/components/policy/policy_external/src/sql_pt_queries.cc +++ b/src/components/policy/policy_external/src/sql_pt_queries.cc @@ -157,7 +157,7 @@ const std::string kCreateSchema = " `auth_token` VARCHAR(65535), " " `cloud_transport_type` VARCHAR(255), " " `icon_url` VARCHAR(65535), " - " `allow_unknown_rpc_pass_through` BOOLEAN, " + " `allow_unknown_rpc_passthrough` BOOLEAN, " " `remote_control_denied` BOOLEAN NOT NULL DEFAULT 0, " " CONSTRAINT `fk_application_hmi_level1` " " FOREIGN KEY(`default_hmi`) " @@ -678,7 +678,7 @@ const std::string kInsertApplication = "INSERT OR IGNORE INTO `application` (`id`, `priority_value`, " "`is_revoked`, `memory_kb`, `heart_beat_timeout_ms`, `certificate`, " "`hybrid_app_preference_value`, `endpoint`, `enabled`, `auth_token`, " - "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_pass_through`) " + "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough`) " "VALUES " "(?,?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -820,7 +820,7 @@ const std::string kSelectAppPolicies = "SELECT `id`, `priority_value`, `memory_kb`, " " `heart_beat_timeout_ms`, `certificate`, `hybrid_app_preference_value`, " " `endpoint`, `enabled`, `auth_token`, `cloud_transport_type`, `icon_url`, " - " `allow_unknown_rpc_pass_through` " + " `allow_unknown_rpc_passthrough` " "FROM " " `application`"; @@ -945,7 +945,7 @@ const std::string kInsertApplicationFull = " `is_predata`, `memory_kb`, `heart_beat_timeout_ms`, " " `certificate`, `hybrid_app_preference_value`, `endpoint`, `enabled`, " " `auth_token`, `cloud_transport_type`, `icon_url`, " - "`allow_unknown_rpc_pass_through`) " + "`allow_unknown_rpc_passthrough`) " " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; const std::string kSelectApplicationFull = @@ -954,7 +954,7 @@ const std::string kSelectApplicationFull = " `heart_beat_timeout_ms`, `certificate`, `hybrid_app_preference_value`, " " `endpoint`, `enabled`, `auth_token`, `cloud_transport_type`, " "`icon_url`, " - " `allow_unknown_rpc_pass_through` " + " `allow_unknown_rpc_passthrough` " "FROM `application` " "WHERE `id` = ?"; diff --git a/src/components/policy/policy_external/src/sql_pt_representation.cc b/src/components/policy/policy_external/src/sql_pt_representation.cc index d7d0f131ec..dce86f6d52 100644 --- a/src/components/policy/policy_external/src/sql_pt_representation.cc +++ b/src/components/policy/policy_external/src/sql_pt_representation.cc @@ -778,7 +778,7 @@ bool SQLPTRepresentation::GatherApplicationPoliciesSection( *params.auth_token = query.GetString(8); *params.cloud_transport_type = query.GetString(9); *params.icon_url = query.GetString(10); - *params.allow_unknown_rpc_pass_through = query.GetBoolean(11); + *params.allow_unknown_rpc_passthrough = query.GetBoolean(11); const auto& gather_app_id = ((*policies).apps[app_id].is_string()) ? (*policies).apps[app_id].get_string() : app_id; @@ -1093,8 +1093,8 @@ bool SQLPTRepresentation::SaveSpecificAppPolicy( app.second.icon_url.is_initialized() ? app_query.Bind(11, *app.second.icon_url) : app_query.Bind(11); - app.second.allow_unknown_rpc_pass_through.is_initialized() - ? app_query.Bind(12, *app.second.allow_unknown_rpc_pass_through) + app.second.allow_unknown_rpc_passthrough.is_initialized() + ? app_query.Bind(12, *app.second.allow_unknown_rpc_passthrough) : app_query.Bind(12); if (!app_query.Exec() || !app_query.Reset()) { diff --git a/src/components/policy/policy_regular/include/policy/cache_manager.h b/src/components/policy/policy_regular/include/policy/cache_manager.h index 1927f740f9..840b706c8b 100644 --- a/src/components/policy/policy_regular/include/policy/cache_manager.h +++ b/src/components/policy/policy_regular/include/policy/cache_manager.h @@ -245,7 +245,7 @@ class CacheManager : public CacheManagerInterface { * provider * @param policy_app_id Unique application id */ - virtual bool UnknownRPCPassThroughAllowed( + virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const; /** diff --git a/src/components/policy/policy_regular/include/policy/cache_manager_interface.h b/src/components/policy/policy_regular/include/policy/cache_manager_interface.h index 27a66215be..2c14fd8cba 100644 --- a/src/components/policy/policy_regular/include/policy/cache_manager_interface.h +++ b/src/components/policy/policy_regular/include/policy/cache_manager_interface.h @@ -251,7 +251,7 @@ class CacheManagerInterface { * provider * @param policy_app_id Unique application id */ - virtual bool UnknownRPCPassThroughAllowed( + virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const = 0; /** diff --git a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h index 8c0a87dbd1..911ce65a11 100644 --- a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h +++ b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h @@ -673,7 +673,7 @@ class PolicyManagerImpl : public PolicyManager { * @param policy_app_id Unique application id * @return bool true if allowed */ - bool UnknownRPCPassThroughAllowed( + bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const OVERRIDE; /** diff --git a/src/components/policy/policy_regular/include/policy/policy_table/types.h b/src/components/policy/policy_regular/include/policy/policy_table/types.h index 17ca247084..e41069a86c 100644 --- a/src/components/policy/policy_regular/include/policy/policy_table/types.h +++ b/src/components/policy/policy_regular/include/policy/policy_table/types.h @@ -202,7 +202,7 @@ struct ApplicationParams : PolicyBase { // App Service Params Optional<AppServiceParameters> app_service_parameters; - Optional<Boolean> allow_unknown_rpc_pass_through; + Optional<Boolean> allow_unknown_rpc_passthrough; public: ApplicationParams(); diff --git a/src/components/policy/policy_regular/src/cache_manager.cc b/src/components/policy/policy_regular/src/cache_manager.cc index deb099605c..54a571609f 100644 --- a/src/components/policy/policy_regular/src/cache_manager.cc +++ b/src/components/policy/policy_regular/src/cache_manager.cc @@ -836,7 +836,7 @@ void CacheManager::GetAppServiceParameters( } } -bool CacheManager::UnknownRPCPassThroughAllowed( +bool CacheManager::UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const { const policy_table::ApplicationPolicies& policies = pt_->policy_table.app_policies_section.apps; @@ -844,8 +844,8 @@ bool CacheManager::UnknownRPCPassThroughAllowed( policies.find(policy_app_id); if (policies.end() != policy_iter) { auto app_policy = (*policy_iter).second; - if (app_policy.allow_unknown_rpc_pass_through.is_initialized()) { - return *(app_policy.allow_unknown_rpc_pass_through); + if (app_policy.allow_unknown_rpc_passthrough.is_initialized()) { + return *(app_policy.allow_unknown_rpc_passthrough); } } return false; diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc index da0cb2f439..10e1c73e9a 100644 --- a/src/components/policy/policy_regular/src/policy_manager_impl.cc +++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc @@ -618,10 +618,10 @@ void PolicyManagerImpl::GetAppServiceParameters( cache_->GetAppServiceParameters(policy_app_id, app_service_parameters); } -bool PolicyManagerImpl::UnknownRPCPassThroughAllowed( +bool PolicyManagerImpl::UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const { LOG4CXX_AUTO_TRACE(logger_); - return cache_->UnknownRPCPassThroughAllowed(policy_app_id); + return cache_->UnknownRPCPassthroughAllowed(policy_app_id); } void PolicyManagerImpl::CheckPermissions(const PTString& device_id, diff --git a/src/components/policy/policy_regular/src/policy_table/types.cc b/src/components/policy/policy_regular/src/policy_table/types.cc index af2a556d91..bdf1329dee 100644 --- a/src/components/policy/policy_regular/src/policy_table/types.cc +++ b/src/components/policy/policy_regular/src/policy_table/types.cc @@ -279,8 +279,8 @@ ApplicationParams::ApplicationParams(const Json::Value* value__) , cloud_transport_type(impl::ValueMember(value__, "cloud_transport_type")) , icon_url(impl::ValueMember(value__, "icon_url")) , app_service_parameters(impl::ValueMember(value__, "app_services")) - , allow_unknown_rpc_pass_through( - impl::ValueMember(value__, "allow_unknown_rpc_pass_through")) {} + , allow_unknown_rpc_passthrough( + impl::ValueMember(value__, "allow_unknown_rpc_passthrough")) {} Json::Value ApplicationParams::ToJsonValue() const { Json::Value result__(PolicyBase::ToJsonValue()); @@ -302,8 +302,8 @@ Json::Value ApplicationParams::ToJsonValue() const { impl::WriteJsonField("cloud_transport_type", cloud_transport_type, &result__); impl::WriteJsonField("icon_url", auth_token, &result__); impl::WriteJsonField("app_services", app_service_parameters, &result__); - impl::WriteJsonField("allow_unknown_rpc_pass_through", - allow_unknown_rpc_pass_through, + impl::WriteJsonField("allow_unknown_rpc_passthrough", + allow_unknown_rpc_passthrough, &result__); return result__; } @@ -357,7 +357,7 @@ bool ApplicationParams::is_valid() const { if (!app_service_parameters.is_valid()) { return false; } - if (!allow_unknown_rpc_pass_through.is_valid()) { + if (!allow_unknown_rpc_passthrough.is_valid()) { return false; } return Validate(); @@ -419,7 +419,7 @@ bool ApplicationParams::struct_empty() const { if (app_service_parameters.is_initialized()) { return false; } - if (allow_unknown_rpc_pass_through.is_initialized()) { + if (allow_unknown_rpc_passthrough.is_initialized()) { return false; } return true; @@ -483,9 +483,9 @@ void ApplicationParams::ReportErrors(rpc::ValidationReport* report__) const { app_service_parameters.ReportErrors( &report__->ReportSubobject("app_services")); } - if (!allow_unknown_rpc_pass_through.is_valid()) { - allow_unknown_rpc_pass_through.ReportErrors( - &report__->ReportSubobject("allow_unknown_rpc_pass_through")); + if (!allow_unknown_rpc_passthrough.is_valid()) { + allow_unknown_rpc_passthrough.ReportErrors( + &report__->ReportSubobject("allow_unknown_rpc_passthrough")); } } @@ -505,7 +505,7 @@ void ApplicationParams::SetPolicyTableType(PolicyTableType pt_type) { hybrid_app_preference.SetPolicyTableType(pt_type); icon_url.SetPolicyTableType(pt_type); app_service_parameters.SetPolicyTableType(pt_type); - allow_unknown_rpc_pass_through.SetPolicyTableType(pt_type); + allow_unknown_rpc_passthrough.SetPolicyTableType(pt_type); } // RpcParameters methods diff --git a/src/components/policy/policy_regular/src/sql_pt_queries.cc b/src/components/policy/policy_regular/src/sql_pt_queries.cc index c1c79e6628..a97b0ab153 100644 --- a/src/components/policy/policy_regular/src/sql_pt_queries.cc +++ b/src/components/policy/policy_regular/src/sql_pt_queries.cc @@ -143,7 +143,7 @@ const std::string kCreateSchema = " `auth_token` VARCHAR(65535), " " `cloud_transport_type` VARCHAR(255), " " `icon_url` VARCHAR(65535), " - " `allow_unknown_rpc_pass_through` BOOLEAN, " + " `allow_unknown_rpc_passthrough` BOOLEAN, " " `remote_control_denied` BOOLEAN NOT NULL DEFAULT 0, " " CONSTRAINT `fk_application_hmi_level1` " " FOREIGN KEY(`default_hmi`) " @@ -627,7 +627,7 @@ const std::string kInsertApplication = "INSERT OR IGNORE INTO `application` (`id`, `priority_value`, " "`is_revoked`, `memory_kb`, `heart_beat_timeout_ms`, `certificate`, " "`hybrid_app_preference_value`, `endpoint`, `enabled`, `auth_token`, " - "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_pass_through`) " + "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough`) " "VALUES " "(?,?,?,?,?,?,?,?,?,?,?,?,?)"; @@ -755,7 +755,7 @@ const std::string kSelectAppPolicies = "SELECT `id`, `priority_value`, `memory_kb`, " " `heart_beat_timeout_ms`, `certificate`, `hybrid_app_preference_value`, " " `endpoint`, `enabled`, `auth_token`, `cloud_transport_type`, `icon_url`, " - " `allow_unknown_rpc_pass_through` " + " `allow_unknown_rpc_passthrough` " "FROM " " `application`"; @@ -880,7 +880,7 @@ const std::string kInsertApplicationFull = " `is_predata`, `memory_kb`, `heart_beat_timeout_ms`, " " `certificate`, `hybrid_app_preference_value`, `endpoint`, `enabled`, " " `auth_token`, `cloud_transport_type`, `icon_url`, " - "`allow_unknown_rpc_pass_through`) " + "`allow_unknown_rpc_passthrough`) " " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; const std::string kSelectApplicationFull = @@ -889,7 +889,7 @@ const std::string kSelectApplicationFull = " `heart_beat_timeout_ms`, `certificate`, `hybrid_app_preference_value`, " " `endpoint`, `enabled`, `auth_token`, `cloud_transport_type`, " "`icon_url`, " - " `allow_unknown_rpc_pass_through` " + " `allow_unknown_rpc_passthrough` " "FROM `application` " "WHERE `id` = " "?"; diff --git a/src/components/policy/policy_regular/src/sql_pt_representation.cc b/src/components/policy/policy_regular/src/sql_pt_representation.cc index a339e94f19..c6f78d6d70 100644 --- a/src/components/policy/policy_regular/src/sql_pt_representation.cc +++ b/src/components/policy/policy_regular/src/sql_pt_representation.cc @@ -734,7 +734,7 @@ bool SQLPTRepresentation::GatherApplicationPoliciesSection( *params.auth_token = query.GetString(8); *params.cloud_transport_type = query.GetString(9); *params.icon_url = query.GetString(10); - *params.allow_unknown_rpc_pass_through = query.GetBoolean(11); + *params.allow_unknown_rpc_passthrough = query.GetBoolean(11); const auto& gather_app_id = ((*policies).apps[app_id].is_string()) ? (*policies).apps[app_id].get_string() @@ -1036,8 +1036,8 @@ bool SQLPTRepresentation::SaveSpecificAppPolicy( app.second.icon_url.is_initialized() ? app_query.Bind(11, *app.second.icon_url) : app_query.Bind(11); - app.second.allow_unknown_rpc_pass_through.is_initialized() - ? app_query.Bind(12, *app.second.allow_unknown_rpc_pass_through) + app.second.allow_unknown_rpc_passthrough.is_initialized() + ? app_query.Bind(12, *app.second.allow_unknown_rpc_passthrough) : app_query.Bind(12); if (!app_query.Exec() || !app_query.Reset()) { |