From 074b802c9f3b1c22f57f5cea57e755487cc01832 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Thu, 22 Feb 2018 07:19:47 -0800 Subject: [PATCH] Polish and address review comments --- .../Grpc.Core/Interceptors/CallInvokerExtensions.cs | 6 +++--- .../Grpc.Core/Interceptors/ChannelExtensions.cs | 4 +--- .../Interceptors/ClientInterceptorContext.cs | 12 ++++++------ .../Interceptors/InterceptingCallInvoker.cs | 4 ++-- .../ServerServiceDefinitionExtensions.cs | 8 ++++---- src/csharp/Grpc.Core/Internal/ServerCallHandler.cs | 10 +++++----- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/csharp/Grpc.Core/Interceptors/CallInvokerExtensions.cs b/src/csharp/Grpc.Core/Interceptors/CallInvokerExtensions.cs index a01865cf2fc..277800ce99e 100644 --- a/src/csharp/Grpc.Core/Interceptors/CallInvokerExtensions.cs +++ b/src/csharp/Grpc.Core/Interceptors/CallInvokerExtensions.cs @@ -64,8 +64,8 @@ namespace Grpc.Core.Interceptors /// public static CallInvoker Intercept(this CallInvoker invoker, params Interceptor[] interceptors) { - GrpcPreconditions.CheckNotNull(invoker, "invoker"); - GrpcPreconditions.CheckNotNull(interceptors, "interceptors"); + GrpcPreconditions.CheckNotNull(invoker, nameof(invoker); + GrpcPreconditions.CheckNotNull(interceptors, nameof(interceptors)); foreach (var interceptor in interceptors.Reverse()) { @@ -104,7 +104,7 @@ namespace Grpc.Core.Interceptors /// public MetadataInterceptor(Func interceptor) { - this.interceptor = GrpcPreconditions.CheckNotNull(interceptor, "interceptor"); + this.interceptor = GrpcPreconditions.CheckNotNull(interceptor, nameof(interceptor)); } protected override ClientCallHooks InterceptCall(ClientInterceptorContext context, bool clientStreaming, bool serverStreaming, TRequest request) diff --git a/src/csharp/Grpc.Core/Interceptors/ChannelExtensions.cs b/src/csharp/Grpc.Core/Interceptors/ChannelExtensions.cs index a095b059250..00b2fa8becc 100644 --- a/src/csharp/Grpc.Core/Interceptors/ChannelExtensions.cs +++ b/src/csharp/Grpc.Core/Interceptors/ChannelExtensions.cs @@ -76,9 +76,7 @@ namespace Grpc.Core.Interceptors /// invocation metadata. /// /// - /// Multiple interceptors can be added on top of each other by calling - /// "channel.Intercept(a, b, c)". The order of invocation will be "a", "b", and then "c". - /// Interceptors can be later added to an existing intercepted channel, effectively + /// Multiple interceptors can be added on top of each other by /// building a chain like "channel.Intercept(c).Intercept(b).Intercept(a)". Note that /// in this case, the last interceptor added will be the first to take control. /// diff --git a/src/csharp/Grpc.Core/Interceptors/ClientInterceptorContext.cs b/src/csharp/Grpc.Core/Interceptors/ClientInterceptorContext.cs index 64d7297a0a3..de06a770771 100644 --- a/src/csharp/Grpc.Core/Interceptors/ClientInterceptorContext.cs +++ b/src/csharp/Grpc.Core/Interceptors/ClientInterceptorContext.cs @@ -46,20 +46,20 @@ namespace Grpc.Core.Interceptors } /// - /// Gets or sets the instance + /// Gets the instance /// representing the method to be invoked. /// - public Method Method { get; set; } + public Method Method { get; } /// - /// Gets or sets the host that the currect invocation will be dispatched to. + /// Gets the host that the currect invocation will be dispatched to. /// - public string Host { get; set; } + public string Host { get; } /// - /// Gets or sets the structure representing the + /// Gets the structure representing the /// call options associated with the current invocation. /// - public CallOptions Options { get; set; } + public CallOptions Options { get; } } } diff --git a/src/csharp/Grpc.Core/Interceptors/InterceptingCallInvoker.cs b/src/csharp/Grpc.Core/Interceptors/InterceptingCallInvoker.cs index fb06523abba..84d2a0b9580 100644 --- a/src/csharp/Grpc.Core/Interceptors/InterceptingCallInvoker.cs +++ b/src/csharp/Grpc.Core/Interceptors/InterceptingCallInvoker.cs @@ -36,8 +36,8 @@ namespace Grpc.Core.Interceptors /// public InterceptingCallInvoker(CallInvoker invoker, Interceptor interceptor) { - this.invoker = GrpcPreconditions.CheckNotNull(invoker, "invoker"); - this.interceptor = GrpcPreconditions.CheckNotNull(interceptor, "interceptor"); + this.invoker = GrpcPreconditions.CheckNotNull(invoker, nameof(invoker)); + this.interceptor = GrpcPreconditions.CheckNotNull(interceptor, nameof(interceptor)); } /// diff --git a/src/csharp/Grpc.Core/Interceptors/ServerServiceDefinitionExtensions.cs b/src/csharp/Grpc.Core/Interceptors/ServerServiceDefinitionExtensions.cs index 21a07820374..b9b53247ce1 100644 --- a/src/csharp/Grpc.Core/Interceptors/ServerServiceDefinitionExtensions.cs +++ b/src/csharp/Grpc.Core/Interceptors/ServerServiceDefinitionExtensions.cs @@ -44,8 +44,8 @@ namespace Grpc.Core.Interceptors /// public static ServerServiceDefinition Intercept(this ServerServiceDefinition serverServiceDefinition, Interceptor interceptor) { - GrpcPreconditions.CheckNotNull(serverServiceDefinition, "serverServiceDefinition"); - GrpcPreconditions.CheckNotNull(interceptor, "interceptor"); + GrpcPreconditions.CheckNotNull(serverServiceDefinition, nameof(serverServiceDefinition)); + GrpcPreconditions.CheckNotNull(interceptor, nameof(interceptor)); return new ServerServiceDefinition(serverServiceDefinition.CallHandlers.ToDictionary(x => x.Key, x => x.Value.Intercept(interceptor))); } @@ -68,8 +68,8 @@ namespace Grpc.Core.Interceptors /// public static ServerServiceDefinition Intercept(this ServerServiceDefinition serverServiceDefinition, params Interceptor[] interceptors) { - GrpcPreconditions.CheckNotNull(serverServiceDefinition, "serverServiceDefinition"); - GrpcPreconditions.CheckNotNull(interceptors, "interceptors"); + GrpcPreconditions.CheckNotNull(serverServiceDefinition, nameof(serverServiceDefinition)); + GrpcPreconditions.CheckNotNull(interceptors, nameof(interceptors)); foreach (var interceptor in interceptors.Reverse()) { diff --git a/src/csharp/Grpc.Core/Internal/ServerCallHandler.cs b/src/csharp/Grpc.Core/Internal/ServerCallHandler.cs index add72ad68da..81522cf8fef 100644 --- a/src/csharp/Grpc.Core/Internal/ServerCallHandler.cs +++ b/src/csharp/Grpc.Core/Internal/ServerCallHandler.cs @@ -76,7 +76,7 @@ namespace Grpc.Core.Internal { if (!(e is RpcException)) { - Logger.Warning(e, "Exception occured in handler or interceptors."); + Logger.Warning(e, "Exception occurred in the handler or an interceptor."); } status = HandlerUtils.GetStatusFromExceptionAndMergeTrailers(e, context.ResponseTrailers); } @@ -138,7 +138,7 @@ namespace Grpc.Core.Internal { if (!(e is RpcException)) { - Logger.Warning(e, "Exception occured in handler or interceptors."); + Logger.Warning(e, "Exception occurred in the handler or an interceptor."); } status = HandlerUtils.GetStatusFromExceptionAndMergeTrailers(e, context.ResponseTrailers); } @@ -201,7 +201,7 @@ namespace Grpc.Core.Internal { if (!(e is RpcException)) { - Logger.Warning(e, "Exception occured in handler or interceptor."); + Logger.Warning(e, "Exception occurred in the handler or an interceptor."); } status = HandlerUtils.GetStatusFromExceptionAndMergeTrailers(e, context.ResponseTrailers); } @@ -262,7 +262,7 @@ namespace Grpc.Core.Internal { if (!(e is RpcException)) { - Logger.Warning(e, "Exception occured in handler or interceptor."); + Logger.Warning(e, "Exception occurred in the handler or an interceptor."); } status = HandlerUtils.GetStatusFromExceptionAndMergeTrailers(e, context.ResponseTrailers); } @@ -313,7 +313,7 @@ namespace Grpc.Core.Internal public IServerCallHandler Intercept(Interceptor interceptor) { - return this; // Do not intercept unimplemented services + return this; // Do not intercept unimplemented methods. } }