refactor grpc: using RpcType extensively

commit_hash:9844be32b717029db220cbf0f8afe4c7f5d37c66

Author: kpavlov00

.mapping.json

@@ -2332,7 +2332,6 @@
   "grpc/include/userver/ugrpc/client/impl/async_methods.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/client/impl/async_methods.hpp",
   "grpc/include/userver/ugrpc/client/impl/async_stream_methods.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/client/impl/async_stream_methods.hpp",
   "grpc/include/userver/ugrpc/client/impl/async_unary_call_adapter.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/client/impl/async_unary_call_adapter.hpp",
-  "grpc/include/userver/ugrpc/client/impl/call_kind.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/client/impl/call_kind.hpp",
   "grpc/include/userver/ugrpc/client/impl/call_params.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/client/impl/call_params.hpp",
   "grpc/include/userver/ugrpc/client/impl/call_state.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/client/impl/call_state.hpp",
   "grpc/include/userver/ugrpc/client/impl/channel_argument_utils.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/client/impl/channel_argument_utils.hpp",
@@ -2388,7 +2387,6 @@
   "grpc/include/userver/ugrpc/impl/maybe_owned_string.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/maybe_owned_string.hpp",
   "grpc/include/userver/ugrpc/impl/protobuf_collector.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/protobuf_collector.hpp",
   "grpc/include/userver/ugrpc/impl/queue_runner.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/queue_runner.hpp",
-  "grpc/include/userver/ugrpc/impl/rpc_type.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/rpc_type.hpp",
   "grpc/include/userver/ugrpc/impl/static_service_metadata.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/static_service_metadata.hpp",
   "grpc/include/userver/ugrpc/impl/statistics.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/statistics.hpp",
   "grpc/include/userver/ugrpc/impl/statistics_scope.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/impl/statistics_scope.hpp",
@@ -2398,14 +2396,14 @@
   "grpc/include/userver/ugrpc/protobuf_logging.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/protobuf_logging.hpp",
   "grpc/include/userver/ugrpc/protobuf_visit.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/protobuf_visit.hpp",
   "grpc/include/userver/ugrpc/rich_status.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/rich_status.hpp",
+  "grpc/include/userver/ugrpc/rpc_type.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/rpc_type.hpp",
   "grpc/include/userver/ugrpc/server/call_context.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/call_context.hpp",
   "grpc/include/userver/ugrpc/server/component_list.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/component_list.hpp",
   "grpc/include/userver/ugrpc/server/exceptions.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/exceptions.hpp",
   "grpc/include/userver/ugrpc/server/generic_service_base.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/generic_service_base.hpp",
   "grpc/include/userver/ugrpc/server/impl/async_method_invocation.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/impl/async_method_invocation.hpp",
   "grpc/include/userver/ugrpc/server/impl/async_methods.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/impl/async_methods.hpp",
   "grpc/include/userver/ugrpc/server/impl/async_service.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/impl/async_service.hpp",
-  "grpc/include/userver/ugrpc/server/impl/call_kind.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/impl/call_kind.hpp",
   "grpc/include/userver/ugrpc/server/impl/call_processor.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/impl/call_processor.hpp",
   "grpc/include/userver/ugrpc/server/impl/call_state.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/impl/call_state.hpp",
   "grpc/include/userver/ugrpc/server/impl/call_traits.hpp":"taxi/uservices/userver/grpc/include/userver/ugrpc/server/impl/call_traits.hpp",

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

@@ -14,6 +14,7 @@
 #include <userver/ugrpc/client/middlewares/fwd.hpp>
 #include <userver/ugrpc/impl/maybe_owned_string.hpp>
 #include <userver/ugrpc/impl/statistics.hpp>
