From de732d4ad462a25de8b60241704bfde4849860e6 Mon Sep 17 00:00:00 2001 From: summerji Date: Mon, 16 Nov 2020 00:25:18 -0800 Subject: [PATCH 01/27] Implement sample code of customize credentials in service client class header --- .../api/generator/gapic/composer/BUILD.bazel | 2 + .../composer/ServiceClientClassComposer.java | 2 +- .../ServiceClientCommentComposer.java | 7 +- .../ServiceClientSampleCodeComposer.java | 107 ++++++++++++++++++ .../gapic/composer/goldens/EchoClient.golden | 8 ++ .../composer/goldens/IdentityClient.golden | 8 ++ .../goldens/asset/AssetServiceClient.java | 8 ++ .../logging/ConfigServiceV2Client.java | 9 ++ .../logging/LoggingServiceV2Client.java | 9 ++ .../logging/MetricsServiceV2Client.java | 9 ++ .../goldens/redis/CloudRedisClient.java | 8 ++ 11 files changed, 174 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java diff --git a/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel index f90d35bd99..503561e307 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel +++ b/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel @@ -15,9 +15,11 @@ java_library( deps = [ "//:service_config_java_proto", "//src/main/java/com/google/api/generator/engine/ast", + "//src/main/java/com/google/api/generator/engine/writer", "//src/main/java/com/google/api/generator/gapic:status_java_proto", "//src/main/java/com/google/api/generator/gapic/model", "//src/main/java/com/google/api/generator/gapic/utils", + "//src/main/java/com/google/api/generator/gapic/composer/samplecode", "@com_google_api_api_common//jar", "@com_google_api_gax_java//gax", "@com_google_api_gax_java//gax-grpc:gax_grpc", diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java index 02ff960025..8ed7331724 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java @@ -119,7 +119,7 @@ public GapicClass generate(Service service, Map messageTypes) { ClassDefinition classDef = ClassDefinition.builder() .setHeaderCommentStatements( - ServiceClientCommentComposer.createClassHeaderComments(service)) + ServiceClientCommentComposer.createClassHeaderComments(service, types)) .setPackageString(pakkage) .setAnnotations(createClassAnnotations(types)) .setScope(ScopeNode.PUBLIC) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java index 1a0f8f2b0f..96cc59df77 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -103,7 +104,8 @@ class ServiceClientCommentComposer { "Returns the OperationsClient that can be used to query the status of a long-running" + " operation returned by another API method call."); - static List createClassHeaderComments(Service service) { + static List createClassHeaderComments( + Service service, Map types) { JavaDocComment.Builder classHeaderJavadocBuilder = JavaDocComment.builder(); if (service.hasDescription()) { classHeaderJavadocBuilder = @@ -134,7 +136,8 @@ static List createClassHeaderComments(Service service) { SERVICE_DESCRIPTION_CUSTOMIZE_SUMMARY_PATTERN, String.format("%sSettings", JavaStyle.toUpperCamelCase(service.name())))); classHeaderJavadocBuilder.addParagraph(SERVICE_DESCRIPTION_CREDENTIALS_SUMMARY_STRING); - // TODO(summerji): Add credentials' customization sample code here. + classHeaderJavadocBuilder.addSampleCode( + ServiceClientSampleCodeComposer.composeClassHeaderCredentialsSampleCode(service, types)); classHeaderJavadocBuilder.addParagraph(SERVICE_DESCRIPTION_ENDPOINT_SUMMARY_STRING); // TODO(summerji): Add endpoint customization sample code here. diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java new file mode 100644 index 0000000000..4e6381fd3d --- /dev/null +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java @@ -0,0 +1,107 @@ +package com.google.api.generator.gapic.composer; + +import com.google.api.gax.core.FixedCredentialsProvider; +import com.google.api.generator.engine.ast.AssignmentExpr; +import com.google.api.generator.engine.ast.ConcreteReference; +import com.google.api.generator.engine.ast.Expr; +import com.google.api.generator.engine.ast.ExprStatement; +import com.google.api.generator.engine.ast.MethodInvocationExpr; +import com.google.api.generator.engine.ast.Statement; +import com.google.api.generator.engine.ast.StringObjectValue; +import com.google.api.generator.engine.ast.TypeNode; +import com.google.api.generator.engine.ast.ValueExpr; +import com.google.api.generator.engine.ast.Variable; +import com.google.api.generator.engine.ast.VariableExpr; +import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.composer.samplecode.SampleCodeJavaFormatter; +import com.google.api.generator.gapic.model.Service; +import com.google.api.generator.gapic.utils.JavaStyle; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class ServiceClientSampleCodeComposer { + private static final String SETTINGS_NAME_PATTERN = "%sSettings"; + private static final String CLASS_NAME_PATTERN = "%sClient"; + + public static String composeClassHeaderCredentialsSampleCode( + Service service, Map types) { + String settingsVarName = JavaStyle.toLowerCamelCase(getSettingsName(service.name())); + TypeNode settingsVarType = types.get(getSettingsName(service.name())); + VariableExpr settingsVarExpr = createVariableExpr(settingsVarName, settingsVarType); + MethodInvocationExpr newBuilderMethodExpr = + MethodInvocationExpr.builder() + .setStaticReferenceType(settingsVarType) + .setMethodName("newBuilder") + .build(); + TypeNode fixedCredentialProvideType = + TypeNode.withReference(ConcreteReference.withClazz(FixedCredentialsProvider.class)); + MethodInvocationExpr credentialArgExpr = + MethodInvocationExpr.builder() + .setStaticReferenceType(fixedCredentialProvideType) + .setArguments(ValueExpr.withValue(StringObjectValue.withValue("myCredentials"))) + .setMethodName("create") + .build(); + MethodInvocationExpr credentialsMethodExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(newBuilderMethodExpr) + .setArguments(credentialArgExpr) + .setMethodName("setCredentialsProvider") + .build(); + MethodInvocationExpr buildMethodExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(credentialsMethodExpr) + .setReturnType(settingsVarType) + .setMethodName("build") + .build(); + Expr initSettingsVarExpr = + AssignmentExpr.builder() + .setVariableExpr(settingsVarExpr.toBuilder().setIsDecl(true).build()) + .setValueExpr(buildMethodExpr) + .build(); + + String clientName = JavaStyle.toLowerCamelCase(getClientClassName(service.name())); + TypeNode clientType = types.get(getClientClassName(service.name())); + VariableExpr clientVarExpr = createVariableExpr(clientName, clientType); + MethodInvocationExpr createMethodExpr = + MethodInvocationExpr.builder() + .setStaticReferenceType(clientType) + .setArguments(settingsVarExpr) + .setMethodName("create") + .setReturnType(clientType) + .build(); + Expr initClientVarExpr = + AssignmentExpr.builder() + .setVariableExpr(clientVarExpr.toBuilder().setIsDecl(true).build()) + .setValueExpr(createMethodExpr) + .build(); + + return writeSampleCode(Arrays.asList(initSettingsVarExpr, initClientVarExpr)); + } + + // ======================================== Helpers ==========================================// + + private static String getClientClassName(String serviceName) { + return String.format(CLASS_NAME_PATTERN, serviceName); + } + + private static String getSettingsName(String serviceName) { + return String.format(SETTINGS_NAME_PATTERN, serviceName); + } + + private static String writeSampleCode(List exprs) { + List statements = + exprs.stream().map(e -> ExprStatement.withExpr(e)).collect(Collectors.toList()); + JavaWriterVisitor visitor = new JavaWriterVisitor(); + for (Statement statement : statements) { + statement.accept(visitor); + } + return SampleCodeJavaFormatter.format(visitor.write()); + } + + private static VariableExpr createVariableExpr(String variableName, TypeNode type) { + return VariableExpr.withVariable( + Variable.builder().setName(variableName).setType(type).build()); + } +} diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden index 20a193853e..f6d876176c 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden @@ -63,6 +63,14 @@ import javax.annotation.Generated; * *

To customize credentials: * + * 

{@code
+ * EchoSettings echoSettings =
+ *     EchoSettings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .build();
+ * EchoClient echoClient = EchoClient.create(echoSettings);
+ * }
+ * *

To customize the endpoint: */ @BetaApi diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden index 0f48757f2b..fa121bc4d9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden @@ -53,6 +53,14 @@ import javax.annotation.Generated; * *

To customize credentials: * + * 

{@code
+ * IdentitySettings identitySettings =
+ *     IdentitySettings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .build();
+ * IdentityClient identityClient = IdentityClient.create(identitySettings);
+ * }
+ * *

To customize the endpoint: */ @BetaApi diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java index 103843b065..7ba8307058 100644 --- a/test/integration/goldens/asset/AssetServiceClient.java +++ b/test/integration/goldens/asset/AssetServiceClient.java @@ -75,6 +75,14 @@ * *

To customize credentials: * + * 

{@code
+ * AssetServiceSettings assetServiceSettings =
+ *     AssetServiceSettings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .build();
+ * AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings);
+ * }
+ * *

To customize the endpoint: */ @BetaApi diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java index b6516172fc..afb5fc89da 100644 --- a/test/integration/goldens/logging/ConfigServiceV2Client.java +++ b/test/integration/goldens/logging/ConfigServiceV2Client.java @@ -73,6 +73,15 @@ * *

To customize credentials: * + * 

{@code
+ * ConfigServiceV2Settings configServiceV2Settings =
+ *     ConfigServiceV2Settings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .build();
+ * ConfigServiceV2Client configServiceV2Client =
+ *     ConfigServiceV2Client.create(configServiceV2Settings);
+ * }
+ * *

To customize the endpoint: */ @BetaApi diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java index d90cbfadf6..45d0ef7d89 100644 --- a/test/integration/goldens/logging/LoggingServiceV2Client.java +++ b/test/integration/goldens/logging/LoggingServiceV2Client.java @@ -75,6 +75,15 @@ * *

To customize credentials: * + * 

{@code
+ * LoggingServiceV2Settings loggingServiceV2Settings =
+ *     LoggingServiceV2Settings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .build();
+ * LoggingServiceV2Client loggingServiceV2Client =
+ *     LoggingServiceV2Client.create(loggingServiceV2Settings);
+ * }
+ * *

To customize the endpoint: */ @BetaApi diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java index 19f6aef98d..c6735f8f00 100644 --- a/test/integration/goldens/logging/MetricsServiceV2Client.java +++ b/test/integration/goldens/logging/MetricsServiceV2Client.java @@ -72,6 +72,15 @@ * *

To customize credentials: * + * 

{@code
+ * MetricsServiceV2Settings metricsServiceV2Settings =
+ *     MetricsServiceV2Settings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .build();
+ * MetricsServiceV2Client metricsServiceV2Client =
+ *     MetricsServiceV2Client.create(metricsServiceV2Settings);
+ * }
+ * *

To customize the endpoint: */ @BetaApi diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java index c807b6dd8a..5fed1d2d0a 100644 --- a/test/integration/goldens/redis/CloudRedisClient.java +++ b/test/integration/goldens/redis/CloudRedisClient.java @@ -95,6 +95,14 @@ * *

To customize credentials: * + * 

{@code
+ * CloudRedisSettings cloudRedisSettings =
+ *     CloudRedisSettings.newBuilder()
+ *         .setCredentialsProvider(FixedCredentialsProvider.create("myCredentials"))
+ *         .build();
+ * CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
+ * }
+ * *

To customize the endpoint: */ @BetaApi From e5df14bca56d5826d04c173a6a1b04e4ecd33242 Mon Sep 17 00:00:00 2001 From: summerji Date: Mon, 16 Nov 2020 00:27:33 -0800 Subject: [PATCH 02/27] Add license --- .../composer/ServiceClientSampleCodeComposer.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java index 4e6381fd3d..b0b272f680 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java @@ -1,3 +1,17 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package com.google.api.generator.gapic.composer; import com.google.api.gax.core.FixedCredentialsProvider; From e21482434a07401dd02d6d0736f1a6ab6ca319af Mon Sep 17 00:00:00 2001 From: summerji Date: Mon, 16 Nov 2020 17:49:01 -0800 Subject: [PATCH 03/27] Add comments in composer, add TODOs, refactor the signatures --- .../ServiceClientCommentComposer.java | 19 ++++++++++- .../ServiceClientSampleCodeComposer.java | 33 +++++++------------ 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java index 96cc59df77..b41b25992c 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java @@ -30,6 +30,10 @@ import java.util.stream.Stream; class ServiceClientCommentComposer { + // Name Pattern. + private static final String SETTINGS_NAME_PATTERN = "%sSettings"; + private static final String CLASS_NAME_PATTERN = "%sClient"; + // Tokens. private static final String COLON = ":"; private static final String EMPTY_STRING = ""; @@ -106,6 +110,10 @@ class ServiceClientCommentComposer { static List createClassHeaderComments( Service service, Map types) { + String settingsName = JavaStyle.toLowerCamelCase(getSettingsName(service.name())); + String clientName = JavaStyle.toLowerCamelCase(getClientClassName(service.name())); + TypeNode settingsType = types.get(getSettingsName(service.name())); + TypeNode clientType = types.get(getClientClassName(service.name())); JavaDocComment.Builder classHeaderJavadocBuilder = JavaDocComment.builder(); if (service.hasDescription()) { classHeaderJavadocBuilder = @@ -137,7 +145,8 @@ static List createClassHeaderComments( String.format("%sSettings", JavaStyle.toUpperCamelCase(service.name())))); classHeaderJavadocBuilder.addParagraph(SERVICE_DESCRIPTION_CREDENTIALS_SUMMARY_STRING); classHeaderJavadocBuilder.addSampleCode( - ServiceClientSampleCodeComposer.composeClassHeaderCredentialsSampleCode(service, types)); + ServiceClientSampleCodeComposer.composeClassHeaderCredentialsSampleCode( + clientName, clientType, settingsName, settingsType)); classHeaderJavadocBuilder.addParagraph(SERVICE_DESCRIPTION_ENDPOINT_SUMMARY_STRING); // TODO(summerji): Add endpoint customization sample code here. @@ -257,4 +266,12 @@ private static JavaDocComment.Builder processProtobufComment( return commentBuilder; } + + private static String getSettingsName(String serviceName) { + return String.format(SETTINGS_NAME_PATTERN, serviceName); + } + + private static String getClientClassName(String serviceName) { + return String.format(CLASS_NAME_PATTERN, serviceName); + } } diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java index b0b272f680..9224dea527 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java @@ -28,25 +28,22 @@ import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.engine.writer.JavaWriterVisitor; import com.google.api.generator.gapic.composer.samplecode.SampleCodeJavaFormatter; -import com.google.api.generator.gapic.model.Service; -import com.google.api.generator.gapic.utils.JavaStyle; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; public class ServiceClientSampleCodeComposer { - private static final String SETTINGS_NAME_PATTERN = "%sSettings"; - private static final String CLASS_NAME_PATTERN = "%sClient"; + //TODO(summerji): Add unit tests for ServiceClientSampleCodeComposer. public static String composeClassHeaderCredentialsSampleCode( - Service service, Map types) { - String settingsVarName = JavaStyle.toLowerCamelCase(getSettingsName(service.name())); - TypeNode settingsVarType = types.get(getSettingsName(service.name())); - VariableExpr settingsVarExpr = createVariableExpr(settingsVarName, settingsVarType); + String clientName, TypeNode clientType, String settingsName, TypeNode settingsType) { + // Initialize clientSettings with builder() method. + // e.g. EchoSettings echoSettings = + // EchoSettings.newBuilder().setCredentialsProvider(FixedCredentialsProvider.create("myCredentials")).build(); + VariableExpr settingsVarExpr = createVariableExpr(settingsName, settingsType); MethodInvocationExpr newBuilderMethodExpr = MethodInvocationExpr.builder() - .setStaticReferenceType(settingsVarType) + .setStaticReferenceType(settingsType) .setMethodName("newBuilder") .build(); TypeNode fixedCredentialProvideType = @@ -66,7 +63,7 @@ public static String composeClassHeaderCredentialsSampleCode( MethodInvocationExpr buildMethodExpr = MethodInvocationExpr.builder() .setExprReferenceExpr(credentialsMethodExpr) - .setReturnType(settingsVarType) + .setReturnType(settingsType) .setMethodName("build") .build(); Expr initSettingsVarExpr = @@ -75,8 +72,8 @@ public static String composeClassHeaderCredentialsSampleCode( .setValueExpr(buildMethodExpr) .build(); - String clientName = JavaStyle.toLowerCamelCase(getClientClassName(service.name())); - TypeNode clientType = types.get(getClientClassName(service.name())); + // Initialized client with create() method. + // e.g. EchoClient echoClient = EchoClient.create(echoSettings); VariableExpr clientVarExpr = createVariableExpr(clientName, clientType); MethodInvocationExpr createMethodExpr = MethodInvocationExpr.builder() @@ -95,15 +92,7 @@ public static String composeClassHeaderCredentialsSampleCode( } // ======================================== Helpers ==========================================// - - private static String getClientClassName(String serviceName) { - return String.format(CLASS_NAME_PATTERN, serviceName); - } - - private static String getSettingsName(String serviceName) { - return String.format(SETTINGS_NAME_PATTERN, serviceName); - } - + // TODO(summerji): Use writeSampleCode method in new class once PR#499 merged. private static String writeSampleCode(List exprs) { List statements = exprs.stream().map(e -> ExprStatement.withExpr(e)).collect(Collectors.toList()); From b9f8024f36994444f6fdcc8c1ae0f3d70ee37abf Mon Sep 17 00:00:00 2001 From: summerji Date: Mon, 16 Nov 2020 18:31:19 -0800 Subject: [PATCH 04/27] format the files --- .../gapic/composer/ServiceClientSampleCodeComposer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java index 9224dea527..519e6691f0 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; public class ServiceClientSampleCodeComposer { - //TODO(summerji): Add unit tests for ServiceClientSampleCodeComposer. + // TODO(summerji): Add unit tests for ServiceClientSampleCodeComposer. public static String composeClassHeaderCredentialsSampleCode( String clientName, TypeNode clientType, String settingsName, TypeNode settingsType) { From 2ae0ccec2b4947349ce8973780aa64386d67386f Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 12:24:19 -0800 Subject: [PATCH 05/27] refactor signature --- .../gapic/composer/ServiceClientClassComposer.java | 9 ++++++++- .../gapic/composer/ServiceClientCommentComposer.java | 5 +---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java index 8ed7331724..edc3b6a265 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java @@ -119,7 +119,10 @@ public GapicClass generate(Service service, Map messageTypes) { ClassDefinition classDef = ClassDefinition.builder() .setHeaderCommentStatements( - ServiceClientCommentComposer.createClassHeaderComments(service, types)) + ServiceClientCommentComposer.createClassHeaderComments( + service, + types.get(getClientClassName(service.name())), + types.get(getSettingsName(service.name())))) .setPackageString(pakkage) .setAnnotations(createClassAnnotations(types)) .setScope(ScopeNode.PUBLIC) @@ -1505,6 +1508,10 @@ private static String getClientClassName(String serviceName) { return String.format("%sClient", serviceName); } + private static String getSettingsName(String serviceName) { + return String.format("%sSettings", serviceName); + } + private static List getGenericsForCallable( CallableMethodKind kind, Method method, Map types) { if (kind.equals(CallableMethodKind.LRO)) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java index b41b25992c..084de56303 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java @@ -25,7 +25,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -109,11 +108,9 @@ class ServiceClientCommentComposer { + " operation returned by another API method call."); static List createClassHeaderComments( - Service service, Map types) { + Service service, TypeNode clientType, TypeNode settingsType) { String settingsName = JavaStyle.toLowerCamelCase(getSettingsName(service.name())); String clientName = JavaStyle.toLowerCamelCase(getClientClassName(service.name())); - TypeNode settingsType = types.get(getSettingsName(service.name())); - TypeNode clientType = types.get(getClientClassName(service.name())); JavaDocComment.Builder classHeaderJavadocBuilder = JavaDocComment.builder(); if (service.hasDescription()) { classHeaderJavadocBuilder = From cc843c6369fd95ed76a14c46da7f6ec2943e7e69 Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 13:46:47 -0800 Subject: [PATCH 06/27] simplify the input parameters --- .../gapic/composer/ServiceClientCommentComposer.java | 2 +- .../gapic/composer/ServiceClientSampleCodeComposer.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java index 084de56303..e3708ecffa 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java @@ -143,7 +143,7 @@ static List createClassHeaderComments( classHeaderJavadocBuilder.addParagraph(SERVICE_DESCRIPTION_CREDENTIALS_SUMMARY_STRING); classHeaderJavadocBuilder.addSampleCode( ServiceClientSampleCodeComposer.composeClassHeaderCredentialsSampleCode( - clientName, clientType, settingsName, settingsType)); + clientType, settingsType)); classHeaderJavadocBuilder.addParagraph(SERVICE_DESCRIPTION_ENDPOINT_SUMMARY_STRING); // TODO(summerji): Add endpoint customization sample code here. diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java index 519e6691f0..29fb34e45d 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java @@ -28,6 +28,7 @@ import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.engine.writer.JavaWriterVisitor; import com.google.api.generator.gapic.composer.samplecode.SampleCodeJavaFormatter; +import com.google.api.generator.gapic.utils.JavaStyle; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -36,10 +37,12 @@ public class ServiceClientSampleCodeComposer { // TODO(summerji): Add unit tests for ServiceClientSampleCodeComposer. public static String composeClassHeaderCredentialsSampleCode( - String clientName, TypeNode clientType, String settingsName, TypeNode settingsType) { + TypeNode clientType, TypeNode settingsType) { // Initialize clientSettings with builder() method. // e.g. EchoSettings echoSettings = // EchoSettings.newBuilder().setCredentialsProvider(FixedCredentialsProvider.create("myCredentials")).build(); + String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name()); + String clientName = JavaStyle.toLowerCamelCase(clientType.reference().name()); VariableExpr settingsVarExpr = createVariableExpr(settingsName, settingsType); MethodInvocationExpr newBuilderMethodExpr = MethodInvocationExpr.builder() From f997138e7fa1a1e395c189286a8be4e2431ac7e0 Mon Sep 17 00:00:00 2001 From: summerji Date: Mon, 16 Nov 2020 00:57:04 -0800 Subject: [PATCH 07/27] Implement set endpoint in service client class comment header --- .../ServiceClientCommentComposer.java | 3 +- .../ServiceClientSampleCodeComposer.java | 48 +++++++++++++++++++ .../gapic/composer/goldens/EchoClient.golden | 5 ++ .../composer/goldens/IdentityClient.golden | 6 +++ .../goldens/asset/AssetServiceClient.java | 6 +++ .../logging/ConfigServiceV2Client.java | 7 +++ .../logging/LoggingServiceV2Client.java | 7 +++ .../logging/MetricsServiceV2Client.java | 7 +++ .../goldens/redis/CloudRedisClient.java | 6 +++ 9 files changed, 94 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java index 50a495440d..14e29f42ce 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java @@ -145,7 +145,8 @@ static List createClassHeaderComments( ServiceClientSampleCodeComposer.composeClassHeaderCredentialsSampleCode( clientType, settingsType)); classHeaderJavadocBuilder.addParagraph(SERVICE_DESCRIPTION_ENDPOINT_SUMMARY_STRING); - // TODO(summerji): Add endpoint customization sample code here. + classHeaderJavadocBuilder.addSampleCode( + ServiceClientSampleCodeComposer.composeClassHeaderEndpointSampleCode(service, types)); return Arrays.asList( CommentComposer.AUTO_GENERATED_CLASS_COMMENT, diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java index 29fb34e45d..68e686bc16 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java @@ -94,6 +94,54 @@ public static String composeClassHeaderCredentialsSampleCode( return writeSampleCode(Arrays.asList(initSettingsVarExpr, initClientVarExpr)); } + public static String composeClassHeaderEndpointSampleCode( + Service service, Map types) { + String settingsVarName = JavaStyle.toLowerCamelCase(getSettingsName(service.name())); + TypeNode settingsVarType = types.get(getSettingsName(service.name())); + VariableExpr settingsVarExpr = createVariableExpr(settingsVarName, settingsVarType); + MethodInvocationExpr newBuilderMethodExpr = + MethodInvocationExpr.builder() + .setStaticReferenceType(settingsVarType) + .setMethodName("newBuilder") + .build(); + MethodInvocationExpr credentialsMethodExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(newBuilderMethodExpr) + .setArguments(ValueExpr.withValue(StringObjectValue.withValue("myEndpoint"))) + .setMethodName("setEndpoint") + .build(); + MethodInvocationExpr buildMethodExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(credentialsMethodExpr) + .setReturnType(settingsVarType) + .setMethodName("build") + .build(); + + Expr initSettingsVarExpr = + AssignmentExpr.builder() + .setVariableExpr(settingsVarExpr.toBuilder().setIsDecl(true).build()) + .setValueExpr(buildMethodExpr) + .build(); + + String clientName = JavaStyle.toLowerCamelCase(getClientClassName(service.name())); + TypeNode clientType = types.get(getClientClassName(service.name())); + VariableExpr clientVarExpr = createVariableExpr(clientName, clientType); + MethodInvocationExpr createMethodExpr = + MethodInvocationExpr.builder() + .setStaticReferenceType(clientType) + .setArguments(settingsVarExpr) + .setMethodName("create") + .setReturnType(clientType) + .build(); + Expr initClientVarExpr = + AssignmentExpr.builder() + .setVariableExpr(clientVarExpr.toBuilder().setIsDecl(true).build()) + .setValueExpr(createMethodExpr) + .build(); + + return writeSampleCode(Arrays.asList(initSettingsVarExpr, initClientVarExpr)); + } + // ======================================== Helpers ==========================================// // TODO(summerji): Use writeSampleCode method in new class once PR#499 merged. private static String writeSampleCode(List exprs) { diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden index f6d876176c..98a271a69a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden @@ -72,6 +72,11 @@ import javax.annotation.Generated; * } * *

To customize the endpoint: + * + * 

{@code
+ * EchoSettings echoSettings = EchoSettings.newBuilder().setEndpoint("myEndpoint").build();
+ * EchoClient echoClient = EchoClient.create(echoSettings);
+ * }
*/ @BetaApi @Generated("by gapic-generator") diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden index fa121bc4d9..2ac3ee2add 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden @@ -62,6 +62,12 @@ import javax.annotation.Generated; * } * *

To customize the endpoint: + * + * 

{@code
+ * IdentitySettings identitySettings =
+ *     IdentitySettings.newBuilder().setEndpoint("myEndpoint").build();
+ * IdentityClient identityClient = IdentityClient.create(identitySettings);
+ * }
*/ @BetaApi @Generated("by gapic-generator") diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java index 7ba8307058..b3d174be9f 100644 --- a/test/integration/goldens/asset/AssetServiceClient.java +++ b/test/integration/goldens/asset/AssetServiceClient.java @@ -84,6 +84,12 @@ * } * *

To customize the endpoint: + * + * 

{@code
+ * AssetServiceSettings assetServiceSettings =
+ *     AssetServiceSettings.newBuilder().setEndpoint("myEndpoint").build();
+ * AssetServiceClient assetServiceClient = AssetServiceClient.create(assetServiceSettings);
+ * }
*/ @BetaApi @Generated("by gapic-generator") diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java index afb5fc89da..575980738f 100644 --- a/test/integration/goldens/logging/ConfigServiceV2Client.java +++ b/test/integration/goldens/logging/ConfigServiceV2Client.java @@ -83,6 +83,13 @@ * } * *

To customize the endpoint: + * + * 

{@code
+ * ConfigServiceV2Settings configServiceV2Settings =
+ *     ConfigServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
+ * ConfigServiceV2Client configServiceV2Client =
+ *     ConfigServiceV2Client.create(configServiceV2Settings);
+ * }
*/ @BetaApi @Generated("by gapic-generator") diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java index 45d0ef7d89..d50f10ebce 100644 --- a/test/integration/goldens/logging/LoggingServiceV2Client.java +++ b/test/integration/goldens/logging/LoggingServiceV2Client.java @@ -85,6 +85,13 @@ * } * *

