From 3d4155fa00a4227a9e61569ebc41d4743badf92b 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:27 +0000 Subject: [PATCH] fix: update gapic-generator-java with mock service generation fixes (#659) - [ ] 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/redis/v1/CloudRedisClient.java | 2 ++ .../com/google/cloud/redis/v1beta1/CloudRedisClient.java | 1 + .../cloudredisclient/deleteinstance/SyncDeleteInstance.java | 1 + .../deleteinstance/SyncDeleteInstanceInstancename.java | 1 + .../deleteinstance/SyncDeleteInstanceString.java | 1 + ...stancenameFailoverinstancerequestdataprotectionmode.java | 6 ++---- ...anceStringFailoverinstancerequestdataprotectionmode.java | 6 ++---- ...ReschedulemaintenancerequestrescheduletypeTimestamp.java | 6 ++---- ...ReschedulemaintenancerequestrescheduletypeTimestamp.java | 6 ++---- .../cloudredisclient/deleteinstance/SyncDeleteInstance.java | 1 + .../deleteinstance/SyncDeleteInstanceInstancename.java | 1 + .../deleteinstance/SyncDeleteInstanceString.java | 1 + ...stancenameFailoverinstancerequestdataprotectionmode.java | 6 ++---- ...anceStringFailoverinstancerequestdataprotectionmode.java | 6 ++---- ...ReschedulemaintenancerequestrescheduletypeTimestamp.java | 6 ++---- ...ReschedulemaintenancerequestrescheduletypeTimestamp.java | 6 ++---- 16 files changed, 25 insertions(+), 32 deletions(-) diff --git a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1/CloudRedisClient.java b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1/CloudRedisClient.java index 59c404bc..03f0ecf3 100644 --- a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1/CloudRedisClient.java +++ b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1/CloudRedisClient.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; @@ -206,6 +207,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-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java index 884a7d67..f9164c8e 100644 --- a/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java +++ b/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java @@ -209,6 +209,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/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstance.java b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstance.java index 8adc4fd3..68e341cc 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstance.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstance.java @@ -20,6 +20,7 @@ import com.google.cloud.redis.v1.CloudRedisClient; import com.google.cloud.redis.v1.DeleteInstanceRequest; import com.google.cloud.redis.v1.InstanceName; +import com.google.protobuf.Empty; public class SyncDeleteInstance { diff --git a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java index 1c83619c..0ada0e1d 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java @@ -19,6 +19,7 @@ // [START redis_v1_generated_cloudredisclient_deleteinstance_instancename_sync] import com.google.cloud.redis.v1.CloudRedisClient; import com.google.cloud.redis.v1.InstanceName; +import com.google.protobuf.Empty; public class SyncDeleteInstanceInstancename { diff --git a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java index b8820bd8..1188b535 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java @@ -19,6 +19,7 @@ // [START redis_v1_generated_cloudredisclient_deleteinstance_string_sync] import com.google.cloud.redis.v1.CloudRedisClient; import com.google.cloud.redis.v1.InstanceName; +import com.google.protobuf.Empty; public class SyncDeleteInstanceString { diff --git a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java index 8823059b..512e7148 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java @@ -16,8 +16,7 @@ package com.google.cloud.redis.v1.samples; -// [START -// redis_v1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] +// [START redis_v1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] import com.google.cloud.redis.v1.CloudRedisClient; import com.google.cloud.redis.v1.FailoverInstanceRequest; import com.google.cloud.redis.v1.Instance; @@ -41,5 +40,4 @@ public static void syncFailoverInstanceInstancenameFailoverinstancerequestdatapr } } } -// [END -// redis_v1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] +// [END redis_v1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] diff --git a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java index 359a6d8e..fb90df6e 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java @@ -16,8 +16,7 @@ package com.google.cloud.redis.v1.samples; -// [START -// redis_v1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] +// [START redis_v1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] import com.google.cloud.redis.v1.CloudRedisClient; import com.google.cloud.redis.v1.FailoverInstanceRequest; import com.google.cloud.redis.v1.Instance; @@ -41,5 +40,4 @@ public static void syncFailoverInstanceStringFailoverinstancerequestdataprotecti } } } -// [END -// redis_v1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] +// [END redis_v1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] diff --git a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java index 576d7262..a12d3ce0 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java @@ -16,8 +16,7 @@ package com.google.cloud.redis.v1.samples; -// [START -// redis_v1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] +// [START redis_v1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] import com.google.cloud.redis.v1.CloudRedisClient; import com.google.cloud.redis.v1.Instance; import com.google.cloud.redis.v1.InstanceName; @@ -46,5 +45,4 @@ public static void main(String[] args) throws Exception { } } } -// [END -// redis_v1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] +// [END redis_v1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] diff --git a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java index 1f4e63b2..d36b725a 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java @@ -16,8 +16,7 @@ package com.google.cloud.redis.v1.samples; -// [START -// redis_v1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync] +// [START redis_v1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync] import com.google.cloud.redis.v1.CloudRedisClient; import com.google.cloud.redis.v1.Instance; import com.google.cloud.redis.v1.InstanceName; @@ -45,5 +44,4 @@ public static void main(String[] args) throws Exception { } } } -// [END -// redis_v1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync] +// [END redis_v1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync] diff --git a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java index 0aa52407..c8916d35 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java @@ -20,6 +20,7 @@ import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.DeleteInstanceRequest; import com.google.cloud.redis.v1beta1.InstanceName; +import com.google.protobuf.Empty; public class SyncDeleteInstance { diff --git a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java index fd859e1e..2e63ba9f 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java @@ -19,6 +19,7 @@ // [START redis_v1beta1_generated_cloudredisclient_deleteinstance_instancename_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceName; +import com.google.protobuf.Empty; public class SyncDeleteInstanceInstancename { diff --git a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java index ce8e43b2..51230d5a 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java @@ -19,6 +19,7 @@ // [START redis_v1beta1_generated_cloudredisclient_deleteinstance_string_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.InstanceName; +import com.google.protobuf.Empty; public class SyncDeleteInstanceString { diff --git a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java index 8f6a549c..3a534cd4 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java @@ -16,8 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START -// redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] +// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -41,5 +40,4 @@ public static void syncFailoverInstanceInstancenameFailoverinstancerequestdatapr } } } -// [END -// redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] +// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync] diff --git a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java index d5c14d25..af21b930 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java @@ -16,8 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START -// redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] +// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.FailoverInstanceRequest; import com.google.cloud.redis.v1beta1.Instance; @@ -41,5 +40,4 @@ public static void syncFailoverInstanceStringFailoverinstancerequestdataprotecti } } } -// [END -// redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] +// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync] diff --git a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java index 18b55fd0..8e4e5e99 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java @@ -16,8 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START -// redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] +// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -46,5 +45,4 @@ public static void main(String[] args) throws Exception { } } } -// [END -// redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] +// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync] diff --git a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java index a244632e..686b3760 100644 --- a/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java +++ b/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java @@ -16,8 +16,7 @@ package com.google.cloud.redis.v1beta1.samples; -// [START -// redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync] +// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync] import com.google.cloud.redis.v1beta1.CloudRedisClient; import com.google.cloud.redis.v1beta1.Instance; import com.google.cloud.redis.v1beta1.InstanceName; @@ -45,5 +44,4 @@ public static void main(String[] args) throws Exception { } } } -// [END -// redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync] +// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync]