fix: Include the final argument in method signatures transformed into…

… blocks (e.g. for pagination)
googleapis · Jul 24, 2024 · a2d7f8f · a2d7f8f
1 parent ce8c0fe
commit a2d7f8f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/Google.Api.Generator.Tests/ProtoTests/Paginated/Testing.Paginated/PaginatedClient.g.cs b/Google.Api.Generator.Tests/ProtoTests/Paginated/Testing.Paginated/PaginatedClient.g.cs
@@ -80,7 +80,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return SignatureMethod(request);
+            return SignatureMethod(request, callSettings);
         }
 
         /// <summary>
@@ -115,7 +115,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return SignatureMethodAsync(request);
+            return SignatureMethodAsync(request, callSettings);
         }
 
         /// <summary>
@@ -147,7 +147,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return SignatureMethod(request);
+            return SignatureMethod(request, callSettings);
         }
 
         /// <summary>
@@ -179,7 +179,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return SignatureMethodAsync(request);
+            return SignatureMethodAsync(request, callSettings);
         }
 
         /// <summary>
@@ -206,7 +206,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return SignatureMethod(request);
+            return SignatureMethod(request, callSettings);
         }
 
         /// <summary>
@@ -233,7 +233,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return SignatureMethodAsync(request);
+            return SignatureMethodAsync(request, callSettings);
         }
 
         /// <summary>
@@ -301,7 +301,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return ResourcedMethod(request);
+            return ResourcedMethod(request, callSettings);
         }
 
         /// <summary>
@@ -331,7 +331,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return ResourcedMethodAsync(request);
+            return ResourcedMethodAsync(request, callSettings);
         }
 
         /// <summary>
@@ -361,7 +361,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return ResourcedMethod(request);
+            return ResourcedMethod(request, callSettings);
         }
 
         /// <summary>
@@ -391,7 +391,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return ResourcedMethodAsync(request);
+            return ResourcedMethodAsync(request, callSettings);
         }
 
         /// <summary>
@@ -427,7 +427,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return ResourcedMethod(request);
+            return ResourcedMethod(request, callSettings);
         }
 
         /// <summary>
@@ -463,7 +463,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return ResourcedMethodAsync(request);
+            return ResourcedMethodAsync(request, callSettings);
         }
 
         /// <summary>
@@ -499,7 +499,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return ResourcedMethod(request);
+            return ResourcedMethod(request, callSettings);
         }
 
         /// <summary>
@@ -535,7 +535,7 @@ public abstract class PaginatedClient
             {
                 request.PageSize = pageSize.Value;
             }
-            return ResourcedMethodAsync(request);
+            return ResourcedMethodAsync(request, callSettings);
         }
         // TEST_END
     }

diff --git a/Google.Api.Generator.Tests/ProtoTests/Showcase/Google.Showcase.V1Beta1/MessagingClient.g.cs b/Google.Api.Generator.Tests/ProtoTests/Showcase/Google.Showcase.V1Beta1/MessagingClient.g.cs
@@ -1386,7 +1386,7 @@ public virtual void DeleteBlurb(BlurbName name, gaxgrpc::CallSettings callSettin
             {
                 request.PageSize = pageSize.Value;
             }
-            return ListBlurbs(request);
+            return ListBlurbs(request, callSettings);
         }
 
         /// <summary>
@@ -1420,7 +1420,7 @@ public virtual void DeleteBlurb(BlurbName name, gaxgrpc::CallSettings callSettin
             {
                 request.PageSize = pageSize.Value;
             }
-            return ListBlurbsAsync(request);
+            return ListBlurbsAsync(request, callSettings);
         }
 
         /// <summary>
@@ -1454,7 +1454,7 @@ public virtual void DeleteBlurb(BlurbName name, gaxgrpc::CallSettings callSettin
             {
                 request.PageSize = pageSize.Value;
             }
-            return ListBlurbs(request);
+            return ListBlurbs(request, callSettings);
         }
 
         /// <summary>
@@ -1488,7 +1488,7 @@ public virtual void DeleteBlurb(BlurbName name, gaxgrpc::CallSettings callSettin
             {
                 request.PageSize = pageSize.Value;
             }
-            return ListBlurbsAsync(request);
+            return ListBlurbsAsync(request, callSettings);
         }
 
         /// <summary>

diff --git a/Google.Api.Generator/Generation/ServiceMethodGenerator.Signatures.cs b/Google.Api.Generator/Generation/ServiceMethodGenerator.Signatures.cs
@@ -183,7 +183,7 @@ private MethodDeclarationSyntax AbstractRequestMethod(bool sync, bool callSettin
                             var type = Ctx.Type(MethodDetails.RequestTyp);
                             var request = Local(Ctx.Type(MethodDetails.RequestTyp), "request").WithInitializer(newRequest);
                             var statements = requestBlock(request);
-                            block = new[] { request }.Concat(statements).Append(Return(This.Call(methodName)(request))).ToArray();
+                            block = new[] { request }.Concat(statements).Append(Return(This.Call(methodName)(request, finalParam))).ToArray();
                         }
                         var method = Method(Public | Virtual, Ctx.Type(returnTyp), methodName)(parameters.Select(x => x.Parameter).Append(finalParam).ToArray())
                                 .MaybeWithAttribute(MethodDetails.IsDeprecated || _sig.HasDeprecatedField, () => Ctx.Type<ObsoleteAttribute>())()