From 8c99479bc7bc90177357376207a9056857b4d7ce Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Mon, 5 Aug 2019 16:38:15 -0700
Subject: [PATCH] move ChannelExtensions to Grpc.Core.Api

---
 .../Interceptors/ChannelExtensions.cs                | 12 ++++++------
 src/csharp/Grpc.Core/ForwardedTypes.cs               |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename src/csharp/{Grpc.Core => Grpc.Core.Api}/Interceptors/ChannelExtensions.cs (87%)

diff --git a/src/csharp/Grpc.Core/Interceptors/ChannelExtensions.cs b/src/csharp/Grpc.Core.Api/Interceptors/ChannelExtensions.cs
similarity index 87%
rename from src/csharp/Grpc.Core/Interceptors/ChannelExtensions.cs
rename to src/csharp/Grpc.Core.Api/Interceptors/ChannelExtensions.cs
index c7d0c2472a1..fe3b516857e 100644
--- a/src/csharp/Grpc.Core/Interceptors/ChannelExtensions.cs
+++ b/src/csharp/Grpc.Core.Api/Interceptors/ChannelExtensions.cs
@@ -38,9 +38,9 @@ namespace Grpc.Core.Interceptors
         /// 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.
         /// </remarks>
-        public static CallInvoker Intercept(this Channel channel, Interceptor interceptor)
+        public static CallInvoker Intercept(this ChannelBase channel, Interceptor interceptor)
         {
-            return new DefaultCallInvoker(channel).Intercept(interceptor);
+            return channel.CreateCallInvoker().Intercept(interceptor);
         }
 
         /// <summary>
@@ -59,9 +59,9 @@ namespace Grpc.Core.Interceptors
         /// 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.
         /// </remarks>
-        public static CallInvoker Intercept(this Channel channel, params Interceptor[] interceptors)
+        public static CallInvoker Intercept(this ChannelBase channel, params Interceptor[] interceptors)
         {
-            return new DefaultCallInvoker(channel).Intercept(interceptors);
+            return channel.CreateCallInvoker().Intercept(interceptors);
         }
 
         /// <summary>
@@ -79,9 +79,9 @@ namespace Grpc.Core.Interceptors
         /// 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.
         /// </remarks>
-        public static CallInvoker Intercept(this Channel channel, Func<Metadata, Metadata> interceptor)
+        public static CallInvoker Intercept(this ChannelBase channel, Func<Metadata, Metadata> interceptor)
         {
-            return new DefaultCallInvoker(channel).Intercept(interceptor);
+            return channel.CreateCallInvoker().Intercept(interceptor);
         }
     }
 }
diff --git a/src/csharp/Grpc.Core/ForwardedTypes.cs b/src/csharp/Grpc.Core/ForwardedTypes.cs
index 4394a7c907c..eaf974c3356 100644
--- a/src/csharp/Grpc.Core/ForwardedTypes.cs
+++ b/src/csharp/Grpc.Core/ForwardedTypes.cs
@@ -38,6 +38,7 @@ using Grpc.Core.Utils;
 [assembly:TypeForwardedToAttribute(typeof(CallInvoker))]
 [assembly:TypeForwardedToAttribute(typeof(CallInvokerExtensions))]
 [assembly:TypeForwardedToAttribute(typeof(CallOptions))]
+[assembly:TypeForwardedToAttribute(typeof(ChannelExtensions))]
 [assembly:TypeForwardedToAttribute(typeof(ClientBase))]
 [assembly:TypeForwardedToAttribute(typeof(ClientBase<>))]
 [assembly:TypeForwardedToAttribute(typeof(ChannelCredentials))]