From 6cd19656e0abb7bdcf744ec6d0a9a845bd308f9e Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 17:47:54 -0800 Subject: [PATCH 01/11] Implement pure rpc sample code --- .../logging/LoggingServiceV2Client.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java index a30d2a5f9e..004a809770 100644 --- a/test/integration/goldens/logging/LoggingServiceV2Client.java +++ b/test/integration/goldens/logging/LoggingServiceV2Client.java @@ -78,7 +78,7 @@ * 
{@code
  * LoggingServiceV2Settings loggingServiceV2Settings =
  *     LoggingServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
  *         .build();
  * LoggingServiceV2Client loggingServiceV2Client =
  *     LoggingServiceV2Client.create(loggingServiceV2Settings);
@@ -88,7 +88,7 @@
  *
  * 
{@code
  * LoggingServiceV2Settings loggingServiceV2Settings =
- *     LoggingServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
+ *     LoggingServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
  * LoggingServiceV2Client loggingServiceV2Client =
  *     LoggingServiceV2Client.create(loggingServiceV2Settings);
  * }

@@ -157,7 +157,7 @@ public LoggingServiceV2Stub getStub() {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   LogName log_name = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
+   *   String log_name = "log_name2013526694";
    *   Empty response = loggingServiceV2Client.DeleteLog(log_name);
    * }
    * }

@@ -216,7 +216,7 @@ public final Empty deleteLog(String logName) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -250,7 +250,7 @@ public final UnaryCallable deleteLogCallable() {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   LogName log_name = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
+   *   String log_name = "log_name2013526694";
    *   MonitoredResource resource = MonitoredResource.newBuilder().build();
    *   Map labels = new HashMap<>();
    *   List entries = new ArrayList<>();
@@ -400,7 +400,7 @@ public final WriteLogEntriesResponse writeLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -435,7 +435,7 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -478,7 +478,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -523,7 +523,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -568,7 +568,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -594,7 +594,7 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -620,7 +620,7 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -646,7 +646,7 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -672,7 +672,7 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -695,7 +695,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }

    *

From 5411d6a85a46e18029a7d2502a1edd0095ae38c8 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 20:28:36 -0800
Subject: [PATCH 02/11] refactor unary rpc method

---
 .../composer/SampleCodeHelperComposer.java    |  1 +
 .../goldens/asset/AssetServiceClient.java     | 30 +++---
 .../logging/ConfigServiceV2Client.java        | 94 +++++++++----------
 .../logging/LoggingServiceV2Client.java       | 22 ++---
 .../logging/MetricsServiceV2Client.java       | 26 ++---
 .../goldens/redis/CloudRedisClient.java       | 50 +++++-----
 6 files changed, 112 insertions(+), 111 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index a445764f90..f286aafc8f 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -20,6 +20,7 @@
 import com.google.api.generator.engine.ast.ExprStatement;
 import com.google.api.generator.engine.ast.LineComment;
 import com.google.api.generator.engine.ast.MethodInvocationExpr;
+import com.google.api.generator.engine.ast.Statement;
 import com.google.api.generator.engine.ast.TryCatchStatement;
 import com.google.api.generator.engine.ast.TypeNode;
 import com.google.api.generator.engine.ast.Variable;
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index 927fe90488..fb2d2b2181 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -78,7 +78,7 @@
  * 
{@code
  * AssetServiceSettings assetServiceSettings =
  *     AssetServiceSettings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
  *         .build();
  * AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings);
  * }

@@ -87,7 +87,7 @@
  *
  * 
{@code
  * AssetServiceSettings assetServiceSettings =
- *     AssetServiceSettings.newBuilder().setEndpoint(myEndpoint).build();
+ *     AssetServiceSettings.newBuilder().setEndpoint("myEndpoint").build();
  * AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings);
  * }

  */