To customize the endpoint: + * + * 

{@code
+ * LoggingServiceV2Settings loggingServiceV2Settings =
+ *     LoggingServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
+ * LoggingServiceV2Client loggingServiceV2Client =
+ *     LoggingServiceV2Client.create(loggingServiceV2Settings);
+ * }
*/ @BetaApi @Generated("by gapic-generator") diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java index c6735f8f00..09761c6979 100644 --- a/test/integration/goldens/logging/MetricsServiceV2Client.java +++ b/test/integration/goldens/logging/MetricsServiceV2Client.java @@ -82,6 +82,13 @@ * } * *

To customize the endpoint: + * + * 

{@code
+ * MetricsServiceV2Settings metricsServiceV2Settings =
+ *     MetricsServiceV2Settings.newBuilder().setEndpoint("myEndpoint").build();
+ * MetricsServiceV2Client metricsServiceV2Client =
+ *     MetricsServiceV2Client.create(metricsServiceV2Settings);
+ * }
*/ @BetaApi @Generated("by gapic-generator") diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java index 5fed1d2d0a..d04354c29b 100644 --- a/test/integration/goldens/redis/CloudRedisClient.java +++ b/test/integration/goldens/redis/CloudRedisClient.java @@ -104,6 +104,12 @@ * } * *

To customize the endpoint: + * + * 

