Skip to content

Commit 68342af

Browse files
committed
refactor grpc: rename mws -> middlewares
commit_hash:9af696d88e147bb13f5d9845c364fac9bde7b47d
1 parent b41a54d commit 68342af

7 files changed

Lines changed: 13 additions & 13 deletions

File tree

grpc/include/userver/ugrpc/client/impl/call_params.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct CallParams {
2828
StubHandle stub;
2929
std::unique_ptr<grpc::ClientContext> context;
3030
ugrpc::impl::MethodStatistics& statistics;
31-
const Middlewares& mws;
31+
const Middlewares& middlewares;
3232
};
3333

3434
CallParams CreateCallParams(

grpc/include/userver/ugrpc/client/impl/call_state.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class CallState final {
140140
ugrpc::impl::RpcStatisticsScope stats_scope_;
141141
grpc::CompletionQueue& queue_;
142142
RpcConfigValues config_values_;
143-
const Middlewares& mws_;
143+
const Middlewares& middlewares_;
144144

145145
CallKind call_kind_{};
146146

grpc/include/userver/ugrpc/client/impl/client_data.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class ClientData final {
100100

101101
std::string_view GetClientName() const { return internals_.client_name; }
102102

103-
const Middlewares& GetMiddlewares() const { return internals_.mws; }
103+
const Middlewares& GetMiddlewares() const { return internals_.middlewares; }
104104

105105
const ugrpc::impl::StaticServiceMetadata& GetMetadata() const;
106106

grpc/include/userver/ugrpc/client/impl/client_internals.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace ugrpc::client::impl {
2424
/// Contains all non-code-generated dependencies for creating a gRPC client
2525
struct ClientInternals final {
2626
std::string client_name;
27-
Middlewares mws;
27+
Middlewares middlewares;
2828
ugrpc::impl::CompletionQueuePoolBase& completion_queues;
2929
ugrpc::impl::StatisticsStorage& statistics_storage;
3030
dynamic_config::Source config_source;

grpc/src/ugrpc/client/client_factory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl::ClientInternals ClientFactory::MakeClientInternals(
3636
info.service_full_name.emplace(meta.value().service_full_name);
3737
}
3838

39-
auto mws = middleware_pipeline_creator_.CreateMiddlewares(info);
39+
auto middlewares = middleware_pipeline_creator_.CreateMiddlewares(info);
4040

4141
auto channel_credentials = testsuite_grpc_.IsTlsEnabled()
4242
? GetClientCredentials(client_factory_settings_, client_settings.client_name)
@@ -47,7 +47,7 @@ impl::ClientInternals ClientFactory::MakeClientInternals(
4747

4848
return impl::ClientInternals{
4949
std::move(client_settings.client_name),
50-
std::move(mws),
50+
std::move(middlewares),
5151
completion_queues_,
5252
client_statistics_storage_,
5353
config_source_,

grpc/src/ugrpc/client/impl/call_state.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CallState::CallState(CallParams&& params, CallKind call_kind)
2222
stats_scope_(params.statistics),
2323
queue_(params.queue),
2424
config_values_(params.config),
25-
mws_(params.mws),
25+
middlewares_(params.middlewares),
2626
call_kind_(call_kind) {
2727
UASSERT(context_);
2828
UASSERT(!client_name_.empty());
@@ -65,7 +65,7 @@ const RpcConfigValues& CallState::GetConfigValues() const noexcept {
6565

6666
const Middlewares& CallState::GetMiddlewares() const noexcept {
6767
UASSERT(context_);
68-
return mws_;
68+
return middlewares_;
6969
}
7070

7171
std::string_view CallState::GetCallName() const noexcept {

grpc/tests/tests/middlewares_fixture.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ class MiddlewaresFixture : public ugrpc::tests::ServiceFixtureBase {
2323

2424
protected:
2525
MiddlewaresFixture() {
26-
std::generate(mws_.begin(), mws_.end(), [] { return std::make_shared<MiddlewareMock>(); });
26+
std::generate(middlewares_.begin(), middlewares_.end(), [] { return std::make_shared<MiddlewareMock>(); });
2727

2828
if constexpr (std::is_base_of_v<ugrpc::server::MiddlewareBase, MiddlewareType>) {
29-
SetServerMiddlewares({mws_.begin(), mws_.end()});
29+
SetServerMiddlewares({middlewares_.begin(), middlewares_.end()});
3030
} else {
31-
SetClientMiddlewares({mws_.begin(), mws_.end()});
31+
SetClientMiddlewares({middlewares_.begin(), middlewares_.end()});
3232
}
3333
RegisterService(service_);
3434
StartServer();
@@ -44,12 +44,12 @@ class MiddlewaresFixture : public ugrpc::tests::ServiceFixtureBase {
4444

4545
ClientType& Client() { return client_.value(); }
4646

47-
const MiddlewareMock& Middleware(std::size_t index) const { return *mws_[index]; }
47+
const MiddlewareMock& Middleware(std::size_t index) const { return *middlewares_[index]; }
4848

4949
private:
5050
ServiceType service_;
5151
std::optional<ClientType> client_;
52-
std::array<std::shared_ptr<const MiddlewareMock>, N> mws_;
52+
std::array<std::shared_ptr<const MiddlewareMock>, N> middlewares_;
5353
};
5454

5555
} // namespace tests

0 commit comments

Comments
 (0)