diff options
author | Andrey Oleynik <aoleynik@luxoft.com> | 2016-05-13 17:32:49 +0300 |
---|---|---|
committer | Andrey Oleynik <aoleynik@luxoft.com> | 2016-05-13 17:42:46 +0300 |
commit | b50a18d748e8e7febfd47f97f8a0e358a0b03596 (patch) | |
tree | 5c5bb090d08c07ca9446a2ebea0ef752ee9ffb2a /src/components | |
parent | a78c047a20408a67365a7c3b292a4fc75329a8f8 (diff) | |
download | sdl_core-b50a18d748e8e7febfd47f97f8a0e358a0b03596.tar.gz |
Removes non-open-source fields support from policy
There were several fields in policy unsupported by open source
implementation, which caused policy update/snapshot validation issues.
Originally changes fixes APPLINK-17753
Closes-bug: APPLINK-21553
Diffstat (limited to 'src/components')
4 files changed, 21 insertions, 112 deletions
diff --git a/src/components/policy/src/policy/policy_table/table_struct/types.cc b/src/components/policy/src/policy/policy_table/table_struct/types.cc index 33fdf83eec..d64b234ddf 100644 --- a/src/components/policy/src/policy/policy_table/table_struct/types.cc +++ b/src/components/policy/src/policy/policy_table/table_struct/types.cc @@ -22,113 +22,49 @@ std::string PolicyTableTypeToString(const PolicyTableType pt_type) { // PolicyBase methods PolicyBase::PolicyBase() : CompositeType(kUninitialized) {} -PolicyBase::PolicyBase(const Strings &groups, Priority priority, - HmiLevel default_hmi, bool keep_context, - bool steal_focus) - : CompositeType(kUninitialized), groups(groups), priority(priority), - default_hmi(default_hmi), keep_context(keep_context), - steal_focus(steal_focus) {} +PolicyBase::PolicyBase(Priority priority) + : CompositeType(kUninitialized), priority(priority) {} PolicyBase::~PolicyBase() {} PolicyBase::PolicyBase(const Json::Value *value__) : CompositeType(InitHelper(value__, &Json::Value::isObject)), - groups(impl::ValueMember(value__, "groups")), - preconsented_groups(impl::ValueMember(value__, "preconsented_groups")), - priority(impl::ValueMember(value__, "priority")), - default_hmi(impl::ValueMember(value__, "default_hmi")), - keep_context(impl::ValueMember(value__, "keep_context")), - steal_focus(impl::ValueMember(value__, "steal_focus")) {} + priority(impl::ValueMember(value__, "priority")) {} Json::Value PolicyBase::ToJsonValue() const { Json::Value result__(Json::objectValue); - impl::WriteJsonField("groups", groups, &result__); - impl::WriteJsonField("preconsented_groups", preconsented_groups, &result__); impl::WriteJsonField("priority", priority, &result__); - impl::WriteJsonField("default_hmi", default_hmi, &result__); - impl::WriteJsonField("keep_context", keep_context, &result__); - impl::WriteJsonField("steal_focus", steal_focus, &result__); return result__; } bool PolicyBase::is_valid() const { - if (!groups.is_valid()) { - return false; - } - if (!preconsented_groups.is_valid()) { - return false; - } if (!priority.is_valid()) { return false; } - if (!default_hmi.is_valid()) { - return false; - } - if (!keep_context.is_valid()) { - return false; - } - if (!steal_focus.is_valid()) { - return false; - } return Validate(); } bool PolicyBase::is_initialized() const { return (initialization_state__ != kUninitialized) || (!struct_empty()); } bool PolicyBase::struct_empty() const { - if (groups.is_initialized()) { - return false; - } - if (preconsented_groups.is_initialized()) { - return false; - } if (priority.is_initialized()) { return false; } - if (default_hmi.is_initialized()) { - return false; - } - if (keep_context.is_initialized()) { - return false; - } - if (steal_focus.is_initialized()) { - return false; - } return true; } void PolicyBase::ReportErrors(rpc::ValidationReport *report__) const { if (struct_empty()) { rpc::CompositeType::ReportErrors(report__); } - if (!groups.is_valid()) { - groups.ReportErrors(&report__->ReportSubobject("groups")); - } - if (!preconsented_groups.is_valid()) { - preconsented_groups.ReportErrors( - &report__->ReportSubobject("preconsented_groups")); - } if (!priority.is_valid()) { priority.ReportErrors(&report__->ReportSubobject("priority")); } - if (!default_hmi.is_valid()) { - default_hmi.ReportErrors(&report__->ReportSubobject("default_hmi")); - } - if (!keep_context.is_valid()) { - keep_context.ReportErrors(&report__->ReportSubobject("keep_context")); - } - if (!steal_focus.is_valid()) { - steal_focus.ReportErrors(&report__->ReportSubobject("steal_focus")); - } } void PolicyBase::SetPolicyTableType(PolicyTableType pt_type) { CompositeType::SetPolicyTableType(pt_type); - groups.SetPolicyTableType(pt_type); priority.SetPolicyTableType(pt_type); } // DevicePolicy methods DevicePolicy::DevicePolicy() : PolicyBase() {} -DevicePolicy::DevicePolicy(const Strings &groups, Priority priority, - HmiLevel default_hmi, bool keep_context, - bool steal_focus) - : PolicyBase(groups, priority, default_hmi, keep_context, steal_focus) {} +DevicePolicy::DevicePolicy(Priority priority) : PolicyBase(priority) {} DevicePolicy::~DevicePolicy() {} DevicePolicy::DevicePolicy(const Json::Value *value__) : PolicyBase(value__) {} @@ -196,13 +132,12 @@ void ApplicationPoliciesSection::SetPolicyTableType(PolicyTableType pt_type) { // ApplicationParams methods ApplicationParams::ApplicationParams() : PolicyBase() {} -ApplicationParams::ApplicationParams(const Strings &groups, Priority priority, - HmiLevel default_hmi, bool keep_context, - bool steal_focus) - : PolicyBase(groups, priority, default_hmi, keep_context, steal_focus) {} +ApplicationParams::ApplicationParams(const Strings &groups, Priority priority) + : PolicyBase(priority), groups(groups) {} ApplicationParams::~ApplicationParams() {} ApplicationParams::ApplicationParams(const Json::Value *value__) - : PolicyBase(value__), nicknames(impl::ValueMember(value__, "nicknames")), + : PolicyBase(value__), groups(impl::ValueMember(value__, "groups")), + nicknames(impl::ValueMember(value__, "nicknames")), AppHMIType(impl::ValueMember(value__, "AppHMIType")), RequestType(impl::ValueMember(value__, "RequestType")), memory_kb(impl::ValueMember(value__, "memory_kb"), 0), @@ -211,6 +146,7 @@ ApplicationParams::ApplicationParams(const Json::Value *value__) certificate(impl::ValueMember(value__, "certificate"), "not_specified") {} Json::Value ApplicationParams::ToJsonValue() const { Json::Value result__(PolicyBase::ToJsonValue()); + impl::WriteJsonField("groups", groups, &result__); impl::WriteJsonField("nicknames", nicknames, &result__); impl::WriteJsonField("AppHMIType", AppHMIType, &result__); impl::WriteJsonField("RequestType", RequestType, &result__); @@ -226,6 +162,9 @@ bool ApplicationParams::is_valid() const { if (!PolicyBase::is_valid()) { return false; } + if (!groups.is_valid()) { + return false; + } if (!nicknames.is_valid()) { return false; } @@ -250,6 +189,9 @@ bool ApplicationParams::struct_empty() const { if (!PolicyBase::is_initialized()) { return false; } + if (groups.is_initialized()) { + return false; + } if (nicknames.is_initialized()) { return false; } @@ -280,10 +222,6 @@ void ApplicationParams::ReportErrors(rpc::ValidationReport *report__) const { if (!nicknames.is_valid()) { nicknames.ReportErrors(&report__->ReportSubobject("nicknames")); } - if (!preconsented_groups.is_valid()) { - preconsented_groups.ReportErrors( - &report__->ReportSubobject("preconsented_groups")); - } if (!AppHMIType.is_valid()) { AppHMIType.ReportErrors(&report__->ReportSubobject("AppHMIType")); } @@ -293,15 +231,6 @@ void ApplicationParams::ReportErrors(rpc::ValidationReport *report__) const { if (!priority.is_valid()) { priority.ReportErrors(&report__->ReportSubobject("priority")); } - if (!default_hmi.is_valid()) { - default_hmi.ReportErrors(&report__->ReportSubobject("default_hmi")); - } - if (!keep_context.is_valid()) { - keep_context.ReportErrors(&report__->ReportSubobject("keep_context")); - } - if (!steal_focus.is_valid()) { - steal_focus.ReportErrors(&report__->ReportSubobject("steal_focus")); - } if (!memory_kb.is_valid()) { memory_kb.ReportErrors(&report__->ReportSubobject("memory_kb")); } @@ -316,6 +245,7 @@ void ApplicationParams::ReportErrors(rpc::ValidationReport *report__) const { void ApplicationParams::SetPolicyTableType(PolicyTableType pt_type) { PolicyBase::SetPolicyTableType(pt_type); + groups.SetPolicyTableType(pt_type); AppHMIType.SetPolicyTableType(pt_type); RequestType.SetPolicyTableType(pt_type); memory_kb.SetPolicyTableType(pt_type); diff --git a/src/components/policy/src/policy/policy_table/table_struct/types.h b/src/components/policy/src/policy/policy_table/table_struct/types.h index 1a77590ef0..96361d3c49 100644 --- a/src/components/policy/src/policy/policy_table/table_struct/types.h +++ b/src/components/policy/src/policy/policy_table/table_struct/types.h @@ -58,17 +58,11 @@ typedef Array<Enum<RequestType>, 0, 255> RequestTypes; struct PolicyBase : CompositeType { public: - Strings groups; - Optional<Strings> preconsented_groups; Enum<Priority> priority; - Enum<HmiLevel> default_hmi; - Boolean keep_context; - Boolean steal_focus; public: PolicyBase(); - PolicyBase(const Strings &groups, Priority priority, HmiLevel default_hmi, - bool keep_context, bool steal_focus); + PolicyBase(Priority priority); virtual ~PolicyBase(); explicit PolicyBase(const Json::Value *value__); Json::Value ToJsonValue() const; @@ -85,14 +79,14 @@ private: struct DevicePolicy : PolicyBase { public: DevicePolicy(); - DevicePolicy(const Strings &groups, Priority priority, HmiLevel default_hmi, - bool keep_context, bool steal_focus); + DevicePolicy(Priority priority); ~DevicePolicy(); explicit DevicePolicy(const Json::Value *value__); }; struct ApplicationParams : PolicyBase { public: + Strings groups; Optional<Strings> nicknames; Optional<AppHMITypes> AppHMIType; Optional<RequestTypes> RequestType; @@ -102,8 +96,7 @@ public: public: ApplicationParams(); - ApplicationParams(const Strings &groups, Priority priority, - HmiLevel default_hmi, bool keep_context, bool steal_focus); + ApplicationParams(const Strings &groups, Priority priority); ~ApplicationParams(); explicit ApplicationParams(const Json::Value *value__); Json::Value ToJsonValue() const; diff --git a/src/components/policy/src/policy/src/cache_manager.cc b/src/components/policy/src/policy/src/cache_manager.cc index 7b2cc5a6fa..0481997b50 100644 --- a/src/components/policy/src/policy/src/cache_manager.cc +++ b/src/components/policy/src/policy/src/cache_manager.cc @@ -148,17 +148,7 @@ void CacheManager::GetAllAppGroups(const std::string &app_id, LOG4CXX_AUTO_TRACE(logger_); CACHE_MANAGER_CHECK_VOID(); if (kDeviceId == app_id) { - policy_table::DevicePolicy &device = - pt_->policy_table.app_policies_section.device; - - policy_table::Strings::const_iterator iter = device.groups.begin(); - policy_table::Strings::const_iterator iter_end = device.groups.end(); - - for (; iter != iter_end; ++iter) { - const uint32_t group_id = static_cast<uint32_t>((GenerateHash(*iter))); - all_group_ids.push_back(group_id); - } - + LOG4CXX_INFO(logger_, "Devices doesn't have groups"); return; } diff --git a/src/components/policy/src/policy/src/sql_pt_representation.cc b/src/components/policy/src/policy/src/sql_pt_representation.cc index 9fd1f53782..9b7205e171 100644 --- a/src/components/policy/src/policy/src/sql_pt_representation.cc +++ b/src/components/policy/src/policy/src/sql_pt_representation.cc @@ -925,10 +925,6 @@ bool policy::SQLPTRepresentation::SaveDevicePolicy( return false; } - if (!SaveAppGroup(kDeviceId, device.groups)) { - return false; - } - return true; } |