{@code
+ * CloudRedisSettings cloudRedisSettings =
+ *     CloudRedisSettings.newBuilder().setEndpoint("myEndpoint").build();
+ * CloudRedisClient cloudRedisClient = CloudRedisClient.create(cloudRedisSettings);
+ * }
*/ @BetaApi @Generated("by gapic-generator") From e5e60144696fdf98f1a46f92271ff7cb7f8c5b61 Mon Sep 17 00:00:00 2001 From: summerji Date: Mon, 16 Nov 2020 17:57:17 -0800 Subject: [PATCH 08/27] Refactor signatures, add todos, and comments --- .../composer/ServiceClientCommentComposer.java | 3 ++- .../ServiceClientSampleCodeComposer.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java index 14e29f42ce..9ec1b6c1a5 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java @@ -146,7 +146,8 @@ static List createClassHeaderComments( clientType, settingsType)); classHeaderJavadocBuilder.addParagraph(SERVICE_DESCRIPTION_ENDPOINT_SUMMARY_STRING); classHeaderJavadocBuilder.addSampleCode( - ServiceClientSampleCodeComposer.composeClassHeaderEndpointSampleCode(service, types)); + ServiceClientSampleCodeComposer.composeClassHeaderEndpointSampleCode( + clientName, clientType, settingsName, settingsType)); return Arrays.asList( CommentComposer.AUTO_GENERATED_CLASS_COMMENT, diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java index 68e686bc16..05db494fbc 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java @@ -95,13 +95,13 @@ public static String composeClassHeaderCredentialsSampleCode( } public static String composeClassHeaderEndpointSampleCode( - Service service, Map types) { - String settingsVarName = JavaStyle.toLowerCamelCase(getSettingsName(service.name())); - TypeNode settingsVarType = types.get(getSettingsName(service.name())); - VariableExpr settingsVarExpr = createVariableExpr(settingsVarName, settingsVarType); + String clientName, TypeNode clientType, String settingsName, TypeNode settingsType) { + // Initialize client settings with builder() method. + // e.g. EchoSettings echoSettings = EchoSettings.newBuilder().setEndpoint("myEndpoint").build(); + VariableExpr settingsVarExpr = createVariableExpr(settingsName, settingsType); MethodInvocationExpr newBuilderMethodExpr = MethodInvocationExpr.builder() - .setStaticReferenceType(settingsVarType) + .setStaticReferenceType(settingsType) .setMethodName("newBuilder") .build(); MethodInvocationExpr credentialsMethodExpr = @@ -113,7 +113,7 @@ public static String composeClassHeaderEndpointSampleCode( MethodInvocationExpr buildMethodExpr = MethodInvocationExpr.builder() .setExprReferenceExpr(credentialsMethodExpr) - .setReturnType(settingsVarType) + .setReturnType(settingsType) .setMethodName("build") .build(); @@ -123,8 +123,8 @@ public static String composeClassHeaderEndpointSampleCode( .setValueExpr(buildMethodExpr) .build(); - String clientName = JavaStyle.toLowerCamelCase(getClientClassName(service.name())); - TypeNode clientType = types.get(getClientClassName(service.name())); + // Initialize client with create() method. + // e.g. EchoClient echoClient = EchoClient.create(echoSettings); VariableExpr clientVarExpr = createVariableExpr(clientName, clientType); MethodInvocationExpr createMethodExpr = MethodInvocationExpr.builder() From 260d6686ef4620a0453fe30dcfd90632a9c35a45 Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 13:54:51 -0800 Subject: [PATCH 09/27] simplify the input parameters --- .../gapic/composer/ServiceClientCommentComposer.java | 2 +- .../gapic/composer/ServiceClientSampleCodeComposer.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java index 9ec1b6c1a5..98eb8a4b2c 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java @@ -147,7 +147,7 @@ static List createClassHeaderComments( classHeaderJavadocBuilder.addParagraph(SERVICE_DESCRIPTION_ENDPOINT_SUMMARY_STRING); classHeaderJavadocBuilder.addSampleCode( ServiceClientSampleCodeComposer.composeClassHeaderEndpointSampleCode( - clientName, clientType, settingsName, settingsType)); + clientType, settingsType)); return Arrays.asList( CommentComposer.AUTO_GENERATED_CLASS_COMMENT, diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java index 05db494fbc..ee51d4cb57 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java @@ -95,9 +95,11 @@ public static String composeClassHeaderCredentialsSampleCode( } public static String composeClassHeaderEndpointSampleCode( - String clientName, TypeNode clientType, String settingsName, TypeNode settingsType) { + TypeNode clientType, TypeNode settingsType) { // Initialize client settings with builder() method. // e.g. EchoSettings echoSettings = EchoSettings.newBuilder().setEndpoint("myEndpoint").build(); + String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name()); + String clientName = JavaStyle.toLowerCamelCase(clientType.reference().name()); VariableExpr settingsVarExpr = createVariableExpr(settingsName, settingsType); MethodInvocationExpr newBuilderMethodExpr = MethodInvocationExpr.builder() From 6306d164aeca4ac807aa4231407b0aeb7adaefcd Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 15:58:41 -0800 Subject: [PATCH 10/27] Structure sample code in rpc methods --- .../composer/ServiceClientClassComposer.java | 25 +- .../ServiceClientCommentComposer.java | 10 +- .../ServiceClientSampleCodeComposer.java | 9 + .../gapic/composer/goldens/EchoClient.golden | 78 +++++ .../composer/goldens/IdentityClient.golden | 66 ++++ .../goldens/asset/AssetServiceClient.java | 108 ++++++ .../logging/ConfigServiceV2Client.java | 324 ++++++++++++++++++ .../logging/LoggingServiceV2Client.java | 90 +++++ .../logging/MetricsServiceV2Client.java | 90 +++++ .../goldens/redis/CloudRedisClient.java | 144 ++++++++ 10 files changed, 932 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java index edc3b6a265..e136c25402 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java @@ -157,7 +157,9 @@ private static List createClassMethods( methods.addAll(createStaticCreatorMethods(service, types)); methods.addAll(createConstructorMethods(service, types, hasLroClient)); methods.addAll(createGetterMethods(service, types, hasLroClient)); - methods.addAll(createServiceMethods(service, messageTypes, types)); + methods.addAll( + createServiceMethods( + service, messageTypes, types, types.get(getClientClassName(service.name())))); methods.addAll(createBackgroundResourceMethods(service, types)); return methods; } @@ -469,12 +471,15 @@ private static List createGetterMethods( } private static List createServiceMethods( - Service service, Map messageTypes, Map types) { + Service service, + Map messageTypes, + Map types, + TypeNode clientType) { List javaMethods = new ArrayList<>(); for (Method method : service.methods()) { if (method.stream().equals(Stream.NONE)) { - javaMethods.addAll(createMethodVariants(method, messageTypes, types)); - javaMethods.add(createMethodDefaultMethod(method, types)); + javaMethods.addAll(createMethodVariants(method, messageTypes, types, clientType)); + javaMethods.add(createMethodDefaultMethod(method, types, clientType)); } if (method.hasLro()) { javaMethods.add(createLroCallableMethod(service.name(), method, types)); @@ -488,7 +493,10 @@ private static List createServiceMethods( } private static List createMethodVariants( - Method method, Map messageTypes, Map types) { + Method method, + Map messageTypes, + Map types, + TypeNode clientType) { List javaMethods = new ArrayList<>(); String methodName = JavaStyle.toLowerCamelCase(method.name()); TypeNode methodInputType = method.inputType(); @@ -552,7 +560,8 @@ private static List createMethodVariants( javaMethods.add( MethodDefinition.builder() .setHeaderCommentStatements( - ServiceClientCommentComposer.createRpcMethodHeaderComment(method, signature)) + ServiceClientCommentComposer.createRpcMethodHeaderComment( + method, signature, clientType)) .setScope(ScopeNode.PUBLIC) .setIsFinal(true) .setReturnType(methodOutputType) @@ -567,7 +576,7 @@ private static List createMethodVariants( } private static MethodDefinition createMethodDefaultMethod( - Method method, Map types) { + Method method, Map types, TypeNode clientType) { String methodName = JavaStyle.toLowerCamelCase(method.name()); TypeNode methodInputType = method.inputType(); TypeNode methodOutputType = @@ -611,7 +620,7 @@ private static MethodDefinition createMethodDefaultMethod( .build(); return MethodDefinition.builder() .setHeaderCommentStatements( - ServiceClientCommentComposer.createRpcMethodHeaderComment(method)) + ServiceClientCommentComposer.createRpcMethodHeaderComment(method, clientType)) .setScope(ScopeNode.PUBLIC) .setIsFinal(true) .setReturnType(methodOutputType) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java index 98eb8a4b2c..9fd2629183 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java @@ -162,7 +162,7 @@ static CommentStatement createCreateMethodStubArgComment( } static List createRpcMethodHeaderComment( - Method method, List methodArguments) { + Method method, List methodArguments, TypeNode clientType) { JavaDocComment.Builder methodJavadocBuilder = JavaDocComment.builder(); if (method.hasDescription()) { @@ -171,7 +171,9 @@ static List createRpcMethodHeaderComment( } methodJavadocBuilder.addParagraph(METHOD_DESCRIPTION_SAMPLE_CODE_SUMMARY_STRING); - // TODO(summerji): Add sample code here. + methodJavadocBuilder.addSampleCode( + ServiceClientSampleCodeComposer.composeRpcMethodHeaderSampleCode( + method, methodArguments, clientType)); if (methodArguments.isEmpty()) { methodJavadocBuilder.addParam( @@ -192,8 +194,8 @@ static List createRpcMethodHeaderComment( CommentStatement.withComment(methodJavadocBuilder.build())); } - static List createRpcMethodHeaderComment(Method method) { - return createRpcMethodHeaderComment(method, Collections.emptyList()); + static List createRpcMethodHeaderComment(Method method, TypeNode clientType) { + return createRpcMethodHeaderComment(method, Collections.emptyList(), clientType); } static CommentStatement createMethodNoArgComment(String serviceName) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java index ee51d4cb57..838f703354 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java @@ -28,6 +28,9 @@ import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.engine.writer.JavaWriterVisitor; import com.google.api.generator.gapic.composer.samplecode.SampleCodeJavaFormatter; +import com.google.api.generator.gapic.composer.samplecode.SampleCodeWriter; +import com.google.api.generator.gapic.model.Method; +import com.google.api.generator.gapic.model.MethodArgument; import com.google.api.generator.gapic.utils.JavaStyle; import java.util.Arrays; import java.util.List; @@ -144,6 +147,12 @@ public static String composeClassHeaderEndpointSampleCode( return writeSampleCode(Arrays.asList(initSettingsVarExpr, initClientVarExpr)); } + public static String composeRpcMethodHeaderSampleCode( + Method method, List arguments, TypeNode clientType) { + return SampleCodeWriter.write( + SampleCodeHelperComposer.composeRpcMethodSampleCode(method, arguments, clientType)); + } + // ======================================== Helpers ==========================================// // TODO(summerji): Use writeSampleCode method in new class once PR#499 merged. private static String writeSampleCode(List exprs) { diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden index 98a271a69a..0c6ba38ac9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden @@ -145,6 +145,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -160,6 +166,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param error * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -172,6 +184,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -185,6 +203,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param content * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -197,6 +221,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -209,6 +239,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -221,6 +257,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param content * @param severity * @throws com.google.api.gax.rpc.ApiException if the remote call fails @@ -235,6 +277,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -276,6 +324,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -300,6 +354,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param ttl * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -312,6 +372,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param end_time * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -324,6 +390,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -347,6 +419,12 @@ public class EchoClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (EchoClient echoClient = EchoClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden index 2ac3ee2add..9b8a9741ad 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden @@ -125,6 +125,12 @@ public class IdentityClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (IdentityClient identityClient = IdentityClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent * @param display_name * @param email @@ -144,6 +150,12 @@ public class IdentityClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (IdentityClient identityClient = IdentityClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent * @param display_name * @param email @@ -178,6 +190,12 @@ public class IdentityClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (IdentityClient identityClient = IdentityClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -195,6 +213,12 @@ public class IdentityClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (IdentityClient identityClient = IdentityClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -208,6 +232,12 @@ public class IdentityClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (IdentityClient identityClient = IdentityClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -220,6 +250,12 @@ public class IdentityClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (IdentityClient identityClient = IdentityClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -237,6 +273,12 @@ public class IdentityClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (IdentityClient identityClient = IdentityClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -254,6 +296,12 @@ public class IdentityClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (IdentityClient identityClient = IdentityClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -269,6 +317,12 @@ public class IdentityClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (IdentityClient identityClient = IdentityClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -281,6 +335,12 @@ public class IdentityClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (IdentityClient identityClient = IdentityClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -298,6 +358,12 @@ public class IdentityClient implements BackgroundResource { /** * Sample code: * + * 
{@code
+   * try (IdentityClient identityClient = IdentityClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java index b3d174be9f..7250e322c3 100644 --- a/test/integration/goldens/asset/AssetServiceClient.java +++ b/test/integration/goldens/asset/AssetServiceClient.java @@ -168,6 +168,12 @@ public final OperationsClient getOperationsClient() { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -221,6 +227,12 @@ public final UnaryCallable exportAssetsCallable( * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -250,6 +262,12 @@ public final BatchGetAssetsHistoryResponse batchGetAssetsHistory( * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The name of the project/folder/organization where this feed should be * created in. It can only be an organization number (such as "organizations/123"), a folder * number (such as "folders/123"), a project ID (such as "projects/my-project-id")", or a @@ -267,6 +285,12 @@ public final Feed createFeed(String parent) { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -290,6 +314,12 @@ public final UnaryCallable createFeedCallable() { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. The name of the Feed and it must be in the format of: * projects/project_number/feeds/feed_id folders/folder_number/feeds/feed_id * organizations/organization_number/feeds/feed_id @@ -307,6 +337,12 @@ public final Feed getFeed(FeedName name) { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. The name of the Feed and it must be in the format of: * projects/project_number/feeds/feed_id folders/folder_number/feeds/feed_id * organizations/organization_number/feeds/feed_id @@ -323,6 +359,12 @@ public final Feed getFeed(String name) { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -346,6 +388,12 @@ public final UnaryCallable getFeedCallable() { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent project/folder/organization whose feeds are to be listed. It * can only be using project/folder/organization number (such as "folders/12345")", or a * project ID (such as "projects/my-project-id"). @@ -362,6 +410,12 @@ public final ListFeedsResponse listFeeds(String parent) { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -385,6 +439,12 @@ public final UnaryCallable listFeedsCallabl * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param feed Required. The new values of feed details. It must match an existing feed and the * field `name` must be in the format of: projects/project_number/feeds/feed_id or * folders/folder_number/feeds/feed_id or organizations/organization_number/feeds/feed_id. @@ -401,6 +461,12 @@ public final Feed updateFeed(Feed feed) { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -424,6 +490,12 @@ public final UnaryCallable updateFeedCallable() { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. The name of the feed and it must be in the format of: * projects/project_number/feeds/feed_id folders/folder_number/feeds/feed_id * organizations/organization_number/feeds/feed_id @@ -443,6 +515,12 @@ public final Empty deleteFeed(FeedName name) { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. The name of the feed and it must be in the format of: * projects/project_number/feeds/feed_id folders/folder_number/feeds/feed_id * organizations/organization_number/feeds/feed_id @@ -459,6 +537,12 @@ public final Empty deleteFeed(String name) { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -484,6 +568,12 @@ public final UnaryCallable deleteFeedCallable() { * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param scope Required. A scope can be a project, a folder, or an organization. The search is * limited to the resources within the `scope`. The caller must be granted the * [`cloudasset.assets.searchAllResources`](http://cloud.google.com/asset-inventory/docs/access-control#required_permissions) @@ -552,6 +642,12 @@ public final SearchAllResourcesPagedResponse searchAllResources( * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -594,6 +690,12 @@ public final SearchAllResourcesPagedResponse searchAllResources( * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param scope Required. A scope can be a project, a folder, or an organization. The search is * limited to the IAM policies within the `scope`. The caller must be granted the * [`cloudasset.assets.searchAllIamPolicies`](http://cloud.google.com/asset-inventory/docs/access-control#required_permissions) @@ -646,6 +748,12 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(String scope * *

Sample code: * + * 

{@code
+   * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java index 575980738f..e2ae38f74b 100644 --- a/test/integration/goldens/logging/ConfigServiceV2Client.java +++ b/test/integration/goldens/logging/ConfigServiceV2Client.java @@ -151,6 +151,12 @@ public ConfigServiceV2Stub getStub() { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose buckets are to be listed: *

"projects/[PROJECT_ID]/locations/[LOCATION_ID]" * "organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]" @@ -174,6 +180,12 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose buckets are to be listed: *

"projects/[PROJECT_ID]/locations/[LOCATION_ID]" * "organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]" @@ -197,6 +209,12 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose buckets are to be listed: *

"projects/[PROJECT_ID]/locations/[LOCATION_ID]" * "organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]" @@ -220,6 +238,12 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose buckets are to be listed: *

"projects/[PROJECT_ID]/locations/[LOCATION_ID]" * "organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]" @@ -243,6 +267,12 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose buckets are to be listed: *

"projects/[PROJECT_ID]/locations/[LOCATION_ID]" * "organizations/[ORGANIZATION_ID]/locations/[LOCATION_ID]" @@ -263,6 +293,12 @@ public final ListBucketsPagedResponse listBuckets(String parent) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -297,6 +333,12 @@ public final UnaryCallable listBucketsC * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -329,6 +371,12 @@ public final UnaryCallable getBucketCallable() { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -361,6 +409,12 @@ public final UnaryCallable updateBucketCallable( * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose sinks are to be listed: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -380,6 +434,12 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose sinks are to be listed: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -399,6 +459,12 @@ public final ListSinksPagedResponse listSinks(FolderName parent) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose sinks are to be listed: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -418,6 +484,12 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose sinks are to be listed: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -437,6 +509,12 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose sinks are to be listed: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -453,6 +531,12 @@ public final ListSinksPagedResponse listSinks(String parent) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -486,6 +570,12 @@ public final UnaryCallable listSinksCallabl * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param sink_name Required. The resource name of the sink: *

"projects/[PROJECT_ID]/sinks/[SINK_ID]" * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]" @@ -508,6 +598,12 @@ public final LogSink getSink(LogSinkName sinkName) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param sink_name Required. The resource name of the sink: *

"projects/[PROJECT_ID]/sinks/[SINK_ID]" * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]" @@ -527,6 +623,12 @@ public final LogSink getSink(String sinkName) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -553,6 +655,12 @@ public final UnaryCallable getSinkCallable() { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource in which to create the sink: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -579,6 +687,12 @@ public final LogSink createSink(BillingAccountName parent, LogSink sink) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource in which to create the sink: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -605,6 +719,12 @@ public final LogSink createSink(FolderName parent, LogSink sink) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource in which to create the sink: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -631,6 +751,12 @@ public final LogSink createSink(OrganizationName parent, LogSink sink) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource in which to create the sink: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -657,6 +783,12 @@ public final LogSink createSink(ProjectName parent, LogSink sink) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource in which to create the sink: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -680,6 +812,12 @@ public final LogSink createSink(String parent, LogSink sink) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -710,6 +848,12 @@ public final UnaryCallable createSinkCallable() { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param sink_name Required. The full resource name of the sink to update, including the parent * resource and the sink identifier: *

"projects/[PROJECT_ID]/sinks/[SINK_ID]" @@ -740,6 +884,12 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param sink_name Required. The full resource name of the sink to update, including the parent * resource and the sink identifier: *

"projects/[PROJECT_ID]/sinks/[SINK_ID]" @@ -767,6 +917,12 @@ public final LogSink updateSink(String sinkName, LogSink sink) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param sink_name Required. The full resource name of the sink to update, including the parent * resource and the sink identifier: *

"projects/[PROJECT_ID]/sinks/[SINK_ID]" @@ -807,6 +963,12 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink, FieldMask up * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param sink_name Required. The full resource name of the sink to update, including the parent * resource and the sink identifier: *

"projects/[PROJECT_ID]/sinks/[SINK_ID]" @@ -847,6 +1009,12 @@ public final LogSink updateSink(String sinkName, LogSink sink, FieldMask updateM * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -875,6 +1043,12 @@ public final UnaryCallable updateSinkCallable() { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param sink_name Required. The full resource name of the sink to delete, including the parent * resource and the sink identifier: *

"projects/[PROJECT_ID]/sinks/[SINK_ID]" @@ -899,6 +1073,12 @@ public final Empty deleteSink(LogSinkName sinkName) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param sink_name Required. The full resource name of the sink to delete, including the parent * resource and the sink identifier: *

"projects/[PROJECT_ID]/sinks/[SINK_ID]" @@ -920,6 +1100,12 @@ public final Empty deleteSink(String sinkName) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -944,6 +1130,12 @@ public final UnaryCallable deleteSinkCallable() { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose exclusions are to be listed. *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -963,6 +1155,12 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose exclusions are to be listed. *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -982,6 +1180,12 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose exclusions are to be listed. *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -1001,6 +1205,12 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent) * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose exclusions are to be listed. *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -1020,6 +1230,12 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource whose exclusions are to be listed. *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -1036,6 +1252,12 @@ public final ListExclusionsPagedResponse listExclusions(String parent) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -1071,6 +1293,12 @@ public final ListExclusionsPagedResponse listExclusions(ListExclusionsRequest re * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. The resource name of an existing exclusion: *

"projects/[PROJECT_ID]/exclusions/[EXCLUSION_ID]" * "organizations/[ORGANIZATION_ID]/exclusions/[EXCLUSION_ID]" @@ -1093,6 +1321,12 @@ public final LogExclusion getExclusion(LogExclusionName name) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. The resource name of an existing exclusion: *

"projects/[PROJECT_ID]/exclusions/[EXCLUSION_ID]" * "organizations/[ORGANIZATION_ID]/exclusions/[EXCLUSION_ID]" @@ -1112,6 +1346,12 @@ public final LogExclusion getExclusion(String name) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -1136,6 +1376,12 @@ public final UnaryCallable getExclusionCallab * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource in which to create the exclusion: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -1160,6 +1406,12 @@ public final LogExclusion createExclusion(BillingAccountName parent, LogExclusio * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource in which to create the exclusion: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -1184,6 +1436,12 @@ public final LogExclusion createExclusion(FolderName parent, LogExclusion exclus * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource in which to create the exclusion: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -1208,6 +1466,12 @@ public final LogExclusion createExclusion(OrganizationName parent, LogExclusion * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource in which to create the exclusion: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -1232,6 +1496,12 @@ public final LogExclusion createExclusion(ProjectName parent, LogExclusion exclu * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The parent resource in which to create the exclusion: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -1253,6 +1523,12 @@ public final LogExclusion createExclusion(String parent, LogExclusion exclusion) * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -1277,6 +1553,12 @@ public final UnaryCallable createExclusion * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. The resource name of the exclusion to update: *

"projects/[PROJECT_ID]/exclusions/[EXCLUSION_ID]" * "organizations/[ORGANIZATION_ID]/exclusions/[EXCLUSION_ID]" @@ -1310,6 +1592,12 @@ public final LogExclusion updateExclusion( * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. The resource name of the exclusion to update: *

"projects/[PROJECT_ID]/exclusions/[EXCLUSION_ID]" * "organizations/[ORGANIZATION_ID]/exclusions/[EXCLUSION_ID]" @@ -1343,6 +1631,12 @@ public final LogExclusion updateExclusion( * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -1366,6 +1660,12 @@ public final UnaryCallable updateExclusion * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. The resource name of an existing exclusion to delete: *

"projects/[PROJECT_ID]/exclusions/[EXCLUSION_ID]" * "organizations/[ORGANIZATION_ID]/exclusions/[EXCLUSION_ID]" @@ -1388,6 +1688,12 @@ public final Empty deleteExclusion(LogExclusionName name) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. The resource name of an existing exclusion to delete: *

"projects/[PROJECT_ID]/exclusions/[EXCLUSION_ID]" * "organizations/[ORGANIZATION_ID]/exclusions/[EXCLUSION_ID]" @@ -1407,6 +1713,12 @@ public final Empty deleteExclusion(String name) { * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -1436,6 +1748,12 @@ public final UnaryCallable deleteExclusionCallabl * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -1476,6 +1794,12 @@ public final UnaryCallable getCmekSettings * *

Sample code: * + * 

{@code
+   * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java index d50f10ebce..6ce1717123 100644 --- a/test/integration/goldens/logging/LoggingServiceV2Client.java +++ b/test/integration/goldens/logging/LoggingServiceV2Client.java @@ -155,6 +155,12 @@ public LoggingServiceV2Stub getStub() { * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param log_name Required. The resource name of the log to delete: *

"projects/[PROJECT_ID]/logs/[LOG_ID]" "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]" "folders/[FOLDER_ID]/logs/[LOG_ID]" @@ -179,6 +185,12 @@ public final Empty deleteLog(LogName logName) { * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param log_name Required. The resource name of the log to delete: *

"projects/[PROJECT_ID]/logs/[LOG_ID]" "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]" "folders/[FOLDER_ID]/logs/[LOG_ID]" @@ -200,6 +212,12 @@ public final Empty deleteLog(String logName) { * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -228,6 +246,12 @@ public final UnaryCallable deleteLogCallable() { * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param log_name Optional. A default log resource name that is assigned to all log entries in * `entries` that do not specify a value for `log_name`: *

"projects/[PROJECT_ID]/logs/[LOG_ID]" "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]" @@ -292,6 +316,12 @@ public final WriteLogEntriesResponse writeLogEntries( * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param log_name Optional. A default log resource name that is assigned to all log entries in * `entries` that do not specify a value for `log_name`: *

"projects/[PROJECT_ID]/logs/[LOG_ID]" "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]" @@ -356,6 +386,12 @@ public final WriteLogEntriesResponse writeLogEntries( * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -385,6 +421,12 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param resource_names Required. Names of one or more parent resources from which to retrieve * log entries: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" @@ -422,6 +464,12 @@ public final ListLogEntriesPagedResponse listLogEntries( * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -461,6 +509,12 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -500,6 +554,12 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource name that owns the logs: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -520,6 +580,12 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) { * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource name that owns the logs: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -540,6 +606,12 @@ public final ListLogsPagedResponse listLogs(FolderName parent) { * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource name that owns the logs: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -560,6 +632,12 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) { * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource name that owns the logs: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -580,6 +658,12 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) { * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource name that owns the logs: *

"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]" * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" @@ -597,6 +681,12 @@ public final ListLogsPagedResponse listLogs(String parent) { * *

Sample code: * + * 

{@code
+   * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java index 09761c6979..e3d59680f4 100644 --- a/test/integration/goldens/logging/MetricsServiceV2Client.java +++ b/test/integration/goldens/logging/MetricsServiceV2Client.java @@ -150,6 +150,12 @@ public MetricsServiceV2Stub getStub() { * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The name of the project containing the metrics: *

"projects/[PROJECT_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails @@ -168,6 +174,12 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) { * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The name of the project containing the metrics: *

"projects/[PROJECT_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails @@ -183,6 +195,12 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) { * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -218,6 +236,12 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param metric_name Required. The resource name of the desired metric: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails @@ -236,6 +260,12 @@ public final LogMetric getLogMetric(LogMetricName metricName) { * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param metric_name Required. The resource name of the desired metric: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails @@ -252,6 +282,12 @@ public final LogMetric getLogMetric(String metricName) { * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -275,6 +311,12 @@ public final UnaryCallable getLogMetricCallable( * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource name of the project in which to create the metric: *

"projects/[PROJECT_ID]" *

The new metric must be provided in the request. @@ -297,6 +339,12 @@ public final LogMetric createLogMetric(ProjectName parent, LogMetric metric) { * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource name of the project in which to create the metric: *

"projects/[PROJECT_ID]" *

The new metric must be provided in the request. @@ -316,6 +364,12 @@ public final LogMetric createLogMetric(String parent, LogMetric metric) { * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -339,6 +393,12 @@ public final UnaryCallable createLogMetricCal * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param metric_name Required. The resource name of the metric to update: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" *

The updated metric must be provided in the request and it's `name` field must be the @@ -362,6 +422,12 @@ public final LogMetric updateLogMetric(LogMetricName metricName, LogMetric metri * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param metric_name Required. The resource name of the metric to update: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" *

The updated metric must be provided in the request and it's `name` field must be the @@ -382,6 +448,12 @@ public final LogMetric updateLogMetric(String metricName, LogMetric metric) { * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -405,6 +477,12 @@ public final UnaryCallable updateLogMetricCal * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param metric_name Required. The resource name of the metric to delete: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails @@ -423,6 +501,12 @@ public final Empty deleteLogMetric(LogMetricName metricName) { * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param metric_name Required. The resource name of the metric to delete: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails @@ -439,6 +523,12 @@ public final Empty deleteLogMetric(String metricName) { * *

Sample code: * + * 

{@code
+   * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java index d04354c29b..abca20f3ca 100644 --- a/test/integration/goldens/redis/CloudRedisClient.java +++ b/test/integration/goldens/redis/CloudRedisClient.java @@ -190,6 +190,12 @@ public final OperationsClient getOperationsClient() { * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource name of the instance location using the form: * `projects/{project_id}/locations/{location_id}` where `location_id` refers to a GCP region. * @throws com.google.api.gax.rpc.ApiException if the remote call fails @@ -218,6 +224,12 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) { * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource name of the instance location using the form: * `projects/{project_id}/locations/{location_id}` where `location_id` refers to a GCP region. * @throws com.google.api.gax.rpc.ApiException if the remote call fails @@ -243,6 +255,12 @@ public final ListInstancesPagedResponse listInstances(String parent) { * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -297,6 +315,12 @@ public final UnaryCallable listInst * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. Redis instance resource name using the form: * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` * refers to a GCP region. @@ -316,6 +340,12 @@ public final Instance getInstance(InstanceName name) { * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. Redis instance resource name using the form: * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` * refers to a GCP region. @@ -332,6 +362,12 @@ public final Instance getInstance(String name) { * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -366,6 +402,12 @@ public final UnaryCallable getInstanceCallable() { * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource name of the instance location using the form: * `projects/{project_id}/locations/{location_id}` where `location_id` refers to a GCP region. * @param instance_id Required. The logical name of the Redis instance in the customer project @@ -409,6 +451,12 @@ public final OperationFuture createInstanceAsync( * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param parent Required. The resource name of the instance location using the form: * `projects/{project_id}/locations/{location_id}` where `location_id` refers to a GCP region. * @param instance_id Required. The logical name of the Redis instance in the customer project @@ -452,6 +500,12 @@ public final OperationFuture createInstanceAsync( * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -513,6 +567,12 @@ public final UnaryCallable createInstanceCalla * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param update_mask Required. Mask of fields to update. At least one path must be supplied in * this field. The elements of the repeated paths field may only include these fields from * [Instance][google.cloud.redis.v1.Instance]: @@ -537,6 +597,12 @@ public final OperationFuture updateInstanceAsync( * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -580,6 +646,12 @@ public final UnaryCallable updateInstanceCalla * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. Redis instance resource name using the form: * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` * refers to a GCP region. @@ -602,6 +674,12 @@ public final OperationFuture upgradeInstanceAsync( * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. Redis instance resource name using the form: * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` * refers to a GCP region. @@ -621,6 +699,12 @@ public final OperationFuture upgradeInstanceAsync( * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -662,6 +746,12 @@ public final UnaryCallable upgradeInstanceCal * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. Redis instance resource name using the form: * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` * refers to a GCP region. @@ -687,6 +777,12 @@ public final OperationFuture importInstanceAsync( * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -739,6 +835,12 @@ public final UnaryCallable importInstanceCalla * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. Redis instance resource name using the form: * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` * refers to a GCP region. @@ -763,6 +865,12 @@ public final OperationFuture exportInstanceAsync( * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -809,6 +917,12 @@ public final UnaryCallable exportInstanceCalla * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. Redis instance resource name using the form: * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` * refers to a GCP region. @@ -833,6 +947,12 @@ public final OperationFuture failoverInstanceAsync( * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. Redis instance resource name using the form: * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` * refers to a GCP region. @@ -857,6 +977,12 @@ public final OperationFuture failoverInstanceAsync( * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -894,6 +1020,12 @@ public final UnaryCallable failoverInstanceC * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. Redis instance resource name using the form: * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` * refers to a GCP region. @@ -913,6 +1045,12 @@ public final OperationFuture deleteInstanceAsync(Insta * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
+   * }
+   * }
+ * * @param name Required. Redis instance resource name using the form: * `projects/{project_id}/locations/{location_id}/instances/{instance_id}` where `location_id` * refers to a GCP region. @@ -929,6 +1067,12 @@ public final OperationFuture deleteInstanceAsync(Strin * *

Sample code: * + * 

{@code
+   * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
+   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   * }
+   * }
+ * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ From 5b7a57c1ba2e372224b9663bec2f1b23bdfc6cdd Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 16:01:09 -0800 Subject: [PATCH 11/27] add license --- .../composer/SampleCodeHelperComposer.java | 149 ++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java 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 new file mode 100644 index 0000000000..d3d7c86967 --- /dev/null +++ b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java @@ -0,0 +1,149 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.api.generator.gapic.composer; + +import com.google.api.generator.engine.ast.AssignmentExpr; +import com.google.api.generator.engine.ast.CommentStatement; +import com.google.api.generator.engine.ast.LineComment; +import com.google.api.generator.engine.ast.MethodInvocationExpr; +import com.google.api.generator.engine.ast.TryCatchStatement; +import com.google.api.generator.engine.ast.TypeNode; +import com.google.api.generator.engine.ast.Variable; +import com.google.api.generator.engine.ast.VariableExpr; +import com.google.api.generator.gapic.model.Method; +import com.google.api.generator.gapic.model.MethodArgument; +import com.google.api.generator.gapic.utils.JavaStyle; +import java.util.Arrays; +import java.util.List; + +public final class SampleCodeHelperComposer { + + public static TryCatchStatement composeRpcMethodSampleCode( + Method method, List arguments, TypeNode clientType) { + // Default Unary RPC method. + if (arguments.isEmpty()) { + return composeUnaryRpcDefaultMethodSampleCode(method, clientType); + } + // Paged Unary RPC method. + if (method.isPaged()) { + return composePagedUnaryRpcMethodSampleCode(method, arguments, clientType); + } + // Long run operation Unary RPC method. + if (method.hasLro()) { + return composeLroUnaryRpcMethodSampleCode(method, arguments, clientType); + } + // Pure Unary RPC method. + return composeUnaryRpcMethodSampleCode(method, arguments, clientType); + } + + private static TryCatchStatement composeUnaryRpcMethodSampleCode( + Method method, List arguments, TypeNode clientType) { + // TODO(summerji): compose sample code for unary rpc method. + return TryCatchStatement.builder() + .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) + .setTryBody( + Arrays.asList( + createLineCommentStatement( + "Note: Not Implement yet. Hold for pure unary rpc method sample code."))) + .setIsSampleCode(true) + .build(); + } + + private static TryCatchStatement composeLroUnaryRpcMethodSampleCode( + Method method, List arguments, TypeNode clientType) { + // TODO(summerji): compose sample code for unary lro rpc method. + return TryCatchStatement.builder() + .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) + .setTryBody( + Arrays.asList( + createLineCommentStatement( + "Note: Not Implement yet. Holder for lro Unary rpc method sample code."))) + .setIsSampleCode(true) + .build(); + } + + private static TryCatchStatement composePagedUnaryRpcMethodSampleCode( + Method method, List arguments, TypeNode clientType) { + // TODO(summerji): compose sample code for unary paged rpc method. + return TryCatchStatement.builder() + .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) + .setTryBody( + Arrays.asList( + createLineCommentStatement( + "Note: Not Implement yet. Holder for paged unary rpc method sample code."))) + .setIsSampleCode(true) + .build(); + } + + private static TryCatchStatement composeUnaryRpcDefaultMethodSampleCode( + Method method, TypeNode clientType) { + // TODO(summerji): compose sample code for unary default rpc method. + String content = + String.format( + "Note: Not Implement yet. Holder for unary %s rpc method sample code.", + (!method.hasLro() && !method.isPaged() + ? "default" + : (method.hasLro() ? "lro" : "paged"))); + return TryCatchStatement.builder() + .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) + .setTryBody(Arrays.asList(createLineCommentStatement(content))) + .setIsSampleCode(true) + .build(); + } + + // ==================================Helpers===================================================// + + // Assign client variable expr with create client. + // e.g EchoClient echoClient = EchoClient.create() + private static AssignmentExpr assignClientVariableWithCreateMethodExpr(TypeNode clientType) { + return AssignmentExpr.builder() + .setVariableExpr(createVariableDeclExpr(getClientName(clientType), clientType)) + .setValueExpr( + MethodInvocationExpr.builder() + .setStaticReferenceType(clientType) + .setReturnType(clientType) + .setMethodName("create") + .build()) + .build(); + } + + private static String getClientName(TypeNode clientType) { + return JavaStyle.toLowerCamelCase(clientType.reference().name()); + } + + private static CommentStatement createLineCommentStatement(String content) { + return CommentStatement.withComment(LineComment.withComment(content)); + } + + private static VariableExpr createVariableExpr(String variableName, TypeNode type) { + return createVariableExpr(variableName, type, false); + } + + private static VariableExpr createVariableDeclExpr(String variableName, TypeNode type) { + return createVariableExpr(variableName, type, true); + } + + private static VariableExpr createVariableExpr( + String variableName, TypeNode type, boolean isDecl) { + return VariableExpr.builder() + .setVariable(createVariable(variableName, type)) + .setIsDecl(isDecl) + .build(); + } + + private static Variable createVariable(String varName, TypeNode type) { + return Variable.builder().setName(varName).setType(type).build(); + } +} From 0a5b153831bb8653dc50ad1e1863d748f2a4656a Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 18:31:01 -0800 Subject: [PATCH 12/27] fix note for default unary rpc --- .../gapic/composer/SampleCodeHelperComposer.java | 2 +- .../gapic/composer/goldens/EchoClient.golden | 4 ++-- .../gapic/composer/goldens/IdentityClient.golden | 2 +- .../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 ++++++++-------- 8 files changed, 22 insertions(+), 22 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 d3d7c86967..36e949dfb4 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 @@ -95,7 +95,7 @@ private static TryCatchStatement composeUnaryRpcDefaultMethodSampleCode( "Note: Not Implement yet. Holder for unary %s rpc method sample code.", (!method.hasLro() && !method.isPaged() ? "default" - : (method.hasLro() ? "lro" : "paged"))); + : (method.hasLro() ? "lro default" : "paged default"))); return TryCatchStatement.builder() .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) .setTryBody(Arrays.asList(createLineCommentStatement(content))) diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden index 0c6ba38ac9..71a5d94f00 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden @@ -326,7 +326,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }
* @@ -392,7 +392,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
    * }
    * }
* diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden index 9b8a9741ad..5cf3b6589d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden @@ -360,7 +360,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }
* diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java index 7250e322c3..da7094dc5d 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. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
    * }
    * }
* @@ -644,7 +644,7 @@ public final SearchAllResourcesPagedResponse searchAllResources( * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }
* @@ -750,7 +750,7 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(String scope * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder 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 e2ae38f74b..7ce61935bf 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. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder 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. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }
* @@ -1254,7 +1254,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. Holder 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 6ce1717123..62894a4140 100644 --- a/test/integration/goldens/logging/LoggingServiceV2Client.java +++ b/test/integration/goldens/logging/LoggingServiceV2Client.java @@ -466,7 +466,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. Holder for unary paged default rpc method sample code.
    * }
    * }
* @@ -511,7 +511,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. Holder for unary paged default rpc method sample code.
    * }
    * }
* @@ -683,7 +683,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. Holder 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 e3d59680f4..7a9f26eee5 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. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder 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 abca20f3ca..08824455d2 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. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }
* @@ -502,7 +502,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. Holder for unary lro default rpc method sample code.
    * }
    * }
* @@ -599,7 +599,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. Holder for unary lro default rpc method sample code.
    * }
    * }
* @@ -701,7 +701,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. Holder for unary lro default rpc method sample code.
    * }
    * }
* @@ -779,7 +779,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. Holder for unary lro default rpc method sample code.
    * }
    * }
* @@ -867,7 +867,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. Holder for unary lro default rpc method sample code.
    * }
    * }
* @@ -979,7 +979,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. Holder for unary lro default rpc method sample code.
    * }
    * }
* @@ -1069,7 +1069,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. Holder for unary lro default rpc method sample code.
    * }
    * }
* From 4b74392b3bedf00573ff13d2cae936e6aedd8ed6 Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 18:51:38 -0800 Subject: [PATCH 13/27] use placeholder --- .../composer/SampleCodeHelperComposer.java | 14 +-- .../gapic/composer/goldens/EchoClient.golden | 26 ++--- .../composer/goldens/IdentityClient.golden | 22 ++-- .../goldens/asset/AssetServiceClient.java | 36 +++--- .../logging/ConfigServiceV2Client.java | 108 +++++++++--------- .../logging/LoggingServiceV2Client.java | 30 ++--- .../logging/MetricsServiceV2Client.java | 30 ++--- .../goldens/redis/CloudRedisClient.java | 48 ++++---- 8 files changed, 155 insertions(+), 159 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 36e949dfb4..9ed9e36ced 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 @@ -56,7 +56,7 @@ private static TryCatchStatement composeUnaryRpcMethodSampleCode( .setTryBody( Arrays.asList( createLineCommentStatement( - "Note: Not Implement yet. Hold for pure unary rpc method sample code."))) + "Note: Not Implement yet, placeholder for pure unary rpc method sample code."))) .setIsSampleCode(true) .build(); } @@ -69,7 +69,7 @@ private static TryCatchStatement composeLroUnaryRpcMethodSampleCode( .setTryBody( Arrays.asList( createLineCommentStatement( - "Note: Not Implement yet. Holder for lro Unary rpc method sample code."))) + "Note: Not Implement yet, placeholder for lro Unary rpc method sample code."))) .setIsSampleCode(true) .build(); } @@ -82,7 +82,7 @@ private static TryCatchStatement composePagedUnaryRpcMethodSampleCode( .setTryBody( Arrays.asList( createLineCommentStatement( - "Note: Not Implement yet. Holder for paged unary rpc method sample code."))) + "Note: Not Implement yet, placeholder for paged unary rpc method sample code."))) .setIsSampleCode(true) .build(); } @@ -92,7 +92,7 @@ private static TryCatchStatement composeUnaryRpcDefaultMethodSampleCode( // TODO(summerji): compose sample code for unary default rpc method. String content = String.format( - "Note: Not Implement yet. Holder for unary %s rpc method sample code.", + "Note: Not Implement yet, placeholder for unary %s rpc method sample code.", (!method.hasLro() && !method.isPaged() ? "default" : (method.hasLro() ? "lro default" : "paged default"))); @@ -138,12 +138,8 @@ private static VariableExpr createVariableDeclExpr(String variableName, TypeNode private static VariableExpr createVariableExpr( String variableName, TypeNode type, boolean isDecl) { return VariableExpr.builder() - .setVariable(createVariable(variableName, type)) + .setVariable(Variable.builder().setName(variableName).setType(type).build()) .setIsDecl(isDecl) .build(); } - - private static Variable createVariable(String varName, TypeNode type) { - return Variable.builder().setName(varName).setType(type).build(); - } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden index 71a5d94f00..e42f3d7172 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden @@ -147,7 +147,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -168,7 +168,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -186,7 +186,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -205,7 +205,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -223,7 +223,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -241,7 +241,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -259,7 +259,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -279,7 +279,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -326,7 +326,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }
* @@ -356,7 +356,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -374,7 +374,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -392,7 +392,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }
* @@ -421,7 +421,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden index 5cf3b6589d..4b0df7fd97 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden @@ -127,7 +127,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -152,7 +152,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -192,7 +192,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -215,7 +215,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -234,7 +234,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -252,7 +252,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -275,7 +275,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -298,7 +298,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -319,7 +319,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -337,7 +337,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -360,7 +360,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }
* diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java index da7094dc5d..74606d5de7 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. Holder for unary lro default rpc method sample code.
+   *   // Note: Not Implement 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. Holder for unary default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
    * }
    * }
* @@ -264,7 +264,7 @@ public final BatchGetAssetsHistoryResponse batchGetAssetsHistory( * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -287,7 +287,7 @@ public final Feed createFeed(String parent) { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.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.
    * }
    * }
* @@ -316,7 +316,7 @@ public final UnaryCallable createFeedCallable() { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -339,7 +339,7 @@ public final Feed getFeed(FeedName name) { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -361,7 +361,7 @@ public final Feed getFeed(String name) { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.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.
    * }
    * }
* @@ -390,7 +390,7 @@ public final UnaryCallable getFeedCallable() { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -412,7 +412,7 @@ public final ListFeedsResponse listFeeds(String parent) { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.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.
    * }
    * }
* @@ -441,7 +441,7 @@ public final UnaryCallable listFeedsCallabl * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -463,7 +463,7 @@ public final Feed updateFeed(Feed feed) { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.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.
    * }
    * }
* @@ -492,7 +492,7 @@ public final UnaryCallable updateFeedCallable() { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -517,7 +517,7 @@ public final Empty deleteFeed(FeedName name) { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -539,7 +539,7 @@ public final Empty deleteFeed(String name) { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.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.
    * }
    * }
* @@ -570,7 +570,7 @@ public final UnaryCallable deleteFeedCallable() { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.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.
    * }
    * }
* @@ -644,7 +644,7 @@ public final SearchAllResourcesPagedResponse searchAllResources( * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }
* @@ -692,7 +692,7 @@ public final SearchAllResourcesPagedResponse searchAllResources( * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.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.
    * }
    * }
* @@ -750,7 +750,7 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(String scope * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default 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 7ce61935bf..092b2302d7 100644 --- a/test/integration/goldens/logging/ConfigServiceV2Client.java +++ b/test/integration/goldens/logging/ConfigServiceV2Client.java @@ -153,7 +153,7 @@ public ConfigServiceV2Stub getStub() { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -182,7 +182,7 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -211,7 +211,7 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -240,7 +240,7 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -269,7 +269,7 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -295,7 +295,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }
* @@ -335,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.
    * }
    * }
* @@ -373,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.
    * }
    * }
* @@ -411,7 +411,7 @@ public final UnaryCallable updateBucketCallable( * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -436,7 +436,7 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -461,7 +461,7 @@ public final ListSinksPagedResponse listSinks(FolderName parent) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -486,7 +486,7 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -511,7 +511,7 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -533,7 +533,7 @@ public final ListSinksPagedResponse listSinks(String parent) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }
* @@ -572,7 +572,7 @@ public final UnaryCallable listSinksCallabl * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -600,7 +600,7 @@ public final LogSink getSink(LogSinkName sinkName) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -625,7 +625,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.
    * }
    * }
* @@ -657,7 +657,7 @@ public final UnaryCallable getSinkCallable() { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -689,7 +689,7 @@ public final LogSink createSink(BillingAccountName parent, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -721,7 +721,7 @@ public final LogSink createSink(FolderName parent, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -753,7 +753,7 @@ public final LogSink createSink(OrganizationName parent, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -785,7 +785,7 @@ public final LogSink createSink(ProjectName parent, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -814,7 +814,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.
    * }
    * }
* @@ -850,7 +850,7 @@ public final UnaryCallable createSinkCallable() { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -886,7 +886,7 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -919,7 +919,7 @@ public final LogSink updateSink(String sinkName, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -965,7 +965,7 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink, FieldMask up * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1011,7 +1011,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.
    * }
    * }
* @@ -1045,7 +1045,7 @@ public final UnaryCallable updateSinkCallable() { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1075,7 +1075,7 @@ public final Empty deleteSink(LogSinkName sinkName) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1102,7 +1102,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.
    * }
    * }
* @@ -1132,7 +1132,7 @@ public final UnaryCallable deleteSinkCallable() { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -1157,7 +1157,7 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -1182,7 +1182,7 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -1207,7 +1207,7 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent) * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -1232,7 +1232,7 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.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.
    * }
    * }
* @@ -1254,7 +1254,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }
* @@ -1295,7 +1295,7 @@ public final ListExclusionsPagedResponse listExclusions(ListExclusionsRequest re * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1323,7 +1323,7 @@ public final LogExclusion getExclusion(LogExclusionName name) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1348,7 +1348,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.
    * }
    * }
* @@ -1378,7 +1378,7 @@ public final UnaryCallable getExclusionCallab * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1408,7 +1408,7 @@ public final LogExclusion createExclusion(BillingAccountName parent, LogExclusio * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1438,7 +1438,7 @@ public final LogExclusion createExclusion(FolderName parent, LogExclusion exclus * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1468,7 +1468,7 @@ public final LogExclusion createExclusion(OrganizationName parent, LogExclusion * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1498,7 +1498,7 @@ public final LogExclusion createExclusion(ProjectName parent, LogExclusion exclu * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1525,7 +1525,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.
    * }
    * }
* @@ -1555,7 +1555,7 @@ public final UnaryCallable createExclusion * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1594,7 +1594,7 @@ public final LogExclusion updateExclusion( * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1633,7 +1633,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.
    * }
    * }
* @@ -1662,7 +1662,7 @@ public final UnaryCallable updateExclusion * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1690,7 +1690,7 @@ public final Empty deleteExclusion(LogExclusionName name) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -1715,7 +1715,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.
    * }
    * }
* @@ -1750,7 +1750,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.
    * }
    * }
* @@ -1796,7 +1796,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 62894a4140..c83198ba66 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()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -187,7 +187,7 @@ public final Empty deleteLog(LogName logName) { * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -214,7 +214,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.
    * }
    * }
* @@ -248,7 +248,7 @@ public final UnaryCallable deleteLogCallable() { * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -318,7 +318,7 @@ public final WriteLogEntriesResponse writeLogEntries( * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -388,7 +388,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.
    * }
    * }
* @@ -423,7 +423,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.
    * }
    * }
* @@ -466,7 +466,7 @@ public final ListLogEntriesPagedResponse listLogEntries( * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }
* @@ -511,7 +511,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }
* @@ -556,7 +556,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.
    * }
    * }
* @@ -582,7 +582,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.
    * }
    * }
* @@ -608,7 +608,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.
    * }
    * }
* @@ -634,7 +634,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.
    * }
    * }
* @@ -660,7 +660,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.
    * }
    * }
* @@ -683,7 +683,7 @@ public final ListLogsPagedResponse listLogs(String parent) { * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default 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 7a9f26eee5..b5924499cb 100644 --- a/test/integration/goldens/logging/MetricsServiceV2Client.java +++ b/test/integration/goldens/logging/MetricsServiceV2Client.java @@ -152,7 +152,7 @@ public MetricsServiceV2Stub getStub() { * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.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.
    * }
    * }
* @@ -176,7 +176,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) { * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.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.
    * }
    * }
* @@ -197,7 +197,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) { * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }
* @@ -238,7 +238,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -262,7 +262,7 @@ public final LogMetric getLogMetric(LogMetricName metricName) { * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -284,7 +284,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.
    * }
    * }
* @@ -313,7 +313,7 @@ public final UnaryCallable getLogMetricCallable( * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -341,7 +341,7 @@ public final LogMetric createLogMetric(ProjectName parent, LogMetric metric) { * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -366,7 +366,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.
    * }
    * }
* @@ -395,7 +395,7 @@ public final UnaryCallable createLogMetricCal * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -424,7 +424,7 @@ public final LogMetric updateLogMetric(LogMetricName metricName, LogMetric metri * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -450,7 +450,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.
    * }
    * }
* @@ -479,7 +479,7 @@ public final UnaryCallable updateLogMetricCal * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -503,7 +503,7 @@ public final Empty deleteLogMetric(LogMetricName metricName) { * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -525,7 +525,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 08824455d2..c0447cceee 100644 --- a/test/integration/goldens/redis/CloudRedisClient.java +++ b/test/integration/goldens/redis/CloudRedisClient.java @@ -192,7 +192,7 @@ public final OperationsClient getOperationsClient() { * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.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.
    * }
    * }
* @@ -226,7 +226,7 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) { * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.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.
    * }
    * }
* @@ -257,7 +257,7 @@ public final ListInstancesPagedResponse listInstances(String parent) { * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
    * }
    * }
* @@ -317,7 +317,7 @@ public final UnaryCallable listInst * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -342,7 +342,7 @@ public final Instance getInstance(InstanceName name) { * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Hold for pure unary rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
    * }
    * }
* @@ -364,7 +364,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.
    * }
    * }
* @@ -404,7 +404,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.
    * }
    * }
* @@ -453,7 +453,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.
    * }
    * }
* @@ -502,7 +502,7 @@ public final OperationFuture createInstanceAsync( * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }
* @@ -569,7 +569,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.
    * }
    * }
* @@ -599,7 +599,7 @@ public final OperationFuture updateInstanceAsync( * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }
* @@ -648,7 +648,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.
    * }
    * }
* @@ -676,7 +676,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.
    * }
    * }
* @@ -701,7 +701,7 @@ public final OperationFuture upgradeInstanceAsync( * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }
* @@ -748,7 +748,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.
    * }
    * }
* @@ -779,7 +779,7 @@ public final OperationFuture importInstanceAsync( * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }
* @@ -837,7 +837,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.
    * }
    * }
* @@ -867,7 +867,7 @@ public final OperationFuture exportInstanceAsync( * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }
* @@ -919,7 +919,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.
    * }
    * }
* @@ -949,7 +949,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.
    * }
    * }
* @@ -979,7 +979,7 @@ public final OperationFuture failoverInstanceAsync( * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }
* @@ -1022,7 +1022,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.
    * }
    * }
* @@ -1047,7 +1047,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.
    * }
    * }
* @@ -1069,7 +1069,7 @@ public final OperationFuture deleteInstanceAsync(Strin * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
    * }
    * }
* From cacf7d02c5ece0ff0ebc23e3ce52f92f5283b5ca Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 17:47:54 -0800 Subject: [PATCH 14/27] Implement pure rpc sample code --- .../composer/SampleCodeHelperComposer.java | 76 ++++++++++++++++--- .../gapic/composer/goldens/EchoClient.golden | 34 +++++---- .../composer/goldens/IdentityClient.golden | 38 +++++++--- .../logging/LoggingServiceV2Client.java | 42 ++++++---- 4 files changed, 141 insertions(+), 49 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 9ed9e36ced..0b69246ca8 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 @@ -16,8 +16,11 @@ import com.google.api.generator.engine.ast.AssignmentExpr; 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.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; @@ -27,8 +30,10 @@ import com.google.api.generator.gapic.utils.JavaStyle; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; public final class SampleCodeHelperComposer { + private static String RESPONSE_VAR_NAME = "response"; public static TryCatchStatement composeRpcMethodSampleCode( Method method, List arguments, TypeNode clientType) { @@ -50,13 +55,30 @@ public static TryCatchStatement composeRpcMethodSampleCode( private static TryCatchStatement composeUnaryRpcMethodSampleCode( Method method, List arguments, TypeNode clientType) { - // TODO(summerji): compose sample code for unary rpc method. + // Assign each method arguments with default value. + List bodyStatements = + arguments.stream() + .map( + methodArg -> + ExprStatement.withExpr(assignMethodArgumentWithDefaultValue(methodArg))) + .collect(Collectors.toList()); + // Invoke current method based on return type. + // e.g. if return void, echoClient.echo(..); or, + // e.g. if return other type, EchoResponse response = echoClient.echo(...); + Expr invokeMethodExpr = + method.outputType().equals(TypeNode.VOID) + ? MethodInvocationExpr.builder() + .setExprReferenceExpr(createVariableDeclExpr(getClientName(clientType), clientType)) + .setMethodName(method.name()) + .setReturnType(clientType) + .build() + : createAssignExprForVariableWithClientMethod( + RESPONSE_VAR_NAME, method.outputType(), clientType, method.name(), arguments); + bodyStatements.add(ExprStatement.withExpr(invokeMethodExpr)); + return TryCatchStatement.builder() .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) - .setTryBody( - Arrays.asList( - createLineCommentStatement( - "Note: Not Implement yet, placeholder for pure unary rpc method sample code."))) + .setTryBody(bodyStatements) .setIsSampleCode(true) .build(); } @@ -69,7 +91,7 @@ private static TryCatchStatement composeLroUnaryRpcMethodSampleCode( .setTryBody( Arrays.asList( createLineCommentStatement( - "Note: Not Implement yet, placeholder for lro Unary rpc method sample code."))) + "Note: Not Implement yet. Holder for lro Unary rpc method sample code."))) .setIsSampleCode(true) .build(); } @@ -82,7 +104,7 @@ private static TryCatchStatement composePagedUnaryRpcMethodSampleCode( .setTryBody( Arrays.asList( createLineCommentStatement( - "Note: Not Implement yet, placeholder for paged unary rpc method sample code."))) + "Note: Not Implement yet. Holder for paged unary rpc method sample code."))) .setIsSampleCode(true) .build(); } @@ -92,10 +114,10 @@ private static TryCatchStatement composeUnaryRpcDefaultMethodSampleCode( // TODO(summerji): compose sample code for unary default rpc method. String content = String.format( - "Note: Not Implement yet, placeholder for unary %s rpc method sample code.", + "Note: Not Implement yet. Holder for unary %s rpc method sample code.", (!method.hasLro() && !method.isPaged() ? "default" - : (method.hasLro() ? "lro default" : "paged default"))); + : (method.hasLro() ? "lro" : "paged"))); return TryCatchStatement.builder() .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) .setTryBody(Arrays.asList(createLineCommentStatement(content))) @@ -119,6 +141,36 @@ private static AssignmentExpr assignClientVariableWithCreateMethodExpr(TypeNode .build(); } + private static Expr assignMethodArgumentWithDefaultValue(MethodArgument argument) { + return AssignmentExpr.builder() + .setVariableExpr(createVariableDeclExpr(argument.name(), argument.field().type())) + .setValueExpr(DefaultValueComposer.createDefaultValue(argument.field())) + .build(); + } + + private static Expr createAssignExprForVariableWithClientMethod( + String variableName, + TypeNode variableType, + TypeNode clientType, + String methodName, + List arguments) { + VariableExpr varExpr = createVariableExpr(variableName, variableType); + MethodInvocationExpr clientMethodInvocationExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(createVariableExpr(getClientName(clientType), clientType)) + .setMethodName(methodName) + .setArguments( + arguments.stream() + .map(arg -> createVariableExpr(arg.name(), arg.type())) + .collect(Collectors.toList())) + .setReturnType(variableType) + .build(); + return AssignmentExpr.builder() + .setVariableExpr(varExpr.toBuilder().setIsDecl(true).build()) + .setValueExpr(clientMethodInvocationExpr) + .build(); + } + private static String getClientName(TypeNode clientType) { return JavaStyle.toLowerCamelCase(clientType.reference().name()); } @@ -138,8 +190,12 @@ private static VariableExpr createVariableDeclExpr(String variableName, TypeNode private static VariableExpr createVariableExpr( String variableName, TypeNode type, boolean isDecl) { return VariableExpr.builder() - .setVariable(Variable.builder().setName(variableName).setType(type).build()) + .setVariable(createVariable(variableName, type)) .setIsDecl(isDecl) .build(); } + + private static Variable createVariable(String varName, TypeNode type) { + return Variable.builder().setName(varName).setType(type).build(); + } } diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden index e42f3d7172..927929a294 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden @@ -147,7 +147,8 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   EchoResponse response = echoClient.Echo(parent);
    * }
    * }
* @@ -168,7 +169,8 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   Status error = Status.newBuilder().build();
+   *   EchoResponse response = echoClient.Echo(error);
    * }
    * }
* @@ -186,7 +188,8 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   EchoResponse response = echoClient.Echo(name);
    * }
    * }
* @@ -205,7 +208,8 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String content = "content951530617";
+   *   EchoResponse response = echoClient.Echo(content);
    * }
    * }
* @@ -223,7 +227,8 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   EchoResponse response = echoClient.Echo(name);
    * }
    * }
* @@ -241,7 +246,8 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   EchoResponse response = echoClient.Echo(parent);
    * }
    * }
* @@ -259,7 +265,9 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String content = "content951530617";
+   *   Severity severity = Severity.forNumber(0);
+   *   EchoResponse response = echoClient.Echo(content, severity);
    * }
    * }
* @@ -279,7 +287,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -326,7 +334,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -356,7 +364,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -374,7 +382,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -392,7 +400,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -421,7 +429,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden index 4b0df7fd97..4267c00440 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden @@ -127,7 +127,10 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   String display_name = "display_name1615086568";
+   *   String email = "email96619420";
+   *   User response = identityClient.CreateUser(parent, display_name, email);
    * }
    * }
* @@ -152,7 +155,16 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   String display_name = "display_name1615086568";
+   *   String email = "email96619420";
+   *   int age = 96511;
+   *   String nickname = "nickname70690926";
+   *   boolean enable_notifications = true;
+   *   double height_feet = -1032737338;
+   *   User response =
+   *       identityClient.CreateUser(
+   *           parent, display_name, email, age, nickname, enable_notifications, height_feet);
    * }
    * }
* @@ -192,7 +204,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -215,7 +227,8 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   User response = identityClient.GetUser(name);
    * }
    * }
* @@ -234,7 +247,8 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   User response = identityClient.GetUser(name);
    * }
    * }
* @@ -252,7 +266,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -275,7 +289,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -298,7 +312,8 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = identityClient.DeleteUser(name);
    * }
    * }
* @@ -319,7 +334,8 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = identityClient.DeleteUser(name);
    * }
    * }
* @@ -337,7 +353,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -360,7 +376,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java index c83198ba66..004a809770 100644 --- a/test/integration/goldens/logging/LoggingServiceV2Client.java +++ b/test/integration/goldens/logging/LoggingServiceV2Client.java @@ -157,7 +157,8 @@ public LoggingServiceV2Stub getStub() { * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String log_name = "log_name2013526694";
+   *   Empty response = loggingServiceV2Client.DeleteLog(log_name);
    * }
    * }
* @@ -187,7 +188,8 @@ public final Empty deleteLog(LogName logName) { * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String log_name = "log_name2013526694";
+   *   Empty response = loggingServiceV2Client.DeleteLog(log_name);
    * }
    * }
* @@ -214,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.
    * }
    * }
* @@ -248,7 +250,12 @@ public final UnaryCallable deleteLogCallable() { * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String log_name = "log_name2013526694";
+   *   MonitoredResource resource = MonitoredResource.newBuilder().build();
+   *   Map labels = new HashMap<>();
+   *   List entries = new ArrayList<>();
+   *   WriteLogEntriesResponse response =
+   *       loggingServiceV2Client.WriteLogEntries(log_name, resource, labels, entries);
    * }
    * }
* @@ -318,7 +325,12 @@ public final WriteLogEntriesResponse writeLogEntries( * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String log_name = "log_name2013526694";
+   *   MonitoredResource resource = MonitoredResource.newBuilder().build();
+   *   Map labels = new HashMap<>();
+   *   List entries = new ArrayList<>();
+   *   WriteLogEntriesResponse response =
+   *       loggingServiceV2Client.WriteLogEntries(log_name, resource, labels, entries);
    * }
    * }
* @@ -388,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.
    * }
    * }
* @@ -423,7 +435,7 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.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.
    * }
    * }
* @@ -466,7 +478,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.
    * }
    * }
* @@ -511,7 +523,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.
    * }
    * }
* @@ -556,7 +568,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.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.
    * }
    * }
* @@ -582,7 +594,7 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) { * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.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.
    * }
    * }
* @@ -608,7 +620,7 @@ public final ListLogsPagedResponse listLogs(FolderName parent) { * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.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.
    * }
    * }
* @@ -634,7 +646,7 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) { * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.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.
    * }
    * }
* @@ -660,7 +672,7 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) { * * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.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.
    * }
    * }
* @@ -683,7 +695,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.
    * }
    * }
* From afc5a362fd40cc29b48be5bf1a17ae200a0ba9ef Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 20:28:36 -0800 Subject: [PATCH 15/27] refactor unary rpc method --- .../composer/SampleCodeHelperComposer.java | 35 ++++--- .../gapic/composer/goldens/EchoClient.golden | 12 +-- .../composer/goldens/IdentityClient.golden | 10 +- .../goldens/asset/AssetServiceClient.java | 27 +++-- .../logging/ConfigServiceV2Client.java | 98 ++++++++++++++----- .../logging/LoggingServiceV2Client.java | 22 ++--- .../logging/MetricsServiceV2Client.java | 30 ++++-- .../goldens/redis/CloudRedisClient.java | 22 +++-- 8 files changed, 165 insertions(+), 91 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 0b69246ca8..6badf4059a 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 @@ -55,6 +55,7 @@ public static TryCatchStatement composeRpcMethodSampleCode( private static TryCatchStatement composeUnaryRpcMethodSampleCode( Method method, List arguments, TypeNode clientType) { + // TODO(summerji): Add unit tests. // Assign each method arguments with default value. List bodyStatements = arguments.stream() @@ -65,16 +66,21 @@ private static TryCatchStatement composeUnaryRpcMethodSampleCode( // Invoke current method based on return type. // e.g. if return void, echoClient.echo(..); or, // e.g. if return other type, EchoResponse response = echoClient.echo(...); - Expr invokeMethodExpr = - method.outputType().equals(TypeNode.VOID) - ? MethodInvocationExpr.builder() - .setExprReferenceExpr(createVariableDeclExpr(getClientName(clientType), clientType)) - .setMethodName(method.name()) - .setReturnType(clientType) - .build() - : createAssignExprForVariableWithClientMethod( - RESPONSE_VAR_NAME, method.outputType(), clientType, method.name(), arguments); - bodyStatements.add(ExprStatement.withExpr(invokeMethodExpr)); + if (method.outputType().equals(TypeNode.VOID)) { + bodyStatements.add( + ExprStatement.withExpr( + MethodInvocationExpr.builder() + .setExprReferenceExpr( + createVariableDeclExpr(getClientName(clientType), clientType)) + .setMethodName(method.name()) + .setReturnType(clientType) + .build())); + } else { + bodyStatements.add( + ExprStatement.withExpr( + createAssignExprForVariableWithClientMethod( + RESPONSE_VAR_NAME, method.outputType(), clientType, method.name(), arguments))); + } return TryCatchStatement.builder() .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) @@ -86,12 +92,13 @@ private static TryCatchStatement composeUnaryRpcMethodSampleCode( private static TryCatchStatement composeLroUnaryRpcMethodSampleCode( Method method, List arguments, TypeNode clientType) { // TODO(summerji): compose sample code for unary lro rpc method. + // TODO(summerji): Add unit tests. return TryCatchStatement.builder() .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) .setTryBody( Arrays.asList( createLineCommentStatement( - "Note: Not Implement yet. Holder for lro Unary rpc method sample code."))) + "Note: Not Implement yet, placeholder for lro Unary rpc method sample code."))) .setIsSampleCode(true) .build(); } @@ -99,12 +106,13 @@ 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. return TryCatchStatement.builder() .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) .setTryBody( Arrays.asList( createLineCommentStatement( - "Note: Not Implement yet. Holder for paged unary rpc method sample code."))) + "Note: Not Implement yet, placeholder for paged unary rpc method sample code."))) .setIsSampleCode(true) .build(); } @@ -112,9 +120,10 @@ private static TryCatchStatement composePagedUnaryRpcMethodSampleCode( private static TryCatchStatement composeUnaryRpcDefaultMethodSampleCode( Method method, TypeNode clientType) { // TODO(summerji): compose sample code for unary default rpc method. + // TODO(summerji): Add unit tests. String content = String.format( - "Note: Not Implement yet. Holder for unary %s rpc method sample code.", + "Note: Not Implement yet, placeholder for unary %s rpc method sample code.", (!method.hasLro() && !method.isPaged() ? "default" : (method.hasLro() ? "lro" : "paged"))); diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden index 927929a294..86928898de 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden @@ -287,7 +287,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -334,7 +334,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -364,7 +364,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -382,7 +382,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -400,7 +400,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -429,7 +429,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden index 4267c00440..4678bebc80 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden @@ -204,7 +204,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -266,7 +266,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -289,7 +289,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -353,7 +353,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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.
    * }
    * }
* @@ -376,7 +376,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java index 74606d5de7..fb2d2b2181 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 default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary lro rpc method sample code.
    * }
    * }
* @@ -264,7 +264,8 @@ public final BatchGetAssetsHistoryResponse batchGetAssetsHistory( * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   Feed response = assetServiceClient.CreateFeed(parent);
    * }
    * }
* @@ -316,7 +317,8 @@ public final UnaryCallable createFeedCallable() { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Feed response = assetServiceClient.GetFeed(name);
    * }
    * }
* @@ -339,7 +341,8 @@ public final Feed getFeed(FeedName name) { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Feed response = assetServiceClient.GetFeed(name);
    * }
    * }
* @@ -390,7 +393,8 @@ public final UnaryCallable getFeedCallable() { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   ListFeedsResponse response = assetServiceClient.ListFeeds(parent);
    * }
    * }
* @@ -441,7 +445,8 @@ public final UnaryCallable listFeedsCallabl * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   Feed feed = Feed.newBuilder().build();
+   *   Feed response = assetServiceClient.UpdateFeed(feed);
    * }
    * }
* @@ -492,7 +497,8 @@ public final UnaryCallable updateFeedCallable() { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = assetServiceClient.DeleteFeed(name);
    * }
    * }
* @@ -517,7 +523,8 @@ public final Empty deleteFeed(FeedName name) { * * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = assetServiceClient.DeleteFeed(name);
    * }
    * }
* @@ -644,7 +651,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 Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }
* @@ -750,7 +757,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 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 092b2302d7..4706c5b199 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 default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged 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 default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }
* @@ -572,7 +572,8 @@ public final UnaryCallable listSinksCallabl * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   LogSink response = configServiceV2Client.GetSink(sink_name);
    * }
    * }
* @@ -600,7 +601,8 @@ public final LogSink getSink(LogSinkName sinkName) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   LogSink response = configServiceV2Client.GetSink(sink_name);
    * }
    * }
* @@ -657,7 +659,9 @@ public final UnaryCallable getSinkCallable() { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
    * }
* @@ -689,7 +693,9 @@ public final LogSink createSink(BillingAccountName parent, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
    * }
* @@ -721,7 +727,9 @@ public final LogSink createSink(FolderName parent, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
    * }
* @@ -753,7 +761,9 @@ public final LogSink createSink(OrganizationName parent, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
    * }
* @@ -785,7 +795,9 @@ public final LogSink createSink(ProjectName parent, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.CreateSink(parent, sink);
    * }
    * }
* @@ -850,7 +862,9 @@ public final UnaryCallable createSinkCallable() { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink);
    * }
    * }
* @@ -886,7 +900,9 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   LogSink response = configServiceV2Client.UpdateSink(sink_name, sink);
    * }
    * }
* @@ -919,7 +935,10 @@ public final LogSink updateSink(String sinkName, LogSink sink) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   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);
    * }
    * }
* @@ -965,7 +984,10 @@ public final LogSink updateSink(LogSinkName sinkName, LogSink sink, FieldMask up * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   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);
    * }
    * }
* @@ -1045,7 +1067,8 @@ public final UnaryCallable updateSinkCallable() { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   Empty response = configServiceV2Client.DeleteSink(sink_name);
    * }
    * }
* @@ -1075,7 +1098,8 @@ public final Empty deleteSink(LogSinkName sinkName) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String sink_name = "sink_name-1391757129";
+   *   Empty response = configServiceV2Client.DeleteSink(sink_name);
    * }
    * }
* @@ -1254,7 +1278,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, placeholder for unary paged rpc method sample code.
    * }
    * }
* @@ -1295,7 +1319,8 @@ public final ListExclusionsPagedResponse listExclusions(ListExclusionsRequest re * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   LogExclusion response = configServiceV2Client.GetExclusion(name);
    * }
    * }
* @@ -1323,7 +1348,8 @@ public final LogExclusion getExclusion(LogExclusionName name) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   LogExclusion response = configServiceV2Client.GetExclusion(name);
    * }
    * }
* @@ -1378,7 +1404,9 @@ public final UnaryCallable getExclusionCallab * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
    * }
* @@ -1408,7 +1436,9 @@ public final LogExclusion createExclusion(BillingAccountName parent, LogExclusio * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
    * }
* @@ -1438,7 +1468,9 @@ public final LogExclusion createExclusion(FolderName parent, LogExclusion exclus * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
    * }
* @@ -1468,7 +1500,9 @@ public final LogExclusion createExclusion(OrganizationName parent, LogExclusion * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
    * }
* @@ -1498,7 +1532,9 @@ public final LogExclusion createExclusion(ProjectName parent, LogExclusion exclu * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.CreateExclusion(parent, exclusion);
    * }
    * }
* @@ -1555,7 +1591,10 @@ public final UnaryCallable createExclusion * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.UpdateExclusion(name, exclusion, update_mask);
    * }
    * }
* @@ -1594,7 +1633,10 @@ public final LogExclusion updateExclusion( * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   LogExclusion response = configServiceV2Client.UpdateExclusion(name, exclusion, update_mask);
    * }
    * }
* @@ -1662,7 +1704,8 @@ public final UnaryCallable updateExclusion * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = configServiceV2Client.DeleteExclusion(name);
    * }
    * }
* @@ -1690,7 +1733,8 @@ public final Empty deleteExclusion(LogExclusionName name) { * * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Empty response = configServiceV2Client.DeleteExclusion(name);
    * }
    * }
* 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 b5924499cb..cd42065382 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 default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }
* @@ -238,7 +238,8 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String metric_name = "metric_name-1737602118";
+   *   LogMetric response = metricsServiceV2Client.GetLogMetric(metric_name);
    * }
    * }
* @@ -262,7 +263,8 @@ public final LogMetric getLogMetric(LogMetricName metricName) { * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String metric_name = "metric_name-1737602118";
+   *   LogMetric response = metricsServiceV2Client.GetLogMetric(metric_name);
    * }
    * }
* @@ -313,7 +315,9 @@ public final UnaryCallable getLogMetricCallable( * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogMetric metric = LogMetric.newBuilder().build();
+   *   LogMetric response = metricsServiceV2Client.CreateLogMetric(parent, metric);
    * }
    * }
* @@ -341,7 +345,9 @@ public final LogMetric createLogMetric(ProjectName parent, LogMetric metric) { * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   LogMetric metric = LogMetric.newBuilder().build();
+   *   LogMetric response = metricsServiceV2Client.CreateLogMetric(parent, metric);
    * }
    * }
* @@ -395,7 +401,9 @@ public final UnaryCallable createLogMetricCal * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String metric_name = "metric_name-1737602118";
+   *   LogMetric metric = LogMetric.newBuilder().build();
+   *   LogMetric response = metricsServiceV2Client.UpdateLogMetric(metric_name, metric);
    * }
    * }
* @@ -424,7 +432,9 @@ public final LogMetric updateLogMetric(LogMetricName metricName, LogMetric metri * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String metric_name = "metric_name-1737602118";
+   *   LogMetric metric = LogMetric.newBuilder().build();
+   *   LogMetric response = metricsServiceV2Client.UpdateLogMetric(metric_name, metric);
    * }
    * }
* @@ -479,7 +489,8 @@ public final UnaryCallable updateLogMetricCal * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String metric_name = "metric_name-1737602118";
+   *   Empty response = metricsServiceV2Client.DeleteLogMetric(metric_name);
    * }
    * }
* @@ -503,7 +514,8 @@ public final Empty deleteLogMetric(LogMetricName metricName) { * * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String metric_name = "metric_name-1737602118";
+   *   Empty response = metricsServiceV2Client.DeleteLogMetric(metric_name);
    * }
    * }
* diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java index c0447cceee..ec803709ce 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 default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }
* @@ -317,7 +317,8 @@ public final UnaryCallable listInst * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Instance response = cloudRedisClient.GetInstance(name);
    * }
    * }
* @@ -342,7 +343,8 @@ public final Instance getInstance(InstanceName name) { * * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for pure unary rpc method sample code.
+   *   String name = "name3373707";
+   *   Instance response = cloudRedisClient.GetInstance(name);
    * }
    * }
* @@ -502,7 +504,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, placeholder for unary lro rpc method sample code.
    * }
    * }
* @@ -599,7 +601,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, placeholder for unary lro rpc method sample code.
    * }
    * }
* @@ -701,7 +703,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, placeholder for unary lro rpc method sample code.
    * }
    * }
* @@ -779,7 +781,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, placeholder for unary lro rpc method sample code.
    * }
    * }
* @@ -867,7 +869,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, placeholder for unary lro rpc method sample code.
    * }
    * }
* @@ -979,7 +981,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, placeholder for unary lro rpc method sample code.
    * }
    * }
* @@ -1069,7 +1071,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, placeholder for unary lro rpc method sample code.
    * }
    * }
* From 9abb2596a87e126b8c0b89ef792b167f655bcfec Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 21:01:35 -0800 Subject: [PATCH 16/27] fix revert changed --- .../gapic/composer/SampleCodeHelperComposer.java | 2 +- .../gapic/composer/goldens/EchoClient.golden | 4 ++-- .../gapic/composer/goldens/IdentityClient.golden | 2 +- .../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 ++++++++-------- 8 files changed, 22 insertions(+), 22 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 6badf4059a..f1b4651964 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 @@ -126,7 +126,7 @@ private static TryCatchStatement composeUnaryRpcDefaultMethodSampleCode( "Note: Not Implement yet, placeholder for unary %s rpc method sample code.", (!method.hasLro() && !method.isPaged() ? "default" - : (method.hasLro() ? "lro" : "paged"))); + : (method.hasLro() ? "lro default" : "paged default"))); return TryCatchStatement.builder() .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) .setTryBody(Arrays.asList(createLineCommentStatement(content))) diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden index 86928898de..0a4e186538 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden @@ -334,7 +334,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* @@ -400,7 +400,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.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.
    * }
    * }
* diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden index 4678bebc80..cb9de87f37 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden @@ -376,7 +376,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.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/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 4d9e3d7c2839f68d81a76daecc9cc54fcd60decf Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 23:46:34 -0800 Subject: [PATCH 17/27] refactor signature pass Map resourceNames --- .../gapic/composer/ClassComposer.java | 4 ++- .../generator/gapic/composer/Composer.java | 31 ++++++++++------ ...pcServiceCallableFactoryClassComposer.java | 4 ++- .../GrpcServiceStubClassComposer.java | 4 ++- .../composer/MockServiceClassComposer.java | 4 ++- .../MockServiceImplClassComposer.java | 4 ++- .../composer/SampleCodeHelperComposer.java | 36 +++++++++++++------ .../composer/ServiceClientClassComposer.java | 35 ++++++++++++------ .../ServiceClientCommentComposer.java | 14 +++++--- .../ServiceClientSampleCodeComposer.java | 10 ++++-- .../ServiceSettingsClassComposer.java | 4 ++- .../composer/ServiceStubClassComposer.java | 4 ++- ...rviceCallableFactoryClassComposerTest.java | 3 +- .../GrpcServiceStubClassComposerTest.java | 9 +++-- .../MockServiceClassComposerTest.java | 3 +- .../MockServiceImplClassComposerTest.java | 3 +- .../ServiceClientClassComposerTest.java | 6 ++-- .../ServiceSettingsClassComposerTest.java | 3 +- .../ServiceStubClassComposerTest.java | 3 +- .../gapic/composer/goldens/EchoClient.golden | 4 +-- .../composer/goldens/IdentityClient.golden | 4 +-- .../goldens/asset/AssetServiceClient.java | 4 +-- .../logging/ConfigServiceV2Client.java | 30 ++++++++-------- .../logging/LoggingServiceV2Client.java | 4 +-- .../logging/MetricsServiceV2Client.java | 8 ++--- .../goldens/redis/CloudRedisClient.java | 2 +- 26 files changed, 157 insertions(+), 83 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java index 131020c562..7f8b5e860d 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java @@ -16,9 +16,11 @@ import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.Message; +import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Service; import java.util.Map; public interface ClassComposer { - GapicClass generate(Service service, Map messageTypes); + GapicClass generate( + Service service, Map resourceNames, Map messageTypes); } diff --git a/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/src/main/java/com/google/api/generator/gapic/composer/Composer.java index 02e1dc9bcc..b4281f483c 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/Composer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/Composer.java @@ -60,8 +60,8 @@ public static List generateServiceClasses( @Nonnull Map resourceNames, @Nonnull Map messageTypes) { List clazzes = new ArrayList<>(); - clazzes.addAll(generateStubClasses(service, serviceConfig, messageTypes)); - clazzes.addAll(generateClientSettingsClasses(service, messageTypes)); + clazzes.addAll(generateStubClasses(service, serviceConfig, messageTypes, resourceNames)); + clazzes.addAll(generateClientSettingsClasses(service, messageTypes, resourceNames)); clazzes.addAll(generateMocksAndTestClasses(service, resourceNames, messageTypes)); // TODO(miraleung): Generate test classes. return clazzes; @@ -76,29 +76,38 @@ public static List generateResourceNameHelperClasses( } public static List generateStubClasses( - Service service, GapicServiceConfig serviceConfig, Map messageTypes) { + Service service, + GapicServiceConfig serviceConfig, + Map messageTypes, + Map resourceNames) { List clazzes = new ArrayList<>(); - clazzes.add(ServiceStubClassComposer.instance().generate(service, messageTypes)); + clazzes.add(ServiceStubClassComposer.instance().generate(service, resourceNames, messageTypes)); clazzes.add( ServiceStubSettingsClassComposer.instance().generate(service, serviceConfig, messageTypes)); - clazzes.add(GrpcServiceCallableFactoryClassComposer.instance().generate(service, messageTypes)); - clazzes.add(GrpcServiceStubClassComposer.instance().generate(service, messageTypes)); + clazzes.add( + GrpcServiceCallableFactoryClassComposer.instance() + .generate(service, resourceNames, messageTypes)); + clazzes.add( + GrpcServiceStubClassComposer.instance().generate(service, resourceNames, messageTypes)); return clazzes; } public static List generateClientSettingsClasses( - Service service, Map messageTypes) { + Service service, Map messageTypes, Map resourceNames) { List clazzes = new ArrayList<>(); - clazzes.add(ServiceClientClassComposer.instance().generate(service, messageTypes)); - clazzes.add(ServiceSettingsClassComposer.instance().generate(service, messageTypes)); + clazzes.add( + ServiceClientClassComposer.instance().generate(service, resourceNames, messageTypes)); + clazzes.add( + ServiceSettingsClassComposer.instance().generate(service, resourceNames, messageTypes)); return clazzes; } public static List generateMocksAndTestClasses( Service service, Map resourceNames, Map messageTypes) { List clazzes = new ArrayList<>(); - clazzes.add(MockServiceClassComposer.instance().generate(service, messageTypes)); - clazzes.add(MockServiceImplClassComposer.instance().generate(service, messageTypes)); + clazzes.add(MockServiceClassComposer.instance().generate(service, resourceNames, messageTypes)); + clazzes.add( + MockServiceImplClassComposer.instance().generate(service, resourceNames, messageTypes)); clazzes.add( ServiceClientTestClassComposer.instance().generate(service, resourceNames, messageTypes)); return clazzes; diff --git a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposer.java index 5d1f054e2f..1bcfdc8b6a 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposer.java @@ -42,6 +42,7 @@ import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.Message; +import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Service; import com.google.common.base.Preconditions; import com.google.longrunning.Operation; @@ -64,7 +65,8 @@ public static GrpcServiceCallableFactoryClassComposer instance() { } @Override - public GapicClass generate(Service service, Map ignore) { + public GapicClass generate( + Service service, Map resourceNames, Map ignore) { Map types = createTypes(service); String className = String.format("Grpc%sCallableFactory", service.name()); GapicClass.Kind kind = Kind.STUB; diff --git a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java index 2fe59e9a7d..c952e9fc0b 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java @@ -51,6 +51,7 @@ import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; +import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.common.base.Preconditions; @@ -112,7 +113,8 @@ public static GrpcServiceStubClassComposer instance() { } @Override - public GapicClass generate(Service service, Map ignore) { + public GapicClass generate( + Service service, Map resourceNames, Map ignore) { String pakkage = service.pakkage() + ".stub"; Map types = createDynamicTypes(service, pakkage); String className = getThisClassName(service.name()); diff --git a/src/main/java/com/google/api/generator/gapic/composer/MockServiceClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/MockServiceClassComposer.java index 5e1a5057f5..8677431d00 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/MockServiceClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/MockServiceClassComposer.java @@ -33,6 +33,7 @@ import com.google.api.generator.gapic.model.GapicClass; import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.Message; +import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Service; import com.google.protobuf.AbstractMessage; import io.grpc.ServerServiceDefinition; @@ -55,7 +56,8 @@ public static MockServiceClassComposer instance() { } @Override - public GapicClass generate(Service service, Map ignore) { + public GapicClass generate( + Service service, Map resourceNames, Map ignore) { Map types = createTypes(service); String className = String.format(MOCK_SERVICE_NAME_PATTERN, service.name()); GapicClass.Kind kind = Kind.TEST; diff --git a/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java index 000e133a1a..6240f9db43 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java @@ -42,6 +42,7 @@ import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.Method.Stream; +import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.longrunning.Operation; @@ -94,7 +95,8 @@ public static MockServiceImplClassComposer instance() { } @Override - public GapicClass generate(Service service, Map ignore) { + public GapicClass generate( + Service service, Map resourceNames, Map ignore) { Map types = createDynamicTypes(service); String className = String.format(MOCK_SERVICE_IMPL_NAME_PATTERN, service.name()); GapicClass.Kind kind = Kind.TEST; 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 f1b4651964..e5bc4643eb 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 @@ -16,6 +16,7 @@ import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.CommentStatement; +import com.google.api.generator.engine.ast.ConcreteReference; import com.google.api.generator.engine.ast.Expr; import com.google.api.generator.engine.ast.ExprStatement; import com.google.api.generator.engine.ast.LineComment; @@ -27,16 +28,22 @@ import com.google.api.generator.engine.ast.VariableExpr; import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.MethodArgument; +import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.utils.JavaStyle; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; public final class SampleCodeHelperComposer { private static String RESPONSE_VAR_NAME = "response"; public static TryCatchStatement composeRpcMethodSampleCode( - Method method, List arguments, TypeNode clientType) { + Method method, + List arguments, + TypeNode clientType, + Map resourceNames) { // Default Unary RPC method. if (arguments.isEmpty()) { return composeUnaryRpcDefaultMethodSampleCode(method, clientType); @@ -50,18 +57,22 @@ public static TryCatchStatement composeRpcMethodSampleCode( return composeLroUnaryRpcMethodSampleCode(method, arguments, clientType); } // Pure Unary RPC method. - return composeUnaryRpcMethodSampleCode(method, arguments, clientType); + return composeUnaryRpcMethodSampleCode(method, arguments, clientType, resourceNames); } private static TryCatchStatement composeUnaryRpcMethodSampleCode( - Method method, List arguments, TypeNode clientType) { + Method method, + List arguments, + TypeNode clientType, + Map resourceNames) { // TODO(summerji): Add unit tests. // 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()); // Invoke current method based on return type. // e.g. if return void, echoClient.echo(..); or, @@ -150,10 +161,11 @@ private static AssignmentExpr assignClientVariableWithCreateMethodExpr(TypeNode .build(); } - private static Expr assignMethodArgumentWithDefaultValue(MethodArgument argument) { + private static Expr assignMethodArgumentWithDefaultValue( + MethodArgument argument, Map resourceNames) { return AssignmentExpr.builder() - .setVariableExpr(createVariableDeclExpr(argument.name(), argument.field().type())) - .setValueExpr(DefaultValueComposer.createDefaultValue(argument.field())) + .setVariableExpr(createVariableDeclExpr(argument.name(), argument.type())) + .setValueExpr(DefaultValueComposer.createDefaultValue(argument, resourceNames)) .build(); } @@ -168,10 +180,7 @@ private static Expr createAssignExprForVariableWithClientMethod( MethodInvocationExpr.builder() .setExprReferenceExpr(createVariableExpr(getClientName(clientType), clientType)) .setMethodName(methodName) - .setArguments( - arguments.stream() - .map(arg -> createVariableExpr(arg.name(), arg.type())) - .collect(Collectors.toList())) + .setArguments(mapMethodArgumentsToVariableExprs(arguments)) .setReturnType(variableType) .build(); return AssignmentExpr.builder() @@ -180,6 +189,11 @@ private static Expr createAssignExprForVariableWithClientMethod( .build(); } + private static List mapMethodArgumentsToVariableExprs(List arguments) { + return arguments.stream().map(arg -> createVariableExpr(arg.name(), arg.type())).collect( + Collectors.toList()); + } + private static String getClientName(TypeNode clientType) { return JavaStyle.toLowerCamelCase(clientType.reference().name()); } diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java index e136c25402..7b3a425580 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java @@ -62,6 +62,7 @@ import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.Method.Stream; import com.google.api.generator.gapic.model.MethodArgument; +import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.common.annotations.VisibleForTesting; @@ -109,7 +110,8 @@ public static ServiceClientClassComposer instance() { } @Override - public GapicClass generate(Service service, Map messageTypes) { + public GapicClass generate( + Service service, Map resourceNames, Map messageTypes) { Map types = createTypes(service, messageTypes); String className = String.format("%sClient", service.name()); GapicClass.Kind kind = Kind.MAIN; @@ -129,7 +131,8 @@ public GapicClass generate(Service service, Map messageTypes) { .setName(className) .setImplementsTypes(createClassImplements(types)) .setStatements(createFieldDeclarations(service, types, hasLroClient)) - .setMethods(createClassMethods(service, messageTypes, types, hasLroClient)) + .setMethods( + createClassMethods(service, messageTypes, types, resourceNames, hasLroClient)) .setNestedClasses(createNestedPagingClasses(service, messageTypes, types)) .build(); return GapicClass.create(kind, classDef); @@ -152,6 +155,7 @@ private static List createClassMethods( Service service, Map messageTypes, Map types, + Map resourceNames, boolean hasLroClient) { List methods = new ArrayList<>(); methods.addAll(createStaticCreatorMethods(service, types)); @@ -159,7 +163,11 @@ private static List createClassMethods( methods.addAll(createGetterMethods(service, types, hasLroClient)); methods.addAll( createServiceMethods( - service, messageTypes, types, types.get(getClientClassName(service.name())))); + service, + messageTypes, + types, + types.get(getClientClassName(service.name())), + resourceNames)); methods.addAll(createBackgroundResourceMethods(service, types)); return methods; } @@ -474,12 +482,14 @@ private static List createServiceMethods( Service service, Map messageTypes, Map types, - TypeNode clientType) { + TypeNode clientType, + Map resourceNames) { List javaMethods = new ArrayList<>(); for (Method method : service.methods()) { if (method.stream().equals(Stream.NONE)) { - javaMethods.addAll(createMethodVariants(method, messageTypes, types, clientType)); - javaMethods.add(createMethodDefaultMethod(method, types, clientType)); + javaMethods.addAll( + createMethodVariants(method, messageTypes, types, clientType, resourceNames)); + javaMethods.add(createMethodDefaultMethod(method, types, clientType, resourceNames)); } if (method.hasLro()) { javaMethods.add(createLroCallableMethod(service.name(), method, types)); @@ -496,7 +506,8 @@ private static List createMethodVariants( Method method, Map messageTypes, Map types, - TypeNode clientType) { + TypeNode clientType, + Map resourceNames) { List javaMethods = new ArrayList<>(); String methodName = JavaStyle.toLowerCamelCase(method.name()); TypeNode methodInputType = method.inputType(); @@ -561,7 +572,7 @@ private static List createMethodVariants( MethodDefinition.builder() .setHeaderCommentStatements( ServiceClientCommentComposer.createRpcMethodHeaderComment( - method, signature, clientType)) + method, signature, clientType, resourceNames)) .setScope(ScopeNode.PUBLIC) .setIsFinal(true) .setReturnType(methodOutputType) @@ -576,7 +587,10 @@ private static List createMethodVariants( } private static MethodDefinition createMethodDefaultMethod( - Method method, Map types, TypeNode clientType) { + Method method, + Map types, + TypeNode clientType, + Map resourceNames) { String methodName = JavaStyle.toLowerCamelCase(method.name()); TypeNode methodInputType = method.inputType(); TypeNode methodOutputType = @@ -620,7 +634,8 @@ private static MethodDefinition createMethodDefaultMethod( .build(); return MethodDefinition.builder() .setHeaderCommentStatements( - ServiceClientCommentComposer.createRpcMethodHeaderComment(method, clientType)) + ServiceClientCommentComposer.createRpcMethodHeaderComment( + method, clientType, resourceNames)) .setScope(ScopeNode.PUBLIC) .setIsFinal(true) .setReturnType(methodOutputType) diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java index 9fd2629183..8f3101a5a3 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientCommentComposer.java @@ -19,12 +19,14 @@ import com.google.api.generator.engine.ast.TypeNode; import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.MethodArgument; +import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.common.base.Strings; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -162,7 +164,10 @@ static CommentStatement createCreateMethodStubArgComment( } static List createRpcMethodHeaderComment( - Method method, List methodArguments, TypeNode clientType) { + Method method, + List methodArguments, + TypeNode clientType, + Map resourceNames) { JavaDocComment.Builder methodJavadocBuilder = JavaDocComment.builder(); if (method.hasDescription()) { @@ -173,7 +178,7 @@ static List createRpcMethodHeaderComment( methodJavadocBuilder.addParagraph(METHOD_DESCRIPTION_SAMPLE_CODE_SUMMARY_STRING); methodJavadocBuilder.addSampleCode( ServiceClientSampleCodeComposer.composeRpcMethodHeaderSampleCode( - method, methodArguments, clientType)); + method, methodArguments, clientType, resourceNames)); if (methodArguments.isEmpty()) { methodJavadocBuilder.addParam( @@ -194,8 +199,9 @@ static List createRpcMethodHeaderComment( CommentStatement.withComment(methodJavadocBuilder.build())); } - static List createRpcMethodHeaderComment(Method method, TypeNode clientType) { - return createRpcMethodHeaderComment(method, Collections.emptyList(), clientType); + static List createRpcMethodHeaderComment( + Method method, TypeNode clientType, Map resourceNames) { + return createRpcMethodHeaderComment(method, Collections.emptyList(), clientType, resourceNames); } static CommentStatement createMethodNoArgComment(String serviceName) { diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java index 838f703354..887f6f6cef 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java @@ -31,9 +31,11 @@ import com.google.api.generator.gapic.composer.samplecode.SampleCodeWriter; import com.google.api.generator.gapic.model.Method; import com.google.api.generator.gapic.model.MethodArgument; +import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.utils.JavaStyle; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; public class ServiceClientSampleCodeComposer { @@ -148,9 +150,13 @@ public static String composeClassHeaderEndpointSampleCode( } public static String composeRpcMethodHeaderSampleCode( - Method method, List arguments, TypeNode clientType) { + Method method, + List arguments, + TypeNode clientType, + Map resourceNames) { return SampleCodeWriter.write( - SampleCodeHelperComposer.composeRpcMethodSampleCode(method, arguments, clientType)); + SampleCodeHelperComposer.composeRpcMethodSampleCode( + method, arguments, clientType, resourceNames)); } // ======================================== Helpers ==========================================// diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java index 45f625f32f..2c8e9b8db7 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposer.java @@ -54,6 +54,7 @@ import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; +import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.common.base.Preconditions; @@ -92,7 +93,8 @@ public static ServiceSettingsClassComposer instance() { } @Override - public GapicClass generate(Service service, Map ignore) { + public GapicClass generate( + Service service, Map resourceNames, Map ignore) { String pakkage = service.pakkage(); Map types = createDynamicTypes(service); String className = getThisClassName(service.name()); diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java index ce1f79727e..4aa3b1e53f 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java @@ -35,6 +35,7 @@ import com.google.api.generator.gapic.model.GapicClass.Kind; import com.google.api.generator.gapic.model.Message; import com.google.api.generator.gapic.model.Method; +import com.google.api.generator.gapic.model.ResourceName; import com.google.api.generator.gapic.model.Service; import com.google.api.generator.gapic.utils.JavaStyle; import com.google.longrunning.Operation; @@ -57,7 +58,8 @@ public static ServiceStubClassComposer instance() { } @Override - public GapicClass generate(Service service, Map messageTypes) { + public GapicClass generate( + Service service, Map resourceNames, Map messageTypes) { Map types = createTypes(service, messageTypes); String className = String.format("%sStub", service.name()); GapicClass.Kind kind = Kind.STUB; diff --git a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java index bc1f8d0c09..c1187dd0f8 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java @@ -59,7 +59,8 @@ public void generateServiceClasses() { Service echoProtoService = services.get(0); GapicClass clazz = - GrpcServiceCallableFactoryClassComposer.instance().generate(echoProtoService, messageTypes); + GrpcServiceCallableFactoryClassComposer.instance() + .generate(echoProtoService, resourceNames, messageTypes); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); diff --git a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java index 47c7767d45..03527dd8f8 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java @@ -55,7 +55,8 @@ public void generateGrpcServiceStubClass_simple() { echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); Service echoProtoService = services.get(0); GapicClass clazz = - GrpcServiceStubClassComposer.instance().generate(echoProtoService, messageTypes); + GrpcServiceStubClassComposer.instance() + .generate(echoProtoService, resourceNames, messageTypes); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); @@ -82,7 +83,8 @@ public void generateGrpcServiceStubClass_httpBindings() { outputResourceNames); Service testingProtoService = services.get(0); GapicClass clazz = - GrpcServiceStubClassComposer.instance().generate(testingProtoService, messageTypes); + GrpcServiceStubClassComposer.instance() + .generate(testingProtoService, resourceNames, messageTypes); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); @@ -115,7 +117,8 @@ public void generateGrpcServiceStubClass_httpBindingsWithSubMessageFields() { outputResourceNames); Service service = services.get(0); - GapicClass clazz = GrpcServiceStubClassComposer.instance().generate(service, messageTypes); + GapicClass clazz = + GrpcServiceStubClassComposer.instance().generate(service, resourceNames, messageTypes); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); diff --git a/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java index 61785acb7b..e8dfb79704 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java @@ -58,7 +58,8 @@ public void generateServiceClasses() { echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); Service echoProtoService = services.get(0); - GapicClass clazz = MockServiceClassComposer.instance().generate(echoProtoService, messageTypes); + GapicClass clazz = + MockServiceClassComposer.instance().generate(echoProtoService, resourceNames, messageTypes); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); diff --git a/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java index 624126bb96..a5bdd6fd3b 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java @@ -59,7 +59,8 @@ public void generateServiceClasses() { Service echoProtoService = services.get(0); GapicClass clazz = - MockServiceImplClassComposer.instance().generate(echoProtoService, messageTypes); + MockServiceImplClassComposer.instance() + .generate(echoProtoService, resourceNames, messageTypes); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java index 1a882a6a30..79b9ee7043 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java @@ -53,7 +53,8 @@ public void generateServiceClasses() { Service echoProtoService = services.get(0); GapicClass clazz = - ServiceClientClassComposer.instance().generate(echoProtoService, messageTypes); + ServiceClientClassComposer.instance() + .generate(echoProtoService, resourceNames, messageTypes); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); @@ -76,7 +77,8 @@ public void generateServiceClasses_methodSignatureHasNestedFields() { fileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); Service protoService = services.get(0); - GapicClass clazz = ServiceClientClassComposer.instance().generate(protoService, messageTypes); + GapicClass clazz = + ServiceClientClassComposer.instance().generate(protoService, resourceNames, messageTypes); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java index bd7b41eb16..5f32693747 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java @@ -59,7 +59,8 @@ public void generateServiceClasses() { Service echoProtoService = services.get(0); GapicClass clazz = - ServiceSettingsClassComposer.instance().generate(echoProtoService, messageTypes); + ServiceSettingsClassComposer.instance() + .generate(echoProtoService, resourceNames, messageTypes); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java index 2e7a390b0b..62ac11c04e 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java @@ -58,7 +58,8 @@ public void generateServiceClasses() { echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames); Service echoProtoService = services.get(0); - GapicClass clazz = ServiceStubClassComposer.instance().generate(echoProtoService, messageTypes); + GapicClass clazz = + ServiceStubClassComposer.instance().generate(echoProtoService, resourceNames, messageTypes); JavaWriterVisitor visitor = new JavaWriterVisitor(); clazz.classDefinition().accept(visitor); diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden index 0a4e186538..2cb88527c4 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden @@ -147,7 +147,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   String parent = "parent-995424086";
+   *   ResourceName parent = FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]");
    *   EchoResponse response = echoClient.Echo(parent);
    * }
    * }
@@ -188,7 +188,7 @@ public class EchoClient implements BackgroundResource { * * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   String name = "name3373707";
+   *   FoobarName name = FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]");
    *   EchoResponse response = echoClient.Echo(name);
    * }
    * }
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden index cb9de87f37..55dfb989f9 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/IdentityClient.golden @@ -227,7 +227,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   String name = "name3373707";
+   *   UserName name = UserName.of("[USER]");
    *   User response = identityClient.GetUser(name);
    * }
    * }
@@ -312,7 +312,7 @@ public class IdentityClient implements BackgroundResource { * * 
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   String name = "name3373707";
+   *   UserName name = UserName.of("[USER]");
    *   Empty response = identityClient.DeleteUser(name);
    * }
    * }
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 790cf6703b8b9dfb94c71879a91dda5822c68d0e Mon Sep 17 00:00:00 2001
From: summerji 
Date: Wed, 18 Nov 2020 00:00:44 -0800
Subject: [PATCH 18/27] run google format

---
 .../generator/gapic/composer/SampleCodeHelperComposer.java | 7 +++----
 1 file changed, 3 insertions(+), 4 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 e5bc4643eb..2028f6ed4a 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
@@ -16,7 +16,6 @@
 
 import com.google.api.generator.engine.ast.AssignmentExpr;
 import com.google.api.generator.engine.ast.CommentStatement;
-import com.google.api.generator.engine.ast.ConcreteReference;
 import com.google.api.generator.engine.ast.Expr;
 import com.google.api.generator.engine.ast.ExprStatement;
 import com.google.api.generator.engine.ast.LineComment;
@@ -30,7 +29,6 @@
 import com.google.api.generator.gapic.model.MethodArgument;
 import com.google.api.generator.gapic.model.ResourceName;
 import com.google.api.generator.gapic.utils.JavaStyle;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -190,8 +188,9 @@ private static Expr createAssignExprForVariableWithClientMethod(
   }
 
   private static List mapMethodArgumentsToVariableExprs(List arguments) {
-    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 String getClientName(TypeNode clientType) {

From 5d5302992cc11ec904665995ba5d68fb121b460d Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 18:13:45 -0800
Subject: [PATCH 19/27] Implement paged unary rpc method' sample code

---
 .../composer/SampleCodeHelperComposer.java    |  33 ++++-
 .../logging/ConfigServiceV2Client.java        | 120 +++++++++++++-----
 .../logging/LoggingServiceV2Client.java       |  48 +++++--
 .../logging/MetricsServiceV2Client.java       |  22 +++-
 .../goldens/redis/CloudRedisClient.java       |  52 ++++----
 5 files changed, 203 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 2028f6ed4a..c31a5511ee 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
@@ -114,8 +114,20 @@ 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.
+    // 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());
+    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(clientType))
         .setTryBody(
@@ -193,6 +205,23 @@ private static List mapMethodArgumentsToVariableExprs(List
         .collect(Collectors.toList());
   }
 
+  private static Expr createIteratorAllMethodExpr(
+      Method method, TypeNode clientType, List arguments) {
+    return MethodInvocationExpr.builder()
+        .setExprReferenceExpr(
+            MethodInvocationExpr.builder()
+                .setStaticReferenceType(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) {
     return JavaStyle.toLowerCamelCase(clientType.reference().name());
   }
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 3a9e88ce9c006781e36d20cad201af0cfa291779 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 18:24:21 -0800
Subject: [PATCH 20/27] fix client

---
 .../composer/SampleCodeHelperComposer.java    |  3 +-
 .../logging/ConfigServiceV2Client.java        | 30 +++++++++----------
 .../logging/LoggingServiceV2Client.java       | 12 ++++----
 .../logging/MetricsServiceV2Client.java       |  4 +--
 .../goldens/redis/CloudRedisClient.java       |  4 +--
 5 files changed, 27 insertions(+), 26 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 c31a5511ee..e4a807357f 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
@@ -207,10 +207,11 @@ private static List mapMethodArgumentsToVariableExprs(List
 
   private static Expr createIteratorAllMethodExpr(
       Method method, TypeNode clientType, List arguments) {
+    // e.g echoClient.echo(name).iterateAll()
     return MethodInvocationExpr.builder()
         .setExprReferenceExpr(
             MethodInvocationExpr.builder()
-                .setStaticReferenceType(clientType)
+                .setExprReferenceExpr(createVariableExpr(getClientName(clientType), clientType))
                 .setMethodName(method.name())
                 .setArguments(
                     !arguments.isEmpty()
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 a3f5f22e3f4ef9a74d729a5f3bfff52a027821fa Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 20:37:29 -0800
Subject: [PATCH 21/27] 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 e4a807357f..d6a813d303 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 bb14577606f039b873564b3d42aacac1cca83d2a Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 21:17:05 -0800
Subject: [PATCH 22/27] add missing comment

---
 .../composer/SampleCodeHelperComposer.java    |  9 +-
 .../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, 160 insertions(+), 46 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 d6a813d303..4be563567a 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
@@ -123,6 +123,10 @@ private static TryCatchStatement composePagedUnaryRpcMethodSampleCode(
                 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))
@@ -131,10 +135,7 @@ private static TryCatchStatement composePagedUnaryRpcMethodSampleCode(
             .build());
     return TryCatchStatement.builder()
         .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType))
-        .setTryBody(
-            Arrays.asList(
-                createLineCommentStatement(
-                    "Note: Not Implement yet, placeholder for paged unary rpc method sample code.")))
+        .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 d21b2478debe9645e5f27763e03011bd08690aee Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 21:29:41 -0800
Subject: [PATCH 23/27] add missing request assignment expr

---
 .../gapic/composer/SampleCodeHelperComposer.java  |  8 ++++----
 .../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, 42 insertions(+), 4 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 4be563567a..5b28a6cde9 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,
@@ -173,11 +174,10 @@ private static AssignmentExpr assignClientVariableWithCreateMethodExpr(TypeNode
         .build();
   }
 
-  private static Expr assignMethodArgumentWithDefaultValue(
-      MethodArgument argument, Map resourceNames) {
+  private static Expr assignMethodArgumentWithDefaultValue(MethodArgument argument) {
     return AssignmentExpr.builder()
-        .setVariableExpr(createVariableDeclExpr(argument.name(), argument.type()))
-        .setValueExpr(DefaultValueComposer.createDefaultValue(argument, resourceNames))
+        .setVariableExpr(createVariableDeclExpr(argument.name(), argument.field().type()))
+        .setValueExpr(DefaultValueComposer.createDefaultValue(argument.field()))
         .build();
   }
 
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 34877cf7f2d2629a488821afade7a2f1fe468071 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 22:04:36 -0800
Subject: [PATCH 24/27] Implement lro unary rpc method's sample code

---
 .../composer/SampleCodeHelperComposer.java    | 40 ++++++++-
 .../gapic/composer/goldens/EchoClient.golden  |  8 +-
 .../goldens/redis/CloudRedisClient.java       | 85 ++++++++++++++++---
 3 files changed, 116 insertions(+), 17 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 5b28a6cde9..9ae43bd379 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
@@ -38,6 +38,7 @@
 public final class SampleCodeHelperComposer {
   private static String RESPONSE_VAR_NAME = "response";
   private static String REQUEST_VAR_NAME = "request";
+  private static String ASYNC_NAME_PATTERN = "%sAsync";
 
   public static TryCatchStatement composeRpcMethodSampleCode(
       Method method,
@@ -104,12 +105,39 @@ private static TryCatchStatement composeLroUnaryRpcMethodSampleCode(
       Method method, List arguments, TypeNode clientType) {
     // TODO(summerji): compose sample code for unary lro rpc method.
     // TODO(summerji): Add unit tests.
+    // Assign each method arguments with default value.
+    List bodyStatements =
+        arguments.stream()
+            .map(
+                methodArg ->
+                    ExprStatement.withExpr(assignMethodArgumentWithDefaultValue(methodArg)))
+            .collect(Collectors.toList());
+    // Assign request with set attributes.
+    // e.g. EchoRequest request = echoClient.newBuilder().setName(name).build();
+    bodyStatements.add(
+        ExprStatement.withExpr(createRequestBuilderExpr(method.inputType(), arguments)));
+    // Assign response variable with get method.
+    // e.g EchoResponse response = echoClient.waitAsync().get();
+    Expr getResponseMethodExpr =
+        MethodInvocationExpr.builder()
+            .setExprReferenceExpr(
+                MethodInvocationExpr.builder()
+                    .setStaticReferenceType(clientType)
+                    .setMethodName(getLroMethodName(method.name()))
+                    .setArguments(mapMethodArgumentsToVariableExprs(arguments))
+                    .build())
+            .setMethodName("get")
+            .setReturnType(method.outputType())
+            .build();
+    bodyStatements.add(
+        ExprStatement.withExpr(
+            AssignmentExpr.builder()
+                .setVariableExpr(createVariableDeclExpr(RESPONSE_VAR_NAME, method.outputType()))
+                .setValueExpr(getResponseMethodExpr)
+                .build()));
     return TryCatchStatement.builder()
         .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType))
-        .setTryBody(
-            Arrays.asList(
-                createLineCommentStatement(
-                    "Note: Not Implement yet, placeholder for lro Unary rpc method sample code.")))
+        .setTryBody(bodyStatements)
         .setIsSampleCode(true)
         .build();
   }
@@ -229,6 +257,10 @@ private static String getClientName(TypeNode clientType) {
     return JavaStyle.toLowerCamelCase(clientType.reference().name());
   }
 
+  private static String getLroMethodName(String methodName) {
+    return JavaStyle.toLowerCamelCase(String.format(ASYNC_NAME_PATTERN, methodName));
+  }
+
   private static CommentStatement createLineCommentStatement(String content) {
     return CommentStatement.withComment(LineComment.withComment(content));
   }
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
index 2cb88527c4..46f7e60788 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
@@ -364,7 +364,9 @@ public class EchoClient implements BackgroundResource {
    *
    * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   Duration ttl = Duration.newBuilder().build();
+   *   WaitRequest request = WaitRequest.newBuilder().setTtl(ttl).build();
+   *   Operation response = EchoClient.waitAsync(ttl).get();
    * }
    * }

    *
@@ -382,7 +384,9 @@ public class EchoClient implements BackgroundResource {
    *
    * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   Timestamp end_time = Timestamp.newBuilder().build();
+   *   WaitRequest request = WaitRequest.newBuilder().setEndTime(end_time).build();
+   *   Operation response = EchoClient.waitAsync(end_time).get();
    * }
    * }

    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 83b44b55c9..9302120c2b 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -416,7 +416,17 @@ public final UnaryCallable getInstanceCallable() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   String instance_id = "instance_id-2101995259";
+   *   Instance instance = Instance.newBuilder().build();
+   *   CreateInstanceRequest request =
+   *       CreateInstanceRequest.newBuilder()
+   *           .setParent(parent)
+   *           .setInstanceId(instance_id)
+   *           .setInstance(instance)
+   *           .build();
+   *   Operation response =
+   *       CloudRedisClient.createInstanceAsync(parent, instance_id, instance).get();
    * }
    * }

    *
@@ -465,7 +475,17 @@ public final OperationFuture createInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   String instance_id = "instance_id-2101995259";
+   *   Instance instance = Instance.newBuilder().build();
+   *   CreateInstanceRequest request =
+   *       CreateInstanceRequest.newBuilder()
+   *           .setParent(parent)
+   *           .setInstanceId(instance_id)
+   *           .setInstance(instance)
+   *           .build();
+   *   Operation response =
+   *       CloudRedisClient.createInstanceAsync(parent, instance_id, instance).get();
    * }
    * }

    *
@@ -581,7 +601,14 @@ public final UnaryCallable createInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   Instance instance = Instance.newBuilder().build();
+   *   UpdateInstanceRequest request =
+   *       UpdateInstanceRequest.newBuilder()
+   *           .setUpdateMask(update_mask)
+   *           .setInstance(instance)
+   *           .build();
+   *   Operation response = CloudRedisClient.updateInstanceAsync(update_mask, instance).get();
    * }
    * }

    *
@@ -660,7 +687,11 @@ public final UnaryCallable updateInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   String name = "name3373707";
+   *   String redis_version = "redis_version-685310444";
+   *   UpgradeInstanceRequest request =
+   *       UpgradeInstanceRequest.newBuilder().setName(name).setRedisVersion(redis_version).build();
+   *   Operation response = CloudRedisClient.upgradeInstanceAsync(name, redis_version).get();
    * }
    * }

    *
@@ -688,7 +719,11 @@ public final OperationFuture upgradeInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   String name = "name3373707";
+   *   String redis_version = "redis_version-685310444";
+   *   UpgradeInstanceRequest request =
+   *       UpgradeInstanceRequest.newBuilder().setName(name).setRedisVersion(redis_version).build();
+   *   Operation response = CloudRedisClient.upgradeInstanceAsync(name, redis_version).get();
    * }
    * }

    *
@@ -760,7 +795,11 @@ public final UnaryCallable upgradeInstanceCal
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   String name = "name3373707";
+   *   InputConfig input_config = InputConfig.newBuilder().build();
+   *   ImportInstanceRequest request =
+   *       ImportInstanceRequest.newBuilder().setName(name).setInputConfig(input_config).build();
+   *   Operation response = CloudRedisClient.importInstanceAsync(name, input_config).get();
    * }
    * }

    *
@@ -849,7 +888,11 @@ public final UnaryCallable importInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   String name = "name3373707";
+   *   OutputConfig output_config = OutputConfig.newBuilder().build();
+   *   ExportInstanceRequest request =
+   *       ExportInstanceRequest.newBuilder().setName(name).setOutputConfig(output_config).build();
+   *   Operation response = CloudRedisClient.exportInstanceAsync(name, output_config).get();
    * }
    * }

    *
@@ -931,7 +974,15 @@ public final UnaryCallable exportInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   String name = "name3373707";
+   *   FailoverInstanceRequest.DataProtectionMode data_protection_mode =
+   *       FailoverInstanceRequest.DataProtectionMode.forNumber(0);
+   *   FailoverInstanceRequest request =
+   *       FailoverInstanceRequest.newBuilder()
+   *           .setName(name)
+   *           .setDataProtectionMode(data_protection_mode)
+   *           .build();
+   *   Operation response = CloudRedisClient.failoverInstanceAsync(name, data_protection_mode).get();
    * }
    * }

    *
@@ -961,7 +1012,15 @@ public final OperationFuture failoverInstanceAsync(
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   String name = "name3373707";
+   *   FailoverInstanceRequest.DataProtectionMode data_protection_mode =
+   *       FailoverInstanceRequest.DataProtectionMode.forNumber(0);
+   *   FailoverInstanceRequest request =
+   *       FailoverInstanceRequest.newBuilder()
+   *           .setName(name)
+   *           .setDataProtectionMode(data_protection_mode)
+   *           .build();
+   *   Operation response = CloudRedisClient.failoverInstanceAsync(name, data_protection_mode).get();
    * }
    * }

    *
@@ -1034,7 +1093,9 @@ public final UnaryCallable failoverInstanceC
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   String name = "name3373707";
+   *   DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder().setName(name).build();
+   *   Operation response = CloudRedisClient.deleteInstanceAsync(name).get();
    * }
    * }

    *
@@ -1059,7 +1120,9 @@ public final OperationFuture deleteInstanceAsync(Insta
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   String name = "name3373707";
+   *   DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder().setName(name).build();
+   *   Operation response = CloudRedisClient.deleteInstanceAsync(name).get();
    * }
    * }

    *

From 06fe431b2fe5116beba939c59f5ccbec0fa121e4 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 22:15:58 -0800
Subject: [PATCH 25/27] remove request assignment

---
 .../composer/SampleCodeHelperComposer.java    |  6 +-
 .../gapic/composer/goldens/EchoClient.golden  |  6 +-
 .../goldens/redis/CloudRedisClient.java       | 59 ++++---------------
 3 files changed, 14 insertions(+), 57 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 9ae43bd379..f2cc3d6b86 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,17 +112,13 @@ private static TryCatchStatement composeLroUnaryRpcMethodSampleCode(
                 methodArg ->
                     ExprStatement.withExpr(assignMethodArgumentWithDefaultValue(methodArg)))
             .collect(Collectors.toList());
-    // Assign request with set attributes.
-    // e.g. EchoRequest request = echoClient.newBuilder().setName(name).build();
-    bodyStatements.add(
-        ExprStatement.withExpr(createRequestBuilderExpr(method.inputType(), arguments)));
     // Assign response variable with get method.
     // e.g EchoResponse response = echoClient.waitAsync().get();
     Expr getResponseMethodExpr =
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(
                 MethodInvocationExpr.builder()
-                    .setStaticReferenceType(clientType)
+                    .setExprReferenceExpr(createVariableExpr(getClientName(clientType), clientType))
                     .setMethodName(getLroMethodName(method.name()))
                     .setArguments(mapMethodArgumentsToVariableExprs(arguments))
                     .build())
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
index 46f7e60788..dc556ad007 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
+++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
@@ -365,8 +365,7 @@ public class EchoClient implements BackgroundResource {
    * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
    *   Duration ttl = Duration.newBuilder().build();
-   *   WaitRequest request = WaitRequest.newBuilder().setTtl(ttl).build();
-   *   Operation response = EchoClient.waitAsync(ttl).get();
+   *   Operation response = echoClient.waitAsync(ttl).get();
    * }
    * }

    *
@@ -385,8 +384,7 @@ public class EchoClient implements BackgroundResource {
    * 
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
    *   Timestamp end_time = Timestamp.newBuilder().build();
-   *   WaitRequest request = WaitRequest.newBuilder().setEndTime(end_time).build();
-   *   Operation response = EchoClient.waitAsync(end_time).get();
+   *   Operation response = echoClient.waitAsync(end_time).get();
    * }
    * }

    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 9302120c2b..20d94b0013 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -419,14 +419,8 @@ public final UnaryCallable getInstanceCallable() {
    *   String parent = "parent-995424086";
    *   String instance_id = "instance_id-2101995259";
    *   Instance instance = Instance.newBuilder().build();
-   *   CreateInstanceRequest request =
-   *       CreateInstanceRequest.newBuilder()
-   *           .setParent(parent)
-   *           .setInstanceId(instance_id)
-   *           .setInstance(instance)
-   *           .build();
    *   Operation response =
-   *       CloudRedisClient.createInstanceAsync(parent, instance_id, instance).get();
+   *       cloudRedisClient.createInstanceAsync(parent, instance_id, instance).get();
    * }
    * }

    *
@@ -478,14 +472,8 @@ public final OperationFuture createInstanceAsync(
    *   String parent = "parent-995424086";
    *   String instance_id = "instance_id-2101995259";
    *   Instance instance = Instance.newBuilder().build();
-   *   CreateInstanceRequest request =
-   *       CreateInstanceRequest.newBuilder()
-   *           .setParent(parent)
-   *           .setInstanceId(instance_id)
-   *           .setInstance(instance)
-   *           .build();
    *   Operation response =
-   *       CloudRedisClient.createInstanceAsync(parent, instance_id, instance).get();
+   *       cloudRedisClient.createInstanceAsync(parent, instance_id, instance).get();
    * }
    * }

    *
@@ -603,12 +591,7 @@ public final UnaryCallable createInstanceCalla
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   FieldMask update_mask = FieldMask.newBuilder().build();
    *   Instance instance = Instance.newBuilder().build();
-   *   UpdateInstanceRequest request =
-   *       UpdateInstanceRequest.newBuilder()
-   *           .setUpdateMask(update_mask)
-   *           .setInstance(instance)
-   *           .build();
-   *   Operation response = CloudRedisClient.updateInstanceAsync(update_mask, instance).get();
+   *   Operation response = cloudRedisClient.updateInstanceAsync(update_mask, instance).get();
    * }
    * }

    *
@@ -689,9 +672,7 @@ public final UnaryCallable updateInstanceCalla
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String name = "name3373707";
    *   String redis_version = "redis_version-685310444";
-   *   UpgradeInstanceRequest request =
-   *       UpgradeInstanceRequest.newBuilder().setName(name).setRedisVersion(redis_version).build();
-   *   Operation response = CloudRedisClient.upgradeInstanceAsync(name, redis_version).get();
+   *   Operation response = cloudRedisClient.upgradeInstanceAsync(name, redis_version).get();
    * }
    * }

    *
@@ -721,9 +702,7 @@ public final OperationFuture upgradeInstanceAsync(
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String name = "name3373707";
    *   String redis_version = "redis_version-685310444";
-   *   UpgradeInstanceRequest request =
-   *       UpgradeInstanceRequest.newBuilder().setName(name).setRedisVersion(redis_version).build();
-   *   Operation response = CloudRedisClient.upgradeInstanceAsync(name, redis_version).get();
+   *   Operation response = cloudRedisClient.upgradeInstanceAsync(name, redis_version).get();
    * }
    * }

    *
@@ -797,9 +776,7 @@ public final UnaryCallable upgradeInstanceCal
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String name = "name3373707";
    *   InputConfig input_config = InputConfig.newBuilder().build();
-   *   ImportInstanceRequest request =
-   *       ImportInstanceRequest.newBuilder().setName(name).setInputConfig(input_config).build();
-   *   Operation response = CloudRedisClient.importInstanceAsync(name, input_config).get();
+   *   Operation response = cloudRedisClient.importInstanceAsync(name, input_config).get();
    * }
    * }

    *
@@ -890,9 +867,7 @@ public final UnaryCallable importInstanceCalla
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String name = "name3373707";
    *   OutputConfig output_config = OutputConfig.newBuilder().build();
-   *   ExportInstanceRequest request =
-   *       ExportInstanceRequest.newBuilder().setName(name).setOutputConfig(output_config).build();
-   *   Operation response = CloudRedisClient.exportInstanceAsync(name, output_config).get();
+   *   Operation response = cloudRedisClient.exportInstanceAsync(name, output_config).get();
    * }
    * }

    *
@@ -977,12 +952,7 @@ public final UnaryCallable exportInstanceCalla
    *   String name = "name3373707";
    *   FailoverInstanceRequest.DataProtectionMode data_protection_mode =
    *       FailoverInstanceRequest.DataProtectionMode.forNumber(0);
-   *   FailoverInstanceRequest request =
-   *       FailoverInstanceRequest.newBuilder()
-   *           .setName(name)
-   *           .setDataProtectionMode(data_protection_mode)
-   *           .build();
-   *   Operation response = CloudRedisClient.failoverInstanceAsync(name, data_protection_mode).get();
+   *   Operation response = cloudRedisClient.failoverInstanceAsync(name, data_protection_mode).get();
    * }
    * }

    *
@@ -1015,12 +985,7 @@ public final OperationFuture failoverInstanceAsync(
    *   String name = "name3373707";
    *   FailoverInstanceRequest.DataProtectionMode data_protection_mode =
    *       FailoverInstanceRequest.DataProtectionMode.forNumber(0);
-   *   FailoverInstanceRequest request =
-   *       FailoverInstanceRequest.newBuilder()
-   *           .setName(name)
-   *           .setDataProtectionMode(data_protection_mode)
-   *           .build();
-   *   Operation response = CloudRedisClient.failoverInstanceAsync(name, data_protection_mode).get();
+   *   Operation response = cloudRedisClient.failoverInstanceAsync(name, data_protection_mode).get();
    * }
    * }

    *
@@ -1094,8 +1059,7 @@ public final UnaryCallable failoverInstanceC
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String name = "name3373707";
-   *   DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder().setName(name).build();
-   *   Operation response = CloudRedisClient.deleteInstanceAsync(name).get();
+   *   Operation response = cloudRedisClient.deleteInstanceAsync(name).get();
    * }
    * }

    *
@@ -1121,8 +1085,7 @@ public final OperationFuture deleteInstanceAsync(Insta
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String name = "name3373707";
-   *   DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder().setName(name).build();
-   *   Operation response = CloudRedisClient.deleteInstanceAsync(name).get();
+   *   Operation response = cloudRedisClient.deleteInstanceAsync(name).get();
    * }
    * }

    *

From 8c42a6251dd7d845ae8f8da318b995d58a052fec Mon Sep 17 00:00:00 2001
From: summerji 
Date: Wed, 18 Nov 2020 00:25:04 -0800
Subject: [PATCH 26/27] rebase upstream

---
 .../composer/SampleCodeHelperComposer.java    | 27 ++++++++-----
 .../goldens/asset/AssetServiceClient.java     |  8 ----
 .../logging/ConfigServiceV2Client.java        | 40 ++++++-------------
 .../logging/LoggingServiceV2Client.java       | 19 ++-------
 .../logging/MetricsServiceV2Client.java       |  4 +-
 .../goldens/redis/CloudRedisClient.java       | 12 +++---
 6 files changed, 41 insertions(+), 69 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 f2cc3d6b86..e43e2427bd 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
@@ -51,11 +51,11 @@ public static TryCatchStatement composeRpcMethodSampleCode(
     }
     // Paged Unary RPC method.
     if (method.isPaged()) {
-      return composePagedUnaryRpcMethodSampleCode(method, arguments, clientType);
+      return composePagedUnaryRpcMethodSampleCode(method, arguments, clientType, resourceNames);
     }
     // Long run operation Unary RPC method.
     if (method.hasLro()) {
-      return composeLroUnaryRpcMethodSampleCode(method, arguments, clientType);
+      return composeLroUnaryRpcMethodSampleCode(method, arguments, clientType, resourceNames);
     }
     // Pure Unary RPC method.
     return composeUnaryRpcMethodSampleCode(method, arguments, clientType, resourceNames);
@@ -102,7 +102,10 @@ private static TryCatchStatement composeUnaryRpcMethodSampleCode(
   }
 
   private static TryCatchStatement composeLroUnaryRpcMethodSampleCode(
-      Method method, List arguments, TypeNode clientType) {
+      Method method,
+      List arguments,
+      TypeNode clientType,
+      Map resourceNames) {
     // TODO(summerji): compose sample code for unary lro rpc method.
     // TODO(summerji): Add unit tests.
     // Assign each method arguments with default value.
@@ -110,7 +113,8 @@ private static TryCatchStatement composeLroUnaryRpcMethodSampleCode(
         arguments.stream()
             .map(
                 methodArg ->
-                    ExprStatement.withExpr(assignMethodArgumentWithDefaultValue(methodArg)))
+                    ExprStatement.withExpr(
+                        assignMethodArgumentWithDefaultValue(methodArg, resourceNames)))
             .collect(Collectors.toList());
     // Assign response variable with get method.
     // e.g EchoResponse response = echoClient.waitAsync().get();
@@ -139,14 +143,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 :
@@ -198,10 +206,11 @@ private static AssignmentExpr assignClientVariableWithCreateMethodExpr(TypeNode
         .build();
   }
 
-  private static Expr assignMethodArgumentWithDefaultValue(MethodArgument argument) {
+  private static Expr assignMethodArgumentWithDefaultValue(
+      MethodArgument argument, Map resourceNames) {
     return AssignmentExpr.builder()
-        .setVariableExpr(createVariableDeclExpr(argument.name(), argument.field().type()))
-        .setValueExpr(DefaultValueComposer.createDefaultValue(argument.field()))
+        .setVariableExpr(createVariableDeclExpr(argument.name(), argument.type()))
+        .setValueExpr(DefaultValueComposer.createDefaultValue(argument, resourceNames))
         .build();
   }
 
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 20d94b0013..7607be4dd7 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);
@@ -416,7 +414,7 @@ public final UnaryCallable getInstanceCallable() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String parent = "parent-995424086";
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
    *   String instance_id = "instance_id-2101995259";
    *   Instance instance = Instance.newBuilder().build();
    *   Operation response =
@@ -670,7 +668,7 @@ public final UnaryCallable updateInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String name = "name3373707";
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
    *   String redis_version = "redis_version-685310444";
    *   Operation response = cloudRedisClient.upgradeInstanceAsync(name, redis_version).get();
    * }
@@ -949,7 +947,7 @@ public final UnaryCallable exportInstanceCalla
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String name = "name3373707";
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
    *   FailoverInstanceRequest.DataProtectionMode data_protection_mode =
    *       FailoverInstanceRequest.DataProtectionMode.forNumber(0);
    *   Operation response = cloudRedisClient.failoverInstanceAsync(name, data_protection_mode).get();
@@ -1058,7 +1056,7 @@ public final UnaryCallable failoverInstanceC
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String name = "name3373707";
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
    *   Operation response = cloudRedisClient.deleteInstanceAsync(name).get();
    * }
    * }


From 3fbdd1e58e68121dee6d0635c06e63ddb32cca62 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Fri, 20 Nov 2020 00:25:40 -0800
Subject: [PATCH 27/27] rebase 33 branch and refactor varialbe expr

---
 .../api/generator/gapic/composer/BUILD.bazel  |  1 -
 .../composer/SampleCodeHelperComposer.java    | 26 +++++++++----------
 .../ServiceClientSampleCodeComposer.java      |  8 ------
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel
index 3d7e1cb00c..a4500c029d 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel
+++ b/src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel
@@ -20,7 +20,6 @@ java_library(
         "//src/main/java/com/google/api/generator/gapic/model",
         "//src/main/java/com/google/api/generator/gapic/composer/samplecode",
         "//src/main/java/com/google/api/generator/gapic/utils",
-        "//src/main/java/com/google/api/generator/gapic/composer/samplecode",
         "@com_google_api_api_common//jar",
         "@com_google_api_gax_java//gax",
         "@com_google_api_gax_java//gax-grpc:gax_grpc",
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 08b2e36b8b..449a385ba0 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
@@ -104,13 +104,11 @@ private static TryCatchStatement composeLroUnaryRpcMethodSampleCode(
       Map resourceNames) {
     // TODO(summerji): compose sample code for unary lro rpc method.
     // TODO(summerji): Add unit tests.
+    VariableExpr clientVarExpr = createVariableExpr(getClientName(clientType), clientType);
     // Assign each method arguments with default value.
-    List bodyStatements =
+    List bodyExprs =
         arguments.stream()
-            .map(
-                methodArg ->
-                    ExprStatement.withExpr(
-                        assignMethodArgumentWithDefaultValue(methodArg, resourceNames)))
+            .map(methodArg -> assignMethodArgumentWithDefaultValue(methodArg, resourceNames))
             .collect(Collectors.toList());
     // Assign response variable with get method.
     // e.g EchoResponse response = echoClient.waitAsync().get();
@@ -118,22 +116,22 @@ private static TryCatchStatement composeLroUnaryRpcMethodSampleCode(
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(
                 MethodInvocationExpr.builder()
-                    .setExprReferenceExpr(createVariableExpr(getClientName(clientType), clientType))
+                    .setExprReferenceExpr(clientVarExpr)
                     .setMethodName(getLroMethodName(method.name()))
                     .setArguments(mapMethodArgumentsToVariableExprs(arguments))
                     .build())
             .setMethodName("get")
             .setReturnType(method.outputType())
             .build();
-    bodyStatements.add(
-        ExprStatement.withExpr(
-            AssignmentExpr.builder()
-                .setVariableExpr(createVariableDeclExpr(RESPONSE_VAR_NAME, method.outputType()))
-                .setValueExpr(getResponseMethodExpr)
-                .build()));
+    bodyExprs.add(
+        AssignmentExpr.builder()
+            .setVariableExpr(createVariableDeclExpr(RESPONSE_VAR_NAME, method.outputType()))
+            .setValueExpr(getResponseMethodExpr)
+            .build());
     return TryCatchStatement.builder()
-        .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType))
-        .setTryBody(bodyStatements)
+        .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientVarExpr))
+        .setTryBody(
+            bodyExprs.stream().map(e -> ExprStatement.withExpr(e)).collect(Collectors.toList()))
         .setIsSampleCode(true)
         .build();
   }
diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java
index 41252daa1b..529f3b4d89 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposer.java
@@ -20,14 +20,6 @@
 import com.google.api.generator.engine.ast.Expr;
 import com.google.api.generator.engine.ast.ExprStatement;
 import com.google.api.generator.engine.ast.MethodInvocationExpr;
-import com.google.api.generator.engine.ast.Statement;
-import com.google.api.generator.engine.ast.StringObjectValue;
-import com.google.api.generator.engine.ast.TypeNode;
-import com.google.api.generator.engine.ast.ValueExpr;
-import com.google.api.generator.engine.ast.Variable;
-import com.google.api.generator.engine.ast.VariableExpr;
-import com.google.api.generator.engine.writer.JavaWriterVisitor;
-import com.google.api.generator.gapic.composer.samplecode.SampleCodeJavaFormatter;
 import com.google.api.generator.engine.ast.TypeNode;
 import com.google.api.generator.engine.ast.VaporReference;
 import com.google.api.generator.engine.ast.Variable;