From 883f0d426cf5432a4e253235408e2155fccaf9ce Mon Sep 17 00:00:00 2001 From: lwk <1076278852@qq.com> Date: Thu, 24 Mar 2022 19:18:42 +0800 Subject: [PATCH] fix: code review liuwenkai@huawei.com Signed-off-by: lwk <1076278852@qq.com> --- .../kitsimpl/include/coauth_callback_proxy.h | 4 ++-- .../kitsimpl/include/coauth_callback_stub.h | 4 ++-- frameworks/kitsimpl/include/coauth_proxy.h | 20 +++++++++---------- .../include/executor_callback_proxy.h | 14 ++++++------- .../kitsimpl/include/executor_callback_stub.h | 14 ++++++------- .../include/executor_messenger_proxy.h | 8 ++++---- .../kitsimpl/include/query_callback_proxy.h | 2 +- .../kitsimpl/include/query_callback_stub.h | 2 +- .../include/set_prop_callback_proxy.h | 2 +- .../kitsimpl/include/set_prop_callback_stub.h | 2 +- .../innerkits/include/executor_messenger.h | 8 ++++---- services/include/coauth_service.h | 16 +++++++-------- services/src/auth_res_manager.cpp | 2 +- 13 files changed, 49 insertions(+), 49 deletions(-) diff --git a/frameworks/kitsimpl/include/coauth_callback_proxy.h b/frameworks/kitsimpl/include/coauth_callback_proxy.h index b1f226b..a01ffbb 100644 --- a/frameworks/kitsimpl/include/coauth_callback_proxy.h +++ b/frameworks/kitsimpl/include/coauth_callback_proxy.h @@ -29,8 +29,8 @@ public: : IRemoteProxy(impl) {} ~CoAuthCallbackProxy() override = default; - virtual void OnFinish(uint32_t resultCode, std::vector &scheduleToken) override; - virtual void OnAcquireInfo(uint32_t acquire) override; + void OnFinish(uint32_t resultCode, std::vector &scheduleToken) override; + void OnAcquireInfo(uint32_t acquire) override; private: bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply); diff --git a/frameworks/kitsimpl/include/coauth_callback_stub.h b/frameworks/kitsimpl/include/coauth_callback_stub.h index b4fe33a..ea3dbe5 100644 --- a/frameworks/kitsimpl/include/coauth_callback_stub.h +++ b/frameworks/kitsimpl/include/coauth_callback_stub.h @@ -28,8 +28,8 @@ public: explicit CoAuthCallbackStub(const std::shared_ptr& impl); ~CoAuthCallbackStub() override = default; - virtual void OnFinish(uint32_t resultCode, std::vector &scheduleToken) override; - virtual void OnAcquireInfo(uint32_t acquire) override; + void OnFinish(uint32_t resultCode, std::vector &scheduleToken) override; + void OnAcquireInfo(uint32_t acquire) override; int32_t OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; diff --git a/frameworks/kitsimpl/include/coauth_proxy.h b/frameworks/kitsimpl/include/coauth_proxy.h index cf54b15..fad1ac7 100644 --- a/frameworks/kitsimpl/include/coauth_proxy.h +++ b/frameworks/kitsimpl/include/coauth_proxy.h @@ -30,16 +30,16 @@ public: : IRemoteProxy(impl) {} ~CoAuthProxy() override = default; - virtual uint64_t Register(std::shared_ptr executorInfo, - const sptr &callback) override; - virtual void QueryStatus(AuthResPool::AuthExecutor &executorInfo, - const sptr &callback) override; - virtual void BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, const sptr &callback) override; - virtual int32_t Cancel(uint64_t scheduleId) override; - virtual int32_t GetExecutorProp(AuthResPool::AuthAttributes &conditions, - std::shared_ptr values) override; - virtual void SetExecutorProp(AuthResPool::AuthAttributes &conditions, - const sptr &callback) override; + uint64_t Register(std::shared_ptr executorInfo, + const sptr &callback) override; + void QueryStatus(AuthResPool::AuthExecutor &executorInfo, + const sptr &callback) override; + void BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, const sptr &callback) override; + int32_t Cancel(uint64_t scheduleId) override; + int32_t GetExecutorProp(AuthResPool::AuthAttributes &conditions, + std::shared_ptr values) override; + void SetExecutorProp(AuthResPool::AuthAttributes &conditions, + const sptr &callback) override; private: bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, bool isSync = true); diff --git a/frameworks/kitsimpl/include/executor_callback_proxy.h b/frameworks/kitsimpl/include/executor_callback_proxy.h index 54a3cee..94486b9 100644 --- a/frameworks/kitsimpl/include/executor_callback_proxy.h +++ b/frameworks/kitsimpl/include/executor_callback_proxy.h @@ -29,13 +29,13 @@ public: : IRemoteProxy(impl) {} ~ExecutorCallbackProxy() override = default; - virtual void OnMessengerReady(const sptr &messenger) override; - virtual int32_t OnBeginExecute(uint64_t scheduleId, std::vector &publicKey, - std::shared_ptr commandAttrs) override; - virtual int32_t OnEndExecute(uint64_t scheduleId, std::shared_ptr consumerAttr) override; - virtual int32_t OnSetProperty(std::shared_ptr properties) override; - virtual int32_t OnGetProperty(std::shared_ptr conditions, - std::shared_ptr values) override; + void OnMessengerReady(const sptr &messenger) override; + int32_t OnBeginExecute(uint64_t scheduleId, std::vector &publicKey, + std::shared_ptr commandAttrs) override; + int32_t OnEndExecute(uint64_t scheduleId, std::shared_ptr consumerAttr) override; + int32_t OnSetProperty(std::shared_ptr properties) override; + int32_t OnGetProperty(std::shared_ptr conditions, + std::shared_ptr values) override; private: bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply); static inline BrokerDelegator delegator_; diff --git a/frameworks/kitsimpl/include/executor_callback_stub.h b/frameworks/kitsimpl/include/executor_callback_stub.h index ceb41fc..7e7dd21 100644 --- a/frameworks/kitsimpl/include/executor_callback_stub.h +++ b/frameworks/kitsimpl/include/executor_callback_stub.h @@ -27,13 +27,13 @@ class ExecutorCallbackStub : public IRemoteStub { public: ExecutorCallbackStub(const std::shared_ptr& impl); ~ExecutorCallbackStub() override = default; - virtual void OnMessengerReady(const sptr &messenger) override; - virtual int32_t OnBeginExecute(uint64_t scheduleId, std::vector &publicKey, - std::shared_ptr commandAttrs) override; - virtual int32_t OnEndExecute(uint64_t scheduleId, std::shared_ptr consumerAttr) override; - virtual int32_t OnSetProperty(std::shared_ptr properties) override; - virtual int32_t OnGetProperty(std::shared_ptr conditions, - std::shared_ptr values) override; + void OnMessengerReady(const sptr &messenger) override; + int32_t OnBeginExecute(uint64_t scheduleId, std::vector &publicKey, + std::shared_ptr commandAttrs) override; + int32_t OnEndExecute(uint64_t scheduleId, std::shared_ptr consumerAttr) override; + int32_t OnSetProperty(std::shared_ptr properties) override; + int32_t OnGetProperty(std::shared_ptr conditions, + std::shared_ptr values) override; int OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; private: int32_t OnMessengerReadyStub(MessageParcel& data, MessageParcel& reply); diff --git a/frameworks/kitsimpl/include/executor_messenger_proxy.h b/frameworks/kitsimpl/include/executor_messenger_proxy.h index 1968c61..7de24d1 100644 --- a/frameworks/kitsimpl/include/executor_messenger_proxy.h +++ b/frameworks/kitsimpl/include/executor_messenger_proxy.h @@ -29,10 +29,10 @@ public: : IRemoteProxy(impl) {} ~ExecutorMessengerProxy() override = default; - virtual int32_t SendData(uint64_t scheduleId, uint64_t transNum, int32_t srcType, - int32_t dstType, std::shared_ptr msg) override; - virtual int32_t Finish(uint64_t scheduleId, int32_t srcType, int32_t resultCode, - std::shared_ptr finalResult) override; + int32_t SendData(uint64_t scheduleId, uint64_t transNum, int32_t srcType, + int32_t dstType, std::shared_ptr msg) override; + int32_t Finish(uint64_t scheduleId, int32_t srcType, int32_t resultCode, + std::shared_ptr finalResult) override; private: bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply); diff --git a/frameworks/kitsimpl/include/query_callback_proxy.h b/frameworks/kitsimpl/include/query_callback_proxy.h index 0c3463e..bd89de7 100644 --- a/frameworks/kitsimpl/include/query_callback_proxy.h +++ b/frameworks/kitsimpl/include/query_callback_proxy.h @@ -28,7 +28,7 @@ public: : IRemoteProxy(impl) {} ~QueryCallbackProxy() override = default; - virtual void OnResult(uint32_t resultCode) override; + void OnResult(uint32_t resultCode) override; private: bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply); diff --git a/frameworks/kitsimpl/include/query_callback_stub.h b/frameworks/kitsimpl/include/query_callback_stub.h index 24b6d24..98c0d35 100644 --- a/frameworks/kitsimpl/include/query_callback_stub.h +++ b/frameworks/kitsimpl/include/query_callback_stub.h @@ -27,7 +27,7 @@ public: explicit QueryCallbackStub(const std::shared_ptr& impl); ~QueryCallbackStub() override = default; - virtual void OnResult(uint32_t resultCode) override; + void OnResult(uint32_t resultCode) override; int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; diff --git a/frameworks/kitsimpl/include/set_prop_callback_proxy.h b/frameworks/kitsimpl/include/set_prop_callback_proxy.h index a05e1e8..b772b61 100644 --- a/frameworks/kitsimpl/include/set_prop_callback_proxy.h +++ b/frameworks/kitsimpl/include/set_prop_callback_proxy.h @@ -27,7 +27,7 @@ public: explicit SetPropCallbackProxy(const sptr& impl) : IRemoteProxy(impl) {} ~SetPropCallbackProxy() override = default; - virtual void OnResult(uint32_t result, std::vector &extraInfo) override; + void OnResult(uint32_t result, std::vector &extraInfo) override; private: bool SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply); diff --git a/frameworks/kitsimpl/include/set_prop_callback_stub.h b/frameworks/kitsimpl/include/set_prop_callback_stub.h index 00a235d..5ac3e84 100644 --- a/frameworks/kitsimpl/include/set_prop_callback_stub.h +++ b/frameworks/kitsimpl/include/set_prop_callback_stub.h @@ -29,7 +29,7 @@ public: explicit SetPropCallbackStub(const std::shared_ptr& impl); ~SetPropCallbackStub() override = default; - virtual void OnResult(uint32_t result, std::vector &extraInfo) override; + void OnResult(uint32_t result, std::vector &extraInfo) override; int32_t OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; diff --git a/interfaces/innerkits/include/executor_messenger.h b/interfaces/innerkits/include/executor_messenger.h index 21e1712..c063787 100644 --- a/interfaces/innerkits/include/executor_messenger.h +++ b/interfaces/innerkits/include/executor_messenger.h @@ -27,10 +27,10 @@ class ExecutorMessenger : public ExecutorMessengerStub { public: ExecutorMessenger(UserIAM::CoAuth::AuthResPool*); ~ExecutorMessenger() override = default; - virtual int32_t SendData(uint64_t scheduleId, uint64_t transNum, int32_t srcType, - int32_t dstType, std::shared_ptr msg) override; - virtual int32_t Finish(uint64_t scheduleId, int32_t srcType, int32_t resultCode, - std::shared_ptr finalResult) override; + int32_t SendData(uint64_t scheduleId, uint64_t transNum, int32_t srcType, + int32_t dstType, std::shared_ptr msg) override; + int32_t Finish(uint64_t scheduleId, int32_t srcType, int32_t resultCode, + std::shared_ptr finalResult) override; private: void DeleteScheduleInfoById(uint64_t scheduleId); int32_t DoSignToken(uint64_t scheduleId, std::vector& scheduleToken, diff --git a/services/include/coauth_service.h b/services/include/coauth_service.h index f807960..8b1ab35 100644 --- a/services/include/coauth_service.h +++ b/services/include/coauth_service.h @@ -39,16 +39,16 @@ class CoAuthService : public SystemAbility, public CoAuthStub { public: DECLEAR_SYSTEM_ABILITY(CoAuthService); explicit CoAuthService(int32_t systemAbilityId, bool runOnCreate = false); - virtual ~CoAuthService() override; + ~CoAuthService() override; void OnStart() override; void OnStop() override; - virtual uint64_t Register(std::shared_ptr executorInfo, - const sptr &callback) override; - virtual void QueryStatus(ResAuthExecutor &executorInfo, const sptr &callback) override; - virtual void BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, const sptr &callback) override; - virtual int32_t Cancel(uint64_t scheduleId) override; - virtual int32_t GetExecutorProp(ResAuthAttributes &conditions, std::shared_ptr values) override; - virtual void SetExecutorProp(ResAuthAttributes &conditions, const sptr &callback) override; + uint64_t Register(std::shared_ptr executorInfo, + const sptr &callback) override; + void QueryStatus(ResAuthExecutor &executorInfo, const sptr &callback) override; + void BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, const sptr &callback) override; + int32_t Cancel(uint64_t scheduleId) override; + int32_t GetExecutorProp(ResAuthAttributes &conditions, std::shared_ptr values) override; + void SetExecutorProp(ResAuthAttributes &conditions, const sptr &callback) override; private: CoAuthRunningState state_ = CoAuthRunningState::STATE_STOPPED; diff --git a/services/src/auth_res_manager.cpp b/services/src/auth_res_manager.cpp index 3e4b1fb..4971541 100644 --- a/services/src/auth_res_manager.cpp +++ b/services/src/auth_res_manager.cpp @@ -86,7 +86,7 @@ void AuthResManager::QueryStatus(ResAuthExecutor &executorInfo, sptr