From 790cf6703b8b9dfb94c71879a91dda5822c68d0e Mon Sep 17 00:00:00 2001 From: summerji Date: Wed, 18 Nov 2020 00:00:44 -0800 Subject: [PATCH 01/19] 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 02/19] 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 03/19] 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 04/19] 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 05/19] 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 06/19] 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 07/19] 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 08/19] 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 09/19] 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 2d8fd9dca38eaead51fe0addcb2e9d32244b1687 Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 18:13:45 -0800 Subject: [PATCH 10/19] Implement paged unary rpc method' sample code --- .../composer/SampleCodeHelperComposer.java | 2 + .../logging/ConfigServiceV2Client.java | 85 +++++++++---------- .../logging/LoggingServiceV2Client.java | 30 +++---- .../logging/MetricsServiceV2Client.java | 16 ++-- .../goldens/redis/CloudRedisClient.java | 72 +++++----------- 5 files changed, 90 insertions(+), 115 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 e43e2427bd..9f43dfc151 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.ForStatement; @@ -30,6 +31,7 @@ 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; diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java index 80338abe61..638f4b6578 100644 --- a/test/integration/goldens/logging/ConfigServiceV2Client.java +++ b/test/integration/goldens/logging/ConfigServiceV2Client.java @@ -153,10 +153,9 @@ public ConfigServiceV2Stub getStub() { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   BillingAccountLocationName parent =
-   *       BillingAccountLocationName.of("[BILLING_ACCOUNT]", "[LOCATION]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -187,9 +186,9 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   FolderLocationName parent = FolderLocationName.of("[FOLDER]", "[LOCATION]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -220,9 +219,9 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -253,9 +252,9 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   OrganizationLocationName parent = OrganizationLocationName.of("[ORGANIZATION]", "[LOCATION]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -288,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);
    *   }
    * }
@@ -316,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.
    * }
    * }
* @@ -356,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.
    * }
    * }
* @@ -394,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.
    * }
    * }
* @@ -432,9 +431,9 @@ public final UnaryCallable updateBucketCallable( * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -461,9 +460,9 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   FolderName parent = FolderName.of("[FOLDER]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -490,9 +489,9 @@ public final ListSinksPagedResponse listSinks(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -519,9 +518,9 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -550,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);
    *   }
    * }
@@ -574,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.
    * }
    * }
* @@ -668,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.
    * }
    * }
* @@ -867,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.
    * }
    * }
* @@ -1074,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.
    * }
    * }
* @@ -1167,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.
    * }
    * }
* @@ -1197,9 +1196,9 @@ public final UnaryCallable deleteSinkCallable() { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1226,9 +1225,9 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   FolderName parent = FolderName.of("[FOLDER]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1255,9 +1254,9 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1284,9 +1283,9 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent)
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   String parent = "parent-995424086";
    *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *       ConfigServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -1315,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);
    *   }
    * }
@@ -1339,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.
    * }
    * }
* @@ -1435,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.
    * }
    * }
* @@ -1622,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.
    * }
    * }
* @@ -1736,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.
    * }
    * }
* @@ -1820,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.
    * }
    * }
* @@ -1855,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.
    * }
    * }
* @@ -1901,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 3ef9ab541a..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.
    * }
    * }
* @@ -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); * } * } @@ -484,7 +484,7 @@ public final ListLogEntriesPagedResponse listLogEntries( * *
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }
* @@ -529,7 +529,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re * *
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }
* @@ -574,9 +574,9 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource * *
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
+   *   String parent = "parent-995424086";
    *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -604,9 +604,9 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   FolderName parent = FolderName.of("[FOLDER]");
+   *   String parent = "parent-995424086";
    *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -634,9 +634,9 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
+   *   String parent = "parent-995424086";
    *   for (LoggingServiceV2Client loggingServiceV2Client :
-   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *       LoggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
    * }
@@ -664,9 +664,9 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   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);
    *   }
    * }
@@ -721,7 +721,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not 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 5ab7dc6ec8..94716c7cb2 100644 --- a/test/integration/goldens/logging/MetricsServiceV2Client.java +++ b/test/integration/goldens/logging/MetricsServiceV2Client.java @@ -152,9 +152,9 @@ public MetricsServiceV2Stub getStub() { * *
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   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);
    *   }
    * }
@@ -205,7 +205,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }
* @@ -294,7 +294,7 @@ public final LogMetric getLogMetric(String metricName) { * *
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }
* @@ -380,7 +380,7 @@ public final LogMetric createLogMetric(String parent, LogMetric metric) { * *
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }
* @@ -468,7 +468,7 @@ public final LogMetric updateLogMetric(String metricName, LogMetric metric) { * *
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }
* @@ -545,7 +545,7 @@ public final Empty deleteLogMetric(String metricName) { * *
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not 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 7607be4dd7..4e5cdbc69b 100644 --- a/test/integration/goldens/redis/CloudRedisClient.java +++ b/test/integration/goldens/redis/CloudRedisClient.java @@ -192,9 +192,9 @@ public final OperationsClient getOperationsClient() { * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   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);
    *   }
    * }
@@ -265,7 +265,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
    * }
    * }
* @@ -374,7 +374,7 @@ public final Instance getInstance(String name) { * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary default rpc method sample code.
    * }
    * }
* @@ -414,11 +414,7 @@ public final UnaryCallable getInstanceCallable() { * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
-   *   String instance_id = "instance_id-2101995259";
-   *   Instance instance = Instance.newBuilder().build();
-   *   Operation response =
-   *       cloudRedisClient.createInstanceAsync(parent, instance_id, instance).get();
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }
* @@ -467,11 +463,7 @@ public final OperationFuture createInstanceAsync( * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String parent = "parent-995424086";
-   *   String instance_id = "instance_id-2101995259";
-   *   Instance instance = Instance.newBuilder().build();
-   *   Operation response =
-   *       cloudRedisClient.createInstanceAsync(parent, instance_id, instance).get();
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }
* @@ -520,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.
    * }
    * }
* @@ -587,9 +579,7 @@ public final UnaryCallable createInstanceCalla * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   FieldMask update_mask = FieldMask.newBuilder().build();
-   *   Instance instance = Instance.newBuilder().build();
-   *   Operation response = cloudRedisClient.updateInstanceAsync(update_mask, instance).get();
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }
* @@ -619,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.
    * }
    * }
* @@ -668,9 +658,7 @@ public final UnaryCallable updateInstanceCalla * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
-   *   String redis_version = "redis_version-685310444";
-   *   Operation response = cloudRedisClient.upgradeInstanceAsync(name, redis_version).get();
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }
* @@ -698,9 +686,7 @@ public final OperationFuture upgradeInstanceAsync( * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String name = "name3373707";
-   *   String redis_version = "redis_version-685310444";
-   *   Operation response = cloudRedisClient.upgradeInstanceAsync(name, redis_version).get();
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }
* @@ -725,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.
    * }
    * }
* @@ -772,9 +758,7 @@ public final UnaryCallable upgradeInstanceCal * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String name = "name3373707";
-   *   InputConfig input_config = InputConfig.newBuilder().build();
-   *   Operation response = cloudRedisClient.importInstanceAsync(name, input_config).get();
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }
* @@ -805,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.
    * }
    * }
* @@ -863,9 +847,7 @@ public final UnaryCallable importInstanceCalla * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String name = "name3373707";
-   *   OutputConfig output_config = OutputConfig.newBuilder().build();
-   *   Operation response = cloudRedisClient.exportInstanceAsync(name, output_config).get();
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }
* @@ -895,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.
    * }
    * }
* @@ -947,10 +929,7 @@ public final UnaryCallable exportInstanceCalla * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   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();
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }
* @@ -980,10 +959,7 @@ public final OperationFuture failoverInstanceAsync( * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String name = "name3373707";
-   *   FailoverInstanceRequest.DataProtectionMode data_protection_mode =
-   *       FailoverInstanceRequest.DataProtectionMode.forNumber(0);
-   *   Operation response = cloudRedisClient.failoverInstanceAsync(name, data_protection_mode).get();
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }
* @@ -1013,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.
    * }
    * }
* @@ -1056,8 +1032,7 @@ public final UnaryCallable failoverInstanceC * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
-   *   Operation response = cloudRedisClient.deleteInstanceAsync(name).get();
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }
* @@ -1082,8 +1057,7 @@ public final OperationFuture deleteInstanceAsync(Insta * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String name = "name3373707";
-   *   Operation response = cloudRedisClient.deleteInstanceAsync(name).get();
+   *   // Note: Not Implement yet. Holder for lro Unary rpc method sample code.
    * }
    * }
* @@ -1105,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 30526c411c229ed31928065335d328fe1bf31ea4 Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 20:37:29 -0800 Subject: [PATCH 11/19] rebase previous branch --- .../goldens/asset/AssetServiceClient.java | 15 +-- .../logging/ConfigServiceV2Client.java | 120 +++++------------- .../logging/LoggingServiceV2Client.java | 48 ++----- .../logging/MetricsServiceV2Client.java | 22 +--- .../goldens/redis/CloudRedisClient.java | 52 ++++---- 5 files changed, 72 insertions(+), 185 deletions(-) diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java index 2e0e5f6872..eb586351c8 100644 --- a/test/integration/goldens/asset/AssetServiceClient.java +++ b/test/integration/goldens/asset/AssetServiceClient.java @@ -577,13 +577,7 @@ public final UnaryCallable deleteFeedCallable() { * *
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   String scope = "scope109264468";
-   *   String query = "query107944136";
-   *   List asset_types = new ArrayList<>();
-   *   for (AssetServiceClient assetServiceClient :
-   *       assetServiceClient.SearchAllResources(scope, query, asset_types).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -705,12 +699,7 @@ public final SearchAllResourcesPagedResponse searchAllResources( * *
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   String scope = "scope109264468";
-   *   String query = "query107944136";
-   *   for (AssetServiceClient assetServiceClient :
-   *       assetServiceClient.SearchAllIamPolicies(scope, query).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // 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 638f4b6578..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 265182a20f..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 94716c7cb2..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 4e5cdbc69b..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 fae22c3c2f8d61c0fef33c62b48daa5bf00664aa Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 21:29:41 -0800 Subject: [PATCH 12/19] add missing request assignment expr --- .../goldens/asset/AssetServiceClient.java | 23 +++- .../logging/ConfigServiceV2Client.java | 111 +++++++++++++++--- .../logging/LoggingServiceV2Client.java | 55 +++++++-- .../logging/MetricsServiceV2Client.java | 16 ++- .../goldens/redis/CloudRedisClient.java | 30 +++-- 5 files changed, 193 insertions(+), 42 deletions(-) diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java index eb586351c8..9dfec6998b 100644 --- a/test/integration/goldens/asset/AssetServiceClient.java +++ b/test/integration/goldens/asset/AssetServiceClient.java @@ -577,7 +577,19 @@ 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<>();
+   *   SearchAllResourcesRequest request =
+   *       SearchAllResourcesRequest.newBuilder()
+   *           .setScope(scope)
+   *           .setQuery(query)
+   *           .setAssetTypes(asset_types)
+   *           .build();
+   *   for (AssetServiceClient assetServiceClient :
+   *       assetServiceClient.SearchAllResources(scope, query, asset_types).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -699,7 +711,14 @@ 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";
+   *   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 fe2d077cb3..94975b73ef 100644 --- a/test/integration/goldens/logging/ConfigServiceV2Client.java +++ b/test/integration/goldens/logging/ConfigServiceV2Client.java @@ -153,7 +153,12 @@ 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";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -182,7 +187,12 @@ 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";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -211,7 +221,12 @@ 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";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -240,7 +255,12 @@ 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";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -269,7 +289,12 @@ 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";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -295,7 +320,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 +436,12 @@ 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";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -436,7 +466,12 @@ 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";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -461,7 +496,12 @@ 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";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -486,7 +526,12 @@ 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";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -511,7 +556,12 @@ 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";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -533,7 +583,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 +1206,12 @@ 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";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -1181,7 +1236,12 @@ 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";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -1206,7 +1266,12 @@ 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";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -1231,7 +1296,12 @@ 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";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -1256,7 +1326,12 @@ 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";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -1278,7 +1353,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..6a39b0c88e 100644 --- a/test/integration/goldens/logging/LoggingServiceV2Client.java +++ b/test/integration/goldens/logging/LoggingServiceV2Client.java @@ -435,7 +435,19 @@ 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";
+   *   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);
+   *   }
    * }
    * }
* @@ -478,7 +490,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 +535,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 +580,12 @@ 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";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -594,7 +611,12 @@ 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";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -620,7 +642,12 @@ 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";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -646,7 +673,12 @@ 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";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -672,7 +704,12 @@ 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";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -695,7 +732,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..c48500ffba 100644 --- a/test/integration/goldens/logging/MetricsServiceV2Client.java +++ b/test/integration/goldens/logging/MetricsServiceV2Client.java @@ -152,7 +152,12 @@ 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";
+   *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder().setParent(parent).build();
+   *   for (MetricsServiceV2Client metricsServiceV2Client :
+   *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -176,7 +181,12 @@ 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";
+   *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder().setParent(parent).build();
+   *   for (MetricsServiceV2Client metricsServiceV2Client :
+   *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -197,7 +207,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..83b44b55c9 100644 --- a/test/integration/goldens/redis/CloudRedisClient.java +++ b/test/integration/goldens/redis/CloudRedisClient.java @@ -192,7 +192,12 @@ 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";
+   *   ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build();
+   *   for (CloudRedisClient cloudRedisClient :
+   *       cloudRedisClient.ListInstances(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -226,7 +231,12 @@ 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";
+   *   ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build();
+   *   for (CloudRedisClient cloudRedisClient :
+   *       cloudRedisClient.ListInstances(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -257,7 +267,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 +514,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 +611,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 +713,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 +791,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 +879,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 +991,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 +1081,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 761c13495a9873771ae2d377e12068a51d57feb8 Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 23:59:54 -0800 Subject: [PATCH 13/19] remove request assignment expr --- .../composer/SampleCodeHelperComposer.java | 2 - .../goldens/asset/AssetServiceClient.java | 8 ---- .../logging/ConfigServiceV2Client.java | 40 ++++++------------- .../logging/LoggingServiceV2Client.java | 19 ++------- .../logging/MetricsServiceV2Client.java | 4 +- .../goldens/redis/CloudRedisClient.java | 4 +- 6 files changed, 19 insertions(+), 58 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 9f43dfc151..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 @@ -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.ForStatement; @@ -31,7 +30,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; diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java index 9dfec6998b..2e0e5f6872 100644 --- a/test/integration/goldens/asset/AssetServiceClient.java +++ b/test/integration/goldens/asset/AssetServiceClient.java @@ -580,12 +580,6 @@ public final UnaryCallable deleteFeedCallable() { * String scope = "scope109264468"; * String query = "query107944136"; * List asset_types = new ArrayList<>(); - * SearchAllResourcesRequest request = - * SearchAllResourcesRequest.newBuilder() - * .setScope(scope) - * .setQuery(query) - * .setAssetTypes(asset_types) - * .build(); * for (AssetServiceClient assetServiceClient : * assetServiceClient.SearchAllResources(scope, query, asset_types).iterateAll()) { * // doThingsWith(element); @@ -713,8 +707,6 @@ public final SearchAllResourcesPagedResponse searchAllResources( * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) { * String scope = "scope109264468"; * String query = "query107944136"; - * SearchAllIamPoliciesRequest request = - * SearchAllIamPoliciesRequest.newBuilder().setScope(scope).setQuery(query).build(); * for (AssetServiceClient assetServiceClient : * assetServiceClient.SearchAllIamPolicies(scope, query).iterateAll()) { * // doThingsWith(element); diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java index 94975b73ef..80338abe61 100644 --- a/test/integration/goldens/logging/ConfigServiceV2Client.java +++ b/test/integration/goldens/logging/ConfigServiceV2Client.java @@ -153,8 +153,8 @@ public ConfigServiceV2Stub getStub() { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   BillingAccountLocationName parent =
+   *       BillingAccountLocationName.of("[BILLING_ACCOUNT]", "[LOCATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -187,8 +187,7 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   FolderLocationName parent = FolderLocationName.of("[FOLDER]", "[LOCATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -221,8 +220,7 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -255,8 +253,7 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   OrganizationLocationName parent = OrganizationLocationName.of("[ORGANIZATION]", "[LOCATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -290,7 +287,6 @@ public final ListBucketsPagedResponse listBuckets(OrganizationLocationName paren
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
-   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -436,8 +432,7 @@ public final UnaryCallable updateBucketCallable(
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -466,8 +461,7 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   FolderName parent = FolderName.of("[FOLDER]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -496,8 +490,7 @@ public final ListSinksPagedResponse listSinks(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -526,8 +519,7 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -557,7 +549,6 @@ public final ListSinksPagedResponse listSinks(ProjectName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
-   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListSinks(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1206,8 +1197,7 @@ public final UnaryCallable deleteSinkCallable() {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1236,8 +1226,7 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   FolderName parent = FolderName.of("[FOLDER]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1266,8 +1255,7 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) {
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1296,8 +1284,7 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent)
    *
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -1327,7 +1314,6 @@ public final ListExclusionsPagedResponse listExclusions(ProjectName parent) {
    * 
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
    *   String parent = "parent-995424086";
-   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
    *   for (ConfigServiceV2Client configServiceV2Client :
    *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
    *     // doThingsWith(element);
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
index 6a39b0c88e..3ef9ab541a 100644
--- a/test/integration/goldens/logging/LoggingServiceV2Client.java
+++ b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -438,12 +438,6 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *   List resource_names = new ArrayList<>();
    *   String filter = "filter-1274492040";
    *   String order_by = "order_by1234304744";
-   *   ListLogEntriesRequest request =
-   *       ListLogEntriesRequest.newBuilder()
-   *           .setResourceNames(resource_names)
-   *           .setFilter(filter)
-   *           .setOrderBy(order_by)
-   *           .build();
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogEntries(resource_names, filter, order_by).iterateAll()) {
    *     // doThingsWith(element);
@@ -580,8 +574,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -611,8 +604,7 @@ public final ListLogsPagedResponse listLogs(BillingAccountName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   FolderName parent = FolderName.of("[FOLDER]");
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -642,8 +634,7 @@ public final ListLogsPagedResponse listLogs(FolderName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -673,8 +664,7 @@ public final ListLogsPagedResponse listLogs(OrganizationName parent) {
    *
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -705,7 +695,6 @@ public final ListLogsPagedResponse listLogs(ProjectName parent) {
    * 
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   String parent = "parent-995424086";
-   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
    *   for (LoggingServiceV2Client loggingServiceV2Client :
    *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
    *     // doThingsWith(element);
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
index c48500ffba..5ab7dc6ec8 100644
--- a/test/integration/goldens/logging/MetricsServiceV2Client.java
+++ b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -152,8 +152,7 @@ public MetricsServiceV2Stub getStub() {
    *
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   String parent = "parent-995424086";
-   *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder().setParent(parent).build();
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
    *   for (MetricsServiceV2Client metricsServiceV2Client :
    *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -182,7 +181,6 @@ public final ListLogMetricsPagedResponse listLogMetrics(ProjectName parent) {
    * 
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
    *   String parent = "parent-995424086";
-   *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder().setParent(parent).build();
    *   for (MetricsServiceV2Client metricsServiceV2Client :
    *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
    *     // doThingsWith(element);
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
index 83b44b55c9..bbb6a7ccd8 100644
--- a/test/integration/goldens/redis/CloudRedisClient.java
+++ b/test/integration/goldens/redis/CloudRedisClient.java
@@ -192,8 +192,7 @@ public final OperationsClient getOperationsClient() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   String parent = "parent-995424086";
-   *   ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build();
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
    *   for (CloudRedisClient cloudRedisClient :
    *       cloudRedisClient.ListInstances(parent).iterateAll()) {
    *     // doThingsWith(element);
@@ -232,7 +231,6 @@ public final ListInstancesPagedResponse listInstances(LocationName parent) {
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
    *   String parent = "parent-995424086";
-   *   ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build();
    *   for (CloudRedisClient cloudRedisClient :
    *       cloudRedisClient.ListInstances(parent).iterateAll()) {
    *     // doThingsWith(element);

From 29b5606b0495ec13b56f055deb8379ba7609f65b Mon Sep 17 00:00:00 2001
From: summerji 
Date: Wed, 18 Nov 2020 00:00:44 -0800
Subject: [PATCH 14/19] run google format

---
 .../api/generator/gapic/composer/SampleCodeHelperComposer.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java
index e43e2427bd..9f43dfc151 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.ForStatement;
@@ -30,6 +31,7 @@
 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;

From 08c34403879b8a02d5abb283764f95adf4199ab0 Mon Sep 17 00:00:00 2001
From: summerji 
Date: Tue, 17 Nov 2020 20:37:29 -0800
Subject: [PATCH 15/19] rebase previous branch

---
 .../goldens/asset/AssetServiceClient.java     | 15 +--
 .../logging/ConfigServiceV2Client.java        | 97 ++++---------------
 .../logging/LoggingServiceV2Client.java       | 44 ++-------
 .../logging/MetricsServiceV2Client.java       | 14 +--
 .../goldens/redis/CloudRedisClient.java       | 28 ++----
 5 files changed, 42 insertions(+), 156 deletions(-)

diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
index 2e0e5f6872..eb586351c8 100644
--- a/test/integration/goldens/asset/AssetServiceClient.java
+++ b/test/integration/goldens/asset/AssetServiceClient.java
@@ -577,13 +577,7 @@ public final UnaryCallable deleteFeedCallable() {
    *
    * 
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   String scope = "scope109264468";
-   *   String query = "query107944136";
-   *   List asset_types = new ArrayList<>();
-   *   for (AssetServiceClient assetServiceClient :
-   *       assetServiceClient.SearchAllResources(scope, query, asset_types).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -705,12 +699,7 @@ public final SearchAllResourcesPagedResponse searchAllResources( * *
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   String scope = "scope109264468";
-   *   String query = "query107944136";
-   *   for (AssetServiceClient assetServiceClient :
-   *       assetServiceClient.SearchAllIamPolicies(scope, query).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // 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 80338abe61..fe2d077cb3 100644 --- a/test/integration/goldens/logging/ConfigServiceV2Client.java +++ b/test/integration/goldens/logging/ConfigServiceV2Client.java @@ -153,12 +153,7 @@ public ConfigServiceV2Stub getStub() { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   BillingAccountLocationName parent =
-   *       BillingAccountLocationName.of("[BILLING_ACCOUNT]", "[LOCATION]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -187,11 +182,7 @@ public final ListBucketsPagedResponse listBuckets(BillingAccountLocationName par * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   FolderLocationName parent = FolderLocationName.of("[FOLDER]", "[LOCATION]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -220,11 +211,7 @@ public final ListBucketsPagedResponse listBuckets(FolderLocationName parent) { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -253,11 +240,7 @@ public final ListBucketsPagedResponse listBuckets(LocationName parent) { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   OrganizationLocationName parent = OrganizationLocationName.of("[ORGANIZATION]", "[LOCATION]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -286,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.
    * }
    * }
* @@ -316,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.
    * }
    * }
* @@ -432,11 +411,7 @@ public final UnaryCallable updateBucketCallable( * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -461,11 +436,7 @@ public final ListSinksPagedResponse listSinks(BillingAccountName parent) { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   FolderName parent = FolderName.of("[FOLDER]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -490,11 +461,7 @@ public final ListSinksPagedResponse listSinks(FolderName parent) { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -519,11 +486,7 @@ public final ListSinksPagedResponse listSinks(OrganizationName parent) { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -548,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.
    * }
    * }
* @@ -574,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.
    * }
    * }
* @@ -1197,11 +1156,7 @@ public final UnaryCallable deleteSinkCallable() { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -1226,11 +1181,7 @@ public final ListExclusionsPagedResponse listExclusions(BillingAccountName paren * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   FolderName parent = FolderName.of("[FOLDER]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -1255,11 +1206,7 @@ public final ListExclusionsPagedResponse listExclusions(FolderName parent) { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -1284,11 +1231,7 @@ public final ListExclusionsPagedResponse listExclusions(OrganizationName parent) * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
-   *   for (ConfigServiceV2Client configServiceV2Client :
-   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
-   *     // doThingsWith(element);
-   *   }
+   *   // Note: Not Implement yet. Holder for paged unary rpc method sample code.
    * }
    * }
* @@ -1313,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.
    * }
    * }
* @@ -1339,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.
    * }
    * }
* diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java index 3ef9ab541a..aea9e8d904 100644 --- a/test/integration/goldens/logging/LoggingServiceV2Client.java +++ b/test/integration/goldens/logging/LoggingServiceV2Client.java @@ -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, placeholder for unary paged default 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, placeholder for unary paged default 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()) {
-   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
-   *   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()) {
-   *   FolderName parent = FolderName.of("[FOLDER]");
-   *   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()) {
-   *   OrganizationName parent = OrganizationName.of("[ORGANIZATION]");
-   *   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()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
-   *   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, 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/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java index 5ab7dc6ec8..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()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
-   *   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, 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/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java index bbb6a7ccd8..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()) {
-   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
-   *   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, placeholder for unary paged default rpc method sample code.
+   *   // Note: Not Implement yet, placeholder for unary paged rpc method sample code.
    * }
    * }
* @@ -512,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.
    * }
    * }
* @@ -609,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.
    * }
    * }
* @@ -711,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.
    * }
    * }
* @@ -789,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.
    * }
    * }
* @@ -877,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.
    * }
    * }
* @@ -989,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.
    * }
    * }
* @@ -1079,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 611901c142175bbc7a21060c17815af527e91d65 Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 17 Nov 2020 21:29:41 -0800 Subject: [PATCH 16/19] add missing request assignment expr --- .../composer/SampleCodeHelperComposer.java | 7 +- .../goldens/asset/AssetServiceClient.java | 23 +++- .../logging/ConfigServiceV2Client.java | 111 +++++++++++++++--- .../logging/LoggingServiceV2Client.java | 55 +++++++-- .../logging/MetricsServiceV2Client.java | 16 ++- .../goldens/redis/CloudRedisClient.java | 30 +++-- 6 files changed, 196 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 9f43dfc151..5f74710da4 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 @@ -208,11 +208,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 eb586351c8..9dfec6998b 100644 --- a/test/integration/goldens/asset/AssetServiceClient.java +++ b/test/integration/goldens/asset/AssetServiceClient.java @@ -577,7 +577,19 @@ 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<>();
+   *   SearchAllResourcesRequest request =
+   *       SearchAllResourcesRequest.newBuilder()
+   *           .setScope(scope)
+   *           .setQuery(query)
+   *           .setAssetTypes(asset_types)
+   *           .build();
+   *   for (AssetServiceClient assetServiceClient :
+   *       assetServiceClient.SearchAllResources(scope, query, asset_types).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -699,7 +711,14 @@ 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";
+   *   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 fe2d077cb3..94975b73ef 100644 --- a/test/integration/goldens/logging/ConfigServiceV2Client.java +++ b/test/integration/goldens/logging/ConfigServiceV2Client.java @@ -153,7 +153,12 @@ 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";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -182,7 +187,12 @@ 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";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -211,7 +221,12 @@ 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";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -240,7 +255,12 @@ 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";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -269,7 +289,12 @@ 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";
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -295,7 +320,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 +436,12 @@ 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";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -436,7 +466,12 @@ 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";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -461,7 +496,12 @@ 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";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -486,7 +526,12 @@ 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";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -511,7 +556,12 @@ 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";
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -533,7 +583,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 +1206,12 @@ 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";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -1181,7 +1236,12 @@ 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";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -1206,7 +1266,12 @@ 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";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -1231,7 +1296,12 @@ 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";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -1256,7 +1326,12 @@ 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";
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -1278,7 +1353,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..6a39b0c88e 100644 --- a/test/integration/goldens/logging/LoggingServiceV2Client.java +++ b/test/integration/goldens/logging/LoggingServiceV2Client.java @@ -435,7 +435,19 @@ 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";
+   *   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);
+   *   }
    * }
    * }
* @@ -478,7 +490,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 +535,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 +580,12 @@ 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";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -594,7 +611,12 @@ 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";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -620,7 +642,12 @@ 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";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -646,7 +673,12 @@ 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";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -672,7 +704,12 @@ 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";
+   *   ListLogsRequest request = ListLogsRequest.newBuilder().setParent(parent).build();
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListLogs(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -695,7 +732,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..c48500ffba 100644 --- a/test/integration/goldens/logging/MetricsServiceV2Client.java +++ b/test/integration/goldens/logging/MetricsServiceV2Client.java @@ -152,7 +152,12 @@ 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";
+   *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder().setParent(parent).build();
+   *   for (MetricsServiceV2Client metricsServiceV2Client :
+   *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -176,7 +181,12 @@ 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";
+   *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder().setParent(parent).build();
+   *   for (MetricsServiceV2Client metricsServiceV2Client :
+   *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -197,7 +207,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..83b44b55c9 100644 --- a/test/integration/goldens/redis/CloudRedisClient.java +++ b/test/integration/goldens/redis/CloudRedisClient.java @@ -192,7 +192,12 @@ 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";
+   *   ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build();
+   *   for (CloudRedisClient cloudRedisClient :
+   *       cloudRedisClient.ListInstances(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -226,7 +231,12 @@ 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";
+   *   ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build();
+   *   for (CloudRedisClient cloudRedisClient :
+   *       cloudRedisClient.ListInstances(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -257,7 +267,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 +514,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 +611,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 +713,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 +791,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 +879,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 +991,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 +1081,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 17faa4173c77a60d7390eab9b89c29f6819165a3 Mon Sep 17 00:00:00 2001 From: summerji Date: Wed, 18 Nov 2020 00:25:04 -0800 Subject: [PATCH 17/19] rebase upstream --- .../composer/SampleCodeHelperComposer.java | 7 +-- .../goldens/asset/AssetServiceClient.java | 8 --- .../logging/ConfigServiceV2Client.java | 40 +++++--------- .../logging/LoggingServiceV2Client.java | 19 ++----- .../logging/MetricsServiceV2Client.java | 4 +- .../goldens/redis/CloudRedisClient.java | 52 ++++++++++++++----- 6 files changed, 60 insertions(+), 70 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 5f74710da4..9f43dfc151 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 @@ -208,10 +208,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 83b44b55c9..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,11 @@ public final UnaryCallable getInstanceCallable() {
    *
    * 
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   String instance_id = "instance_id-2101995259";
+   *   Instance instance = Instance.newBuilder().build();
+   *   Operation response =
+   *       cloudRedisClient.createInstanceAsync(parent, instance_id, instance).get();
    * }
    * }
* @@ -465,7 +467,11 @@ 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();
+   *   Operation response =
+   *       cloudRedisClient.createInstanceAsync(parent, instance_id, instance).get();
    * }
    * }
* @@ -581,7 +587,9 @@ 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();
+   *   Operation response = cloudRedisClient.updateInstanceAsync(update_mask, instance).get();
    * }
    * }
* @@ -660,7 +668,9 @@ public final UnaryCallable updateInstanceCalla * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   String redis_version = "redis_version-685310444";
+   *   Operation response = cloudRedisClient.upgradeInstanceAsync(name, redis_version).get();
    * }
    * }
* @@ -688,7 +698,9 @@ 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";
+   *   Operation response = cloudRedisClient.upgradeInstanceAsync(name, redis_version).get();
    * }
    * }
* @@ -760,7 +772,9 @@ 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();
+   *   Operation response = cloudRedisClient.importInstanceAsync(name, input_config).get();
    * }
    * }
* @@ -849,7 +863,9 @@ 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();
+   *   Operation response = cloudRedisClient.exportInstanceAsync(name, output_config).get();
    * }
    * }
* @@ -931,7 +947,10 @@ public final UnaryCallable exportInstanceCalla * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   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();
    * }
    * }
* @@ -961,7 +980,10 @@ 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);
+   *   Operation response = cloudRedisClient.failoverInstanceAsync(name, data_protection_mode).get();
    * }
    * }
* @@ -1034,7 +1056,8 @@ public final UnaryCallable failoverInstanceC * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for lro Unary rpc method sample code.
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   Operation response = cloudRedisClient.deleteInstanceAsync(name).get();
    * }
    * }
* @@ -1059,7 +1082,8 @@ 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";
+   *   Operation response = cloudRedisClient.deleteInstanceAsync(name).get();
    * }
    * }
* From 3b2d44550de76259f34eaaf9413c8952274af375 Mon Sep 17 00:00:00 2001 From: summerji Date: Wed, 18 Nov 2020 11:22:14 -0800 Subject: [PATCH 18/19] Implement default unary rpc sample code --- .../composer/SampleCodeHelperComposer.java | 110 ++++++++++++++++-- .../ServiceClientSampleCodeComposer.java | 1 + .../gapic/composer/goldens/EchoClient.golden | 16 ++- .../composer/goldens/IdentityClient.golden | 27 ++++- .../goldens/asset/AssetServiceClient.java | 49 ++++++-- .../logging/ConfigServiceV2Client.java | 79 ++++++++++--- .../logging/LoggingServiceV2Client.java | 45 ++++++- .../logging/MetricsServiceV2Client.java | 29 ++++- .../goldens/redis/CloudRedisClient.java | 63 ++++++++-- 9 files changed, 358 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java b/src/main/java/com/google/api/generator/gapic/composer/SampleCodeHelperComposer.java index 9f43dfc151..f4152fe919 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 @@ -33,6 +33,7 @@ import com.google.api.generator.gapic.utils.JavaStyle; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -49,7 +50,7 @@ public static TryCatchStatement composeRpcMethodSampleCode( Map resourceNames) { // Default Unary RPC method. if (arguments.isEmpty()) { - return composeUnaryRpcDefaultMethodSampleCode(method, clientType); + return composeUnaryRpcDefaultMethodSampleCode(method, clientType, resourceNames); } // Paged Unary RPC method. if (method.isPaged()) { @@ -176,18 +177,78 @@ private static TryCatchStatement composePagedUnaryRpcMethodSampleCode( } private static TryCatchStatement composeUnaryRpcDefaultMethodSampleCode( - Method method, TypeNode clientType) { + Method method, TypeNode clientType, Map resourceNames) { // TODO(summerji): compose sample code for unary default rpc method. // TODO(summerji): Add unit tests. - String content = - String.format( - "Note: Not Implement yet, placeholder for unary %s rpc method sample code.", - (!method.hasLro() && !method.isPaged() - ? "default" - : (method.hasLro() ? "lro default" : "paged default"))); + // If variant method signatures exists, use the first one. + List arguments = + !method.methodSignatures().isEmpty() + ? method.methodSignatures().get(0) + : Collections.emptyList(); + // Assign each method arguments with default value. + List bodyStatements = + arguments.stream() + .map( + methodArg -> + ExprStatement.withExpr( + assignMethodArgumentWithDefaultValue(methodArg, resourceNames))) + .collect(Collectors.toList()); + // Assign request variables with set argument attributes. + // e.g EchoRequest + bodyStatements.add( + ExprStatement.withExpr(createRequestBuilderExpr(method.inputType(), arguments))); + + if (method.isPaged()) { + // For loop on invoke client method's iterator with comment. + // e.g. for (EchoClient echoClient : echoClient.PagedExpand(request).iterateAll()) {//..} + bodyStatements.add( + ForStatement.builder() + .setLocalVariableExpr(createVariableDeclExpr(getClientName(clientType), clientType)) + .setCollectionExpr(createIteratorAllMethodExpr(method, clientType, arguments)) + .setBody(Arrays.asList(createLineCommentStatement("doThingsWith(element);"))) + .build()); + } else if (method.hasLro()) { + // Create response variable by invoke client's async method. + // e.g Operation response = EchoClient.waitAsync(request).get(); + Expr getResponseMethodExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr( + MethodInvocationExpr.builder() + .setStaticReferenceType(clientType) + .setMethodName(getLroMethodName(method.name())) + .setArguments( + Arrays.asList(createVariableExpr(REQUEST_VAR_NAME, method.inputType()))) + .build()) + .setMethodName("get") + .setReturnType(method.outputType()) + .build(); + bodyStatements.add( + ExprStatement.withExpr( + AssignmentExpr.builder() + .setVariableExpr(createVariableDeclExpr(RESPONSE_VAR_NAME, method.outputType())) + .setValueExpr(getResponseMethodExpr) + .build())); + } else { + // Create response variable by invoke client's method by passing request. + // e.g. EchoResponse response = echoClient.Echo(request); + Expr invokeMethodExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(createVariableExpr(getClientName(clientType), clientType)) + .setMethodName(method.name()) + .setArguments(createVariableExpr("request", method.inputType())) + .setReturnType(method.outputType()) + .build(); + bodyStatements.add( + ExprStatement.withExpr( + AssignmentExpr.builder() + .setVariableExpr(createVariableDeclExpr(RESPONSE_VAR_NAME, method.outputType())) + .setValueExpr(invokeMethodExpr) + .build())); + } + return TryCatchStatement.builder() .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType)) - .setTryBody(Arrays.asList(createLineCommentStatement(content))) + .setTryBody(bodyStatements) .setIsSampleCode(true) .build(); } @@ -208,6 +269,37 @@ private static AssignmentExpr assignClientVariableWithCreateMethodExpr(TypeNode .build(); } + // Create request variable by set attributes. + // e.g. EchoRequest request = EchoRequest.newBuilder().setParent(parent).build(); + private static Expr createRequestBuilderExpr( + TypeNode requestType, List arguments) { + MethodInvocationExpr newBuilderExpr = + MethodInvocationExpr.builder() + .setStaticReferenceType(requestType) + .setMethodName("newBuilder") + .build(); + for (MethodArgument arg : arguments) { + newBuilderExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(newBuilderExpr) + .setMethodName(String.format("set%s", JavaStyle.toUpperCamelCase(arg.name()))) + .setArguments( + VariableExpr.withVariable( + Variable.builder().setName(arg.name()).setType(arg.type()).build())) + .build(); + } + MethodInvocationExpr requestBuildExpr = + MethodInvocationExpr.builder() + .setExprReferenceExpr(newBuilderExpr) + .setMethodName("build") + .setReturnType(requestType) + .build(); + return AssignmentExpr.builder() + .setVariableExpr(createVariableDeclExpr("request", requestType)) + .setValueExpr(requestBuildExpr) + .build(); + } + private static Expr assignMethodArgumentWithDefaultValue( MethodArgument argument, Map resourceNames) { return AssignmentExpr.builder() 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 887f6f6cef..2bcd681235 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 @@ -40,6 +40,7 @@ public class ServiceClientSampleCodeComposer { // TODO(summerji): Add unit tests for ServiceClientSampleCodeComposer. + // TODO(summerji): Refactor signatures as sample code context. public static String composeClassHeaderCredentialsSampleCode( TypeNode clientType, TypeNode settingsType) { 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 dc556ad007..077c35e156 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,9 @@ public class EchoClient implements BackgroundResource { * *
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   ResourceName parent = FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]");
+   *   EchoRequest request = EchoRequest.newBuilder().setParent(parent).build();
+   *   EchoResponse response = echoClient.Echo(request);
    * }
    * }