+#include <userver/ugrpc/rpc_type.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
@@ -26,6 +27,7 @@ struct CallParams {
     grpc::CompletionQueue& queue;
     dynamic_config::Snapshot config;
     std::string_view endpoint;
+    RpcType rpc_type{};
     ugrpc::impl::MaybeOwnedString call_name;
     std::string_view service_name;
     std::string_view method_name;

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

@@ -12,12 +12,12 @@
 #include <userver/tracing/in_place_span.hpp>
 
 #include <userver/ugrpc/client/fwd.hpp>
-#include <userver/ugrpc/client/impl/call_kind.hpp>
 #include <userver/ugrpc/client/impl/middleware_pipeline.hpp>
 #include <userver/ugrpc/client/impl/stub_handle.hpp>
 #include <userver/ugrpc/impl/async_method_invocation.hpp>
 #include <userver/ugrpc/impl/maybe_owned_string.hpp>
 #include <userver/ugrpc/impl/statistics_scope.hpp>
+#include <userver/ugrpc/rpc_type.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
@@ -37,7 +37,7 @@ struct RpcConfigValues final {
 
 class CallState {
 public:
-    CallState(CallParams&&, CallKind);
+    explicit CallState(CallParams&& params);
 
     ~CallState() noexcept = default;
 
@@ -52,9 +52,11 @@ class CallState {
 
     grpc::ClientContext& GetClientContext() noexcept;
 
+    std::string_view GetClientName() const noexcept;
+
     std::string_view GetCallName() const noexcept;
 
-    std::string_view GetClientName() const noexcept;
+    RpcType GetRpcType() const noexcept;
 
     tracing::Span& GetSpan() noexcept;
 
@@ -66,8 +68,6 @@ class CallState {
 
     const testsuite::GrpcControl& GetTestsuiteControl() const noexcept;
 
-    CallKind GetCallKind() const noexcept;
-
     void ResetSpan() noexcept;
 
     ugrpc::impl::RpcStatisticsScope& GetStatsScope() noexcept;
@@ -88,8 +88,11 @@ class CallState {
     std::unique_ptr<grpc::ClientContext> client_context_;
 
     std::string client_name_;
+
     ugrpc::impl::MaybeOwnedString call_name_;
 
+    RpcType rpc_type_{};
+
     bool is_deadline_propagated_{false};
 
     std::optional<tracing::InPlaceSpan> span_;
@@ -104,16 +107,14 @@ class CallState {
 
     const testsuite::GrpcControl& testsuite_grpc_;
 
-    CallKind call_kind_{};
-
     grpc::Status status_;
 
     std::atomic<bool> committed_{false};
 };
 
 class StreamingCallState final : public CallState {
 public:
-    StreamingCallState(CallParams&& params, CallKind call_kind);
+    explicit StreamingCallState(CallParams&& params);
 
     ~StreamingCallState() noexcept;
 

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

@@ -254,7 +254,7 @@ InputStream<Response>::InputStream(
     PrepareServerStreamingCall<Stub, Request, Response> prepare_async_method,
     const Request& request
 )
-    : state_{std::move(params), CallKind::kInputStream},
+    : state_{std::move(params)},
       context_{utils::impl::InternalTag{}, state_}
 {
     RunMiddlewarePipeline(state_, MiddlewareHooks::StartCallHooks(ToBaseMessage(&request)));
@@ -302,7 +302,7 @@ OutputStream<Request, Response>::OutputStream(
     CallParams&& params,
     PrepareClientStreamingCall<Stub, Request, Response> prepare_async_method
 )
-    : state_{std::move(params), CallKind::kOutputStream},
+    : state_{std::move(params)},
       context_{utils::impl::InternalTag{}, state_}
 {
     RunMiddlewarePipeline(state_, MiddlewareHooks::StartCallHooks());
@@ -378,7 +378,7 @@ BidirectionalStream<Request, Response>::BidirectionalStream(
     CallParams&& params,
     PrepareBidiStreamingCall<Stub, Request, Response> prepare_async_method
 )
-    : state_{std::move(params), CallKind::kBidirectionalStream},
+    : state_{std::move(params)},
       context_{utils::impl::InternalTag{}, state_}
 {
     RunMiddlewarePipeline(state_, MiddlewareHooks::StartCallHooks());

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

@@ -36,7 +36,7 @@ class UnaryCall final {
 
     UnaryCall(CallParams&& params, PrepareUnaryCall&& prepare_unary_call, const Request& request)
         : call_options_{std::move(params.call_options)},
-          state_{std::move(params), CallKind::kUnaryCall},
+          state_{std::move(params)},
           context_{utils::impl::InternalTag{}, state_},
           prepare_unary_call_{std::move(prepare_unary_call)},
           request_{request}

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

@@ -16,6 +16,7 @@
 #include <userver/tracing/span.hpp>
 #include <userver/utils/impl/internal_tag_fwd.hpp>
 
+#include <userver/ugrpc/rpc_type.hpp>
 #include <userver/ugrpc/time_utils.hpp>
 
 USERVER_NAMESPACE_BEGIN
@@ -62,15 +63,12 @@ class MiddlewareCallContext final {
     /// @returns RPC name
     std::string_view GetCallName() const noexcept;
 
+    /// @returns RPC type
+    RpcType GetRpcType() const noexcept;
+
     /// @returns RPC span
     tracing::Span& GetSpan() noexcept;
 
-    /// @returns Is a client-side streaming call
-    bool IsClientStreaming() const noexcept;
-
-    /// @returns Is a server-side streaming call
-    bool IsServerStreaming() const noexcept;
-
     /// @cond
     // For internal use only
     impl::CallState& GetState(utils::impl::InternalTag);

grpc/include/userver/ugrpc/client/middlewares/base.hpp

@@ -6,7 +6,7 @@
 #include <userver/utils/span.hpp>
 #include <userver/utils/string_literal.hpp>
 
-#include <userver/ugrpc/impl/rpc_type.hpp>
+#include <userver/ugrpc/rpc_type.hpp>
 
 USERVER_NAMESPACE_BEGIN
 

grpc/include/userver/ugrpc/impl/rpc_type.hpp

@@ -0,0 +1,30 @@
+#pragma once
+
+/// @file userver/ugrpc/rpc_type.hpp
+/// @brief @copybrief ugrpc::RpcType
+
+USERVER_NAMESPACE_BEGIN
+
+namespace ugrpc {
+
+/// Type categorizes RPCs by unary or streaming type
+enum class RpcType {
+    kUnary,
+    kClientStreaming,
+    kServerStreaming,
+    kBidiStreaming,
+};
+
+/// Returns `true` for `RpcType::kUnary` and `RpcType::kServerStreaming`, where the client sends a single request
+constexpr bool IsSingleRequestMethod(RpcType rpc_type) noexcept {
+    return RpcType::kUnary == rpc_type || RpcType::kServerStreaming == rpc_type;
+}
+
+/// Returns `true` for `RpcType::kUnary` and `RpcType::kClientStreaming`, where the server sends back a single response
+constexpr bool IsSingleResponseMethod(RpcType rpc_type) noexcept {
+    return RpcType::kUnary == rpc_type || RpcType::kClientStreaming == rpc_type;
+}
+
+}  // namespace ugrpc
+
+USERVER_NAMESPACE_END