From: Sangyoon Jang Date: Tue, 8 Apr 2025 05:31:45 +0000 (+0900) Subject: Rename some interface classes X-Git-Tag: accepted/tizen/unified/20250514.114137~31 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3adf47e003f55ca6aa3b4a13c1bd410eebb17585;p=platform%2Fcore%2Fappfw%2Ftizen-action.git Rename some interface classes Rename to clarify its purpose. Signed-off-by: Sangyoon Jang --- diff --git a/src/action/action_request_handler.cc b/src/action/action_request_handler.cc index e0635bb..394108b 100644 --- a/src/action/action_request_handler.cc +++ b/src/action/action_request_handler.cc @@ -123,12 +123,13 @@ void ActionRequestHandler::OnExecute(const std::string& instance, executors_.emplace_back(std::move(executor)); } -void ActionRequestHandler::RegisterRequestReplyHandler(const std::string& requester, - RequestReplyHandler* handler) { +void ActionRequestHandler::RegisterRequestReplyHandler( + const std::string& requester, IRequestReplyHandler* handler) { reply_handlers_.emplace(requester, handler); } -void ActionRequestHandler::UnregisterRequestReplyHandler(const std::string& requester) { +void ActionRequestHandler::UnregisterRequestReplyHandler( + const std::string& requester) { auto it = std::find_if(reply_handlers_.begin(), reply_handlers_.end(), [requester](const auto& iterator) { return iterator.first == requester; diff --git a/src/action/action_request_handler.hh b/src/action/action_request_handler.hh index 67f4ca6..859d1d6 100644 --- a/src/action/action_request_handler.hh +++ b/src/action/action_request_handler.hh @@ -24,11 +24,11 @@ #include "action/tizen_action_service_stub.h" #include "common/action_executor.hh" #include "common/action_model.h" -#include "common/result_handler.hh" +#include "common/action_result_handler.hh" namespace action { -class ActionRequestHandler : public IRequestHandler, common::IResultHandler { +class ActionRequestHandler : public IRequestHandler, common::IActionResultHandler { public: ActionRequestHandler(); ~ActionRequestHandler(); @@ -42,7 +42,7 @@ class ActionRequestHandler : public IRequestHandler, common::IResultHandler { void OnExecute(const std::string& instance, rpc::Action& model) override; void RegisterRequestReplyHandler(const std::string& requester, - RequestReplyHandler* handler) override; + IRequestReplyHandler* handler) override; void UnregisterRequestReplyHandler(const std::string& requester) override; void OnResult(const std::string& requester, @@ -51,7 +51,7 @@ class ActionRequestHandler : public IRequestHandler, common::IResultHandler { private: rpc_port::tizen_action_service_stub::stub::ActionService service_; std::vector> executors_; - std::map reply_handlers_; + std::map reply_handlers_; }; } // namespace action diff --git a/src/action/plugin_executor.hh b/src/action/plugin_executor.hh index aa4c3d4..6a4b1ae 100644 --- a/src/action/plugin_executor.hh +++ b/src/action/plugin_executor.hh @@ -43,7 +43,7 @@ class PluginExecutor : public common::AbstractActionExecutor, private: rpc_port::plugin_manager_proxy::proxy::PluginManager plugin_manager_; - common::IResultHandler* result_handler_ = nullptr; + common::IActionResultHandler* result_handler_ = nullptr; bool connected_ = false; }; diff --git a/src/action/request_handler.hh b/src/action/request_handler.hh index b26bf20..dff18b2 100644 --- a/src/action/request_handler.hh +++ b/src/action/request_handler.hh @@ -37,7 +37,7 @@ class IRequestHandler { float search_threshold) = 0; virtual void OnExecute(const std::string& requester, rpc::Action& model) = 0; virtual void RegisterRequestReplyHandler(const std::string& requester, - RequestReplyHandler* handler) = 0; + IRequestReplyHandler* handler) = 0; virtual void UnregisterRequestReplyHandler(const std::string& requester) = 0; }; diff --git a/src/action/request_reply_handler.hh b/src/action/request_reply_handler.hh index 8dfa3fe..307a385 100644 --- a/src/action/request_reply_handler.hh +++ b/src/action/request_reply_handler.hh @@ -21,9 +21,9 @@ namespace action { -class RequestReplyHandler { +class IRequestReplyHandler { public: - virtual ~RequestReplyHandler() = default; + virtual ~IRequestReplyHandler() = default; virtual void SendRequestReply(const std::string& reply) = 0; }; diff --git a/src/action/service.hh b/src/action/service.hh index 85efc65..deafb02 100644 --- a/src/action/service.hh +++ b/src/action/service.hh @@ -33,7 +33,7 @@ namespace action { namespace rpc = rpc_port::tizen_action_service_stub; class Service : public rpc::stub::ActionService::ServiceBase, - public RequestReplyHandler { + public IRequestReplyHandler { public: class Factory : public rpc::stub::ActionService::ServiceBase::Factory { public: diff --git a/src/common/action_executor.hh b/src/common/action_executor.hh index b1e4eea..4a92f2e 100644 --- a/src/common/action_executor.hh +++ b/src/common/action_executor.hh @@ -21,7 +21,7 @@ #include #include "common/action_model.h" -#include "common/result_handler.hh" +#include "common/action_result_handler.hh" namespace common { @@ -31,14 +31,14 @@ class AbstractActionExecutor { virtual ~AbstractActionExecutor() = default; virtual int Execute(const ActionModel& model) = 0; std::string GetId() { return id_; } - void SetResultHandler(IResultHandler* handler) { handler_ = handler; } + void SetResultHandler(IActionResultHandler* handler) { handler_ = handler; } void NotifyResult(const std::string& result) { handler_->OnResult(id_, result); } private: std::string id_; - IResultHandler* handler_; + IActionResultHandler* handler_; }; } // namespace common diff --git a/src/common/action_result_handler.hh b/src/common/action_result_handler.hh new file mode 100644 index 0000000..d5a939f --- /dev/null +++ b/src/common/action_result_handler.hh @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2025 Samsung Electronics Co., Ltd All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef COMMON_ACTION_RESULT_HANDLER_HH_ +#define COMMON_ACTION_RESULT_HANDLER_HH_ + +#include + +namespace common { + +class IActionResultHandler { + public: + virtual ~IActionResultHandler() = default; + virtual void OnResult(const std::string& executor_id, + const std::string& result) = 0; +}; + +} // namespace common + +#endif // COMMON_ACTION_RESULT_HANDLER_HH_ diff --git a/src/common/result_handler.hh b/src/common/result_handler.hh deleted file mode 100644 index 4fecce7..0000000 --- a/src/common/result_handler.hh +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2025 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef COMMON_RESULT_HANDLER_HH_ -#define COMMON_RESULT_HANDLER_HH_ - -#include - -namespace common { - -class IResultHandler { - public: - virtual ~IResultHandler() = default; - virtual void OnResult(const std::string& executor_id, - const std::string& result) = 0; -}; - -} // namespace common - -#endif // COMMON_RESULT_HANDLER_HH_