@@ -170,7 +170,7 @@ public final OperationsClient getOperationsClient() {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -229,7 +229,7 @@ public final UnaryCallable exportAssetsCallable(
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -288,7 +288,7 @@ public final Feed createFeed(String parent) {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -317,7 +317,7 @@ public final UnaryCallable createFeedCallable() {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]");
+   *   String name = "name3373707";
    *   Feed response = assetServiceClient.GetFeed(name);
    * }
    * }

@@ -364,7 +364,7 @@ public final Feed getFeed(String name) {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -416,7 +416,7 @@ public final ListFeedsResponse listFeeds(String parent) {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -468,7 +468,7 @@ public final Feed updateFeed(Feed feed) {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -497,7 +497,7 @@ public final UnaryCallable updateFeedCallable() {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]");
+   *   String name = "name3373707";
    *   Empty response = assetServiceClient.DeleteFeed(name);
    * }
    * }

@@ -546,7 +546,7 @@ public final Empty deleteFeed(String name) {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -577,7 +577,7 @@ public final UnaryCallable deleteFeedCallable() {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -651,7 +651,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -699,7 +699,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -757,7 +757,7 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(String scope
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 4d284b0150..4706c5b199 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -76,7 +76,7 @@
  * 
{@code
  * ConfigServiceV2Settings configServiceV2Settings =
  *     ConfigServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
  *         .build();
  * ConfigServiceV2Client configServiceV2Client =
  *     ConfigServiceV2Client.create(configServiceV2Settings);
@@ -86,7 +86,7 @@
  *
  * 
{@code
  * ConfigServiceV2Settings configServiceV2Settings =
- *     ConfigServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
+ *     ConfigServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
  * ConfigServiceV2Client configServiceV2Client =
  *     ConfigServiceV2Client.create(configServiceV2Settings);
  * }

@@ -153,7 +153,7 @@ public ConfigServiceV2Stub getStub() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -182,7 +182,7 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -211,7 +211,7 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -240,7 +240,7 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -269,7 +269,7 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -295,7 +295,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -335,7 +335,7 @@ public final UnaryCallable listBucketsC
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -373,7 +373,7 @@ public final UnaryCallable getBucketCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -411,7 +411,7 @@ public final UnaryCallable updateBucketCallable(
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -436,7 +436,7 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -461,7 +461,7 @@ public final ListSinksPagedResponse listSinks(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -486,7 +486,7 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -511,7 +511,7 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -533,7 +533,7 @@ public final ListSinksPagedResponse listSinks(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -572,7 +572,7 @@ public final UnaryCallable listSinksCallabl
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
+   *   String sink_name = "sink_name-1391757129";
    *   LogSink response = configServiceV2Client.GetSink(sink_name);
    * }
    * }

@@ -627,7 +627,7 @@ public final LogSink getSink(String sinkName) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -659,7 +659,7 @@ public final UnaryCallable getSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
+   *   String parent = "parent-995424086";
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -693,7 +693,7 @@ public final LogSink createSink(BillingAccountName parent, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   FolderName parent = FolderName.of("[FOLDER]");
+   *   String parent = "parent-995424086";
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -727,7 +727,7 @@ public final LogSink createSink(FolderName parent, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
+   *   String parent = "parent-995424086";
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -761,7 +761,7 @@ public final LogSink createSink(OrganizationName parent, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   String parent = "parent-995424086";
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -826,7 +826,7 @@ public final LogSink createSink(String parent, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -862,7 +862,7 @@ public final UnaryCallable createSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
+   *   String sink_name = "sink_name-1391757129";
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink);
    * }
@@ -935,7 +935,7 @@ public final LogSink updateSink(String sinkName, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
+   *   String sink_name = "sink_name-1391757129";
    *   LogSink sink = LogSink.newBuilder().build();
    *   FieldMask update_mask = FieldMask.newBuilder().build();
    *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink, update_mask);
@@ -1033,7 +1033,7 @@ public final LogSink updateSink(String sinkName, LogSink sink, FieldMask updateM
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1067,7 +1067,7 @@ public final UnaryCallable updateSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
+   *   String sink_name = "sink_name-1391757129";
    *   Empty response = configServiceV2Client.DeleteSink(sink_name);
    * }
    * }

@@ -1126,7 +1126,7 @@ public final Empty deleteSink(String sinkName) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1156,7 +1156,7 @@ public final UnaryCallable deleteSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -1181,7 +1181,7 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -1206,7 +1206,7 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -1231,7 +1231,7 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent)
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -1256,7 +1256,7 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -1278,7 +1278,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -1319,7 +1319,7 @@ public final ListExclusionsPagedResponse listExclusions(ListExclusionsRequest re
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
+   *   String name = "name3373707";
    *   LogExclusion response = configServiceV2Client.GetExclusion(name);
    * }
    * }

@@ -1374,7 +1374,7 @@ public final LogExclusion getExclusion(String name) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1404,7 +1404,7 @@ public final UnaryCallable getExclusionCallab
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
+   *   String parent = "parent-995424086";
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1436,7 +1436,7 @@ public final LogExclusion createExclusion(BillingAccountName parent, LogExclusio
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   FolderName parent = FolderName.of("[FOLDER]");
+   *   String parent = "parent-995424086";
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1468,7 +1468,7 @@ public final LogExclusion createExclusion(FolderName parent, LogExclusion exclus
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
+   *   String parent = "parent-995424086";
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1500,7 +1500,7 @@ public final LogExclusion createExclusion(OrganizationName parent, LogExclusion
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   String parent = "parent-995424086";
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1561,7 +1561,7 @@ public final LogExclusion createExclusion(String parent, LogExclusion exclusion)
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1591,7 +1591,7 @@ public final UnaryCallable createExclusion
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
+   *   String name = "name3373707";
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   FieldMask update_mask = FieldMask.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.UpdateExclusion(name, exclusion, update_mask);
@@ -1675,7 +1675,7 @@ public final LogExclusion updateExclusion(
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1704,7 +1704,7 @@ public final UnaryCallable updateExclusion
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
+   *   String name = "name3373707";
    *   Empty response = configServiceV2Client.DeleteExclusion(name);
    * }
    * }

@@ -1759,7 +1759,7 @@ public final Empty deleteExclusion(String name) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1794,7 +1794,7 @@ public final UnaryCallable deleteExclusionCallabl
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1840,7 +1840,7 @@ public final UnaryCallable getCmekSettings
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 004a809770..d6349aa8ce 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -216,7 +216,7 @@ public final Empty deleteLog(String logName) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -400,7 +400,7 @@ public final WriteLogEntriesResponse writeLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -435,7 +435,7 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -478,7 +478,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -523,7 +523,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -568,7 +568,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -594,7 +594,7 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -620,7 +620,7 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -646,7 +646,7 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -672,7 +672,7 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -695,7 +695,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index b5295fbde0..cd42065382 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -75,7 +75,7 @@
  * 
{@code
  * MetricsServiceV2Settings metricsServiceV2Settings =
  *     MetricsServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
  *         .build();
  * MetricsServiceV2Client metricsServiceV2Client =
  *     MetricsServiceV2Client.create(metricsServiceV2Settings);
@@ -85,7 +85,7 @@
  *
  * 
{@code
  * MetricsServiceV2Settings metricsServiceV2Settings =
- *     MetricsServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
+ *     MetricsServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
  * MetricsServiceV2Client metricsServiceV2Client =
  *     MetricsServiceV2Client.create(metricsServiceV2Settings);
  * }

@@ -152,7 +152,7 @@ public MetricsServiceV2Stub getStub() {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -176,7 +176,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -197,7 +197,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -238,7 +238,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   String metric_name = "metric_name-1737602118";
    *   LogMetric response = metricsServiceV2Client.GetLogMetric(metric_name);
    * }
    * }

@@ -286,7 +286,7 @@ public final LogMetric getLogMetric(String metricName) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -315,7 +315,7 @@ public final UnaryCallable getLogMetricCallable(
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   String parent = "parent-995424086";
    *   LogMetric metric = LogMetric.newBuilder().build();
    *   LogMetric response = metricsServiceV2Client.CreateLogMetric(parent, metric);
    * }
@@ -372,7 +372,7 @@ public final LogMetric createLogMetric(String parent, LogMetric metric) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -401,7 +401,7 @@ public final UnaryCallable createLogMetricCal
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   String metric_name = "metric_name-1737602118";
    *   LogMetric metric = LogMetric.newBuilder().build();
    *   LogMetric response = metricsServiceV2Client.UpdateLogMetric(metric_name, metric);
    * }
@@ -460,7 +460,7 @@ public final LogMetric updateLogMetric(String metricName, LogMetric metric) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -489,7 +489,7 @@ public final UnaryCallable updateLogMetricCal
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   String metric_name = "metric_name-1737602118";
    *   Empty response = metricsServiceV2Client.DeleteLogMetric(metric_name);
    * }
    * }

@@ -537,7 +537,7 @@ public final Empty deleteLogMetric(String metricName) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 2684febe00..ec803709ce 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -98,7 +98,7 @@
  * 
{@code
  * CloudRedisSettings cloudRedisSettings =
  *     CloudRedisSettings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
  *         .build();
  * CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
  * }

@@ -107,7 +107,7 @@
  *
  * 
{@code
  * CloudRedisSettings cloudRedisSettings =
- *     CloudRedisSettings.newBuilder().setEndpoint(myEndpoint).build();
+ *     CloudRedisSettings.newBuilder().setEndpoint("myEndpoint").build();
  * CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
  * }

  */
@@ -192,7 +192,7 @@ public final OperationsClient getOperationsClient() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -226,7 +226,7 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -257,7 +257,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -317,7 +317,7 @@ public final UnaryCallable listInst
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   String name = "name3373707";
    *   Instance response = cloudRedisClient.GetInstance(name);
    * }
    * }

@@ -366,7 +366,7 @@ public final Instance getInstance(String name) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -406,7 +406,7 @@ public final UnaryCallable getInstanceCallable() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -455,7 +455,7 @@ public final OperationFuture createInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -504,7 +504,7 @@ public final OperationFuture createInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -571,7 +571,7 @@ public final UnaryCallable createInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -601,7 +601,7 @@ public final OperationFuture updateInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -650,7 +650,7 @@ public final UnaryCallable updateInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -678,7 +678,7 @@ public final OperationFuture upgradeInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -703,7 +703,7 @@ public final OperationFuture upgradeInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -750,7 +750,7 @@ public final UnaryCallable upgradeInstanceCal
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -781,7 +781,7 @@ public final OperationFuture importInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -839,7 +839,7 @@ public final UnaryCallable importInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -869,7 +869,7 @@ public final OperationFuture exportInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -921,7 +921,7 @@ public final UnaryCallable exportInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -951,7 +951,7 @@ public final OperationFuture failoverInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -981,7 +981,7 @@ public final OperationFuture failoverInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -1024,7 +1024,7 @@ public final UnaryCallable failoverInstanceC
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -1049,7 +1049,7 @@ public final OperationFuture deleteInstanceAsync(Insta
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -1071,7 +1071,7 @@ public final OperationFuture deleteInstanceAsync(Strin
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *

From fdae55e46e15431f3955986665d294556ee9db7d Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 21:01:35 -0800
Subject: [PATCH 03/11] fix revert changed

---
 .../goldens/asset/AssetServiceClient.java        |  6 +++---
 .../goldens/logging/ConfigServiceV2Client.java   |  6 +++---
 .../goldens/logging/LoggingServiceV2Client.java  |  6 +++---
 .../goldens/logging/MetricsServiceV2Client.java  |  2 +-
 .../goldens/redis/CloudRedisClient.java          | 16 ++++++++--------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index fb2d2b2181..14792aeb80 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -170,7 +170,7 @@ public final OperationsClient getOperationsClient() {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -651,7 +651,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -757,7 +757,7 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(String scope
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 4706c5b199..827ebda1e6 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -295,7 +295,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -533,7 +533,7 @@ public final ListSinksPagedResponse listSinks(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -1278,7 +1278,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index d6349aa8ce..3385101e0d 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -478,7 +478,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -523,7 +523,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -695,7 +695,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index cd42065382..a9b8789f75 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -197,7 +197,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index ec803709ce..3f3d444812 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -257,7 +257,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -504,7 +504,7 @@ public final OperationFuture createInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -601,7 +601,7 @@ public final OperationFuture updateInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -703,7 +703,7 @@ public final OperationFuture upgradeInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -781,7 +781,7 @@ public final OperationFuture importInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -869,7 +869,7 @@ public final OperationFuture exportInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -981,7 +981,7 @@ public final OperationFuture failoverInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -1071,7 +1071,7 @@ public final OperationFuture deleteInstanceAsync(Strin
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *

From 86805b57a567e1d65409662555d1cf30430d9b53 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 23:46:34 -0800
Subject: [PATCH 04/11] refactor signature pass Map
 resourceNames

---
 .../goldens/asset/AssetServiceClient.java     |  4 +--
 .../logging/ConfigServiceV2Client.java        | 30 +++++++++----------
 .../logging/LoggingServiceV2Client.java       |  4 +--
 .../logging/MetricsServiceV2Client.java       |  8 ++---
 .../goldens/redis/CloudRedisClient.java       |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index 14792aeb80..c086f9a693 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -317,7 +317,7 @@ public final UnaryCallable createFeedCallable() {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   String name = "name3373707";
+   *   FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]");
    *   Feed response = assetServiceClient.GetFeed(name);
    * }
    * }

@@ -497,7 +497,7 @@ public final UnaryCallable updateFeedCallable() {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   String name = "name3373707";
+   *   FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]");
    *   Empty response = assetServiceClient.DeleteFeed(name);
    * }
    * }

diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 827ebda1e6..ed28beeef0 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -572,7 +572,7 @@ public final UnaryCallable listSinksCallabl
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink response = configServiceV2Client.GetSink(sink_name);
    * }
    * }

@@ -659,7 +659,7 @@ public final UnaryCallable getSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -693,7 +693,7 @@ public final LogSink createSink(BillingAccountName parent, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   FolderName parent = FolderName.of("[FOLDER]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -727,7 +727,7 @@ public final LogSink createSink(FolderName parent, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -761,7 +761,7 @@ public final LogSink createSink(OrganizationName parent, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
@@ -862,7 +862,7 @@ public final UnaryCallable createSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink);
    * }
@@ -935,7 +935,7 @@ public final LogSink updateSink(String sinkName, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   LogSink sink = LogSink.newBuilder().build();
    *   FieldMask update_mask = FieldMask.newBuilder().build();
    *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink, update_mask);
@@ -1067,7 +1067,7 @@ public final UnaryCallable updateSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String sink_name = "sink_name-1391757129";
+   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
    *   Empty response = configServiceV2Client.DeleteSink(sink_name);
    * }
    * }

@@ -1319,7 +1319,7 @@ public final ListExclusionsPagedResponse listExclusions(ListExclusionsRequest re
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String name = "name3373707";
+   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
    *   LogExclusion response = configServiceV2Client.GetExclusion(name);
    * }
    * }

