diff --git a/src/csharp/Grpc.Core/Interceptors/CallInvokerExtensions.cs b/src/csharp/Grpc.Core/Interceptors/CallInvokerExtensions.cs index 1c0831a242a..a01865cf2fc 100644 --- a/src/csharp/Grpc.Core/Interceptors/CallInvokerExtensions.cs +++ b/src/csharp/Grpc.Core/Interceptors/CallInvokerExtensions.cs @@ -28,123 +28,6 @@ namespace Grpc.Core.Interceptors /// public static class CallInvokerExtensions { - /// - /// Decorates an underlying to - /// intercept calls through a given interceptor. - /// - private class InterceptingCallInvoker : CallInvoker - { - readonly CallInvoker invoker; - readonly Interceptor interceptor; - - /// - /// Creates a new instance of - /// with the given underlying invoker and interceptor instances. - /// - public InterceptingCallInvoker(CallInvoker invoker, Interceptor interceptor) - { - this.invoker = GrpcPreconditions.CheckNotNull(invoker, "invoker"); - this.interceptor = GrpcPreconditions.CheckNotNull(interceptor, "interceptor"); - } - - /// - /// Intercepts a simple blocking call with the registered interceptor. - /// - public override TResponse BlockingUnaryCall(Method method, string host, CallOptions options, TRequest request) - { - return interceptor.BlockingUnaryCall( - request, - new ClientInterceptorContext(method, host, options), - (req, ctx) => invoker.BlockingUnaryCall(ctx.Method, ctx.Host, ctx.Options, req)); - } - - /// - /// Intercepts a simple asynchronous call with the registered interceptor. - /// - public override AsyncUnaryCall AsyncUnaryCall(Method method, string host, CallOptions options, TRequest request) - { - return interceptor.AsyncUnaryCall( - request, - new ClientInterceptorContext(method, host, options), - (req, ctx) => invoker.AsyncUnaryCall(ctx.Method, ctx.Host, ctx.Options, req)); - } - - /// - /// Intercepts an asynchronous server streaming call with the registered interceptor. - /// - public override AsyncServerStreamingCall AsyncServerStreamingCall(Method method, string host, CallOptions options, TRequest request) - { - return interceptor.AsyncServerStreamingCall( - request, - new ClientInterceptorContext(method, host, options), - (req, ctx) => invoker.AsyncServerStreamingCall(ctx.Method, ctx.Host, ctx.Options, req)); - } - - /// - /// Intercepts an asynchronous client streaming call with the registered interceptor. - /// - public override AsyncClientStreamingCall AsyncClientStreamingCall(Method method, string host, CallOptions options) - { - return interceptor.AsyncClientStreamingCall( - new ClientInterceptorContext(method, host, options), - ctx => invoker.AsyncClientStreamingCall(ctx.Method, ctx.Host, ctx.Options)); - } - - /// - /// Intercepts an asynchronous duplex streaming call with the registered interceptor. - /// - public override AsyncDuplexStreamingCall AsyncDuplexStreamingCall(Method method, string host, CallOptions options) - { - return interceptor.AsyncDuplexStreamingCall( - new ClientInterceptorContext(method, host, options), - ctx => invoker.AsyncDuplexStreamingCall(ctx.Method, ctx.Host, ctx.Options)); - } - } - - private class MetadataInterceptor : GenericInterceptor - { - readonly Func interceptor; - - /// - /// Creates a new instance of MetadataInterceptor given the specified interceptor function. - /// - public MetadataInterceptor(Func interceptor) - { - this.interceptor = GrpcPreconditions.CheckNotNull(interceptor, "interceptor"); - } - - protected override ClientCallHooks InterceptCall(ClientInterceptorContext context, bool clientStreaming, bool serverStreaming, TRequest request) - { - var metadata = context.Options.Headers ?? new Metadata(); - return new ClientCallHooks - { - ContextOverride = new ClientInterceptorContext(context.Method, context.Host, context.Options.WithHeaders(interceptor(metadata))), - }; - } - } - - /// - /// Returns a instance that intercepts - /// the invoker with the given interceptor. - /// - /// The underlying invoker to intercept. - /// - /// An interceptor delegate that takes the request metadata to be sent with an outgoing call - /// and returns a instance that will replace the existing - /// invocation metadata. - /// - /// - /// Multiple interceptors can be added on top of each other by calling - /// "invoker.Intercept(a, b, c)". The order of invocation will be "a", "b", and then "c". - /// Interceptors can be later added to an existing intercepted CallInvoker, effectively - /// building a chain like "invoker.Intercept(c).Intercept(b).Intercept(a)". Note that - /// in this case, the last interceptor added will be the first to take control. - /// - public static CallInvoker Intercept(this CallInvoker invoker, Func interceptor) - { - return new InterceptingCallInvoker(invoker, new MetadataInterceptor(interceptor)); - } - /// /// Returns a instance that intercepts /// the invoker with the given interceptor. @@ -191,5 +74,47 @@ namespace Grpc.Core.Interceptors return invoker; } + + /// + /// Returns a instance that intercepts + /// the invoker with the given interceptor. + /// + /// The underlying invoker to intercept. + /// + /// An interceptor delegate that takes the request metadata to be sent with an outgoing call + /// and returns a instance that will replace the existing + /// invocation metadata. + /// + /// + /// Multiple interceptors can be added on top of each other by + /// building a chain like "invoker.Intercept(c).Intercept(b).Intercept(a)". Note that + /// in this case, the last interceptor added will be the first to take control. + /// + public static CallInvoker Intercept(this CallInvoker invoker, Func interceptor) + { + return new InterceptingCallInvoker(invoker, new MetadataInterceptor(interceptor)); + } + + private class MetadataInterceptor : GenericInterceptor + { + readonly Func interceptor; + + /// + /// Creates a new instance of MetadataInterceptor given the specified interceptor function. + /// + public MetadataInterceptor(Func interceptor) + { + this.interceptor = GrpcPreconditions.CheckNotNull(interceptor, "interceptor"); + } + + protected override ClientCallHooks InterceptCall(ClientInterceptorContext context, bool clientStreaming, bool serverStreaming, TRequest request) + { + var metadata = context.Options.Headers ?? new Metadata(); + return new ClientCallHooks + { + ContextOverride = new ClientInterceptorContext(context.Method, context.Host, context.Options.WithHeaders(interceptor(metadata))), + }; + } + } } } diff --git a/src/csharp/Grpc.Core/Interceptors/InterceptingCallInvoker.cs b/src/csharp/Grpc.Core/Interceptors/InterceptingCallInvoker.cs new file mode 100644 index 00000000000..fb06523abba --- /dev/null +++ b/src/csharp/Grpc.Core/Interceptors/InterceptingCallInvoker.cs @@ -0,0 +1,96 @@ +#region Copyright notice and license + +// Copyright 2018 gRPC authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#endregion + +using System; +using Grpc.Core.Utils; + +namespace Grpc.Core.Interceptors +{ + /// + /// Decorates an underlying to + /// intercept calls through a given interceptor. + /// + internal class InterceptingCallInvoker : CallInvoker + { + readonly CallInvoker invoker; + readonly Interceptor interceptor; + + /// + /// Creates a new instance of + /// with the given underlying invoker and interceptor instances. + /// + public InterceptingCallInvoker(CallInvoker invoker, Interceptor interceptor) + { + this.invoker = GrpcPreconditions.CheckNotNull(invoker, "invoker"); + this.interceptor = GrpcPreconditions.CheckNotNull(interceptor, "interceptor"); + } + + /// + /// Intercepts a simple blocking call with the registered interceptor. + /// + public override TResponse BlockingUnaryCall(Method method, string host, CallOptions options, TRequest request) + { + return interceptor.BlockingUnaryCall( + request, + new ClientInterceptorContext(method, host, options), + (req, ctx) => invoker.BlockingUnaryCall(ctx.Method, ctx.Host, ctx.Options, req)); + } + + /// + /// Intercepts a simple asynchronous call with the registered interceptor. + /// + public override AsyncUnaryCall AsyncUnaryCall(Method method, string host, CallOptions options, TRequest request) + { + return interceptor.AsyncUnaryCall( + request, + new ClientInterceptorContext(method, host, options), + (req, ctx) => invoker.AsyncUnaryCall(ctx.Method, ctx.Host, ctx.Options, req)); + } + + /// + /// Intercepts an asynchronous server streaming call with the registered interceptor. + /// + public override AsyncServerStreamingCall AsyncServerStreamingCall(Method method, string host, CallOptions options, TRequest request) + { + return interceptor.AsyncServerStreamingCall( + request, + new ClientInterceptorContext(method, host, options), + (req, ctx) => invoker.AsyncServerStreamingCall(ctx.Method, ctx.Host, ctx.Options, req)); + } + + /// + /// Intercepts an asynchronous client streaming call with the registered interceptor. + /// + public override AsyncClientStreamingCall AsyncClientStreamingCall(Method method, string host, CallOptions options) + { + return interceptor.AsyncClientStreamingCall( + new ClientInterceptorContext(method, host, options), + ctx => invoker.AsyncClientStreamingCall(ctx.Method, ctx.Host, ctx.Options)); + } + + /// + /// Intercepts an asynchronous duplex streaming call with the registered interceptor. + /// + public override AsyncDuplexStreamingCall AsyncDuplexStreamingCall(Method method, string host, CallOptions options) + { + return interceptor.AsyncDuplexStreamingCall( + new ClientInterceptorContext(method, host, options), + ctx => invoker.AsyncDuplexStreamingCall(ctx.Method, ctx.Host, ctx.Options)); + } + } +}