From 4de20392815441cc04d77725294d7f9ba7142181 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 (#269) - [ ] 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 --- .../google/cloud/apigateway/v1/ApiGatewayServiceClient.java | 2 ++ .../SyncCreateApiConfigApinameApiconfigString.java | 3 +-- .../SyncCreateApiConfigStringApiconfigString.java | 3 +-- .../SyncCreateGatewayLocationnameGatewayString.java | 6 ++---- .../v1/apigatewayserviceclient/deleteapi/SyncDeleteApi.java | 1 + .../deleteapi/SyncDeleteApiApiname.java | 1 + .../deleteapi/SyncDeleteApiString.java | 1 + .../deleteapiconfig/SyncDeleteApiConfig.java | 1 + .../deleteapiconfig/SyncDeleteApiConfigApiconfigname.java | 1 + .../deleteapiconfig/SyncDeleteApiConfigString.java | 1 + .../deletegateway/SyncDeleteGateway.java | 1 + .../deletegateway/SyncDeleteGatewayGatewayname.java | 1 + .../deletegateway/SyncDeleteGatewayString.java | 1 + 13 files changed, 15 insertions(+), 8 deletions(-) diff --git a/java-api-gateway/google-cloud-api-gateway/src/main/java/com/google/cloud/apigateway/v1/ApiGatewayServiceClient.java b/java-api-gateway/google-cloud-api-gateway/src/main/java/com/google/cloud/apigateway/v1/ApiGatewayServiceClient.java index cc84d6af50ea..ce27036be5e7 100644 --- a/java-api-gateway/google-cloud-api-gateway/src/main/java/com/google/cloud/apigateway/v1/ApiGatewayServiceClient.java +++ b/java-api-gateway/google-cloud-api-gateway/src/main/java/com/google/cloud/apigateway/v1/ApiGatewayServiceClient.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; @@ -192,6 +193,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-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigApinameApiconfigString.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigApinameApiconfigString.java index 8871e99ae11d..1447fab04f12 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigApinameApiconfigString.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigApinameApiconfigString.java @@ -16,8 +16,7 @@ package com.google.cloud.apigateway.v1.samples; -// [START -// apigateway_v1_generated_apigatewayserviceclient_createapiconfig_apinameapiconfigstring_sync] +// [START apigateway_v1_generated_apigatewayserviceclient_createapiconfig_apinameapiconfigstring_sync] import com.google.cloud.apigateway.v1.ApiConfig; import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; import com.google.cloud.apigateway.v1.ApiName; diff --git a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigStringApiconfigString.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigStringApiconfigString.java index e93f3561b450..209a787643aa 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigStringApiconfigString.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/createapiconfig/SyncCreateApiConfigStringApiconfigString.java @@ -16,8 +16,7 @@ package com.google.cloud.apigateway.v1.samples; -// [START -// apigateway_v1_generated_apigatewayserviceclient_createapiconfig_stringapiconfigstring_sync] +// [START apigateway_v1_generated_apigatewayserviceclient_createapiconfig_stringapiconfigstring_sync] import com.google.cloud.apigateway.v1.ApiConfig; import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; import com.google.cloud.apigateway.v1.ApiName; diff --git a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/creategateway/SyncCreateGatewayLocationnameGatewayString.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/creategateway/SyncCreateGatewayLocationnameGatewayString.java index 1cbccf8980b3..cb988ad76a01 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/creategateway/SyncCreateGatewayLocationnameGatewayString.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/creategateway/SyncCreateGatewayLocationnameGatewayString.java @@ -16,8 +16,7 @@ package com.google.cloud.apigateway.v1.samples; -// [START -// apigateway_v1_generated_apigatewayserviceclient_creategateway_locationnamegatewaystring_sync] +// [START apigateway_v1_generated_apigatewayserviceclient_creategateway_locationnamegatewaystring_sync] import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; import com.google.cloud.apigateway.v1.Gateway; import com.google.cloud.apigateway.v1.LocationName; @@ -40,5 +39,4 @@ public static void syncCreateGatewayLocationnameGatewayString() throws Exception } } } -// [END -// apigateway_v1_generated_apigatewayserviceclient_creategateway_locationnamegatewaystring_sync] +// [END apigateway_v1_generated_apigatewayserviceclient_creategateway_locationnamegatewaystring_sync] diff --git a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApi.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApi.java index 24f0a1a7cb68..e49cd4bf2e9d 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApi.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApi.java @@ -20,6 +20,7 @@ import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; import com.google.cloud.apigateway.v1.ApiName; import com.google.cloud.apigateway.v1.DeleteApiRequest; +import com.google.protobuf.Empty; public class SyncDeleteApi { diff --git a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiApiname.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiApiname.java index f03e8c0ceeb2..4c2b9b229984 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiApiname.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiApiname.java @@ -19,6 +19,7 @@ // [START apigateway_v1_generated_apigatewayserviceclient_deleteapi_apiname_sync] import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; import com.google.cloud.apigateway.v1.ApiName; +import com.google.protobuf.Empty; public class SyncDeleteApiApiname { diff --git a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiString.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiString.java index 427c4ad3a6f2..4b193dceff9b 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiString.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapi/SyncDeleteApiString.java @@ -19,6 +19,7 @@ // [START apigateway_v1_generated_apigatewayserviceclient_deleteapi_string_sync] import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; import com.google.cloud.apigateway.v1.ApiName; +import com.google.protobuf.Empty; public class SyncDeleteApiString { diff --git a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfig.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfig.java index 2295082eda5a..cc1fd5ecf7de 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfig.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfig.java @@ -20,6 +20,7 @@ import com.google.cloud.apigateway.v1.ApiConfigName; import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; import com.google.cloud.apigateway.v1.DeleteApiConfigRequest; +import com.google.protobuf.Empty; public class SyncDeleteApiConfig { diff --git a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigApiconfigname.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigApiconfigname.java index 56171c950026..af071528ef52 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigApiconfigname.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigApiconfigname.java @@ -19,6 +19,7 @@ // [START apigateway_v1_generated_apigatewayserviceclient_deleteapiconfig_apiconfigname_sync] import com.google.cloud.apigateway.v1.ApiConfigName; import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; +import com.google.protobuf.Empty; public class SyncDeleteApiConfigApiconfigname { diff --git a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigString.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigString.java index 2512af859352..254df7759f8b 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigString.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deleteapiconfig/SyncDeleteApiConfigString.java @@ -19,6 +19,7 @@ // [START apigateway_v1_generated_apigatewayserviceclient_deleteapiconfig_string_sync] import com.google.cloud.apigateway.v1.ApiConfigName; import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; +import com.google.protobuf.Empty; public class SyncDeleteApiConfigString { diff --git a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGateway.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGateway.java index 69ba64542193..fe8f28b0390e 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGateway.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGateway.java @@ -20,6 +20,7 @@ import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; import com.google.cloud.apigateway.v1.DeleteGatewayRequest; import com.google.cloud.apigateway.v1.GatewayName; +import com.google.protobuf.Empty; public class SyncDeleteGateway { diff --git a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayGatewayname.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayGatewayname.java index 317ae6e46732..d0fbf36a6dc0 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayGatewayname.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayGatewayname.java @@ -19,6 +19,7 @@ // [START apigateway_v1_generated_apigatewayserviceclient_deletegateway_gatewayname_sync] import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; import com.google.cloud.apigateway.v1.GatewayName; +import com.google.protobuf.Empty; public class SyncDeleteGatewayGatewayname { diff --git a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayString.java b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayString.java index b8b8baa8b39b..80ebb315e2d1 100644 --- a/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayString.java +++ b/java-api-gateway/samples/snippets/generated/com/google/cloud/apigateway/v1/apigatewayserviceclient/deletegateway/SyncDeleteGatewayString.java @@ -19,6 +19,7 @@ // [START apigateway_v1_generated_apigatewayserviceclient_deletegateway_string_sync] import com.google.cloud.apigateway.v1.ApiGatewayServiceClient; import com.google.cloud.apigateway.v1.GatewayName; +import com.google.protobuf.Empty; public class SyncDeleteGatewayString {