fix: update gapic-generator-java with mock service generation fixes (#…

…659) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 457524730 Source-Link: googleapis/googleapis@917e7f2 Source-Link: googleapis/googleapis-gen@2497f9a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjQ5N2Y5YTA2OWQzZjZiMmQ2ODEwZDVhNGUyMzljZGExZTdlNWEzOSJ9
googleapis · Jun 28, 2022 · 3d4155f · 3d4155f
1 parent cd34e4b
commit 3d4155f
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 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
@@ -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
@@ -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/...nerated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstance.java b/...nerated/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/...google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java b/...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/...d/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java b/...d/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/...erinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java b/...erinstance/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/...failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java b/...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/...RescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java b/...RescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.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/...e/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java b/...e/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/...ed/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java b/...ed/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/...e/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java b/...e/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/.../google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java b/.../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/...erinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java b/...erinstance/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/...failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java b/...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/...RescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java b/...RescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.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/...e/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java b/...e/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]