* @@ -334,7 +336,10 @@ public class EchoClient implements BackgroundResource { * *
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   PagedExpandRequest request = PagedExpandRequest.newBuilder().build();
+   *   for (EchoClient echoClient : echoClient.PagedExpand(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -402,7 +407,9 @@ public class EchoClient implements BackgroundResource { * *
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   Duration ttl = Duration.newBuilder().build();
+   *   WaitRequest request = WaitRequest.newBuilder().setTtl(ttl).build();
+   *   Operation response = EchoClient.waitAsync(request).get();
    * }
    * }
* @@ -431,7 +438,8 @@ public class EchoClient implements BackgroundResource { * *
{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   BlockRequest request = BlockRequest.newBuilder().build();
+   *   BlockResponse response = echoClient.Block(request);
    * }
    * }
* 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 55dfb989f9..9cea5ba67a 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,16 @@ public class IdentityClient implements BackgroundResource { * *
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   String display_name = "display_name1615086568";
+   *   String email = "email96619420";
+   *   CreateUserRequest request =
+   *       CreateUserRequest.newBuilder()
+   *           .setParent(parent)
+   *           .setDisplayName(display_name)
+   *           .setEmail(email)
+   *           .build();
+   *   User response = identityClient.CreateUser(request);
    * }
    * }
* @@ -266,7 +275,9 @@ public class IdentityClient implements BackgroundResource { * *
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   UserName name = UserName.of("[USER]");
+   *   GetUserRequest request = GetUserRequest.newBuilder().setName(name).build();
+   *   User response = identityClient.GetUser(request);
    * }
    * }
