fix note for default unary rpc

summer-ji-eng · summer-ji-eng · commit 5f9a593dc048 · 2020-11-17T18:31:01.000-08:00
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
@@ -95,7 +95,7 @@ private static TryCatchStatement composeUnaryRpcDefaultMethodSampleCode(
             "Note: Not Implement yet. Holder for unary %s rpc method sample code.",
             (!method.hasLro() && !method.isPaged()
                 ? "default"
-                : (method.hasLro() ? "lro" : "paged")));
+                : (method.hasLro() ? "lro default" : "paged default")));
     return TryCatchStatement.builder()
         .setTryResourceExpr(assignClientVariableWithCreateMethodExpr(clientType))
         .setTryBody(Arrays.asList(createLineCommentStatement(content)))
diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClient.golden
@@ -326,7 +326,7 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -392,7 +392,7 @@ public class EchoClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (EchoClient echoClient = EchoClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
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
@@ -360,7 +360,7 @@ public class IdentityClient implements BackgroundResource {
    *
    * <pre>{@code
    * try (IdentityClient identityClient = IdentityClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/asset/AssetServiceClient.java b/test/integration/goldens/asset/AssetServiceClient.java
@@ -170,7 +170,7 @@ public final OperationsClient getOperationsClient() {
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -644,7 +644,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -750,7 +750,7 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(String scope
    *
    * <pre>{@code
    * try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/ConfigServiceV2Client.java b/test/integration/goldens/logging/ConfigServiceV2Client.java
@@ -295,7 +295,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -533,7 +533,7 @@ public final ListSinksPagedResponse listSinks(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1254,7 +1254,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) {
    *
    * <pre>{@code
    * try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/LoggingServiceV2Client.java b/test/integration/goldens/logging/LoggingServiceV2Client.java
@@ -466,7 +466,7 @@ public final ListLogEntriesPagedResponse listLogEntries(
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -511,7 +511,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -683,7 +683,7 @@ public final ListLogsPagedResponse listLogs(String parent) {
    *
    * <pre>{@code
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/logging/MetricsServiceV2Client.java b/test/integration/goldens/logging/MetricsServiceV2Client.java
@@ -197,7 +197,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) {
    *
    * <pre>{@code
    * try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
diff --git a/test/integration/goldens/redis/CloudRedisClient.java b/test/integration/goldens/redis/CloudRedisClient.java
@@ -257,7 +257,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary paged rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary paged default rpc method sample code.
    * }
    * }</pre>
    *
@@ -502,7 +502,7 @@ public final OperationFuture<Instance, OperationMetadata> createInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -599,7 +599,7 @@ public final OperationFuture<Instance, OperationMetadata> updateInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -701,7 +701,7 @@ public final OperationFuture<Instance, OperationMetadata> upgradeInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -779,7 +779,7 @@ public final OperationFuture<Instance, OperationMetadata> importInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -867,7 +867,7 @@ public final OperationFuture<Instance, OperationMetadata> exportInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -979,7 +979,7 @@ public final OperationFuture<Instance, OperationMetadata> failoverInstanceAsync(
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *
@@ -1069,7 +1069,7 @@ public final OperationFuture<Empty, OperationMetadata> deleteInstanceAsync(Strin
    *
    * <pre>{@code
    * try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {
-   *   // Note: Not Implement yet. Holder for unary lro rpc method sample code.
+   *   // Note: Not Implement yet. Holder for unary lro default rpc method sample code.
    * }
    * }</pre>
    *

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ public class EchoClient implements BackgroundResource {`
`326`	`326`	`*`
`327`	`327`	`* <pre>{@code`
`328`	`328`	`* try (EchoClient echoClient = EchoClient.create()) {`
`329`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`329`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`330`	`330`	`* }`
`331`	`331`	`* }</pre>`
`332`	`332`	`*`
`@@ -392,7 +392,7 @@ public class EchoClient implements BackgroundResource {`
`392`	`392`	`*`
`393`	`393`	`* <pre>{@code`
`394`	`394`	`* try (EchoClient echoClient = EchoClient.create()) {`
`395`		`- * // Note: Not Implement yet. Holder for unary lro rpc method sample code.`
	`395`	`+ * // Note: Not Implement yet. Holder for unary lro default rpc method sample code.`
`396`	`396`	`* }`
`397`	`397`	`* }</pre>`
`398`	`398`	`*`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ public class IdentityClient implements BackgroundResource {`
`360`	`360`	`*`
`361`	`361`	`* <pre>{@code`
`362`	`362`	`* try (IdentityClient identityClient = IdentityClient.create()) {`
`363`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`363`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`364`	`364`	`* }`
`365`	`365`	`* }</pre>`
`366`	`366`	`*`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public final OperationsClient getOperationsClient() {`
`170`	`170`	`*`
`171`	`171`	`* <pre>{@code`
`172`	`172`	`* try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {`
`173`		`- * // Note: Not Implement yet. Holder for unary lro rpc method sample code.`
	`173`	`+ * // Note: Not Implement yet. Holder for unary lro default rpc method sample code.`
`174`	`174`	`* }`
`175`	`175`	`* }</pre>`
`176`	`176`	`*`
`@@ -644,7 +644,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(`
`644`	`644`	`*`
`645`	`645`	`* <pre>{@code`
`646`	`646`	`* try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {`
`647`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`647`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`648`	`648`	`* }`
`649`	`649`	`* }</pre>`
`650`	`650`	`*`
`@@ -750,7 +750,7 @@ public final SearchAllIamPoliciesPagedResponse searchAllIamPolicies(String scope`
`750`	`750`	`*`
`751`	`751`	`* <pre>{@code`
`752`	`752`	`* try (AssetServiceClient assetServiceClient = AssetServiceClient.create()) {`
`753`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`753`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`754`	`754`	`* }`
`755`	`755`	`* }</pre>`
`756`	`756`	`*`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public final ListBucketsPagedResponse listBuckets(String parent) {`
`295`	`295`	`*`
`296`	`296`	`* <pre>{@code`
`297`	`297`	`* try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {`
`298`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`298`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`299`	`299`	`* }`
`300`	`300`	`* }</pre>`
`301`	`301`	`*`
`@@ -533,7 +533,7 @@ public final ListSinksPagedResponse listSinks(String parent) {`
`533`	`533`	`*`
`534`	`534`	`* <pre>{@code`
`535`	`535`	`* try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {`
`536`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`536`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`537`	`537`	`* }`
`538`	`538`	`* }</pre>`
`539`	`539`	`*`
`@@ -1254,7 +1254,7 @@ public final ListExclusionsPagedResponse listExclusions(String parent) {`
`1254`	`1254`	`*`
`1255`	`1255`	`* <pre>{@code`
`1256`	`1256`	`* try (ConfigServiceV2Client configServiceV2Client = ConfigServiceV2Client.create()) {`
`1257`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`1257`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`1258`	`1258`	`* }`
`1259`	`1259`	`* }</pre>`
`1260`	`1260`	`*`
Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ public final ListLogEntriesPagedResponse listLogEntries(`
`466`	`466`	`*`
`467`	`467`	`* <pre>{@code`
`468`	`468`	`* try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {`
`469`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`469`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`470`	`470`	`* }`
`471`	`471`	`* }</pre>`
`472`	`472`	`*`
`@@ -511,7 +511,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re`
`511`	`511`	`*`
`512`	`512`	`* <pre>{@code`
`513`	`513`	`* try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {`
`514`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`514`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`515`	`515`	`* }`
`516`	`516`	`* }</pre>`
`517`	`517`	`*`
`@@ -683,7 +683,7 @@ public final ListLogsPagedResponse listLogs(String parent) {`
`683`	`683`	`*`
`684`	`684`	`* <pre>{@code`
`685`	`685`	`* try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {`
`686`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`686`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`687`	`687`	`* }`
`688`	`688`	`* }</pre>`
`689`	`689`	`*`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(String parent) {`
`197`	`197`	`*`
`198`	`198`	`* <pre>{@code`
`199`	`199`	`* try (MetricsServiceV2Client metricsServiceV2Client = MetricsServiceV2Client.create()) {`
`200`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`200`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`201`	`201`	`* }`
`202`	`202`	`* }</pre>`
`203`	`203`	`*`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ public final ListInstancesPagedResponse listInstances(String parent) {`
`257`	`257`	`*`
`258`	`258`	`* <pre>{@code`
`259`	`259`	`* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {`
`260`		`- * // Note: Not Implement yet. Holder for unary paged rpc method sample code.`
	`260`	`+ * // Note: Not Implement yet. Holder for unary paged default rpc method sample code.`
`261`	`261`	`* }`
`262`	`262`	`* }</pre>`
`263`	`263`	`*`
`@@ -502,7 +502,7 @@ public final OperationFuture<Instance, OperationMetadata> createInstanceAsync(`
`502`	`502`	`*`
`503`	`503`	`* <pre>{@code`
`504`	`504`	`* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {`
`505`		`- * // Note: Not Implement yet. Holder for unary lro rpc method sample code.`
	`505`	`+ * // Note: Not Implement yet. Holder for unary lro default rpc method sample code.`
`506`	`506`	`* }`
`507`	`507`	`* }</pre>`
`508`	`508`	`*`
`@@ -599,7 +599,7 @@ public final OperationFuture<Instance, OperationMetadata> updateInstanceAsync(`
`599`	`599`	`*`
`600`	`600`	`* <pre>{@code`
`601`	`601`	`* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {`
`602`		`- * // Note: Not Implement yet. Holder for unary lro rpc method sample code.`
	`602`	`+ * // Note: Not Implement yet. Holder for unary lro default rpc method sample code.`
`603`	`603`	`* }`
`604`	`604`	`* }</pre>`
`605`	`605`	`*`
`@@ -701,7 +701,7 @@ public final OperationFuture<Instance, OperationMetadata> upgradeInstanceAsync(`
`701`	`701`	`*`
`702`	`702`	`* <pre>{@code`
`703`	`703`	`* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {`
`704`		`- * // Note: Not Implement yet. Holder for unary lro rpc method sample code.`
	`704`	`+ * // Note: Not Implement yet. Holder for unary lro default rpc method sample code.`
`705`	`705`	`* }`
`706`	`706`	`* }</pre>`
`707`	`707`	`*`
`@@ -779,7 +779,7 @@ public final OperationFuture<Instance, OperationMetadata> importInstanceAsync(`
`779`	`779`	`*`
`780`	`780`	`* <pre>{@code`
`781`	`781`	`* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {`
`782`		`- * // Note: Not Implement yet. Holder for unary lro rpc method sample code.`
	`782`	`+ * // Note: Not Implement yet. Holder for unary lro default rpc method sample code.`
`783`	`783`	`* }`
`784`	`784`	`* }</pre>`
`785`	`785`	`*`
`@@ -867,7 +867,7 @@ public final OperationFuture<Instance, OperationMetadata> exportInstanceAsync(`
`867`	`867`	`*`
`868`	`868`	`* <pre>{@code`
`869`	`869`	`* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {`
`870`		`- * // Note: Not Implement yet. Holder for unary lro rpc method sample code.`
	`870`	`+ * // Note: Not Implement yet. Holder for unary lro default rpc method sample code.`
`871`	`871`	`* }`
`872`	`872`	`* }</pre>`
`873`	`873`	`*`
`@@ -979,7 +979,7 @@ public final OperationFuture<Instance, OperationMetadata> failoverInstanceAsync(`
`979`	`979`	`*`
`980`	`980`	`* <pre>{@code`
`981`	`981`	`* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {`
`982`		`- * // Note: Not Implement yet. Holder for unary lro rpc method sample code.`
	`982`	`+ * // Note: Not Implement yet. Holder for unary lro default rpc method sample code.`
`983`	`983`	`* }`
`984`	`984`	`* }</pre>`
`985`	`985`	`*`
`@@ -1069,7 +1069,7 @@ public final OperationFuture<Empty, OperationMetadata> deleteInstanceAsync(Strin`
`1069`	`1069`	`*`
`1070`	`1070`	`* <pre>{@code`
`1071`	`1071`	`* try (CloudRedisClient cloudRedisClient = CloudRedisClient.create()) {`
`1072`		`- * // Note: Not Implement yet. Holder for unary lro rpc method sample code.`
	`1072`	`+ * // Note: Not Implement yet. Holder for unary lro default rpc method sample code.`
`1073`	`1073`	`* }`
`1074`	`1074`	`* }</pre>`
`1075`	`1075`	`*`