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

…646) - [ ] 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 · c459a20 · c459a20
1 parent 71c61d1
commit c459a20
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 38 deletions.
diff --git a/google-cloud-memcache/src/main/java/com/google/cloud/memcache/v1/CloudMemcacheClient.java b/google-cloud-memcache/src/main/java/com/google/cloud/memcache/v1/CloudMemcacheClient.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/...e-cloud-memcache/src/main/java/com/google/cloud/memcache/v1beta2/CloudMemcacheClient.java b/...e-cloud-memcache/src/main/java/com/google/cloud/memcache/v1beta2/CloudMemcacheClient.java
@@ -208,6 +208,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/...cloudmemcacheclient/applyparameters/SyncApplyParametersInstancenameListstringBoolean.java b/...cloudmemcacheclient/applyparameters/SyncApplyParametersInstancenameListstringBoolean.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.memcache.v1.samples;
 
-// [START
-// memcache_v1_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
+// [START memcache_v1_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
 import com.google.cloud.memcache.v1.CloudMemcacheClient;
 import com.google.cloud.memcache.v1.Instance;
 import com.google.cloud.memcache.v1.InstanceName;
@@ -41,5 +40,4 @@ public static void syncApplyParametersInstancenameListstringBoolean() throws Exc
     }
   }
 }
-// [END
-// memcache_v1_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
+// [END memcache_v1_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
diff --git a/...d/com/google/cloud/memcache/v1/cloudmemcacheclient/deleteinstance/SyncDeleteInstance.java b/...d/com/google/cloud/memcache/v1/cloudmemcacheclient/deleteinstance/SyncDeleteInstance.java
@@ -20,6 +20,7 @@
 import com.google.cloud.memcache.v1.CloudMemcacheClient;
 import com.google.cloud.memcache.v1.DeleteInstanceRequest;
 import com.google.cloud.memcache.v1.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstance {
 

diff --git a/.../cloud/memcache/v1/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceInstancename.java b/.../cloud/memcache/v1/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceInstancename.java
@@ -19,6 +19,7 @@
 // [START memcache_v1_generated_cloudmemcacheclient_deleteinstance_instancename_sync]
 import com.google.cloud.memcache.v1.CloudMemcacheClient;
 import com.google.cloud.memcache.v1.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstanceInstancename {
 

diff --git a/...google/cloud/memcache/v1/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceString.java b/...google/cloud/memcache/v1/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceString.java
@@ -19,6 +19,7 @@
 // [START memcache_v1_generated_cloudmemcacheclient_deleteinstance_string_sync]
 import com.google.cloud.memcache.v1.CloudMemcacheClient;
 import com.google.cloud.memcache.v1.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstanceString {
 

diff --git a/...eclient/updateparameters/SyncUpdateParametersInstancenameFieldmaskMemcacheparameters.java b/...eclient/updateparameters/SyncUpdateParametersInstancenameFieldmaskMemcacheparameters.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.memcache.v1.samples;
 
-// [START
-// memcache_v1_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
+// [START memcache_v1_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
 import com.google.cloud.memcache.v1.CloudMemcacheClient;
 import com.google.cloud.memcache.v1.Instance;
 import com.google.cloud.memcache.v1.InstanceName;
@@ -43,5 +42,4 @@ public static void syncUpdateParametersInstancenameFieldmaskMemcacheparameters()
     }
   }
 }
-// [END
-// memcache_v1_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
+// [END memcache_v1_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
diff --git a/...emcacheclient/updateparameters/SyncUpdateParametersStringFieldmaskMemcacheparameters.java b/...emcacheclient/updateparameters/SyncUpdateParametersStringFieldmaskMemcacheparameters.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.memcache.v1.samples;
 
-// [START
-// memcache_v1_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
+// [START memcache_v1_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
 import com.google.cloud.memcache.v1.CloudMemcacheClient;
 import com.google.cloud.memcache.v1.Instance;
 import com.google.cloud.memcache.v1.InstanceName;
@@ -42,5 +41,4 @@ public static void syncUpdateParametersStringFieldmaskMemcacheparameters() throw
     }
   }
 }
-// [END
-// memcache_v1_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
+// [END memcache_v1_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
diff --git a/...cloudmemcacheclient/applyparameters/SyncApplyParametersInstancenameListstringBoolean.java b/...cloudmemcacheclient/applyparameters/SyncApplyParametersInstancenameListstringBoolean.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.memcache.v1beta2.samples;
 
-// [START
-// memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
+// [START memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
 import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
 import com.google.cloud.memcache.v1beta2.Instance;
 import com.google.cloud.memcache.v1beta2.InstanceName;
@@ -41,5 +40,4 @@ public static void syncApplyParametersInstancenameListstringBoolean() throws Exc
     }
   }
 }
-// [END
-// memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
+// [END memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
diff --git a/...beta2/cloudmemcacheclient/applyparameters/SyncApplyParametersStringListstringBoolean.java b/...beta2/cloudmemcacheclient/applyparameters/SyncApplyParametersStringListstringBoolean.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.memcache.v1beta2.samples;
 
-// [START
-// memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_stringliststringboolean_sync]
+// [START memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_stringliststringboolean_sync]
 import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
 import com.google.cloud.memcache.v1beta2.Instance;
 import com.google.cloud.memcache.v1beta2.InstanceName;