* @@ -289,7 +300,8 @@ public class IdentityClient implements BackgroundResource { * *
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   UpdateUserRequest request = UpdateUserRequest.newBuilder().build();
+   *   User response = identityClient.UpdateUser(request);
    * }
    * }
* @@ -353,7 +365,9 @@ public class IdentityClient implements BackgroundResource { * *
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   UserName name = UserName.of("[USER]");
+   *   DeleteUserRequest request = DeleteUserRequest.newBuilder().setName(name).build();
+   *   Empty response = identityClient.DeleteUser(request);
    * }
    * }
* @@ -376,7 +390,10 @@ public class IdentityClient implements BackgroundResource { * *
{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   ListUsersRequest request = ListUsersRequest.newBuilder().build();
+   *   for (IdentityClient identityClient : identityClient.ListUsers(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java index 2e0e5f6872..cfa2f86cfc 100644 --- a/test/integration/goldens/asset/AssetServiceClient.java +++ b/test/integration/goldens/asset/AssetServiceClient.java @@ -170,7 +170,8 @@ public final OperationsClient getOperationsClient() { * *
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   ExportAssetsRequest request = ExportAssetsRequest.newBuilder().build();
+   *   Operation response = AssetServiceClient.exportAssetsAsync(request).get();
    * }
    * }
* @@ -229,7 +230,8 @@ public final UnaryCallable exportAssetsCallable( * *
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   BatchGetAssetsHistoryRequest request = BatchGetAssetsHistoryRequest.newBuilder().build();
+   *   BatchGetAssetsHistoryResponse response = assetServiceClient.BatchGetAssetsHistory(request);
    * }
    * }
* @@ -288,7 +290,9 @@ public final Feed createFeed(String parent) { * *
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   CreateFeedRequest request = CreateFeedRequest.newBuilder().setParent(parent).build();
+   *   Feed response = assetServiceClient.CreateFeed(request);
    * }
    * }
* @@ -364,7 +368,9 @@ public final Feed getFeed(String name) { * *
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]");
+   *   GetFeedRequest request = GetFeedRequest.newBuilder().setName(name).build();
+   *   Feed response = assetServiceClient.GetFeed(request);
    * }
    * }
