Skip to content

Commit 3d47af2

Browse files
fix: update gapic-generator-java with mock service generation fixes (googleapis#197)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 457524730 Source-Link: googleapis/googleapis@917e7f2 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2497f9a069d3f6b2d6810d5a4e239cda1e7e5a39 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjQ5N2Y5YTA2OWQzZjZiMmQ2ODEwZDVhNGUyMzljZGExZTdlNWEzOSJ9
1 parent a1dba2c commit 3d47af2

24 files changed

+32
-34
lines changed

java-filestore/google-cloud-filestore/src/main/java/com/google/cloud/filestore/v1/CloudFilestoreManagerClient.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.google.api.core.ApiFuture;
2020
import com.google.api.core.ApiFutures;
21+
import com.google.api.core.BetaApi;
2122
import com.google.api.gax.core.BackgroundResource;
2223
import com.google.api.gax.httpjson.longrunning.OperationsClient;
2324
import com.google.api.gax.longrunning.OperationFuture;
@@ -218,6 +219,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
218219
* Returns the OperationsClient that can be used to query the status of a long-running operation
219220
* returned by another API method call.
220221
*/
222+
@BetaApi
221223
public final OperationsClient getHttpJsonOperationsClient() {
222224
return httpJsonOperationsClient;
223225
}

java-filestore/google-cloud-filestore/src/main/java/com/google/cloud/filestore/v1beta1/CloudFilestoreManagerClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
220220
* Returns the OperationsClient that can be used to query the status of a long-running operation
221221
* returned by another API method call.
222222
*/
223+
@BetaApi
223224
public final OperationsClient getHttpJsonOperationsClient() {
224225
return httpJsonOperationsClient;
225226
}

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1/cloudfilestoremanagerclient/createbackup/SyncCreateBackupLocationnameBackupString.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.filestore.v1.samples;
1818

19-
// [START
20-
// filestore_v1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
19+
// [START filestore_v1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
2120
import com.google.cloud.filestore.v1.Backup;
2221
import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
2322
import com.google.cloud.filestore.v1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateBackupLocationnameBackupString() throws Exception {
4140
}
4241
}
4342
}
44-
// [END
45-
// filestore_v1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
43+
// [END filestore_v1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1/cloudfilestoremanagerclient/createinstance/SyncCreateInstanceLocationnameInstanceString.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.filestore.v1.samples;
1818

19-
// [START
20-
// filestore_v1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
19+
// [START filestore_v1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
2120
import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
2221
import com.google.cloud.filestore.v1.Instance;
2322
import com.google.cloud.filestore.v1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateInstanceLocationnameInstanceString() throws Excepti
4140
}
4241
}
4342
}
44-
// [END
45-
// filestore_v1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
43+
// [END filestore_v1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1/cloudfilestoremanagerclient/createinstance/SyncCreateInstanceStringInstanceString.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.filestore.v1.samples;
1818

19-
// [START
20-
// filestore_v1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]
19+
// [START filestore_v1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]
2120
import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
2221
import com.google.cloud.filestore.v1.Instance;
2322
import com.google.cloud.filestore.v1.LocationName;

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackup.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.cloud.filestore.v1.BackupName;
2121
import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
2222
import com.google.cloud.filestore.v1.DeleteBackupRequest;
23+
import com.google.protobuf.Empty;
2324

2425
public class SyncDeleteBackup {
2526

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupBackupname.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START filestore_v1_generated_cloudfilestoremanagerclient_deletebackup_backupname_sync]
2020
import com.google.cloud.filestore.v1.BackupName;
2121
import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteBackupBackupname {
2425

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupString.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START filestore_v1_generated_cloudfilestoremanagerclient_deletebackup_string_sync]
2020
import com.google.cloud.filestore.v1.BackupName;
2121
import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteBackupString {
2425

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstance.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
2121
import com.google.cloud.filestore.v1.DeleteInstanceRequest;
2222
import com.google.cloud.filestore.v1.InstanceName;
23+
import com.google.protobuf.Empty;
2324

2425
public class SyncDeleteInstance {
2526

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceInstancename.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START filestore_v1_generated_cloudfilestoremanagerclient_deleteinstance_instancename_sync]
2020
import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
2121
import com.google.cloud.filestore.v1.InstanceName;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteInstanceInstancename {
2425

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceString.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START filestore_v1_generated_cloudfilestoremanagerclient_deleteinstance_string_sync]
2020
import com.google.cloud.filestore.v1.CloudFilestoreManagerClient;
2121
import com.google.cloud.filestore.v1.InstanceName;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteInstanceString {
2425

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/create/SyncCreateSetCredentialsProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.filestore.v1beta1.samples;
1818

19-
// [START
20-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_create_setcredentialsprovider_sync]
19+
// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_create_setcredentialsprovider_sync]
2120
import com.google.api.gax.core.FixedCredentialsProvider;
2221
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
2322
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerSettings;

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/create/SyncCreateSetCredentialsProvider1.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.filestore.v1beta1.samples;
1818

19-
// [START
20-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_create_setcredentialsprovider1_sync]
19+
// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_create_setcredentialsprovider1_sync]
2120
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
2221
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerSettings;
2322

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/createbackup/SyncCreateBackupLocationnameBackupString.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.filestore.v1beta1.samples;
1818

