From 9f2a86ec26099ad775650bea4efd9b5c1b2e79b1 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 28 Jun 2022 04:18:32 +0000 Subject: [PATCH] fix: update gapic-generator-java with mock service generation fixes (#796) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 457524730 Source-Link: https://github.com/googleapis/googleapis/commit/917e7f21cb1dc062744c6694437cdd46219f28cb Source-Link: https://github.com/googleapis/googleapis-gen/commit/2497f9a069d3f6b2d6810d5a4e239cda1e7e5a39 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjQ5N2Y5YTA2OWQzZjZiMmQ2ODEwZDVhNGUyMzljZGExZTdlNWEzOSJ9 --- .../com/google/cloud/resourcemanager/v3/FoldersClient.java | 2 ++ .../com/google/cloud/resourcemanager/v3/ProjectsClient.java | 2 ++ .../google/cloud/resourcemanager/v3/TagBindingsClient.java | 2 ++ .../com/google/cloud/resourcemanager/v3/TagKeysClient.java | 2 ++ .../google/cloud/resourcemanager/v3/TagValuesClient.java | 2 ++ .../SyncTestIamPermissionsResourcenameListstring.java | 6 ++---- .../SyncTestIamPermissionsResourcenameListstring.java | 3 +-- .../deletetagbinding/SyncDeleteTagBinding.java | 1 + .../deletetagbinding/SyncDeleteTagBindingString.java | 1 + .../SyncDeleteTagBindingTagbindingname.java | 1 + .../SyncTestIamPermissionsResourcenameListstring.java | 3 +-- 11 files changed, 17 insertions(+), 8 deletions(-) diff --git a/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/FoldersClient.java b/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/FoldersClient.java index 90c29b241fe6..f60a8dc90d89 100644 --- a/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/FoldersClient.java +++ b/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/FoldersClient.java @@ -18,6 +18,7 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; +import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.httpjson.longrunning.OperationsClient; import com.google.api.gax.longrunning.OperationFuture; @@ -191,6 +192,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() { * Returns the OperationsClient that can be used to query the status of a long-running operation * returned by another API method call. */ + @BetaApi public final OperationsClient getHttpJsonOperationsClient() { return httpJsonOperationsClient; } diff --git a/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/ProjectsClient.java b/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/ProjectsClient.java index d69c6779daaa..fba402a2a225 100644 --- a/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/ProjectsClient.java +++ b/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/ProjectsClient.java @@ -18,6 +18,7 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; +import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.httpjson.longrunning.OperationsClient; import com.google.api.gax.longrunning.OperationFuture; @@ -191,6 +192,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() { * Returns the OperationsClient that can be used to query the status of a long-running operation * returned by another API method call. */ + @BetaApi public final OperationsClient getHttpJsonOperationsClient() { return httpJsonOperationsClient; } diff --git a/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagBindingsClient.java b/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagBindingsClient.java index 6ba9c78ff340..51072f0b3382 100644 --- a/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagBindingsClient.java +++ b/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagBindingsClient.java @@ -18,6 +18,7 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; +import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.httpjson.longrunning.OperationsClient; import com.google.api.gax.longrunning.OperationFuture; @@ -190,6 +191,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() { * Returns the OperationsClient that can be used to query the status of a long-running operation * returned by another API method call. */ + @BetaApi public final OperationsClient getHttpJsonOperationsClient() { return httpJsonOperationsClient; } diff --git a/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagKeysClient.java b/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagKeysClient.java index 0365b0715d48..a9d03663221c 100644 --- a/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagKeysClient.java +++ b/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagKeysClient.java @@ -18,6 +18,7 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; +import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.httpjson.longrunning.OperationsClient; import com.google.api.gax.longrunning.OperationFuture; @@ -190,6 +191,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() { * Returns the OperationsClient that can be used to query the status of a long-running operation * returned by another API method call. */ + @BetaApi public final OperationsClient getHttpJsonOperationsClient() { return httpJsonOperationsClient; } diff --git a/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagValuesClient.java b/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagValuesClient.java index 838973a26c00..627ab4c039e6 100644 --- a/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagValuesClient.java +++ b/java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/v3/TagValuesClient.java @@ -18,6 +18,7 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; +import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.httpjson.longrunning.OperationsClient; import com.google.api.gax.longrunning.OperationFuture; @@ -191,6 +192,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() { * Returns the OperationsClient that can be used to query the status of a long-running operation * returned by another API method call. */ + @BetaApi public final OperationsClient getHttpJsonOperationsClient() { return httpJsonOperationsClient; } diff --git a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/organizationsclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/organizationsclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java index b26dea1ffd9a..9c14e1ce13e5 100644 --- a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/organizationsclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java +++ b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/organizationsclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java @@ -16,8 +16,7 @@ package com.google.cloud.resourcemanager.v3.samples; -// [START -// resourcemanager_v3_generated_organizationsclient_testiampermissions_resourcenameliststring_sync] +// [START resourcemanager_v3_generated_organizationsclient_testiampermissions_resourcenameliststring_sync] import com.google.api.resourcenames.ResourceName; import com.google.cloud.resourcemanager.v3.OrganizationName; import com.google.cloud.resourcemanager.v3.OrganizationsClient; @@ -42,5 +41,4 @@ public static void syncTestIamPermissionsResourcenameListstring() throws Excepti } } } -// [END -// resourcemanager_v3_generated_organizationsclient_testiampermissions_resourcenameliststring_sync] +// [END resourcemanager_v3_generated_organizationsclient_testiampermissions_resourcenameliststring_sync] diff --git a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/projectsclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/projectsclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java index 3af3671f79ed..e2e6e67d4ad0 100644 --- a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/projectsclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java +++ b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/projectsclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java @@ -16,8 +16,7 @@ package com.google.cloud.resourcemanager.v3.samples; -// [START -// resourcemanager_v3_generated_projectsclient_testiampermissions_resourcenameliststring_sync] +// [START resourcemanager_v3_generated_projectsclient_testiampermissions_resourcenameliststring_sync] import com.google.api.resourcenames.ResourceName; import com.google.cloud.resourcemanager.v3.ProjectName; import com.google.cloud.resourcemanager.v3.ProjectsClient; diff --git a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBinding.java b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBinding.java index dd1c043da2ca..f74b3d1ed71c 100644 --- a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBinding.java +++ b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBinding.java @@ -20,6 +20,7 @@ import com.google.cloud.resourcemanager.v3.DeleteTagBindingRequest; import com.google.cloud.resourcemanager.v3.TagBindingName; import com.google.cloud.resourcemanager.v3.TagBindingsClient; +import com.google.protobuf.Empty; public class SyncDeleteTagBinding { diff --git a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBindingString.java b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBindingString.java index f633987c9581..66c0ba523d6c 100644 --- a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBindingString.java +++ b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBindingString.java @@ -19,6 +19,7 @@ // [START resourcemanager_v3_generated_tagbindingsclient_deletetagbinding_string_sync] import com.google.cloud.resourcemanager.v3.TagBindingName; import com.google.cloud.resourcemanager.v3.TagBindingsClient; +import com.google.protobuf.Empty; public class SyncDeleteTagBindingString { diff --git a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBindingTagbindingname.java b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBindingTagbindingname.java index dd8852da2e8f..665fcf529c4f 100644 --- a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBindingTagbindingname.java +++ b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagbindingsclient/deletetagbinding/SyncDeleteTagBindingTagbindingname.java @@ -19,6 +19,7 @@ // [START resourcemanager_v3_generated_tagbindingsclient_deletetagbinding_tagbindingname_sync] import com.google.cloud.resourcemanager.v3.TagBindingName; import com.google.cloud.resourcemanager.v3.TagBindingsClient; +import com.google.protobuf.Empty; public class SyncDeleteTagBindingTagbindingname { diff --git a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagvaluesclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagvaluesclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java index 7edf87679ae9..af93bb4389a5 100644 --- a/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagvaluesclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java +++ b/java-resourcemanager/samples/snippets/generated/com/google/cloud/resourcemanager/v3/tagvaluesclient/testiampermissions/SyncTestIamPermissionsResourcenameListstring.java @@ -16,8 +16,7 @@ package com.google.cloud.resourcemanager.v3.samples; -// [START -// resourcemanager_v3_generated_tagvaluesclient_testiampermissions_resourcenameliststring_sync] +// [START resourcemanager_v3_generated_tagvaluesclient_testiampermissions_resourcenameliststring_sync] import com.google.api.resourcenames.ResourceName; import com.google.cloud.resourcemanager.v3.TagValueName; import com.google.cloud.resourcemanager.v3.TagValuesClient;