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

…197) - [ ] 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 · d763954 · d763954
1 parent dc66995
commit d763954
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 34 deletions.
diff --git a/...ud-filestore/src/main/java/com/google/cloud/filestore/v1/CloudFilestoreManagerClient.java b/...ud-filestore/src/main/java/com/google/cloud/filestore/v1/CloudFilestoreManagerClient.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;
@@ -218,6 +219,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/...lestore/src/main/java/com/google/cloud/filestore/v1beta1/CloudFilestoreManagerClient.java b/...lestore/src/main/java/com/google/cloud/filestore/v1beta1/CloudFilestoreManagerClient.java
@@ -220,6 +220,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/...v1/cloudfilestoremanagerclient/createbackup/SyncCreateBackupLocationnameBackupString.java b/...v1/cloudfilestoremanagerclient/createbackup/SyncCreateBackupLocationnameBackupString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.filestore.v1.samples;
 
-// [START
-// filestore_v1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
+// [START filestore_v1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
 import com.google.cloud.filestore.v1.Backup;
 import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateBackupLocationnameBackupString() throws Exception {
     }
   }
 }
-// [END
-// filestore_v1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
+// [END filestore_v1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
diff --git a/...udfilestoremanagerclient/createinstance/SyncCreateInstanceLocationnameInstanceString.java b/...udfilestoremanagerclient/createinstance/SyncCreateInstanceLocationnameInstanceString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.filestore.v1.samples;
 
-// [START
-// filestore_v1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
+// [START filestore_v1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
 import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1.Instance;
 import com.google.cloud.filestore.v1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateInstanceLocationnameInstanceString() throws Excepti
     }
   }
 }
-// [END
-// filestore_v1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
+// [END filestore_v1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
diff --git a/...v1/cloudfilestoremanagerclient/createinstance/SyncCreateInstanceStringInstanceString.java b/...v1/cloudfilestoremanagerclient/createinstance/SyncCreateInstanceStringInstanceString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.filestore.v1.samples;
 
-// [START
-// filestore_v1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]
+// [START filestore_v1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]
 import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1.Instance;
 import com.google.cloud.filestore.v1.LocationName;

diff --git a/.../google/cloud/filestore/v1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackup.java b/.../google/cloud/filestore/v1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackup.java
@@ -20,6 +20,7 @@
 import com.google.cloud.filestore.v1.BackupName;
 import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1.DeleteBackupRequest;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteBackup {
 

diff --git a/...oud/filestore/v1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupBackupname.java b/...oud/filestore/v1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupBackupname.java
@@ -19,6 +19,7 @@
 // [START filestore_v1_generated_cloudfilestoremanagerclient_deletebackup_backupname_sync]
 import com.google.cloud.filestore.v1.BackupName;
 import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteBackupBackupname {
 

diff --git a/...e/cloud/filestore/v1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupString.java b/...e/cloud/filestore/v1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupString.java
@@ -19,6 +19,7 @@
 // [START filestore_v1_generated_cloudfilestoremanagerclient_deletebackup_string_sync]
 import com.google.cloud.filestore.v1.BackupName;
 import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteBackupString {
 

diff --git a/...gle/cloud/filestore/v1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstance.java b/...gle/cloud/filestore/v1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstance.java
@@ -20,6 +20,7 @@
 import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1.DeleteInstanceRequest;
 import com.google.cloud.filestore.v1.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstance {
 

diff --git a/...lestore/v1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceInstancename.java b/...lestore/v1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceInstancename.java
@@ -19,6 +19,7 @@
 // [START filestore_v1_generated_cloudfilestoremanagerclient_deleteinstance_instancename_sync]
 import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstanceInstancename {
 

diff --git a/...oud/filestore/v1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceString.java b/...oud/filestore/v1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceString.java
@@ -19,6 +19,7 @@
 // [START filestore_v1_generated_cloudfilestoremanagerclient_deleteinstance_string_sync]
 import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstanceString {
 

diff --git a/...ilestore/v1beta1/cloudfilestoremanagerclient/create/SyncCreateSetCredentialsProvider.java b/...ilestore/v1beta1/cloudfilestoremanagerclient/create/SyncCreateSetCredentialsProvider.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.filestore.v1beta1.samples;
 
-// [START
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_create_setcredentialsprovider_sync]
+// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_create_setcredentialsprovider_sync]
 import com.google.api.gax.core.FixedCredentialsProvider;
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerSettings;

diff --git a/...lestore/v1beta1/cloudfilestoremanagerclient/create/SyncCreateSetCredentialsProvider1.java b/...lestore/v1beta1/cloudfilestoremanagerclient/create/SyncCreateSetCredentialsProvider1.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.filestore.v1beta1.samples;
 
-// [START
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_create_setcredentialsprovider1_sync]
+// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_create_setcredentialsprovider1_sync]
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerSettings;
 

diff --git a/...a1/cloudfilestoremanagerclient/createbackup/SyncCreateBackupLocationnameBackupString.java b/...a1/cloudfilestoremanagerclient/createbackup/SyncCreateBackupLocationnameBackupString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.filestore.v1beta1.samples;
 
-// [START
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
+// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
 import com.google.cloud.filestore.v1beta1.Backup;
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1beta1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateBackupLocationnameBackupString() throws Exception {
     }
   }
 }
-// [END
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
+// [END filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
diff --git a/.../v1beta1/cloudfilestoremanagerclient/createbackup/SyncCreateBackupStringBackupString.java b/.../v1beta1/cloudfilestoremanagerclient/createbackup/SyncCreateBackupStringBackupString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.filestore.v1beta1.samples;
 
-// [START
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_stringbackupstring_sync]
+// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_stringbackupstring_sync]
 import com.google.cloud.filestore.v1beta1.Backup;
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1beta1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateBackupStringBackupString() throws Exception {
     }
   }
 }
