Renames interfaces according to people desire

5 files changed, 35 insertions, 34 deletions

diff --git a/src/components/application_manager/include/application_manager/command_holder.h b/src/components/application_manager/include/application_manager/command_holder.h
index 6a92e805b0..02ae91e30c 100644
--- a/src/components/application_manager/include/application_manager/command_holder.h
+++ b/src/components/application_manager/include/application_manager/command_holder.h
@@ -49,24 +49,25 @@ class CommandHolder {
   virtual ~CommandHolder() {}
 
   /**
-   * @brief Hold collects command for specific application policy id internally
+   * @brief Suspend collects command for specific application policy id
+   * internally
    * @param policy_app_id Application policy id
    * @param command Command
    */
-  virtual void Hold(const std::string& policy_app_id,
-                    smart_objects::SmartObjectSPtr command) = 0;
+  virtual void Suspend(const std::string& policy_app_id,
+                       smart_objects::SmartObjectSPtr command) = 0;
 
   /**
-   * @brief Release send all collected commands for further processing and
+   * @brief Resume send all collected commands for further processing and
    * removes them afterward
    * @param policy_app_id Application policy id
    */
-  virtual void Release(const std::string& policy_app_id) = 0;
+  virtual void Resume(const std::string& policy_app_id) = 0;
 
   /**
-   * @brief Drop removes all collected commands w/o processing
+   * @brief Clear removes all collected commands w/o processing
    * @param policy_app_id Application policy id
    */
-  virtual void Drop(const std::string& policy_app_id) = 0;
+  virtual void Clear(const std::string& policy_app_id) = 0;
 };
 }  // application_manager
