feat: Select the first GrpcAdapter that supports the API

googleapis · Apr 6, 2022 · cf2001e · cf2001e
1 parent 4f9f337
commit cf2001e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/Google.Api.Gax.Grpc.Tests/ClientBuilderBaseTest.DependencyInjection.cs b/Google.Api.Gax.Grpc.Tests/ClientBuilderBaseTest.DependencyInjection.cs
@@ -24,7 +24,7 @@ public partial class ClientBuilderBaseTest
         public class DependencyInjection
         {
             [Fact]
-            public void GrpcAdapter_NotSetBefore()
+            public void GrpcAdapter_NotSetBefore_SingleMatching()
             {
                 var serviceCollection = new ServiceCollection();
                 serviceCollection.AddGrpcNetClientAdapter();
@@ -33,6 +33,27 @@ public void GrpcAdapter_NotSetBefore()
                 Assert.IsType<GrpcNetClientAdapter>(builder.GrpcAdapter);
             }
 
+            [Fact]
+            public void GrpcAdapter_NotSetBefore_SingleNonMatching()
+            {
+                var serviceCollection = new ServiceCollection();
+                serviceCollection.AddRestGrpcAdapter();
+                var builder = new FakeBuilder();
+                builder.Configure(serviceCollection);
+                Assert.Null(builder.GrpcAdapter);
+            }
+
+            [Fact]
+            public void GrpcAdapter_NotSetBefore_MultipleFirstMatchUsed()
+            {
+                var serviceCollection = new ServiceCollection();
+                serviceCollection.AddRestGrpcAdapter();
+                serviceCollection.AddGrpcNetClientAdapter();
+                var builder = new FakeBuilder();
+                builder.Configure(serviceCollection);
+                Assert.IsType<GrpcNetClientAdapter>(builder.GrpcAdapter);
+            }
+
             [Fact]
             public void GrpcAdapter_SetBefore()
             {

diff --git a/Google.Api.Gax.Grpc/ClientBuilderBase.cs b/Google.Api.Gax.Grpc/ClientBuilderBase.cs
@@ -514,6 +514,10 @@ protected virtual GrpcChannelOptions GetChannelOptions()
         /// </summary>
         /// <remarks>
         /// <para>
+        /// If gRPC adapters are configured in <paramref name="provider"/>, the first one that supports
+        /// the <see cref="ServiceMetadata"/> will be used.
+        /// </para>
+        /// <para>
         /// Credentials are only requested from dependency injection if they are not already set
         /// via any of <see cref="ChannelCredentials"/>, <see cref="CredentialsPath"/>,
         /// <see cref="JsonCredentials"/>, <see cref="Credential"/>, <see cref="GoogleCredential"/>
@@ -539,8 +543,7 @@ protected virtual void Configure(IServiceProvider provider)
                 return;
             }
 
-            // TODO: Check for the concrete adapters as well, based on what is supported?
-            GrpcAdapter ??= provider.GetService<GrpcAdapter>();
+            GrpcAdapter ??= provider.GetServices<GrpcAdapter>().FirstOrDefault(adapter => adapter.SupportsApi(ServiceMetadata));
             GrpcChannelOptions ??= provider.GetService<GrpcChannelOptions>();
 
 #pragma warning disable CS0618 // Type or member is obsolete