From 9fd56f753dd18e002b8b85a3a328e393113a72fa Mon Sep 17 00:00:00 2001 From: ShobhitAd Date: Fri, 16 Nov 2018 14:42:38 -0500 Subject: Style fix --- .../policy/policy_external/policy/policy_manager.h | 6 +++--- .../policy_external/policy/mock_cache_manager.h | 3 +-- .../policy_external/policy/mock_policy_manager.h | 3 +-- .../policy_regular/policy/mock_cache_manager.h | 3 +-- .../policy_regular/policy/mock_policy_manager.h | 3 +-- .../policy_external/include/policy/cache_manager.h | 2 +- .../include/policy/cache_manager_interface.h | 12 ++++++------ .../include/policy/policy_manager_impl.h | 2 +- .../policy/policy_external/src/cache_manager.cc | 20 ++++++++++---------- .../policy_external/src/policy_manager_impl.cc | 2 +- .../policy_regular/include/policy/cache_manager.h | 1 - .../include/policy/cache_manager_interface.h | 2 +- .../policy/policy_regular/src/cache_manager.cc | 16 ++++++++-------- .../policy/policy_regular/src/policy_manager_impl.cc | 2 +- 14 files changed, 36 insertions(+), 41 deletions(-) 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 54dde0d8cf..92c0305279 100644 --- a/src/components/include/policy/policy_external/policy/policy_manager.h +++ b/src/components/include/policy/policy_external/policy/policy_manager.h @@ -554,13 +554,13 @@ class PolicyManager : public usage_statistics::StatisticsManager { std::string& auth_token, std::string& cloud_transport_type, std::string& hybrid_app_preference) const = 0; - + /** * @ brief Initialize new cloud app in the policy table * @ param policy_app_id Application ID */ - virtual void InitCloudApp(const std::string& policy_app_id) = 0; - + virtual void InitCloudApp(const std::string& policy_app_id) = 0; + /** * @brief Enable or disable a cloud application in the HMI * @param enabled Cloud app enabled state 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 d426107200..da2b4cc2a1 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 @@ -86,8 +86,7 @@ class MockCacheManagerInterface : public ::policy::CacheManagerInterface { std::string& auth_token, std::string& cloud_transport_type, std::string& hybrid_app_preference)); - MOCK_METHOD1(InitCloudApp, - void(const std::string& policy_app_id)); + MOCK_METHOD1(InitCloudApp, void(const std::string& policy_app_id)); MOCK_METHOD2(SetCloudAppEnabled, void(const std::string& policy_app_id, const bool enabled)); MOCK_METHOD2(SetAppAuthToken, 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 dfcea6c65c..72dcb147e3 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 @@ -194,8 +194,7 @@ class MockPolicyManager : public PolicyManager { std::string& auth_token, std::string& cloud_transport_type, std::string& hybrid_app_preference)); - MOCK_METHOD1(InitCloudApp, - void(const std::string& policy_app_id)); + MOCK_METHOD1(InitCloudApp, void(const std::string& policy_app_id)); MOCK_METHOD2(SetCloudAppEnabled, void(const std::string& policy_app_id, const bool enabled)); MOCK_METHOD2(SetAppAuthToken, 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 703c1c9c8b..24fe9b2393 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 @@ -73,8 +73,7 @@ class MockCacheManagerInterface : public CacheManagerInterface { std::string& auth_token, std::string& cloud_transport_type, std::string& hybrid_app_preference)); - MOCK_METHOD1(InitCloudApp, - void(const std::string& policy_app_id)); + MOCK_METHOD1(InitCloudApp, void(const std::string& policy_app_id)); MOCK_METHOD2(SetCloudAppEnabled, void(const std::string& policy_app_id, const bool enabled)); MOCK_METHOD2(SetAppAuthToken, 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 f63cc21c83..a5ce488e1a 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 @@ -191,8 +191,7 @@ class MockPolicyManager : public PolicyManager { std::string& auth_token, std::string& cloud_transport_type, std::string& hybrid_app_preference)); - MOCK_METHOD1(InitCloudApp, - void(const std::string& policy_app_id)); + MOCK_METHOD1(InitCloudApp, void(const std::string& policy_app_id)); MOCK_METHOD2(SetCloudAppEnabled, void(const std::string& policy_app_id, const bool enabled)); MOCK_METHOD2(SetAppAuthToken, 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 e5258e36c8..3344b149e4 100644 --- a/src/components/policy/policy_external/include/policy/cache_manager.h +++ b/src/components/policy/policy_external/include/policy/cache_manager.h @@ -189,7 +189,7 @@ class CacheManager : public CacheManagerInterface { std::string& auth_token, std::string& cloud_transport_type, std::string& hybrid_app_preference) const; - + /** * Initializes a new cloud application with default policies * Then adds cloud specific policies 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 aba3e32004..6a172e6f4b 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 @@ -198,12 +198,12 @@ class CacheManagerInterface { std::string& cloud_transport_type, std::string& hybrid_app_preference) const = 0; - /** - * Initializes a new cloud application with default policies - * Then adds cloud specific policies - * @param app_id application id - * @return true if success - */ + /** + * Initializes a new cloud application with default policies + * Then adds cloud specific policies + * @param app_id application id + * @return true if success + */ virtual void InitCloudApp(const std::string& policy_app_id) = 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 d9bec20791..399c95170d 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 @@ -606,7 +606,7 @@ class PolicyManagerImpl : public PolicyManager { * @ brief Initialize new cloud app in the policy table * @ param policy_app_id Application ID */ - void InitCloudApp(const std::string& policy_app_id) OVERRIDE; + void InitCloudApp(const std::string& policy_app_id) OVERRIDE; /** * @brief Enable or disable a cloud application in the HMI diff --git a/src/components/policy/policy_external/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc index 31f0f4110e..8cec6ef91c 100644 --- a/src/components/policy/policy_external/src/cache_manager.cc +++ b/src/components/policy/policy_external/src/cache_manager.cc @@ -1439,19 +1439,19 @@ void CacheManager::InitCloudApp(const std::string& policy_app_id) { CACHE_MANAGER_CHECK_VOID(); sync_primitives::AutoLock auto_lock(cache_lock_); - policy_table::ApplicationPolicies& policies = - pt_->policy_table.app_policies_section.apps; - policy_table::ApplicationPolicies::const_iterator default_iter = - policies.find(kDefaultId); - policy_table::ApplicationPolicies::const_iterator app_iter = - policies.find(policy_app_id); - if (default_iter != policies.end()) { - if (app_iter == policies.end()){ + policy_table::ApplicationPolicies& policies = + pt_->policy_table.app_policies_section.apps; + policy_table::ApplicationPolicies::const_iterator default_iter = + policies.find(kDefaultId); + policy_table::ApplicationPolicies::const_iterator app_iter = + policies.find(policy_app_id); + if (default_iter != policies.end()) { + if (app_iter == policies.end()) { policies[policy_app_id] = policies[kDefaultId]; } } - //Add cloud app specific policies - Backup(); + // Add cloud app specific policies + Backup(); } void CacheManager::SetCloudAppEnabled(const std::string& policy_app_id, 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 1aa6776011..0844edd8eb 100644 --- a/src/components/policy/policy_external/src/policy_manager_impl.cc +++ b/src/components/policy/policy_external/src/policy_manager_impl.cc @@ -747,7 +747,7 @@ void PolicyManagerImpl::GetCloudAppParameters( hybrid_app_preference); } -void PolicyManagerImpl::InitCloudApp(const std::string& policy_app_id){ +void PolicyManagerImpl::InitCloudApp(const std::string& policy_app_id) { cache_->InitCloudApp(policy_app_id); } 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 0ce35b5beb..8c8f0c55c6 100644 --- a/src/components/policy/policy_regular/include/policy/cache_manager.h +++ b/src/components/policy/policy_regular/include/policy/cache_manager.h @@ -186,7 +186,6 @@ class CacheManager : public CacheManagerInterface { */ virtual void InitCloudApp(const std::string& policy_app_id); - /** * @brief Enable or disable a cloud application in the HMI * @param enabled Cloud app enabled state 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 bf0f17d83c..50b546ecc5 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 @@ -191,7 +191,7 @@ class CacheManagerInterface { * @return true if success */ virtual void InitCloudApp(const std::string& policy_app_id) = 0; - + /** * @brief Enable or disable a cloud application in the HMI * @param enabled Cloud app enabled state diff --git a/src/components/policy/policy_regular/src/cache_manager.cc b/src/components/policy/policy_regular/src/cache_manager.cc index 2c37279baa..ca61a338f1 100644 --- a/src/components/policy/policy_regular/src/cache_manager.cc +++ b/src/components/policy/policy_regular/src/cache_manager.cc @@ -732,19 +732,19 @@ void CacheManager::InitCloudApp(const std::string& policy_app_id) { CACHE_MANAGER_CHECK_VOID(); sync_primitives::AutoLock auto_lock(cache_lock_); - policy_table::ApplicationPolicies& policies = - pt_->policy_table.app_policies_section.apps; - policy_table::ApplicationPolicies::const_iterator default_iter = - policies.find(kDefaultId); - policy_table::ApplicationPolicies::const_iterator app_iter = - policies.find(policy_app_id); + policy_table::ApplicationPolicies& policies = + pt_->policy_table.app_policies_section.apps; + policy_table::ApplicationPolicies::const_iterator default_iter = + policies.find(kDefaultId); + policy_table::ApplicationPolicies::const_iterator app_iter = + policies.find(policy_app_id); if (default_iter != policies.end()) { - if (app_iter == policies.end()){ + if (app_iter == policies.end()) { policies[policy_app_id] = policies[kDefaultId]; } } - //Add cloud app specific policies + // Add cloud app specific policies Backup(); } 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 e2adde4524..9b2392a015 100644 --- a/src/components/policy/policy_regular/src/policy_manager_impl.cc +++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc @@ -566,7 +566,7 @@ void PolicyManagerImpl::GetCloudAppParameters( hybrid_app_preference); } -void PolicyManagerImpl::InitCloudApp(const std::string& policy_app_id){ +void PolicyManagerImpl::InitCloudApp(const std::string& policy_app_id) { cache_->InitCloudApp(policy_app_id); } -- cgit v1.2.1