* @@ -416,7 +422,9 @@ public final ListFeedsResponse listFeeds(String parent) { * *
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   String parent = "parent-995424086";
+   *   ListFeedsRequest request = ListFeedsRequest.newBuilder().setParent(parent).build();
+   *   ListFeedsResponse response = assetServiceClient.ListFeeds(request);
    * }
    * }
* @@ -468,7 +476,9 @@ public final Feed updateFeed(Feed feed) { * *
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   Feed feed = Feed.newBuilder().build();
+   *   UpdateFeedRequest request = UpdateFeedRequest.newBuilder().setFeed(feed).build();
+   *   Feed response = assetServiceClient.UpdateFeed(request);
    * }
    * }
* @@ -546,7 +556,9 @@ public final Empty deleteFeed(String name) { * *
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   FeedName name = FeedName.ofProjectFeedName("[PROJECT]", "[FEED]");
+   *   DeleteFeedRequest request = DeleteFeedRequest.newBuilder().setName(name).build();
+   *   Empty response = assetServiceClient.DeleteFeed(request);
    * }
    * }
* @@ -657,7 +669,19 @@ public final SearchAllResourcesPagedResponse searchAllResources( * *
{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   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);
+   *   }
    * }
    * }
* @@ -768,7 +792,14 @@ 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.
+   *   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 80338abe61..2042747d89 100644 --- a/test/integration/goldens/logging/ConfigServiceV2Client.java +++ b/test/integration/goldens/logging/ConfigServiceV2Client.java @@ -316,7 +316,13 @@ 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.
+   *   BillingAccountLocationName parent =
+   *       BillingAccountLocationName.of("[BILLING_ACCOUNT]", "[LOCATION]");
+   *   ListBucketsRequest request = ListBucketsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListBuckets(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -356,7 +362,8 @@ public final UnaryCallable listBucketsC * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   GetBucketRequest request = GetBucketRequest.newBuilder().build();
+   *   LogBucket response = configServiceV2Client.GetBucket(request);
    * }
    * }
* @@ -394,7 +401,8 @@ public final UnaryCallable getBucketCallable() { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   UpdateBucketRequest request = UpdateBucketRequest.newBuilder().build();
+   *   LogBucket response = configServiceV2Client.UpdateBucket(request);
    * }
    * }
* @@ -574,7 +582,12 @@ 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.
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
+   *   ListSinksRequest request = ListSinksRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListSinks(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -668,7 +681,9 @@ public final LogSink getSink(String sinkName) { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
+   *   GetSinkRequest request = GetSinkRequest.newBuilder().setSinkName(sink_name).build();
+   *   LogSink response = configServiceV2Client.GetSink(request);
    * }
    * }
* @@ -867,7 +882,11 @@ 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.
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   CreateSinkRequest request =
+   *       CreateSinkRequest.newBuilder().setParent(parent).setSink(sink).build();
+   *   LogSink response = configServiceV2Client.CreateSink(request);
    * }
    * }
* @@ -1074,7 +1093,11 @@ 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.
+   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
+   *   LogSink sink = LogSink.newBuilder().build();
+   *   UpdateSinkRequest request =
+   *       UpdateSinkRequest.newBuilder().setSinkName(sink_name).setSink(sink).build();
+   *   LogSink response = configServiceV2Client.UpdateSink(request);
    * }
    * }
* @@ -1167,7 +1190,9 @@ public final Empty deleteSink(String sinkName) { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   LogSinkName sink_name = LogSinkName.ofProjectSinkName("[PROJECT]", "[SINK]");
+   *   DeleteSinkRequest request = DeleteSinkRequest.newBuilder().setSinkName(sink_name).build();
+   *   Empty response = configServiceV2Client.DeleteSink(request);
    * }
    * }
* @@ -1339,7 +1364,12 @@ 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.
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
+   *   ListExclusionsRequest request = ListExclusionsRequest.newBuilder().setParent(parent).build();
+   *   for (ConfigServiceV2Client configServiceV2Client :
+   *       configServiceV2Client.ListExclusions(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -1435,7 +1465,9 @@ public final LogExclusion getExclusion(String name) { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
+   *   GetExclusionRequest request = GetExclusionRequest.newBuilder().setName(name).build();
+   *   LogExclusion response = configServiceV2Client.GetExclusion(request);
    * }
    * }
* @@ -1622,7 +1654,11 @@ 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.
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   CreateExclusionRequest request =
+   *       CreateExclusionRequest.newBuilder().setParent(parent).setExclusion(exclusion).build();
+   *   LogExclusion response = configServiceV2Client.CreateExclusion(request);
    * }
    * }
* @@ -1736,7 +1772,16 @@ public final LogExclusion updateExclusion( * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
+   *   LogExclusion exclusion = LogExclusion.newBuilder().build();
+   *   FieldMask update_mask = FieldMask.newBuilder().build();
+   *   UpdateExclusionRequest request =
+   *       UpdateExclusionRequest.newBuilder()
+   *           .setName(name)
+   *           .setExclusion(exclusion)
+   *           .setUpdateMask(update_mask)
+   *           .build();
+   *   LogExclusion response = configServiceV2Client.UpdateExclusion(request);
    * }
    * }
* @@ -1820,7 +1865,9 @@ public final Empty deleteExclusion(String name) { * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   LogExclusionName name = LogExclusionName.ofProjectExclusionName("[PROJECT]", "[EXCLUSION]");
+   *   DeleteExclusionRequest request = DeleteExclusionRequest.newBuilder().setName(name).build();
+   *   Empty response = configServiceV2Client.DeleteExclusion(request);
    * }
    * }
* @@ -1855,7 +1902,8 @@ public final UnaryCallable deleteExclusionCallabl * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   GetCmekSettingsRequest request = GetCmekSettingsRequest.newBuilder().build();
+   *   CmekSettings response = configServiceV2Client.GetCmekSettings(request);
    * }
    * }
* @@ -1901,7 +1949,8 @@ public final UnaryCallable getCmekSettings * *
{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   UpdateCmekSettingsRequest request = UpdateCmekSettingsRequest.newBuilder().build();
+   *   CmekSettings response = configServiceV2Client.UpdateCmekSettings(request);
    * }
    * }
* diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java index 3ef9ab541a..efd1503cec 100644 --- a/test/integration/goldens/logging/LoggingServiceV2Client.java +++ b/test/integration/goldens/logging/LoggingServiceV2Client.java @@ -216,7 +216,9 @@ public final Empty deleteLog(String logName) { * *
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   LogName log_name = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
+   *   DeleteLogRequest request = DeleteLogRequest.newBuilder().setLogName(log_name).build();
+   *   Empty response = loggingServiceV2Client.DeleteLog(request);
    * }
    * }
* @@ -400,7 +402,18 @@ public final WriteLogEntriesResponse writeLogEntries( * *
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   LogName log_name = LogName.ofProjectLogName("[PROJECT]", "[LOG]");
+   *   MonitoredResource resource = MonitoredResource.newBuilder().build();
+   *   Map labels = new HashMap<>();
+   *   List entries = new ArrayList<>();
+   *   WriteLogEntriesRequest request =
+   *       WriteLogEntriesRequest.newBuilder()
+   *           .setLogName(log_name)
+   *           .setResource(resource)
+   *           .setLabels(labels)
+   *           .setEntries(entries)
+   *           .build();
+   *   WriteLogEntriesResponse response = loggingServiceV2Client.WriteLogEntries(request);
    * }
    * }
* @@ -484,7 +497,19 @@ public final ListLogEntriesPagedResponse listLogEntries( * *
{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary paged default rpc method sample code.
+   *   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);
+   *   }
    * }
    * }
* @@ -529,7 +554,12 @@ 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.
+   *   ListMonitoredResourceDescriptorsRequest request =
+   *       ListMonitoredResourceDescriptorsRequest.newBuilder().build();
+   *   for (LoggingServiceV2Client loggingServiceV2Client :
+   *       loggingServiceV2Client.ListMonitoredResourceDescriptors(request).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -721,7 +751,12 @@ 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.
+   *   BillingAccountName parent = BillingAccountName.of("[BILLING_ACCOUNT]");
+   *   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 5ab7dc6ec8..bf3fac6f53 100644 --- a/test/integration/goldens/logging/MetricsServiceV2Client.java +++ b/test/integration/goldens/logging/MetricsServiceV2Client.java @@ -205,7 +205,12 @@ 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.
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   ListLogMetricsRequest request = ListLogMetricsRequest.newBuilder().setParent(parent).build();
+   *   for (MetricsServiceV2Client metricsServiceV2Client :
+   *       metricsServiceV2Client.ListLogMetrics(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -294,7 +299,10 @@ public final LogMetric getLogMetric(String metricName) { * *
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   GetLogMetricRequest request =
+   *       GetLogMetricRequest.newBuilder().setMetricName(metric_name).build();
+   *   LogMetric response = metricsServiceV2Client.GetLogMetric(request);
    * }
    * }
* @@ -380,7 +388,11 @@ 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.
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   LogMetric metric = LogMetric.newBuilder().build();
+   *   CreateLogMetricRequest request =
+   *       CreateLogMetricRequest.newBuilder().setParent(parent).setMetric(metric).build();
+   *   LogMetric response = metricsServiceV2Client.CreateLogMetric(request);
    * }
    * }
* @@ -468,7 +480,11 @@ 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.
+   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   LogMetric metric = LogMetric.newBuilder().build();
+   *   UpdateLogMetricRequest request =
+   *       UpdateLogMetricRequest.newBuilder().setMetricName(metric_name).setMetric(metric).build();
+   *   LogMetric response = metricsServiceV2Client.UpdateLogMetric(request);
    * }
    * }
* @@ -545,7 +561,10 @@ public final Empty deleteLogMetric(String metricName) { * *
{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   LogMetricName metric_name = LogMetricName.of("[PROJECT]", "[METRIC]");
+   *   DeleteLogMetricRequest request =
+   *       DeleteLogMetricRequest.newBuilder().setMetricName(metric_name).build();
+   *   Empty response = metricsServiceV2Client.DeleteLogMetric(request);
    * }
    * }
* diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java index 7607be4dd7..e20d84dca2 100644 --- a/test/integration/goldens/redis/CloudRedisClient.java +++ b/test/integration/goldens/redis/CloudRedisClient.java @@ -265,7 +265,12 @@ 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.
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ListInstancesRequest request = ListInstancesRequest.newBuilder().setParent(parent).build();
+   *   for (CloudRedisClient cloudRedisClient :
+   *       cloudRedisClient.ListInstances(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * }
* @@ -374,7 +379,9 @@ public final Instance getInstance(String name) { * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary default rpc method sample code.
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   GetInstanceRequest request = GetInstanceRequest.newBuilder().setName(name).build();
+   *   Instance response = cloudRedisClient.GetInstance(request);
    * }
    * }
* @@ -520,7 +527,16 @@ public final OperationFuture createInstanceAsync( * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   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(request).get();
    * }
    * }
* @@ -619,7 +635,14 @@ public final OperationFuture updateInstanceAsync( * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default 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(request).get();
    * }
    * }
* @@ -725,7 +748,11 @@ public final OperationFuture upgradeInstanceAsync( * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   String redis_version = "redis_version-685310444";
+   *   UpgradeInstanceRequest request =
+   *       UpgradeInstanceRequest.newBuilder().setName(name).setRedisVersion(redis_version).build();
+   *   Operation response = CloudRedisClient.upgradeInstanceAsync(request).get();
    * }
    * }
* @@ -805,7 +832,11 @@ public final OperationFuture importInstanceAsync( * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default 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(request).get();
    * }
    * }
* @@ -895,7 +926,11 @@ public final OperationFuture exportInstanceAsync( * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default 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(request).get();
    * }
    * }
* @@ -1013,7 +1048,15 @@ public final OperationFuture failoverInstanceAsync( * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   FailoverInstanceRequest.DataProtectionMode data_protection_mode =
+   *       FailoverInstanceRequest.DataProtectionMode.forNumber(0);
+   *   FailoverInstanceRequest request =
+   *       FailoverInstanceRequest.newBuilder()
+   *           .setName(name)
+   *           .setDataProtectionMode(data_protection_mode)
+   *           .build();
+   *   Operation response = CloudRedisClient.failoverInstanceAsync(request).get();
    * }
    * }
* @@ -1105,7 +1148,9 @@ public final OperationFuture deleteInstanceAsync(Strin * *
{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet, placeholder for unary lro default rpc method sample code.
+   *   InstanceName name = InstanceName.of("[PROJECT]", "[LOCATION]", "[INSTANCE]");
+   *   DeleteInstanceRequest request = DeleteInstanceRequest.newBuilder().setName(name).build();
+   *   Operation response = CloudRedisClient.deleteInstanceAsync(request).get();
    * }
    * }
* From 82e7d38c57ce038a35b2b1722b2b35dbef737776 Mon Sep 17 00:00:00 2001 From: summerji Date: Wed, 18 Nov 2020 11:35:28 -0800 Subject: [PATCH 19/19] rebase branch33 --- .../api/generator/gapic/composer/SampleCodeHelperComposer.java | 2 -- 1 file changed, 2 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 f4152fe919..95305eecee 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.ForStatement; @@ -31,7 +30,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.Collections; import java.util.List;