feat: Generate calls to GetEffectiveSettings in the client builder

This will allow API key support to be introduced through partial classes. Requires googleapis/gax-dotnet#732 to be merged and released.
jskeet · Jan 23, 2024 · 3a4b8d1 · 3a4b8d1
1 parent ee6046c
commit 3a4b8d1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Google.Api.Generator/Generation/ServiceBuilderCodeGenerator.cs b/Google.Api.Generator/Generation/ServiceBuilderCodeGenerator.cs
@@ -103,23 +103,27 @@ private MethodDeclarationSyntax BuildImpl()
         {
             var callInvoker = Local(_ctx.Type<CallInvoker>(), "callInvoker");
             var logger = Property(Public, _ctx.Type<ILogger>(), nameof(ClientBuilderBase<string>.Logger));
+            var settingsClone = IdentifierName("Settings").Call("Clone", conditional: true)();
+            var effectiveSettings = This.Call("GetEffectiveSettings")(settingsClone);
             return Method(Private, _ctx.Type(_svc.ClientAbstractTyp), "BuildImpl")()
                 .WithBody(
                     This.Call("Validate")(),
                     callInvoker.WithInitializer(This.Call("CreateCallInvoker")()),
-                    Return(_ctx.Type(_svc.ClientAbstractTyp).Call("Create")(callInvoker, Settings(), logger)));
+                    Return(_ctx.Type(_svc.ClientAbstractTyp).Call("Create")(callInvoker, effectiveSettings, logger)));
         }
 
         private MethodDeclarationSyntax BuildAsyncImpl()
         {
             var cancellationToken = Parameter(_ctx.Type<CancellationToken>(), "cancellationToken");
             var callInvoker = Local(_ctx.Type<CallInvoker>(), "callInvoker");
             var logger = Property(Public, _ctx.Type<ILogger>(), nameof(ClientBuilderBase<string>.Logger));
+            var settingsClone = IdentifierName("Settings").Call("Clone", conditional: true)();
+            var effectiveSettings = This.Call("GetEffectiveSettings")(settingsClone);
             return Method(Private | Async, _ctx.Type(Typ.Generic(typeof(Task<>), _svc.ClientAbstractTyp)), "BuildAsyncImpl")(cancellationToken)
                 .WithBody(
                     This.Call("Validate")(),
                     callInvoker.WithInitializer(Await(This.Call("CreateCallInvokerAsync")(cancellationToken).ConfigureAwait())),
-                    Return(_ctx.Type(_svc.ClientAbstractTyp).Call("Create")(callInvoker, Settings(), logger)));
+                    Return(_ctx.Type(_svc.ClientAbstractTyp).Call("Create")(callInvoker, effectiveSettings, logger)));
         }
 
         private MethodDeclarationSyntax GetChannelPool() =>