From ebd1b897c73233d5d26a7850fe7a750c9bbd16a4 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:16:15 +0000 Subject: [PATCH] fix: update gapic-generator-java with mock service generation fixes (#1249) - [ ] 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 --- .../java/com/google/cloud/asset/v1/AssetServiceClient.java | 2 ++ .../google/cloud/asset/v1p4beta1/AssetServiceClient.java | 1 + ...yncCreateSavedQueryOrganizationnameSavedqueryString.java | 6 ++---- .../v1/assetserviceclient/deletefeed/SyncDeleteFeed.java | 1 + .../deletefeed/SyncDeleteFeedFeedname.java | 1 + .../assetserviceclient/deletefeed/SyncDeleteFeedString.java | 1 + .../deletesavedquery/SyncDeleteSavedQuery.java | 1 + .../SyncDeleteSavedQuerySavedqueryname.java | 1 + .../deletesavedquery/SyncDeleteSavedQueryString.java | 1 + .../SyncSearchAllResourcesStringStringListstring.java | 3 +-- .../assetserviceclient/deletefeed/SyncDeleteFeed.java | 1 + .../deletefeed/SyncDeleteFeedFeedname.java | 1 + .../assetserviceclient/deletefeed/SyncDeleteFeedString.java | 1 + 13 files changed, 15 insertions(+), 6 deletions(-) diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceClient.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceClient.java index b885e4813..7e2555999 100644 --- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceClient.java +++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceClient.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; @@ -195,6 +196,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/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/AssetServiceClient.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/AssetServiceClient.java index 4a78f7783..9089a73d6 100644 --- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/AssetServiceClient.java +++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/AssetServiceClient.java @@ -183,6 +183,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/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/createsavedquery/SyncCreateSavedQueryOrganizationnameSavedqueryString.java b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/createsavedquery/SyncCreateSavedQueryOrganizationnameSavedqueryString.java index 3bd74b81d..ad65a814a 100644 --- a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/createsavedquery/SyncCreateSavedQueryOrganizationnameSavedqueryString.java +++ b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/createsavedquery/SyncCreateSavedQueryOrganizationnameSavedqueryString.java @@ -16,8 +16,7 @@ package com.google.cloud.asset.v1.samples; -// [START -// asset_v1_generated_assetserviceclient_createsavedquery_organizationnamesavedquerystring_sync] +// [START asset_v1_generated_assetserviceclient_createsavedquery_organizationnamesavedquerystring_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.OrganizationName; import com.google.cloud.asset.v1.SavedQuery; @@ -39,5 +38,4 @@ public static void syncCreateSavedQueryOrganizationnameSavedqueryString() throws } } } -// [END -// asset_v1_generated_assetserviceclient_createsavedquery_organizationnamesavedquerystring_sync] +// [END asset_v1_generated_assetserviceclient_createsavedquery_organizationnamesavedquerystring_sync] diff --git a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java index 8440342be..a9ec6bfe4 100644 --- a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java +++ b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeed.java @@ -20,6 +20,7 @@ import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.DeleteFeedRequest; import com.google.cloud.asset.v1.FeedName; +import com.google.protobuf.Empty; public class SyncDeleteFeed { diff --git a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java index a274a4162..11d453448 100644 --- a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java +++ b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java @@ -19,6 +19,7 @@ // [START asset_v1_generated_assetserviceclient_deletefeed_feedname_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.FeedName; +import com.google.protobuf.Empty; public class SyncDeleteFeedFeedname { diff --git a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java index 19d861743..2477cd554 100644 --- a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java +++ b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletefeed/SyncDeleteFeedString.java @@ -19,6 +19,7 @@ // [START asset_v1_generated_assetserviceclient_deletefeed_string_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.FeedName; +import com.google.protobuf.Empty; public class SyncDeleteFeedString { diff --git a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQuery.java b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQuery.java index f767317fa..3b84c2317 100644 --- a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQuery.java +++ b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQuery.java @@ -20,6 +20,7 @@ import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.DeleteSavedQueryRequest; import com.google.cloud.asset.v1.SavedQueryName; +import com.google.protobuf.Empty; public class SyncDeleteSavedQuery { diff --git a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQuerySavedqueryname.java b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQuerySavedqueryname.java index f07529793..417e163ec 100644 --- a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQuerySavedqueryname.java +++ b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQuerySavedqueryname.java @@ -19,6 +19,7 @@ // [START asset_v1_generated_assetserviceclient_deletesavedquery_savedqueryname_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.SavedQueryName; +import com.google.protobuf.Empty; public class SyncDeleteSavedQuerySavedqueryname { diff --git a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQueryString.java b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQueryString.java index 8eaddfb88..c380bf82f 100644 --- a/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQueryString.java +++ b/samples/snippets/generated/com/google/cloud/asset/v1/assetserviceclient/deletesavedquery/SyncDeleteSavedQueryString.java @@ -19,6 +19,7 @@ // [START asset_v1_generated_assetserviceclient_deletesavedquery_string_sync] import com.google.cloud.asset.v1.AssetServiceClient; import com.google.cloud.asset.v1.SavedQueryName; +import com.google.protobuf.Empty; public class SyncDeleteSavedQueryString { diff --git a/samples/snippets/generated/com/google/cloud/asset/v1p1beta1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java b/samples/snippets/generated/com/google/cloud/asset/v1p1beta1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java index b57409a4e..4f42dcd7e 100644 --- a/samples/snippets/generated/com/google/cloud/asset/v1p1beta1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java +++ b/samples/snippets/generated/com/google/cloud/asset/v1p1beta1/assetserviceclient/searchallresources/SyncSearchAllResourcesStringStringListstring.java @@ -16,8 +16,7 @@ package com.google.cloud.asset.v1p1beta1.samples; -// [START -// asset_v1p1beta1_generated_assetserviceclient_searchallresources_stringstringliststring_sync] +// [START asset_v1p1beta1_generated_assetserviceclient_searchallresources_stringstringliststring_sync] import com.google.cloud.asset.v1p1beta1.AssetServiceClient; import com.google.cloud.asset.v1p1beta1.StandardResourceMetadata; import java.util.ArrayList; diff --git a/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeed.java b/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeed.java index adfe58284..600ffafdb 100644 --- a/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeed.java +++ b/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeed.java @@ -20,6 +20,7 @@ import com.google.cloud.asset.v1p2beta1.AssetServiceClient; import com.google.cloud.asset.v1p2beta1.DeleteFeedRequest; import com.google.cloud.asset.v1p2beta1.FeedName; +import com.google.protobuf.Empty; public class SyncDeleteFeed { diff --git a/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java b/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java index 187733cda..0cfd47b3f 100644 --- a/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java +++ b/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeedFeedname.java @@ -19,6 +19,7 @@ // [START asset_v1p2beta1_generated_assetserviceclient_deletefeed_feedname_sync] import com.google.cloud.asset.v1p2beta1.AssetServiceClient; import com.google.cloud.asset.v1p2beta1.FeedName; +import com.google.protobuf.Empty; public class SyncDeleteFeedFeedname { diff --git a/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeedString.java b/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeedString.java index e58feaba9..447fe0654 100644 --- a/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeedString.java +++ b/samples/snippets/generated/com/google/cloud/asset/v1p2beta1/assetserviceclient/deletefeed/SyncDeleteFeedString.java @@ -19,6 +19,7 @@ // [START asset_v1p2beta1_generated_assetserviceclient_deletefeed_string_sync] import com.google.cloud.asset.v1p2beta1.AssetServiceClient; import com.google.cloud.asset.v1p2beta1.FeedName; +import com.google.protobuf.Empty; public class SyncDeleteFeedString {