diff --git a/src/components/application_manager/include/application_manager/command_holder_impl.h b/src/components/application_manager/include/application_manager/command_holder_impl.h
index 686c449199..a9dfa46bc7 100644
--- a/src/components/application_manager/include/application_manager/command_holder_impl.h
+++ b/src/components/application_manager/include/application_manager/command_holder_impl.h
@@ -58,25 +58,25 @@ class CommandHolderImpl : public CommandHolder {
   explicit CommandHolderImpl(ApplicationManager& app_manager);
 
   /**
-   * @brief Hold collects command for specific application id internally
+   * @brief Suspend collects command for specific application id internally
    * @param policy_app_id Policy id of application
    * @param command Command
    */
-  void Hold(const std::string& policy_app_id,
-            smart_objects::SmartObjectSPtr command) FINAL;
+  void Suspend(const std::string& policy_app_id,
+               smart_objects::SmartObjectSPtr command) FINAL;
 
   /**
-   * @brief Release sends all collected HMI commands to ApplicationManager
+   * @brief Resume sends all collected HMI commands to ApplicationManager
    * for further processing
    * @param policy_app_id Policy id of application
    */
-  void Release(const std::string& policy_app_id) FINAL;
+  void Resume(const std::string& policy_app_id) FINAL;
 
   /**
-   * @brief Drop removes all commands collected for specific application id
+   * @brief Clear removes all commands collected for specific application id
    * @param policy_app_id Policy application id
    */
-  void Drop(const std::string& policy_app_id) FINAL;
+  void Clear(const std::string& policy_app_id) FINAL;
 
  private:
   using AppCommands =
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 4afaefb781..abb2d9ea70 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -391,7 +391,7 @@ void ApplicationManagerImpl::OnApplicationRegistered(ApplicationSharedPtr app) {
 }
 
 void ApplicationManagerImpl::OnApplicationSwitched(ApplicationSharedPtr app) {
-  commands_holder_->Release(app->policy_app_id());
+  commands_holder_->Resume(app->policy_app_id());
 }
 
 bool ApplicationManagerImpl::IsAppTypeExistsInFullOrLimited(
@@ -1103,7 +1103,7 @@ void ApplicationManagerImpl::OnDeviceSwitchingFinish(
        app_it != reregister_wait_list_.end();
        ++app_it) {
     auto app = *app_it;
-    commands_holder_->Drop(app->policy_app_id());
+    commands_holder_->Clear(app->policy_app_id());
     UnregisterApplication(app->app_id(),
                           mobile_apis::Result::INVALID_ENUM,
                           is_resuming,
@@ -2054,7 +2054,7 @@ bool ApplicationManagerImpl::ManageHMICommand(
 
   auto app = application(command->connection_key());
   if (app && IsAppInReconnectMode(app->policy_app_id())) {
-    commands_holder_->Hold(app->policy_app_id(), message);
+    commands_holder_->Suspend(app->policy_app_id(), message);
     return true;
   }
 
diff --git a/src/components/application_manager/src/command_holder_impl.cc b/src/components/application_manager/src/command_holder_impl.cc
index db3e1648ef..dfb100c802 100644
--- a/src/components/application_manager/src/command_holder_impl.cc
+++ b/src/components/application_manager/src/command_holder_impl.cc
@@ -37,14 +37,14 @@ namespace application_manager {
 CommandHolderImpl::CommandHolderImpl(ApplicationManager& app_manager)
     : app_manager_(app_manager) {}
 
-void CommandHolderImpl::Hold(
+void CommandHolderImpl::Suspend(
     const std::string& policy_app_id,
     utils::SharedPtr<smart_objects::SmartObject> command) {
   sync_primitives::AutoLock lock(commands_lock_);
   app_commands_[policy_app_id].push_back(command);
 }
 
-void CommandHolderImpl::Release(const std::string& policy_app_id) {
+void CommandHolderImpl::Resume(const std::string& policy_app_id) {
   sync_primitives::AutoLock lock(commands_lock_);
   auto app_commands = app_commands_.find(policy_app_id);
   if (app_commands_.end() == app_commands) {
@@ -57,7 +57,7 @@ void CommandHolderImpl::Release(const std::string& policy_app_id) {
   app_commands_.erase(app_commands);
 }
 
-void CommandHolderImpl::Drop(const std::string& policy_app_id) {
+void CommandHolderImpl::Clear(const std::string& policy_app_id) {
   sync_primitives::AutoLock lock(commands_lock_);
   auto app_commands = app_commands_.find(policy_app_id);
   if (app_commands_.end() == app_commands) {
diff --git a/src/components/application_manager/test/command_holder_test.cc b/src/components/application_manager/test/command_holder_test.cc
index 70035aec4d..8082c3811f 100644
--- a/src/components/application_manager/test/command_holder_test.cc
+++ b/src/components/application_manager/test/command_holder_test.cc
@@ -58,11 +58,11 @@ class CommandHolderImplTest : public testing::Test {
 
 TEST_F(CommandHolderImplTest, HoldOne_ExpectReleaseOne) {
   am::CommandHolderImpl cmd_holder(mock_app_manager_);
-  cmd_holder.Hold(kPolicyAppId_, cmd_ptr_);
+  cmd_holder.Suspend(kPolicyAppId_, cmd_ptr_);
 
   // Act
   EXPECT_CALL(mock_app_manager_, ManageHMICommand(cmd_ptr_));
-  cmd_holder.Release(kPolicyAppId_);
+  cmd_holder.Resume(kPolicyAppId_);
 }
 
 TEST_F(CommandHolderImplTest, HoldMany_ExpectReleaseSame) {
@@ -70,34 +70,34 @@ TEST_F(CommandHolderImplTest, HoldMany_ExpectReleaseSame) {
 
   int32_t iterations = 0;
   do {
-    cmd_holder.Hold(kPolicyAppId_, cmd_ptr_);
+    cmd_holder.Suspend(kPolicyAppId_, cmd_ptr_);
     ++iterations;
   } while (iterations < 5);
 
   // Act
   EXPECT_CALL(mock_app_manager_, ManageHMICommand(cmd_ptr_)).Times(iterations);
-  cmd_holder.Release(kPolicyAppId_);
+  cmd_holder.Resume(kPolicyAppId_);
 }
 
 TEST_F(CommandHolderImplTest, Hold_Drop_ExpectNoReleased) {
   am::CommandHolderImpl cmd_holder(mock_app_manager_);
-  cmd_holder.Hold(kPolicyAppId_, cmd_ptr_);
-  cmd_holder.Hold(kPolicyAppId_, cmd_ptr_);
+  cmd_holder.Suspend(kPolicyAppId_, cmd_ptr_);
+  cmd_holder.Suspend(kPolicyAppId_, cmd_ptr_);
 
   // Act
-  cmd_holder.Drop(kPolicyAppId_);
+  cmd_holder.Clear(kPolicyAppId_);
   EXPECT_CALL(mock_app_manager_, ManageHMICommand(cmd_ptr_)).Times(0);
-  cmd_holder.Release(kPolicyAppId_);
+  cmd_holder.Resume(kPolicyAppId_);
 }
 
 TEST_F(CommandHolderImplTest, Hold_ReleaseAnotherId_ExpectNoReleased) {
   am::CommandHolderImpl cmd_holder(mock_app_manager_);
-  cmd_holder.Hold(kPolicyAppId_, cmd_ptr_);
-  cmd_holder.Hold(kPolicyAppId_, cmd_ptr_);
+  cmd_holder.Suspend(kPolicyAppId_, cmd_ptr_);
+  cmd_holder.Suspend(kPolicyAppId_, cmd_ptr_);
 
   // Act
   EXPECT_CALL(mock_app_manager_, ManageHMICommand(cmd_ptr_)).Times(0);
-  cmd_holder.Release("anotherId");
+  cmd_holder.Resume("anotherId");
 }
 
 TEST_F(CommandHolderImplTest, Hold_DropAnotherId_ExpectReleased) {
@@ -105,15 +105,15 @@ TEST_F(CommandHolderImplTest, Hold_DropAnotherId_ExpectReleased) {
 
   int32_t iterations = 0;
   do {
-    cmd_holder.Hold(kPolicyAppId_, cmd_ptr_);
+    cmd_holder.Suspend(kPolicyAppId_, cmd_ptr_);
     ++iterations;
   } while (iterations < 3);
 
   // Act
-  cmd_holder.Drop("anotherId");
+  cmd_holder.Clear("anotherId");
 
   EXPECT_CALL(mock_app_manager_, ManageHMICommand(cmd_ptr_)).Times(iterations);
-  cmd_holder.Release(kPolicyAppId_);
+  cmd_holder.Resume(kPolicyAppId_);
 }
 
 }  // application_manager_test