feat: Refactor ClientHelper initialization to use ClientHelper.Options

(Test changes in next commit.)
googleapis · Mar 14, 2024 · 4ba6069 · 4ba6069
1 parent f689ab2
commit 4ba6069
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/Google.Api.Generator/Generation/ServiceImplClientClassGenerator.cs b/Google.Api.Generator/Generation/ServiceImplClientClassGenerator.cs
@@ -110,7 +110,7 @@ private MemberDeclarationSyntax CtorGrpcClient(PropertyDeclarationSyntax grpcCli
                 .WithBody(
                     grpcClientProperty.Assign(grpcClient),
                     effectiveSettings.WithInitializer(settings.NullCoalesce(_ctx.Type(_svc.SettingsTyp).Call("GetDefault")())),
-                    clientHelper.WithInitializer(New(_ctx.Type<ClientHelper>())(effectiveSettings, logger)),
+                    clientHelper.WithInitializer(ClientHelperInitializer()),
                     _svc.Methods.OfType<MethodDetails.StandardLro>().Select(m => StandardLroClient(m, logger)),
                     _svc.Methods.OfType<MethodDetails.NonStandardLro>().Select(m => NonStandardLroClient(m, logger)),
                     _svc.Mixins.Select(m => MixinClient(m, logger)),
@@ -124,6 +124,16 @@ private MemberDeclarationSyntax CtorGrpcClient(PropertyDeclarationSyntax grpcCli
                     XmlDoc.Param(logger, "Optional ", logger.Type, " to use within this client.")
                 );
 
+            object ClientHelperInitializer()
+            {
+                var assignments = new List<ObjectInitExpr>
+                {
+                    new(nameof(ClientHelper.Options.Settings), effectiveSettings),
+                    new(nameof(ClientHelper.Options.Logger), logger)
+                };
+                return New(_ctx.Type<ClientHelper>())(New(_ctx.Type<ClientHelper.Options>())().WithInitializer(assignments.ToArray()));
+            }
+
             SyntaxNode StandardLroClient(MethodDetails.StandardLro lro, ParameterSyntax logger)
             {
                 var lroOperationsClientProperty = Property(Public, _ctx.Type<OperationsClient>(), lro.LroClientName);