Skip to content

Commit 6aae8ea

Browse files
MaximilianToe=
authored andcommitted
renamed invokeProtoMethod
1 parent f567967 commit 6aae8ea

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

include/up-cpp/communication/RpcClient.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ struct RpcClient {
181181
[[nodiscard]] InvokeFuture invokeMethod(const v1::UUri&);
182182

183183
template <typename R>
184-
InvokeHandle invokeProtoMethod(const v1::UUri& method,
185-
const R& request_message,
186-
Callback&& callback) {
184+
InvokeHandle invokeMethodToProto(const v1::UUri& method,
185+
const R& request_message,
186+
Callback&& callback) {
187187
auto payload_or_status =
188188
uprotocol::utils::ProtoConverter::protoToPayload(request_message);
189189

@@ -200,12 +200,12 @@ struct RpcClient {
200200
}
201201

202202
template <typename T, typename R>
203-
InvokeProtoFuture<T> invokeProtoMethod(const v1::UUri& method,
204-
const R& request_message) {
203+
InvokeProtoFuture<T> invokeMethodToProto(const v1::UUri& method,
204+
const R& request_message) {
205205
auto result_promise =
206206
std::make_shared<std::promise<ResponseOrStatus<T>>>();
207207
auto future = result_promise->get_future();
208-
auto handle = invokeProtoMethod(
208+
auto handle = invokeMethodToProto(
209209
method, request_message,
210210
[result_promise](const MessageOrStatus& message_or_status) {
211211
if (!message_or_status.has_value()) {
@@ -234,13 +234,13 @@ struct RpcClient {
234234
}
235235

236236
template <typename R>
237-
InvokeFuture invokeProtoMethod(const v1::UUri& method,
238-
const R& request_message) {
237+
InvokeFuture invokeMethodToProto(const v1::UUri& method,
238+
const R& request_message) {
239239
auto result_promise =
240240
std::make_shared<std::promise<ResponseOrStatus<v1::UMessage>>>();
241241
auto future = result_promise->get_future();
242242

243-
auto handle = invokeProtoMethod(
243+
auto handle = invokeMethodToProto(
244244
method, request_message,
245245
[result_promise](const MessageOrStatus& message_or_status) {
246246
if (!message_or_status.has_value()) {

src/client/usubscription/v3/RpcClientUSubscription.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RpcClientUSubscription::subscribe(
3636
const SubscriptionRequest& subscription_request) {
3737
auto method =
3838
uuri_builder_.getServiceUriWithResourceId(RESOURCE_ID_SUBSCRIBE);
39-
return rpc_client_->invokeProtoMethod<SubscriptionResponse>(
39+
return rpc_client_->invokeMethodToProto<SubscriptionResponse>(
4040
method, subscription_request);
4141
}
4242

@@ -45,7 +45,7 @@ RpcClientUSubscription::unsubscribe(
4545
const UnsubscribeRequest& unsubscribe_request) {
4646
auto method =
4747
uuri_builder_.getServiceUriWithResourceId(RESOURCE_ID_UNSUBSCRIBE);
48-
return rpc_client_->invokeProtoMethod<UnsubscribeResponse>(
48+
return rpc_client_->invokeMethodToProto<UnsubscribeResponse>(
4949
method, unsubscribe_request);
5050
}
5151

@@ -54,7 +54,7 @@ RpcClientUSubscription::fetch_subscriptions(
5454
const FetchSubscriptionsRequest& fetch_subscriptions_request) {
5555
auto method = uuri_builder_.getServiceUriWithResourceId(
5656
RESOURCE_ID_FETCH_SUBSCRIPTIONS);
57-
return rpc_client_->invokeProtoMethod<FetchSubscriptionsResponse>(
57+
return rpc_client_->invokeMethodToProto<FetchSubscriptionsResponse>(
5858
method, fetch_subscriptions_request);
5959
}
6060

@@ -63,7 +63,7 @@ RpcClientUSubscription::fetch_subscribers(
6363
const FetchSubscribersRequest& fetch_subscribers_request) {
6464
auto method = uuri_builder_.getServiceUriWithResourceId(
6565
RESOURCE_ID_FETCH_SUBSCRIBERS);
66-
return rpc_client_->invokeProtoMethod<FetchSubscribersResponse>(
66+
return rpc_client_->invokeMethodToProto<FetchSubscribersResponse>(
6767
method, fetch_subscribers_request);
6868
}
6969

@@ -72,7 +72,7 @@ RpcClientUSubscription::register_for_notifications(
7272
const NotificationsRequest& register_notifications_request) {
7373
auto method = uuri_builder_.getServiceUriWithResourceId(
7474
RESOURCE_ID_REGISTER_FOR_NOTIFICATIONS);
75-
return rpc_client_->invokeProtoMethod<NotificationsResponse>(
75+
return rpc_client_->invokeMethodToProto<NotificationsResponse>(
7676
method, register_notifications_request);
7777
}
7878

@@ -81,7 +81,7 @@ RpcClientUSubscription::unregister_for_notifications(
8181
const NotificationsRequest& unregister_notifications_request) {
8282
auto method = uuri_builder_.getServiceUriWithResourceId(
8383
RESOURCE_ID_UNREGISTER_FOR_NOTIFICATIONS);
84-
return rpc_client_->invokeProtoMethod<NotificationsResponse>(
84+
return rpc_client_->invokeMethodToProto<NotificationsResponse>(
8585
method, unregister_notifications_request);
8686
}
8787

0 commit comments

Comments
 (0)