-// [END
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_stringbackupstring_sync]
+// [END filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_stringbackupstring_sync]
diff --git a/...udfilestoremanagerclient/createinstance/SyncCreateInstanceLocationnameInstanceString.java b/...udfilestoremanagerclient/createinstance/SyncCreateInstanceLocationnameInstanceString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.filestore.v1beta1.samples;
 
-// [START
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
+// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1beta1.Instance;
 import com.google.cloud.filestore.v1beta1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateInstanceLocationnameInstanceString() throws Excepti
     }
   }
 }
-// [END
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
+// [END filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
diff --git a/...a1/cloudfilestoremanagerclient/createinstance/SyncCreateInstanceStringInstanceString.java b/...a1/cloudfilestoremanagerclient/createinstance/SyncCreateInstanceStringInstanceString.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.filestore.v1beta1.samples;
 
-// [START
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]
+// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1beta1.Instance;
 import com.google.cloud.filestore.v1beta1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateInstanceStringInstanceString() throws Exception {
     }
   }
 }
-// [END
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]
+// [END filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]
diff --git a/...le/cloud/filestore/v1beta1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackup.java b/...le/cloud/filestore/v1beta1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackup.java
@@ -20,6 +20,7 @@
 import com.google.cloud.filestore.v1beta1.BackupName;
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1beta1.DeleteBackupRequest;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteBackup {
 

diff --git a/...ilestore/v1beta1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupBackupname.java b/...ilestore/v1beta1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupBackupname.java
@@ -19,6 +19,7 @@
 // [START filestore_v1beta1_generated_cloudfilestoremanagerclient_deletebackup_backupname_sync]
 import com.google.cloud.filestore.v1beta1.BackupName;
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteBackupBackupname {
 

diff --git a/...ud/filestore/v1beta1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupString.java b/...ud/filestore/v1beta1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupString.java
@@ -19,6 +19,7 @@
 // [START filestore_v1beta1_generated_cloudfilestoremanagerclient_deletebackup_string_sync]
 import com.google.cloud.filestore.v1beta1.BackupName;
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteBackupString {
 

diff --git a/...loud/filestore/v1beta1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstance.java b/...loud/filestore/v1beta1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstance.java
@@ -20,6 +20,7 @@
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1beta1.DeleteInstanceRequest;
 import com.google.cloud.filestore.v1beta1.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstance {
 

diff --git a/...re/v1beta1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceInstancename.java b/...re/v1beta1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceInstancename.java
@@ -19,6 +19,7 @@
 // [START filestore_v1beta1_generated_cloudfilestoremanagerclient_deleteinstance_instancename_sync]
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1beta1.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstanceInstancename {
 

diff --git a/...ilestore/v1beta1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceString.java b/...ilestore/v1beta1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceString.java
@@ -19,6 +19,7 @@
 // [START filestore_v1beta1_generated_cloudfilestoremanagerclient_deleteinstance_string_sync]
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1beta1.InstanceName;
+import com.google.protobuf.Empty;
 
 public class SyncDeleteInstanceString {
 

diff --git a/...beta1/cloudfilestoremanagerclient/updateinstance/SyncUpdateInstanceInstanceFieldmask.java b/...beta1/cloudfilestoremanagerclient/updateinstance/SyncUpdateInstanceInstanceFieldmask.java
@@ -16,8 +16,7 @@
 
 package com.google.cloud.filestore.v1beta1.samples;
 
-// [START
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_updateinstance_instancefieldmask_sync]
+// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_updateinstance_instancefieldmask_sync]
 import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
 import com.google.cloud.filestore.v1beta1.Instance;
 import com.google.protobuf.FieldMask;
@@ -40,5 +39,4 @@ public static void syncUpdateInstanceInstanceFieldmask() throws Exception {
     }
   }
 }
-// [END
-// filestore_v1beta1_generated_cloudfilestoremanagerclient_updateinstance_instancefieldmask_sync]
+// [END filestore_v1beta1_generated_cloudfilestoremanagerclient_updateinstance_instancefieldmask_sync]