19-
// [START
20-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
19+
// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
2120
import com.google.cloud.filestore.v1beta1.Backup;
2221
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
2322
import com.google.cloud.filestore.v1beta1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateBackupLocationnameBackupString() throws Exception {
4140
}
4241
}
4342
}
44-
// [END
45-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]
43+
// [END filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_locationnamebackupstring_sync]

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/createbackup/SyncCreateBackupStringBackupString.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.filestore.v1beta1.samples;
1818

19-
// [START
20-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_stringbackupstring_sync]
19+
// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_stringbackupstring_sync]
2120
import com.google.cloud.filestore.v1beta1.Backup;
2221
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
2322
import com.google.cloud.filestore.v1beta1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateBackupStringBackupString() throws Exception {
4140
}
4241
}
4342
}
44-
// [END
45-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_stringbackupstring_sync]
43+
// [END filestore_v1beta1_generated_cloudfilestoremanagerclient_createbackup_stringbackupstring_sync]

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/createinstance/SyncCreateInstanceLocationnameInstanceString.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.filestore.v1beta1.samples;
1818

19-
// [START
20-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
19+
// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
2120
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
2221
import com.google.cloud.filestore.v1beta1.Instance;
2322
import com.google.cloud.filestore.v1beta1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateInstanceLocationnameInstanceString() throws Excepti
4140
}
4241
}
4342
}
44-
// [END
45-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]
43+
// [END filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_locationnameinstancestring_sync]

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/createinstance/SyncCreateInstanceStringInstanceString.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.filestore.v1beta1.samples;
1818

19-
// [START
20-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]
19+
// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]
2120
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
2221
import com.google.cloud.filestore.v1beta1.Instance;
2322
import com.google.cloud.filestore.v1beta1.LocationName;
@@ -41,5 +40,4 @@ public static void syncCreateInstanceStringInstanceString() throws Exception {
4140
}
4241
}
4342
}
44-
// [END
45-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]
43+
// [END filestore_v1beta1_generated_cloudfilestoremanagerclient_createinstance_stringinstancestring_sync]

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackup.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.cloud.filestore.v1beta1.BackupName;
2121
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
2222
import com.google.cloud.filestore.v1beta1.DeleteBackupRequest;
23+
import com.google.protobuf.Empty;
2324

2425
public class SyncDeleteBackup {
2526

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupBackupname.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_deletebackup_backupname_sync]
2020
import com.google.cloud.filestore.v1beta1.BackupName;
2121
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteBackupBackupname {
2425

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/deletebackup/SyncDeleteBackupString.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_deletebackup_string_sync]
2020
import com.google.cloud.filestore.v1beta1.BackupName;
2121
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteBackupString {
2425

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstance.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
2121
import com.google.cloud.filestore.v1beta1.DeleteInstanceRequest;
2222
import com.google.cloud.filestore.v1beta1.InstanceName;
23+
import com.google.protobuf.Empty;
2324

2425
public class SyncDeleteInstance {
2526

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceInstancename.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_deleteinstance_instancename_sync]
2020
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
2121
import com.google.cloud.filestore.v1beta1.InstanceName;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteInstanceInstancename {
2425

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/deleteinstance/SyncDeleteInstanceString.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_deleteinstance_string_sync]
2020
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
2121
import com.google.cloud.filestore.v1beta1.InstanceName;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteInstanceString {
2425

java-filestore/samples/snippets/generated/com/google/cloud/filestore/v1beta1/cloudfilestoremanagerclient/updateinstance/SyncUpdateInstanceInstanceFieldmask.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.filestore.v1beta1.samples;
1818

19-
// [START
20-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_updateinstance_instancefieldmask_sync]
19+
// [START filestore_v1beta1_generated_cloudfilestoremanagerclient_updateinstance_instancefieldmask_sync]
2120
import com.google.cloud.filestore.v1beta1.CloudFilestoreManagerClient;
2221
import com.google.cloud.filestore.v1beta1.Instance;
2322
import com.google.protobuf.FieldMask;
@@ -40,5 +39,4 @@ public static void syncUpdateInstanceInstanceFieldmask() throws Exception {
4039
}
4140
}
4241
}
43-
// [END
44-
// filestore_v1beta1_generated_cloudfilestoremanagerclient_updateinstance_instancefieldmask_sync]
42+
// [END filestore_v1beta1_generated_cloudfilestoremanagerclient_updateinstance_instancefieldmask_sync]

0 commit comments

Comments
 (0)