diff --git a/...cacheclient/applysoftwareupdate/SyncApplySoftwareUpdateInstancenameListstringBoolean.java b/...cacheclient/applysoftwareupdate/SyncApplySoftwareUpdateInstancenameListstringBoolean.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.memcache.v1beta2.samples;
 
-// [START
-// memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_instancenameliststringboolean_sync]
+// [START memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_instancenameliststringboolean_sync]
 import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
 import com.google.cloud.memcache.v1beta2.Instance;
 import com.google.cloud.memcache.v1beta2.InstanceName;
@@ -42,5 +41,4 @@ public static void syncApplySoftwareUpdateInstancenameListstringBoolean() throws
     }
   }
 }
-// [END
-// memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_instancenameliststringboolean_sync]
+// [END memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_instancenameliststringboolean_sync]
diff --git a/...oudmemcacheclient/applysoftwareupdate/SyncApplySoftwareUpdateStringListstringBoolean.java b/...oudmemcacheclient/applysoftwareupdate/SyncApplySoftwareUpdateStringListstringBoolean.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.memcache.v1beta2.samples;
 
-// [START
-// memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_stringliststringboolean_sync]
+// [START memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_stringliststringboolean_sync]
 import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
 import com.google.cloud.memcache.v1beta2.Instance;
 import com.google.cloud.memcache.v1beta2.InstanceName;
@@ -42,5 +41,4 @@ public static void syncApplySoftwareUpdateStringListstringBoolean() throws Excep
     }
   }
 }
-// [END
-// memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_stringliststringboolean_sync]
+// [END memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_stringliststringboolean_sync]
diff --git a/...eta2/cloudmemcacheclient/createinstance/SyncCreateInstanceLocationnameStringInstance.java b/...eta2/cloudmemcacheclient/createinstance/SyncCreateInstanceLocationnameStringInstance.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.memcache.v1beta2.samples;
 
-// [START
-// memcache_v1beta2_generated_cloudmemcacheclient_createinstance_locationnamestringinstance_sync]
+// [START memcache_v1beta2_generated_cloudmemcacheclient_createinstance_locationnamestringinstance_sync]
 import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
 import com.google.cloud.memcache.v1beta2.Instance;
 import com.google.cloud.memcache.v1beta2.LocationName;
@@ -40,5 +39,4 @@ public static void syncCreateInstanceLocationnameStringInstance() throws Excepti
     }
   }
 }
-// [END
-// memcache_v1beta2_generated_cloudmemcacheclient_createinstance_locationnamestringinstance_sync]
+// [END memcache_v1beta2_generated_cloudmemcacheclient_createinstance_locationnamestringinstance_sync]
diff --git a/.../google/cloud/memcache/v1beta2/cloudmemcacheclient/deleteinstance/SyncDeleteInstance.java b/.../google/cloud/memcache/v1beta2/cloudmemcacheclient/deleteinstance/SyncDeleteInstance.java
@@ -20,6 +20,7 @@
 import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
 import com.google.cloud.memcache.v1beta2.DeleteInstanceRequest;
 import com.google.cloud.memcache.v1beta2.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstance {
 

diff --git a/...d/memcache/v1beta2/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceInstancename.java b/...d/memcache/v1beta2/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceInstancename.java
@@ -19,6 +19,7 @@
 // [START memcache_v1beta2_generated_cloudmemcacheclient_deleteinstance_instancename_sync]
 import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
 import com.google.cloud.memcache.v1beta2.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstanceInstancename {
 

diff --git a/...e/cloud/memcache/v1beta2/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceString.java b/...e/cloud/memcache/v1beta2/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceString.java
@@ -19,6 +19,7 @@
 // [START memcache_v1beta2_generated_cloudmemcacheclient_deleteinstance_string_sync]
 import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
 import com.google.cloud.memcache.v1beta2.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstanceString {
 

diff --git a/...eclient/updateparameters/SyncUpdateParametersInstancenameFieldmaskMemcacheparameters.java b/...eclient/updateparameters/SyncUpdateParametersInstancenameFieldmaskMemcacheparameters.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.memcache.v1beta2.samples;
 
-// [START
-// memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
+// [START memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
 import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
 import com.google.cloud.memcache.v1beta2.Instance;
 import com.google.cloud.memcache.v1beta2.InstanceName;
@@ -43,5 +42,4 @@ public static void syncUpdateParametersInstancenameFieldmaskMemcacheparameters()
     }
   }
 }
-// [END
-// memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
+// [END memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
diff --git a/...emcacheclient/updateparameters/SyncUpdateParametersStringFieldmaskMemcacheparameters.java b/...emcacheclient/updateparameters/SyncUpdateParametersStringFieldmaskMemcacheparameters.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.memcache.v1beta2.samples;
 
-// [START
-// memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
+// [START memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
 import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
 import com.google.cloud.memcache.v1beta2.Instance;
 import com.google.cloud.memcache.v1beta2.InstanceName;
@@ -42,5 +41,4 @@ public static void syncUpdateParametersStringFieldmaskMemcacheparameters() throw
     }
   }
 }
-// [END
-// memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
+// [END memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]