Make GenericInterceptor internal for now

Also change `*Arbitrator` to `*Hooks`.

2 files changed, 10 insertions, 13 deletions

diff --git a/src/csharp/Grpc.Core.Tests/Interceptors/ClientInterceptorTest.cs b/src/csharp/Grpc.Core.Tests/Interceptors/ClientInterceptorTest.cs
index ca7677c41f..0ec2d848f0 100644
--- a/src/csharp/Grpc.Core.Tests/Interceptors/ClientInterceptorTest.cs
+++ b/src/csharp/Grpc.Core.Tests/Interceptors/ClientInterceptorTest.cs
@@ -71,17 +71,14 @@ namespace Grpc.Core.Interceptors.Tests
             var stringBuilder = new StringBuilder();
             var callInvoker = helper.GetChannel().Intercept(metadata =>
             {
-                metadata = metadata ?? new Metadata();
                 stringBuilder.Append("interceptor1");
                 return metadata;
             }).Intercept(metadata =>
             {
-                metadata = metadata ?? new Metadata();
                 stringBuilder.Append("interceptor2");
                 return metadata;
             }).Intercept(metadata =>
             {
-                metadata = metadata ?? new Metadata();
                 stringBuilder.Append("interceptor3");
                 return metadata;
             });
@@ -91,14 +88,14 @@ namespace Grpc.Core.Interceptors.Tests
 
         private class CountingInterceptor : GenericInterceptor
         {
-            protected override ClientCallArbitrator<TRequest, TResponse> InterceptCall<TRequest, TResponse>(ClientInterceptorContext<TRequest, TResponse> context, bool clientStreaming, bool serverStreaming, TRequest request)
+            protected override ClientCallHooks<TRequest, TResponse> InterceptCall<TRequest, TResponse>(ClientInterceptorContext<TRequest, TResponse> context, bool clientStreaming, bool serverStreaming, TRequest request)
             {
                 if (!clientStreaming)
                 {
                     return null;
                 }
                 int counter = 0;
-                return new ClientCallArbitrator<TRequest, TResponse>
+                return new ClientCallHooks<TRequest, TResponse>
                 {
                     OnRequestMessage = m => { counter++; return m; },
                     OnUnaryResponse = x => (TResponse)(object)counter.ToString()  // Cast to object first is needed to satisfy the type-checker
@@ -112,14 +109,14 @@ namespace Grpc.Core.Interceptors.Tests
             var helper = new MockServiceHelper(Host);
             helper.ClientStreamingHandler = new ClientStreamingServerMethod<string, string>(async (requestStream, context) =>
             {
-                string result = "";
-                await requestStream.ForEachAsync((request) =>
+                var stringBuilder = new StringBuilder();
+                await requestStream.ForEachAsync(request =>
                 {
-                    result += request;
+                    stringBuilder.Append(request);
                     return TaskUtils.CompletedTask;
                 });
                 await Task.Delay(100);
-                return result;
+                return stringBuilder.ToString();
             });
 
             var callInvoker = helper.GetChannel().Intercept(new CountingInterceptor());
diff --git a/src/csharp/Grpc.Core.Tests/Interceptors/ServerInterceptorTest.cs b/src/csharp/Grpc.Core.Tests/Interceptors/ServerInterceptorTest.cs
index fbace51db5..57dd68b1eb 100644
--- a/src/csharp/Grpc.Core.Tests/Interceptors/ServerInterceptorTest.cs
+++ b/src/csharp/Grpc.Core.Tests/Interceptors/ServerInterceptorTest.cs
@@ -44,10 +44,10 @@ namespace Grpc.Core.Interceptors.Tests
                 this.header = new Metadata.Entry(key, value);
             }
 
-            protected override Task<ServerCallArbitrator<TRequest, TResponse>> InterceptHandler<TRequest, TResponse>(ServerCallContext context, bool clientStreaming, bool serverStreaming, TRequest request)
+            protected override Task<ServerCallHooks<TRequest, TResponse>> InterceptHandler<TRequest, TResponse>(ServerCallContext context, bool clientStreaming, bool serverStreaming, TRequest request)
             {
                 context.RequestHeaders.Add(header);
-                return Task.FromResult<ServerCallArbitrator<TRequest, TResponse>>(null);
+                return Task.FromResult<ServerCallHooks<TRequest, TResponse>>(null);
             }
 
             public Metadata.Entry Header
@@ -87,10 +87,10 @@ namespace Grpc.Core.Interceptors.Tests
                 this.action = action;
             }
 
-            protected override Task<ServerCallArbitrator<TRequest, TResponse>> InterceptHandler<TRequest, TResponse>(ServerCallContext context, bool clientStreaming, bool serverStreaming, TRequest request)
+            protected override Task<ServerCallHooks<TRequest, TResponse>> InterceptHandler<TRequest, TResponse>(ServerCallContext context, bool clientStreaming, bool serverStreaming, TRequest request)
             {
                 action();
-                return Task.FromResult<ServerCallArbitrator<TRequest, TResponse>>(null);
+                return Task.FromResult<ServerCallHooks<TRequest, TResponse>>(null);
             }
         }