@@ -1404,7 +1404,7 @@ public final UnaryCallable getExclusionCallab
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1436,7 +1436,7 @@ public final LogExclusion createExclusion(BillingAccountName parent, LogExclusio
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   FolderName parent = FolderName.of("[FOLDER]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1468,7 +1468,7 @@ public final LogExclusion createExclusion(FolderName parent, LogExclusion exclus
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1500,7 +1500,7 @@ public final LogExclusion createExclusion(OrganizationName parent, LogExclusion
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
@@ -1591,7 +1591,7 @@ public final UnaryCallable createExclusion
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String name = "name3373707";
+   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
    *   LogExclusion exclusion = LogExclusion.newBuilder().build();
    *   FieldMask update_mask = FieldMask.newBuilder().build();
    *   LogExclusion response = configServiceV2Client.UpdateExclusion(name, exclusion, update_mask);
@@ -1704,7 +1704,7 @@ public final UnaryCallable updateExclusion
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String name = "name3373707";
+   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
    *   Empty response = configServiceV2Client.DeleteExclusion(name);
    * }
    * }

diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 3385101e0d..9309a543a7 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -157,7 +157,7 @@ public LoggingServiceV2Stub getStub() {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String log_name = "log_name2013526694";
+   *   LogName log_name = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
    *   Empty response = loggingServiceV2Client.DeleteLog(log_name);
    * }
    * }

@@ -250,7 +250,7 @@ public final UnaryCallable deleteLogCallable() {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String log_name = "log_name2013526694";
+   *   LogName log_name = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
    *   MonitoredResource resource = MonitoredResource.newBuilder().build();
    *   Map labels = new HashMap<>();
    *   List entries = new ArrayList<>();
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index a9b8789f75..f072ec6551 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -238,7 +238,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   String metric_name = "metric_name-1737602118";
+   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
    *   LogMetric response = metricsServiceV2Client.GetLogMetric(metric_name);
    * }
    * }

@@ -315,7 +315,7 @@ public final UnaryCallable getLogMetricCallable(
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   LogMetric metric = LogMetric.newBuilder().build();
    *   LogMetric response = metricsServiceV2Client.CreateLogMetric(parent, metric);
    * }
@@ -401,7 +401,7 @@ public final UnaryCallable createLogMetricCal
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   String metric_name = "metric_name-1737602118";
+   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
    *   LogMetric metric = LogMetric.newBuilder().build();
    *   LogMetric response = metricsServiceV2Client.UpdateLogMetric(metric_name, metric);
    * }
@@ -489,7 +489,7 @@ public final UnaryCallable updateLogMetricCal
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   String metric_name = "metric_name-1737602118";
+   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
    *   Empty response = metricsServiceV2Client.DeleteLogMetric(metric_name);
    * }
    * }

diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 3f3d444812..cf6045a524 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -317,7 +317,7 @@ public final UnaryCallable listInst
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String name = "name3373707";
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
    *   Instance response = cloudRedisClient.GetInstance(name);
    * }
    * }


From 045430aae18204841609f2f5909c869bd849b682 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 18:13:45 -0800
Subject: [PATCH 05/11] Implement paged unary rpc method' sample code

---
 .../logging/ConfigServiceV2Client.java        | 120 +++++++++++++-----
 .../logging/LoggingServiceV2Client.java       |  48 +++++--
 .../logging/MetricsServiceV2Client.java       |  22 +++-
 .../goldens/redis/CloudRedisClient.java       |  52 ++++----
 4 files changed, 172 insertions(+), 70 deletions(-)

diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index ed28beeef0..638f4b6578 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -153,7 +153,11 @@ public ConfigServiceV2Stub getStub() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -182,7 +186,11 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -211,7 +219,11 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -240,7 +252,11 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -269,7 +285,11 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -295,7 +315,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -335,7 +355,7 @@ public final UnaryCallable listBucketsC
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -373,7 +393,7 @@ public final UnaryCallable getBucketCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -411,7 +431,11 @@ public final UnaryCallable updateBucketCallable(
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -436,7 +460,11 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -461,7 +489,11 @@ public final ListSinksPagedResponse listSinks(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -486,7 +518,11 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -511,7 +547,11 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -533,7 +573,7 @@ public final ListSinksPagedResponse listSinks(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -627,7 +667,7 @@ public final LogSink getSink(String sinkName) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -826,7 +866,7 @@ public final LogSink createSink(String parent, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1033,7 +1073,7 @@ public final LogSink updateSink(String sinkName, LogSink sink, FieldMask updateM
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1126,7 +1166,7 @@ public final Empty deleteSink(String sinkName) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1156,7 +1196,11 @@ public final UnaryCallable deleteSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -1181,7 +1225,11 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -1206,7 +1254,11 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -1231,7 +1283,11 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent)
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -1256,7 +1312,11 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -1278,7 +1338,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -1374,7 +1434,7 @@ public final LogExclusion getExclusion(String name) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1561,7 +1621,7 @@ public final LogExclusion createExclusion(String parent, LogExclusion exclusion)
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1675,7 +1735,7 @@ public final LogExclusion updateExclusion(
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1759,7 +1819,7 @@ public final Empty deleteExclusion(String name) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1794,7 +1854,7 @@ public final UnaryCallable deleteExclusionCallabl
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1840,7 +1900,7 @@ public final UnaryCallable getCmekSettings
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 9309a543a7..265182a20f 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -216,7 +216,7 @@ public final Empty deleteLog(String logName) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -400,7 +400,7 @@ public final WriteLogEntriesResponse writeLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -435,7 +435,13 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   List resource_names = new ArrayList<>();
+   *   String filter = "filter-1274492040";
+   *   String order_by = "order_by1234304744";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       LoggingServiceV2Client.ListLogEntries(resource_names, filter, order_by).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -478,7 +484,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -523,7 +529,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -568,7 +574,11 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -594,7 +604,11 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -620,7 +634,11 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -646,7 +664,11 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -672,7 +694,11 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -695,7 +721,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index f072ec6551..94716c7cb2 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -152,7 +152,11 @@ public MetricsServiceV2Stub getStub() {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (MetricsServiceV2Client metricsServiceV2Client :
+   *       MetricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -176,7 +180,11 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (MetricsServiceV2Client metricsServiceV2Client :
+   *       MetricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -197,7 +205,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -286,7 +294,7 @@ public final LogMetric getLogMetric(String metricName) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -372,7 +380,7 @@ public final LogMetric createLogMetric(String parent, LogMetric metric) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -460,7 +468,7 @@ public final LogMetric updateLogMetric(String metricName, LogMetric metric) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -537,7 +545,7 @@ public final Empty deleteLogMetric(String metricName) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index cf6045a524..4e5cdbc69b 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -192,7 +192,11 @@ public final OperationsClient getOperationsClient() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (CloudRedisClient cloudRedisClient :
+   *       CloudRedisClient.ListInstances(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -226,7 +230,11 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (CloudRedisClient cloudRedisClient :
+   *       CloudRedisClient.ListInstances(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -257,7 +265,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -366,7 +374,7 @@ public final Instance getInstance(String name) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }

    *
@@ -406,7 +414,7 @@ public final UnaryCallable getInstanceCallable() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -455,7 +463,7 @@ public final OperationFuture createInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -504,7 +512,7 @@ public final OperationFuture createInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -571,7 +579,7 @@ public final UnaryCallable createInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -601,7 +609,7 @@ public final OperationFuture updateInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -650,7 +658,7 @@ public final UnaryCallable updateInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -678,7 +686,7 @@ public final OperationFuture upgradeInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -703,7 +711,7 @@ public final OperationFuture upgradeInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -750,7 +758,7 @@ public final UnaryCallable upgradeInstanceCal
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -781,7 +789,7 @@ public final OperationFuture importInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -839,7 +847,7 @@ public final UnaryCallable importInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -869,7 +877,7 @@ public final OperationFuture exportInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -921,7 +929,7 @@ public final UnaryCallable exportInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -951,7 +959,7 @@ public final OperationFuture failoverInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -981,7 +989,7 @@ public final OperationFuture failoverInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -1024,7 +1032,7 @@ public final UnaryCallable failoverInstanceC
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -1049,7 +1057,7 @@ public final OperationFuture deleteInstanceAsync(Insta
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -1071,7 +1079,7 @@ public final OperationFuture deleteInstanceAsync(Strin
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
    * }
    * }

    *

From d54bb6d473f7974baa8b09a28a874dc751873ee3 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 18:24:21 -0800
Subject: [PATCH 06/11] fix client

---
 .../composer/SampleCodeHelperComposer.java    | 20 +++++++++++++
 .../logging/ConfigServiceV2Client.java        | 30 +++++++++----------
 .../logging/LoggingServiceV2Client.java       | 12 ++++----
 .../logging/MetricsServiceV2Client.java       |  4 +--
 .../goldens/redis/CloudRedisClient.java       |  4 +--
 5 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index f286aafc8f..7bf17c0340 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -191,6 +191,26 @@ private static List mapMethodArgumentsToVariableExprs(List
     return arguments.stream()
         .map(arg -> createVariableExpr(arg.name(), arg.type()))
         .collect(Collectors.toList());
+    return arguments.stream().map(arg -> createVariableExpr(arg.name(), arg.type())).collect(
+        Collectors.toList());
+  }
+
+  private static Expr createIteratorAllMethodExpr(
+      Method method, TypeNode clientType, List arguments) {
+    // e.g echoClient.echo(name).iterateAll()
+    return MethodInvocationExpr.builder()
+        .setExprReferenceExpr(
+            MethodInvocationExpr.builder()
+                .setExprReferenceExpr(createVariableExpr(getClientName(clientType), clientType))
+                .setMethodName(method.name())
+                .setArguments(
+                    !arguments.isEmpty()
+                        ? mapMethodArgumentsToVariableExprs(arguments)
+                        : Arrays.asList(createVariableExpr("request", method.inputType())))
+                .build())
+        .setMethodName("iterateAll")
+        .setReturnType(clientType)
+        .build();
   }
 
   private static String getClientName(TypeNode clientType) {
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 638f4b6578..79daf4abaf 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -155,7 +155,7 @@ public ConfigServiceV2Stub getStub() {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -188,7 +188,7 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -221,7 +221,7 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -254,7 +254,7 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -287,7 +287,7 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -433,7 +433,7 @@ public final UnaryCallable updateBucketCallable(
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -462,7 +462,7 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -491,7 +491,7 @@ public final ListSinksPagedResponse listSinks(FolderName parent) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -520,7 +520,7 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -549,7 +549,7 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1198,7 +1198,7 @@ public final UnaryCallable deleteSinkCallable() {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1227,7 +1227,7 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1256,7 +1256,7 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1285,7 +1285,7 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent)
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1314,7 +1314,7 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) {
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 265182a20f..51851bbcc1 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -439,7 +439,7 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *   String filter = "filter-1274492040";
    *   String order_by = "order_by1234304744";
    *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       LoggingServiceV2Client.ListLogEntries(resource_names, filter, order_by).iterateAll()) {
+   *       loggingServiceV2Client.ListLogEntries(resource_names, filter, order_by).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -576,7 +576,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -606,7 +606,7 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -636,7 +636,7 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -666,7 +666,7 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -696,7 +696,7 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index 94716c7cb2..d08a3e0b4c 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -154,7 +154,7 @@ public MetricsServiceV2Stub getStub() {
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (MetricsServiceV2Client metricsServiceV2Client :
-   *       MetricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
+   *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -182,7 +182,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) {
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String parent = "parent-995424086";
    *   for (MetricsServiceV2Client metricsServiceV2Client :
-   *       MetricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
+   *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 4e5cdbc69b..80007b7cb1 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -194,7 +194,7 @@ public final OperationsClient getOperationsClient() {
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String parent = "parent-995424086";
    *   for (CloudRedisClient cloudRedisClient :
-   *       CloudRedisClient.ListInstances(parent).iterateAll()) {
+   *       cloudRedisClient.ListInstances(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -232,7 +232,7 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) {
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String parent = "parent-995424086";
    *   for (CloudRedisClient cloudRedisClient :
-   *       CloudRedisClient.ListInstances(parent).iterateAll()) {
+   *       cloudRedisClient.ListInstances(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }

From ea13f59a0d931d0bf1ad61b84e846f0af8942828 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 20:37:29 -0800
Subject: [PATCH 07/11] rebase previous branch

---
 .../composer/SampleCodeHelperComposer.java    |   1 +
 .../goldens/asset/AssetServiceClient.java     |   4 +-
 .../logging/ConfigServiceV2Client.java        | 120 +++++-------------
 .../logging/LoggingServiceV2Client.java       |  48 ++-----
 .../logging/MetricsServiceV2Client.java       |  22 +---
 .../goldens/redis/CloudRedisClient.java       |  52 ++++----
 6 files changed, 73 insertions(+), 174 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index 7bf17c0340..f217fc1014 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -18,6 +18,7 @@
 import com.google.api.generator.engine.ast.CommentStatement;
 import com.google.api.generator.engine.ast.Expr;
 import com.google.api.generator.engine.ast.ExprStatement;
+import com.google.api.generator.engine.ast.ForStatement;
 import com.google.api.generator.engine.ast.LineComment;
 import com.google.api.generator.engine.ast.MethodInvocationExpr;
 import com.google.api.generator.engine.ast.Statement;
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index c086f9a693..eb586351c8 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -577,7 +577,7 @@ public final UnaryCallable deleteFeedCallable() {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -699,7 +699,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for paged unary rpc method sample code.
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 79daf4abaf..fe2d077cb3 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -153,11 +153,7 @@ public ConfigServiceV2Stub getStub() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -186,11 +182,7 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -219,11 +211,7 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -252,11 +240,7 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -285,11 +269,7 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -315,7 +295,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -355,7 +335,7 @@ public final UnaryCallable listBucketsC
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -393,7 +373,7 @@ public final UnaryCallable getBucketCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -431,11 +411,7 @@ public final UnaryCallable updateBucketCallable(
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -460,11 +436,7 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -489,11 +461,7 @@ public final ListSinksPagedResponse listSinks(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -518,11 +486,7 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -547,11 +511,7 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -573,7 +533,7 @@ public final ListSinksPagedResponse listSinks(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -667,7 +627,7 @@ public final LogSink getSink(String sinkName) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -866,7 +826,7 @@ public final LogSink createSink(String parent, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1073,7 +1033,7 @@ public final LogSink updateSink(String sinkName, LogSink sink, FieldMask updateM
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1166,7 +1126,7 @@ public final Empty deleteSink(String sinkName) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1196,11 +1156,7 @@ public final UnaryCallable deleteSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -1225,11 +1181,7 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -1254,11 +1206,7 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -1283,11 +1231,7 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent)
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -1312,11 +1256,7 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -1338,7 +1278,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -1434,7 +1374,7 @@ public final LogExclusion getExclusion(String name) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1621,7 +1561,7 @@ public final LogExclusion createExclusion(String parent, LogExclusion exclusion)
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1735,7 +1675,7 @@ public final LogExclusion updateExclusion(
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1819,7 +1759,7 @@ public final Empty deleteExclusion(String name) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1854,7 +1794,7 @@ public final UnaryCallable deleteExclusionCallabl
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1900,7 +1840,7 @@ public final UnaryCallable getCmekSettings
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 51851bbcc1..aea9e8d904 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -216,7 +216,7 @@ public final Empty deleteLog(String logName) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -400,7 +400,7 @@ public final WriteLogEntriesResponse writeLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -435,13 +435,7 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   List resource_names = new ArrayList<>();
-   *   String filter = "filter-1274492040";
-   *   String order_by = "order_by1234304744";
-   *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       loggingServiceV2Client.ListLogEntries(resource_names, filter, order_by).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -484,7 +478,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -529,7 +523,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -574,11 +568,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -604,11 +594,7 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -634,11 +620,7 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -664,11 +646,7 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -694,11 +672,7 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -721,7 +695,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index d08a3e0b4c..92edca805b 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -152,11 +152,7 @@ public MetricsServiceV2Stub getStub() {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (MetricsServiceV2Client metricsServiceV2Client :
-   *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -180,11 +176,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   for (MetricsServiceV2Client metricsServiceV2Client :
-   *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -205,7 +197,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -294,7 +286,7 @@ public final LogMetric getLogMetric(String metricName) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -380,7 +372,7 @@ public final LogMetric createLogMetric(String parent, LogMetric metric) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -468,7 +460,7 @@ public final LogMetric updateLogMetric(String metricName, LogMetric metric) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -545,7 +537,7 @@ public final Empty deleteLogMetric(String metricName) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 80007b7cb1..436bd759c7 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -192,11 +192,7 @@ public final OperationsClient getOperationsClient() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String parent = "parent-995424086";
-   *   for (CloudRedisClient cloudRedisClient :
-   *       cloudRedisClient.ListInstances(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -230,11 +226,7 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String parent = "parent-995424086";
-   *   for (CloudRedisClient cloudRedisClient :
-   *       cloudRedisClient.ListInstances(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }

    *
@@ -265,7 +257,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }

    *
@@ -374,7 +366,7 @@ public final Instance getInstance(String name) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -414,7 +406,7 @@ public final UnaryCallable getInstanceCallable() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -463,7 +455,7 @@ public final OperationFuture createInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -512,7 +504,7 @@ public final OperationFuture createInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -579,7 +571,7 @@ public final UnaryCallable createInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -609,7 +601,7 @@ public final OperationFuture updateInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -658,7 +650,7 @@ public final UnaryCallable updateInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -686,7 +678,7 @@ public final OperationFuture upgradeInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -711,7 +703,7 @@ public final OperationFuture upgradeInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -758,7 +750,7 @@ public final UnaryCallable upgradeInstanceCal
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -789,7 +781,7 @@ public final OperationFuture importInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -847,7 +839,7 @@ public final UnaryCallable importInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -877,7 +869,7 @@ public final OperationFuture exportInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -929,7 +921,7 @@ public final UnaryCallable exportInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -959,7 +951,7 @@ public final OperationFuture failoverInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -989,7 +981,7 @@ public final OperationFuture failoverInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *
@@ -1032,7 +1024,7 @@ public final UnaryCallable failoverInstanceC
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -1057,7 +1049,7 @@ public final OperationFuture deleteInstanceAsync(Insta
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -1079,7 +1071,7 @@ public final OperationFuture deleteInstanceAsync(Strin
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }

    *

From 247a8be433238b93edcbf7624743a63b94ea2c51 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 21:17:05 -0800
Subject: [PATCH 08/11] add missing comment

---
 .../composer/SampleCodeHelperComposer.java    | 28 ++++--
 .../goldens/asset/AssetServiceClient.java     | 15 ++-
 .../logging/ConfigServiceV2Client.java        | 96 +++++++++++++++----
 .../logging/LoggingServiceV2Client.java       | 44 +++++++--
 .../logging/MetricsServiceV2Client.java       | 14 ++-
 .../goldens/redis/CloudRedisClient.java       | 28 ++++--
 6 files changed, 175 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index f217fc1014..54f4d0ef66 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -112,15 +112,27 @@ private static TryCatchStatement composeLroUnaryRpcMethodSampleCode(
 
   private static TryCatchStatement composePagedUnaryRpcMethodSampleCode(
       Method method, List arguments, TypeNode clientType) {
-    // TODO(summerji): compose sample code for unary paged rpc method.
-    // TODO(summerji): Add unit tests.
-    VariableExpr clientVarExpr = createVariableExpr(getClientName(clientType), clientType);
+    // TODO(summerji): Add unit test.
+    // Assign each method arguments with default value.
+    List bodyStatements =
+        arguments.stream()
+            .map(
+                methodArg ->
+                    ExprStatement.withExpr(assignMethodArgumentWithDefaultValue(methodArg)))
+            .collect(Collectors.toList());
+    // For loop client on iterateAll method.
+    // e.g. for (LoggingServiceV2Client loggingServiceV2Client :
+    // loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+    // //doThingsWith(element);}
+    bodyStatements.add(
+        ForStatement.builder()
+            .setLocalVariableExpr(createVariableDeclExpr(getClientName(clientType), clientType))
+            .setCollectionExpr(createIteratorAllMethodExpr(method, clientType, arguments))
+            .setBody(Arrays.asList(createLineCommentStatement("doThingsWith(element);")))
+            .build());
     return TryCatchStatement.builder()
-        .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientVarExpr))
-        .setTryBody(
-            Arrays.asList(
-                createLineCommentStatement(
-                    "Note: Not implemented yet, placeholder for paged unary rpc method sample code.")))
+        .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType))
+        .setTryBody(bodyStatements)
         .setIsSampleCode(true)
         .build();
   }
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index eb586351c8..2e0e5f6872 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -577,7 +577,13 @@ public final UnaryCallable deleteFeedCallable() {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String scope = "scope109264468";
+   *   String query = "query107944136";
+   *   List asset_types = new ArrayList<>();
+   *   for (AssetServiceClient assetServiceClient :
+   *       assetServiceClient.SearchAllResources(scope, query, asset_types).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -699,7 +705,12 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String scope = "scope109264468";
+   *   String query = "query107944136";
+   *   for (AssetServiceClient assetServiceClient :
+   *       assetServiceClient.SearchAllIamPolicies(scope, query).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index fe2d077cb3..f35233ab7d 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -153,7 +153,11 @@ public ConfigServiceV2Stub getStub() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -182,7 +186,11 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -211,7 +219,11 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -240,7 +252,11 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -269,7 +285,11 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -295,7 +315,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -411,7 +431,11 @@ public final UnaryCallable updateBucketCallable(
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -436,7 +460,11 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -461,7 +489,11 @@ public final ListSinksPagedResponse listSinks(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -486,7 +518,11 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -511,7 +547,11 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -533,7 +573,7 @@ public final ListSinksPagedResponse listSinks(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -1156,7 +1196,11 @@ public final UnaryCallable deleteSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -1181,7 +1225,11 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -1206,7 +1254,11 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -1231,7 +1283,11 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent)
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -1256,7 +1312,11 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -1278,7 +1338,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index aea9e8d904..f33af5261c 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -435,7 +435,13 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   List resource_names = new ArrayList<>();
+   *   String filter = "filter-1274492040";
+   *   String order_by = "order_by1234304744";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogEntries(resource_names, filter, order_by).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -478,7 +484,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -523,7 +529,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -568,7 +574,11 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -594,7 +604,11 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -620,7 +634,11 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -646,7 +664,11 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -672,7 +694,11 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -695,7 +721,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index 92edca805b..899152a407 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -152,7 +152,11 @@ public MetricsServiceV2Stub getStub() {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (MetricsServiceV2Client metricsServiceV2Client :
+   *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -176,7 +180,11 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (MetricsServiceV2Client metricsServiceV2Client :
+   *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -197,7 +205,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 436bd759c7..7572a2d940 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -192,7 +192,11 @@ public final OperationsClient getOperationsClient() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (CloudRedisClient cloudRedisClient :
+   *       cloudRedisClient.ListInstances(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -226,7 +230,11 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   for (CloudRedisClient cloudRedisClient :
+   *       cloudRedisClient.ListInstances(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }

    *
@@ -257,7 +265,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -504,7 +512,7 @@ public final OperationFuture createInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -601,7 +609,7 @@ public final OperationFuture updateInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -703,7 +711,7 @@ public final OperationFuture upgradeInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -781,7 +789,7 @@ public final OperationFuture importInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -869,7 +877,7 @@ public final OperationFuture exportInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -981,7 +989,7 @@ public final OperationFuture failoverInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -1071,7 +1079,7 @@ public final OperationFuture deleteInstanceAsync(Strin
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *

From b82635a6ab1a9b8e3128d42159a285e012c66676 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 21:29:41 -0800
Subject: [PATCH 09/11] add missing request assignment expr

---
 .../gapic/composer/SampleCodeHelperComposer.java  |  1 +
 .../goldens/asset/AssetServiceClient.java         |  8 ++++++++
 .../goldens/logging/ConfigServiceV2Client.java    | 15 +++++++++++++++
 .../goldens/logging/LoggingServiceV2Client.java   | 11 +++++++++++
 .../goldens/logging/MetricsServiceV2Client.java   |  2 ++
 .../goldens/redis/CloudRedisClient.java           |  2 ++
 6 files changed, 39 insertions(+)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index 54f4d0ef66..c58d4d6261 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -37,6 +37,7 @@
 
 public final class SampleCodeHelperComposer {
   private static String RESPONSE_VAR_NAME = "response";
+  private static String REQUEST_VAR_NAME = "request";
 
   public static TryCatchStatement composeRpcMethodSampleCode(
       Method method,
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index 2e0e5f6872..9dfec6998b 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -580,6 +580,12 @@ public final UnaryCallable deleteFeedCallable() {
    *   String scope = "scope109264468";
    *   String query = "query107944136";
    *   List asset_types = new ArrayList<>();
+   *   SearchAllResourcesRequest request =
+   *       SearchAllResourcesRequest.newBuilder()
+   *           .setScope(scope)
+   *           .setQuery(query)
+   *           .setAssetTypes(asset_types)
+   *           .build();
    *   for (AssetServiceClient assetServiceClient :
    *       assetServiceClient.SearchAllResources(scope, query, asset_types).iterateAll()) {
    *     // doThingsWith(element);
@@ -707,6 +713,8 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
    *   String scope = "scope109264468";
    *   String query = "query107944136";
+   *   SearchAllIamPoliciesRequest request =
+   *       SearchAllIamPoliciesRequest.newBuilder().setScope(scope).setQuery(query).build();
    *   for (AssetServiceClient assetServiceClient :
    *       assetServiceClient.SearchAllIamPolicies(scope, query).iterateAll()) {
    *     // doThingsWith(element);
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index f35233ab7d..94975b73ef 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -154,6 +154,7 @@ public ConfigServiceV2Stub getStub() {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -187,6 +188,7 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -220,6 +222,7 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -253,6 +256,7 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -286,6 +290,7 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -432,6 +437,7 @@ public final UnaryCallable updateBucketCallable(
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -461,6 +467,7 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -490,6 +497,7 @@ public final ListSinksPagedResponse listSinks(FolderName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -519,6 +527,7 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -548,6 +557,7 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1197,6 +1207,7 @@ public final UnaryCallable deleteSinkCallable() {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1226,6 +1237,7 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1255,6 +1267,7 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1284,6 +1297,7 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent)
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1313,6 +1327,7 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index f33af5261c..6a39b0c88e 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -438,6 +438,12 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *   List resource_names = new ArrayList<>();
    *   String filter = "filter-1274492040";
    *   String order_by = "order_by1234304744";
+   *   ListLogEntriesRequest request =
+   *       ListLogEntriesRequest.newBuilder()
+   *           .setResourceNames(resource_names)
+   *           .setFilter(filter)
+   *           .setOrderBy(order_by)
+   *           .build();
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogEntries(resource_names, filter, order_by).iterateAll()) {
    *     // doThingsWith(element);
@@ -575,6 +581,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -605,6 +612,7 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -635,6 +643,7 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -665,6 +674,7 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -695,6 +705,7 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index 899152a407..c48500ffba 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -153,6 +153,7 @@ public MetricsServiceV2Stub getStub() {
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder().setParent(parent).build();
    *   for (MetricsServiceV2Client metricsServiceV2Client :
    *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -181,6 +182,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) {
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String parent = "parent-995424086";
+   *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder().setParent(parent).build();
    *   for (MetricsServiceV2Client metricsServiceV2Client :
    *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
    *     // doThingsWith(element);
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 7572a2d940..83b44b55c9 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -193,6 +193,7 @@ public final OperationsClient getOperationsClient() {
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String parent = "parent-995424086";
+   *   ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build();
    *   for (CloudRedisClient cloudRedisClient :
    *       cloudRedisClient.ListInstances(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -231,6 +232,7 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) {
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String parent = "parent-995424086";
+   *   ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build();
    *   for (CloudRedisClient cloudRedisClient :
    *       cloudRedisClient.ListInstances(parent).iterateAll()) {
    *     // doThingsWith(element);

From 14cbbd38161d745f2cf08d5b2b8fa5c56298d3b1 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 23:59:54 -0800
Subject: [PATCH 10/11] remove request assignment expr

---
 .../composer/SampleCodeHelperComposer.java    | 12 +++---
 .../goldens/asset/AssetServiceClient.java     |  8 ----
 .../logging/ConfigServiceV2Client.java        | 40 ++++++-------------
 .../logging/LoggingServiceV2Client.java       | 19 ++-------
 .../logging/MetricsServiceV2Client.java       |  4 +-
 .../goldens/redis/CloudRedisClient.java       |  4 +-
 6 files changed, 26 insertions(+), 61 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index c58d4d6261..32ed5470f1 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -50,7 +50,7 @@ public static TryCatchStatement composeRpcMethodSampleCode(
     }
     // Paged Unary RPC method.
     if (method.isPaged()) {
-      return composePagedUnaryRpcMethodSampleCode(method, arguments, clientType);
+      return composePagedUnaryRpcMethodSampleCode(method, arguments, clientType, resourceNames);
     }
     // Long-running operation Unary RPC method.
     if (method.hasLro()) {
@@ -112,14 +112,18 @@ private static TryCatchStatement composeLroUnaryRpcMethodSampleCode(
   }
 
   private static TryCatchStatement composePagedUnaryRpcMethodSampleCode(
-      Method method, List arguments, TypeNode clientType) {
+      Method method,
+      List arguments,
+      TypeNode clientType,
+      Map resourceNames) {
     // TODO(summerji): Add unit test.
     // Assign each method arguments with default value.
     List bodyStatements =
         arguments.stream()
             .map(
                 methodArg ->
-                    ExprStatement.withExpr(assignMethodArgumentWithDefaultValue(methodArg)))
+                    ExprStatement.withExpr(
+                        assignMethodArgumentWithDefaultValue(methodArg, resourceNames)))
             .collect(Collectors.toList());
     // For loop client on iterateAll method.
     // e.g. for (LoggingServiceV2Client loggingServiceV2Client :
@@ -205,8 +209,6 @@ private static List mapMethodArgumentsToVariableExprs(List
     return arguments.stream()
         .map(arg -> createVariableExpr(arg.name(), arg.type()))
         .collect(Collectors.toList());
-    return arguments.stream().map(arg -> createVariableExpr(arg.name(), arg.type())).collect(
-        Collectors.toList());
   }
 
   private static Expr createIteratorAllMethodExpr(
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index 9dfec6998b..2e0e5f6872 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -580,12 +580,6 @@ public final UnaryCallable deleteFeedCallable() {
    *   String scope = "scope109264468";
    *   String query = "query107944136";
    *   List asset_types = new ArrayList<>();
-   *   SearchAllResourcesRequest request =
-   *       SearchAllResourcesRequest.newBuilder()
-   *           .setScope(scope)
-   *           .setQuery(query)
-   *           .setAssetTypes(asset_types)
-   *           .build();
    *   for (AssetServiceClient assetServiceClient :
    *       assetServiceClient.SearchAllResources(scope, query, asset_types).iterateAll()) {
    *     // doThingsWith(element);
@@ -713,8 +707,6 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
    *   String scope = "scope109264468";
    *   String query = "query107944136";
-   *   SearchAllIamPoliciesRequest request =
-   *       SearchAllIamPoliciesRequest.newBuilder().setScope(scope).setQuery(query).build();
    *   for (AssetServiceClient assetServiceClient :
    *       assetServiceClient.SearchAllIamPolicies(scope, query).iterateAll()) {
    *     // doThingsWith(element);
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 94975b73ef..80338abe61 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -153,8 +153,8 @@ public ConfigServiceV2Stub getStub() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   BillingAccountLocationName parent =
+   *       BillingAccountLocationName.of("[BILLING_ACCOUNT]", "[LOCATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -187,8 +187,7 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   FolderLocationName parent = FolderLocationName.of("[FOLDER]", "[LOCATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -221,8 +220,7 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -255,8 +253,7 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   OrganizationLocationName parent = OrganizationLocationName.of("[ORGANIZATION]", "[LOCATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -290,7 +287,6 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
-   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -436,8 +432,7 @@ public final UnaryCallable updateBucketCallable(
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -466,8 +461,7 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   FolderName parent = FolderName.of("[FOLDER]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -496,8 +490,7 @@ public final ListSinksPagedResponse listSinks(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -526,8 +519,7 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -557,7 +549,6 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
-   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1206,8 +1197,7 @@ public final UnaryCallable deleteSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1236,8 +1226,7 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   FolderName parent = FolderName.of("[FOLDER]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1266,8 +1255,7 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1296,8 +1284,7 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent)
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1327,7 +1314,6 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
-   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 6a39b0c88e..3ef9ab541a 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -438,12 +438,6 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *   List resource_names = new ArrayList<>();
    *   String filter = "filter-1274492040";
    *   String order_by = "order_by1234304744";
-   *   ListLogEntriesRequest request =
-   *       ListLogEntriesRequest.newBuilder()
-   *           .setResourceNames(resource_names)
-   *           .setFilter(filter)
-   *           .setOrderBy(order_by)
-   *           .build();
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogEntries(resource_names, filter, order_by).iterateAll()) {
    *     // doThingsWith(element);
@@ -580,8 +574,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -611,8 +604,7 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   FolderName parent = FolderName.of("[FOLDER]");
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -642,8 +634,7 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -673,8 +664,7 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -705,7 +695,6 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
-   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index c48500ffba..5ab7dc6ec8 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -152,8 +152,7 @@ public MetricsServiceV2Stub getStub() {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder().setParent(parent).build();
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   for (MetricsServiceV2Client metricsServiceV2Client :
    *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -182,7 +181,6 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) {
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String parent = "parent-995424086";
-   *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder().setParent(parent).build();
    *   for (MetricsServiceV2Client metricsServiceV2Client :
    *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
    *     // doThingsWith(element);
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 83b44b55c9..bbb6a7ccd8 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -192,8 +192,7 @@ public final OperationsClient getOperationsClient() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String parent = "parent-995424086";
-   *   ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build();
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
    *   for (CloudRedisClient cloudRedisClient :
    *       cloudRedisClient.ListInstances(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -232,7 +231,6 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) {
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String parent = "parent-995424086";
-   *   ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build();
    *   for (CloudRedisClient cloudRedisClient :
    *       cloudRedisClient.ListInstances(parent).iterateAll()) {
    *     // doThingsWith(element);

From 51a0cbf0bb471db732327d81f369054c006db68c Mon Sep 17 00:00:00 2001
From: summerji 
Date: Thu, 19 Nov 2020 23:45:44 -0800
Subject: [PATCH 11/11] rebase change clientType to client variable expr

---
 .../composer/SampleCodeHelperComposer.java    | 18 ++++----
 .../goldens/asset/AssetServiceClient.java     | 22 +++++-----
 .../logging/ConfigServiceV2Client.java        | 34 +++++++-------
 .../logging/LoggingServiceV2Client.java       | 14 +++---
 .../logging/MetricsServiceV2Client.java       | 14 +++---
 .../goldens/redis/CloudRedisClient.java       | 44 +++++++++----------
 6 files changed, 74 insertions(+), 72 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index 32ed5470f1..b35fc836a5 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
@@ -117,6 +117,7 @@ private static TryCatchStatement composePagedUnaryRpcMethodSampleCode(
       TypeNode clientType,
       Map resourceNames) {
     // TODO(summerji): Add unit test.
+    VariableExpr clientVarExpr = createVariableExpr(getClientName(clientType), clientType);
     // Assign each method arguments with default value.
     List bodyStatements =
         arguments.stream()
@@ -127,16 +128,17 @@ private static TryCatchStatement composePagedUnaryRpcMethodSampleCode(
             .collect(Collectors.toList());
     // For loop client on iterateAll method.
     // e.g. for (LoggingServiceV2Client loggingServiceV2Client :
-    // loggingServiceV2Client.ListLogs(parent).iterateAll()) {
-    // //doThingsWith(element);}
+    //        loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+    //          //doThingsWith(element);
+    //      }
     bodyStatements.add(
         ForStatement.builder()
-            .setLocalVariableExpr(createVariableDeclExpr(getClientName(clientType), clientType))
-            .setCollectionExpr(createIteratorAllMethodExpr(method, clientType, arguments))
+            .setLocalVariableExpr(clientVarExpr.toBuilder().setIsDecl(true).build())
+            .setCollectionExpr(createIteratorAllMethodExpr(method, clientVarExpr, arguments))
             .setBody(Arrays.asList(createLineCommentStatement("doThingsWith(element);")))
             .build());
     return TryCatchStatement.builder()
-        .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType))
+        .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientVarExpr))
         .setTryBody(bodyStatements)
         .setIsSampleCode(true)
         .build();
@@ -212,12 +214,12 @@ private static List mapMethodArgumentsToVariableExprs(List
   }
 
   private static Expr createIteratorAllMethodExpr(
-      Method method, TypeNode clientType, List arguments) {
+      Method method, VariableExpr clientVarExpr, List arguments) {
     // e.g echoClient.echo(name).iterateAll()
     return MethodInvocationExpr.builder()
         .setExprReferenceExpr(
             MethodInvocationExpr.builder()
-                .setExprReferenceExpr(createVariableExpr(getClientName(clientType), clientType))
+                .setExprReferenceExpr(clientVarExpr)
                 .setMethodName(method.name())
                 .setArguments(
                     !arguments.isEmpty()
@@ -225,7 +227,7 @@ private static Expr createIteratorAllMethodExpr(
                         : Arrays.asList(createVariableExpr("request", method.inputType())))
                 .build())
         .setMethodName("iterateAll")
-        .setReturnType(clientType)
+        .setReturnType(clientVarExpr.variable().type())
         .build();
   }
 
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index 2e0e5f6872..7be87a3cf7 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -78,7 +78,7 @@
  * 
{@code
  * AssetServiceSettings assetServiceSettings =
  *     AssetServiceSettings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
  * AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings);
  * }

@@ -87,7 +87,7 @@
  *
  * 
{@code
  * AssetServiceSettings assetServiceSettings =
- *     AssetServiceSettings.newBuilder().setEndpoint("myEndpoint").build();
+ *     AssetServiceSettings.newBuilder().setEndpoint(myEndpoint).build();
  * AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings);
  * }

  */
@@ -170,7 +170,7 @@ public final OperationsClient getOperationsClient() {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -229,7 +229,7 @@ public final UnaryCallable exportAssetsCallable(
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -288,7 +288,7 @@ public final Feed createFeed(String parent) {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -364,7 +364,7 @@ public final Feed getFeed(String name) {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -416,7 +416,7 @@ public final ListFeedsResponse listFeeds(String parent) {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -468,7 +468,7 @@ public final Feed updateFeed(Feed feed) {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -546,7 +546,7 @@ public final Empty deleteFeed(String name) {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -657,7 +657,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -768,7 +768,7 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(String scope
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
index 80338abe61..642446e389 100644
--- a/test/integration/goldens/logging/ConfigServiceV2Client.java
+++ b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -76,7 +76,7 @@
  * 
{@code
  * ConfigServiceV2Settings configServiceV2Settings =
  *     ConfigServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
  * ConfigServiceV2Client configServiceV2Client =
  *     ConfigServiceV2Client.create(configServiceV2Settings);
@@ -86,7 +86,7 @@
  *
  * 
{@code
  * ConfigServiceV2Settings configServiceV2Settings =
- *     ConfigServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
+ *     ConfigServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
  * ConfigServiceV2Client configServiceV2Client =
  *     ConfigServiceV2Client.create(configServiceV2Settings);
  * }

@@ -316,7 +316,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -356,7 +356,7 @@ public final UnaryCallable listBucketsC
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -394,7 +394,7 @@ public final UnaryCallable getBucketCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -574,7 +574,7 @@ public final ListSinksPagedResponse listSinks(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -668,7 +668,7 @@ public final LogSink getSink(String sinkName) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -867,7 +867,7 @@ public final LogSink createSink(String parent, LogSink sink) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1074,7 +1074,7 @@ public final LogSink updateSink(String sinkName, LogSink sink, FieldMask updateM
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1167,7 +1167,7 @@ public final Empty deleteSink(String sinkName) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1339,7 +1339,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -1435,7 +1435,7 @@ public final LogExclusion getExclusion(String name) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1622,7 +1622,7 @@ public final LogExclusion createExclusion(String parent, LogExclusion exclusion)
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1736,7 +1736,7 @@ public final LogExclusion updateExclusion(
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1820,7 +1820,7 @@ public final Empty deleteExclusion(String name) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1855,7 +1855,7 @@ public final UnaryCallable deleteExclusionCallabl
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -1901,7 +1901,7 @@ public final UnaryCallable getCmekSettings
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 3ef9ab541a..ff74f506bf 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -78,7 +78,7 @@
  * 
{@code
  * LoggingServiceV2Settings loggingServiceV2Settings =
  *     LoggingServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
  * LoggingServiceV2Client loggingServiceV2Client =
  *     LoggingServiceV2Client.create(loggingServiceV2Settings);
@@ -88,7 +88,7 @@
  *
  * 
{@code
  * LoggingServiceV2Settings loggingServiceV2Settings =
- *     LoggingServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
+ *     LoggingServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
  * LoggingServiceV2Client loggingServiceV2Client =
  *     LoggingServiceV2Client.create(loggingServiceV2Settings);
  * }

@@ -216,7 +216,7 @@ public final Empty deleteLog(String logName) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -400,7 +400,7 @@ public final WriteLogEntriesResponse writeLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -484,7 +484,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -529,7 +529,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -721,7 +721,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index 5ab7dc6ec8..f32e456e60 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -75,7 +75,7 @@
  * 
{@code
  * MetricsServiceV2Settings metricsServiceV2Settings =
  *     MetricsServiceV2Settings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
  * MetricsServiceV2Client metricsServiceV2Client =
  *     MetricsServiceV2Client.create(metricsServiceV2Settings);
@@ -85,7 +85,7 @@
  *
  * 
{@code
  * MetricsServiceV2Settings metricsServiceV2Settings =
- *     MetricsServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
+ *     MetricsServiceV2Settings.newBuilder().setEndpoint(myEndpoint).build();
  * MetricsServiceV2Client metricsServiceV2Client =
  *     MetricsServiceV2Client.create(metricsServiceV2Settings);
  * }

@@ -205,7 +205,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -294,7 +294,7 @@ public final LogMetric getLogMetric(String metricName) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -380,7 +380,7 @@ public final LogMetric createLogMetric(String parent, LogMetric metric) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -468,7 +468,7 @@ public final LogMetric updateLogMetric(String metricName, LogMetric metric) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -545,7 +545,7 @@ public final Empty deleteLogMetric(String metricName) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index bbb6a7ccd8..59fc10f8c4 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -98,7 +98,7 @@
  * 
{@code
  * CloudRedisSettings cloudRedisSettings =
  *     CloudRedisSettings.newBuilder()
- *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
  *         .build();
  * CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
  * }

@@ -107,7 +107,7 @@
  *
  * 
{@code
  * CloudRedisSettings cloudRedisSettings =
- *     CloudRedisSettings.newBuilder().setEndpoint("myEndpoint").build();
+ *     CloudRedisSettings.newBuilder().setEndpoint(myEndpoint).build();
  * CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
  * }

  */
@@ -265,7 +265,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary paged default rpc method sample code.
    * }
    * }

    *
@@ -374,7 +374,7 @@ public final Instance getInstance(String name) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary default rpc method sample code.
    * }
    * }

    *
@@ -414,7 +414,7 @@ public final UnaryCallable getInstanceCallable() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -463,7 +463,7 @@ public final OperationFuture createInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -512,7 +512,7 @@ public final OperationFuture createInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -579,7 +579,7 @@ public final UnaryCallable createInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -609,7 +609,7 @@ public final OperationFuture updateInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -658,7 +658,7 @@ public final UnaryCallable updateInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -686,7 +686,7 @@ public final OperationFuture upgradeInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -711,7 +711,7 @@ public final OperationFuture upgradeInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -758,7 +758,7 @@ public final UnaryCallable upgradeInstanceCal
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -789,7 +789,7 @@ public final OperationFuture importInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -847,7 +847,7 @@ public final UnaryCallable importInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -877,7 +877,7 @@ public final OperationFuture exportInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -929,7 +929,7 @@ public final UnaryCallable exportInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -959,7 +959,7 @@ public final OperationFuture failoverInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -989,7 +989,7 @@ public final OperationFuture failoverInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *
@@ -1032,7 +1032,7 @@ public final UnaryCallable failoverInstanceC
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -1057,7 +1057,7 @@ public final OperationFuture deleteInstanceAsync(Insta
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for lro Unary rpc method sample code.
    * }
    * }

    *
@@ -1079,7 +1079,7 @@ public final OperationFuture deleteInstanceAsync(Strin
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   // Note: Not implemented yet, placeholder for unary lro default rpc method sample code.
    * }
    * }

    *