From c0ffe7c7cb50181cc375a945b9e79f97da9aa290 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 13:56:49 -0400 Subject: [PATCH] feat: remove Bucket.retention_period, now that we've migrated to retention_duration (#1955) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: Clarifications about behavior of DeleteObject RPC docs: Clarifications about format of GetServiceAccountRequest, CreateHmacKeyRequest, DeleteHmacKeyRequest, GetHmacKeyRequest, ListHmacKeysRequest, ObjectChecksums, HmacKeyMetadata, Bucket field used in CreateBucket request docs: Corrected child_type annotations for ListBucketsRequest docs: Updated resource_reference for DeleteObjectRequest, ReadObjectRequest, GetObjectRequest, ListObjectsRequest, Bucket feat: Changed ChecksummedData definition to use annotation ctype=CORD feat!: Removed Bucket.retention_period, now that we've migrated to retention_duration PiperOrigin-RevId: 519863335 Source-Link: https://github.com/googleapis/googleapis/commit/617ec7477f420d04e2cc32f04683c4ee0fbdec08 Source-Link: https://github.com/googleapis/googleapis-gen/commit/400b7375fadfce1e5101b353e34888301391f80f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDAwYjczNzVmYWRmY2UxZTUxMDFiMzUzZTM0ODg4MzAxMzkxZjgwZiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(deps): Update gapic-generator-java to 2.16.0 PiperOrigin-RevId: 520153493 Source-Link: https://github.com/googleapis/googleapis/commit/26a424a2e4190c3103ab6f5d00c3144c89161b20 Source-Link: https://github.com/googleapis/googleapis-gen/commit/78f1567661df07bea7425e4341012e7b77c11254 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzhmMTU2NzY2MWRmMDdiZWE3NDI1ZTQzNDEwMTJlN2I3N2MxMTI1NCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: update clirr ignore rules for proto renames --------- Co-authored-by: Owl Bot Co-authored-by: BenWhitehead --- .../clirr-ignored-differences.xml | 8 + .../com/google/storage/v2/StorageClient.java | 308 +++-- .../com/google/storage/v2/gapic_metadata.json | 4 +- .../google/storage/v2/StorageClientTest.java | 256 +++- .../com/google/storage/v2/StorageGrpc.java | 508 ++++---- .../clirr-ignored-differences.xml | 11 + .../java/com/google/storage/v2/Bucket.java | 225 +--- .../google/storage/v2/BucketOrBuilder.java | 8 +- .../storage/v2/CreateBucketRequest.java | 108 +- .../v2/CreateBucketRequestOrBuilder.java | 27 +- .../storage/v2/CreateHmacKeyRequest.java | 14 +- .../v2/CreateHmacKeyRequestOrBuilder.java | 4 +- .../storage/v2/DeleteHmacKeyRequest.java | 28 +- .../v2/DeleteHmacKeyRequestOrBuilder.java | 8 +- .../storage/v2/DeleteObjectRequest.java | 28 +- .../v2/DeleteObjectRequestOrBuilder.java | 8 +- .../google/storage/v2/GetHmacKeyRequest.java | 28 +- .../v2/GetHmacKeyRequestOrBuilder.java | 8 +- .../google/storage/v2/GetObjectRequest.java | 28 +- .../storage/v2/GetObjectRequestOrBuilder.java | 8 +- .../storage/v2/GetServiceAccountRequest.java | 28 +- .../v2/GetServiceAccountRequestOrBuilder.java | 8 +- .../google/storage/v2/HmacKeyMetadata.java | 56 +- .../storage/v2/HmacKeyMetadataOrBuilder.java | 16 +- .../storage/v2/ListHmacKeysRequest.java | 28 +- .../v2/ListHmacKeysRequestOrBuilder.java | 8 +- .../google/storage/v2/ObjectChecksums.java | 12 +- .../storage/v2/ObjectChecksumsOrBuilder.java | 4 +- .../google/storage/v2/ReadObjectRequest.java | 28 +- .../v2/ReadObjectRequestOrBuilder.java | 8 +- .../google/storage/v2/ReadObjectResponse.java | 24 +- .../v2/ReadObjectResponseOrBuilder.java | 6 +- .../storage/v2/RewriteObjectRequest.java | 28 +- .../v2/RewriteObjectRequestOrBuilder.java | 8 +- .../com/google/storage/v2/StorageProto.java | 1043 ++++++++--------- .../storage/v2/UpdateBucketRequest.java | 24 - .../v2/UpdateBucketRequestOrBuilder.java | 6 - .../storage/v2/UpdateObjectRequest.java | 24 - .../v2/UpdateObjectRequestOrBuilder.java | 6 - .../proto/google/storage/v2/storage.proto | 99 +- 40 files changed, 1710 insertions(+), 1379 deletions(-) diff --git a/gapic-google-cloud-storage-v2/clirr-ignored-differences.xml b/gapic-google-cloud-storage-v2/clirr-ignored-differences.xml index 0e52c3345..14e3e17b6 100644 --- a/gapic-google-cloud-storage-v2/clirr-ignored-differences.xml +++ b/gapic-google-cloud-storage-v2/clirr-ignored-differences.xml @@ -43,4 +43,12 @@ com/google/storage/v2/StorageClient$ListNotification* + + + 7005 + com/google/storage/v2/StorageClient + * *(*Name*) + * *(*Name*) + + diff --git a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java index ea21e6048..12097b0bb 100644 --- a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java +++ b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java @@ -425,9 +425,11 @@ public final UnaryCallable getBucketCallable() { * } * * @param parent Required. The project to which this bucket will belong. - * @param bucket Properties of the new bucket being inserted. The project and name of the bucket - * are specified in the parent and bucket_id fields, respectively. Populating those fields in - * `bucket` will result in an error. + * @param bucket Properties of the new bucket being inserted. The name of the bucket is specified + * in the `bucket_id` field. Populating `bucket.name` field will result in an error. The + * project of the bucket must be specified in the `bucket.project` field. This field must be + * in `projects/{projectIdentifier}` format, {projectIdentifier} can be the project ID or + * project number. The `parent` field must be either empty or `projects/_`. * @param bucketId Required. The ID to use for this bucket, which will become the final component * of the bucket's resource name. For example, the value `foo` might result in a bucket with * the name `projects/123456/buckets/foo`. @@ -464,9 +466,11 @@ public final Bucket createBucket(ProjectName parent, Bucket bucket, String bucke * } * * @param parent Required. The project to which this bucket will belong. - * @param bucket Properties of the new bucket being inserted. The project and name of the bucket - * are specified in the parent and bucket_id fields, respectively. Populating those fields in - * `bucket` will result in an error. + * @param bucket Properties of the new bucket being inserted. The name of the bucket is specified + * in the `bucket_id` field. Populating `bucket.name` field will result in an error. The + * project of the bucket must be specified in the `bucket.project` field. This field must be + * in `projects/{projectIdentifier}` format, {projectIdentifier} can be the project ID or + * project number. The `parent` field must be either empty or `projects/_`. * @param bucketId Required. The ID to use for this bucket, which will become the final component * of the bucket's resource name. For example, the value `foo` might result in a bucket with * the name `projects/123456/buckets/foo`. @@ -1270,8 +1274,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq * field with the value `*`. Note: not recommended. If a new field is introduced at a * later time, an older client updating with the `*` may accidentally reset the new * field's value. - *

Not specifying any fields is an error. Not specifying a field while setting that field - * to a non-default value is an error. + *

Not specifying any fields is an error. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final Bucket updateBucket(Bucket bucket, FieldMask updateMask) { @@ -1477,7 +1480,8 @@ public final void deleteNotificationConfig(DeleteNotificationConfigRequest reque * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library * try (StorageClient storageClient = StorageClient.create()) { - * BucketName name = BucketName.of("[PROJECT]", "[BUCKET]"); + * NotificationConfigName name = + * NotificationConfigName.of("[PROJECT]", "[BUCKET]", "[NOTIFICATION_CONFIG]"); * NotificationConfig response = storageClient.getNotificationConfig(name); * } * } @@ -1486,7 +1490,7 @@ public final void deleteNotificationConfig(DeleteNotificationConfigRequest reque * `projects/{project}/buckets/{bucket}/notificationConfigs/{notificationConfig}` * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final NotificationConfig getNotificationConfig(BucketName name) { + public final NotificationConfig getNotificationConfig(NotificationConfigName name) { GetNotificationConfigRequest request = GetNotificationConfigRequest.newBuilder() .setName(name == null ? null : name.toString()) @@ -1507,7 +1511,8 @@ public final NotificationConfig getNotificationConfig(BucketName name) { * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library * try (StorageClient storageClient = StorageClient.create()) { - * String name = BucketName.of("[PROJECT]", "[BUCKET]").toString(); + * String name = + * NotificationConfigName.of("[PROJECT]", "[BUCKET]", "[NOTIFICATION_CONFIG]").toString(); * NotificationConfig response = storageClient.getNotificationConfig(name); * } * } @@ -1537,7 +1542,9 @@ public final NotificationConfig getNotificationConfig(String name) { * try (StorageClient storageClient = StorageClient.create()) { * GetNotificationConfigRequest request = * GetNotificationConfigRequest.newBuilder() - * .setName(BucketName.of("[PROJECT]", "[BUCKET]").toString()) + * .setName( + * NotificationConfigName.of("[PROJECT]", "[BUCKET]", "[NOTIFICATION_CONFIG]") + * .toString()) * .build(); * NotificationConfig response = storageClient.getNotificationConfig(request); * } @@ -1565,7 +1572,9 @@ public final NotificationConfig getNotificationConfig(GetNotificationConfigReque * try (StorageClient storageClient = StorageClient.create()) { * GetNotificationConfigRequest request = * GetNotificationConfigRequest.newBuilder() - * .setName(BucketName.of("[PROJECT]", "[BUCKET]").toString()) + * .setName( + * NotificationConfigName.of("[PROJECT]", "[BUCKET]", "[NOTIFICATION_CONFIG]") + * .toString()) * .build(); * ApiFuture future = * storageClient.getNotificationConfigCallable().futureCall(request); @@ -1594,7 +1603,7 @@ public final NotificationConfig getNotificationConfig(GetNotificationConfigReque * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library * try (StorageClient storageClient = StorageClient.create()) { - * ProjectName parent = ProjectName.of("[PROJECT]"); + * BucketName parent = BucketName.of("[PROJECT]", "[BUCKET]"); * NotificationConfig notificationConfig = NotificationConfig.newBuilder().build(); * NotificationConfig response = * storageClient.createNotificationConfig(parent, notificationConfig); @@ -1606,7 +1615,7 @@ public final NotificationConfig getNotificationConfig(GetNotificationConfigReque * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final NotificationConfig createNotificationConfig( - ProjectName parent, NotificationConfig notificationConfig) { + BucketName parent, NotificationConfig notificationConfig) { CreateNotificationConfigRequest request = CreateNotificationConfigRequest.newBuilder() .setParent(parent == null ? null : parent.toString()) @@ -1630,7 +1639,7 @@ public final NotificationConfig createNotificationConfig( * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library * try (StorageClient storageClient = StorageClient.create()) { - * String parent = ProjectName.of("[PROJECT]").toString(); + * String parent = BucketName.of("[PROJECT]", "[BUCKET]").toString(); * NotificationConfig notificationConfig = NotificationConfig.newBuilder().build(); * NotificationConfig response = * storageClient.createNotificationConfig(parent, notificationConfig); @@ -1668,7 +1677,7 @@ public final NotificationConfig createNotificationConfig( * try (StorageClient storageClient = StorageClient.create()) { * CreateNotificationConfigRequest request = * CreateNotificationConfigRequest.newBuilder() - * .setParent(ProjectName.of("[PROJECT]").toString()) + * .setParent(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setNotificationConfig(NotificationConfig.newBuilder().build()) * .build(); * NotificationConfig response = storageClient.createNotificationConfig(request); @@ -1700,7 +1709,7 @@ public final NotificationConfig createNotificationConfig( * try (StorageClient storageClient = StorageClient.create()) { * CreateNotificationConfigRequest request = * CreateNotificationConfigRequest.newBuilder() - * .setParent(ProjectName.of("[PROJECT]").toString()) + * .setParent(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setNotificationConfig(NotificationConfig.newBuilder().build()) * .build(); * ApiFuture future = @@ -1728,7 +1737,7 @@ public final NotificationConfig createNotificationConfig( * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library * try (StorageClient storageClient = StorageClient.create()) { - * ProjectName parent = ProjectName.of("[PROJECT]"); + * BucketName parent = BucketName.of("[PROJECT]", "[BUCKET]"); * for (NotificationConfig element : * storageClient.listNotificationConfigs(parent).iterateAll()) { * // doThingsWith(element); @@ -1739,7 +1748,7 @@ public final NotificationConfig createNotificationConfig( * @param parent Required. Name of a Google Cloud Storage bucket. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final ListNotificationConfigsPagedResponse listNotificationConfigs(ProjectName parent) { + public final ListNotificationConfigsPagedResponse listNotificationConfigs(BucketName parent) { ListNotificationConfigsRequest request = ListNotificationConfigsRequest.newBuilder() .setParent(parent == null ? null : parent.toString()) @@ -1760,7 +1769,7 @@ public final ListNotificationConfigsPagedResponse listNotificationConfigs(Projec * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library * try (StorageClient storageClient = StorageClient.create()) { - * String parent = ProjectName.of("[PROJECT]").toString(); + * String parent = BucketName.of("[PROJECT]", "[BUCKET]").toString(); * for (NotificationConfig element : * storageClient.listNotificationConfigs(parent).iterateAll()) { * // doThingsWith(element); @@ -1792,7 +1801,7 @@ public final ListNotificationConfigsPagedResponse listNotificationConfigs(String * try (StorageClient storageClient = StorageClient.create()) { * ListNotificationConfigsRequest request = * ListNotificationConfigsRequest.newBuilder() - * .setParent(ProjectName.of("[PROJECT]").toString()) + * .setParent(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setPageSize(883849137) * .setPageToken("pageToken873572522") * .build(); @@ -1826,7 +1835,7 @@ public final ListNotificationConfigsPagedResponse listNotificationConfigs( * try (StorageClient storageClient = StorageClient.create()) { * ListNotificationConfigsRequest request = * ListNotificationConfigsRequest.newBuilder() - * .setParent(ProjectName.of("[PROJECT]").toString()) + * .setParent(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setPageSize(883849137) * .setPageToken("pageToken873572522") * .build(); @@ -1859,7 +1868,7 @@ public final ListNotificationConfigsPagedResponse listNotificationConfigs( * try (StorageClient storageClient = StorageClient.create()) { * ListNotificationConfigsRequest request = * ListNotificationConfigsRequest.newBuilder() - * .setParent(ProjectName.of("[PROJECT]").toString()) + * .setParent(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setPageSize(883849137) * .setPageToken("pageToken873572522") * .build(); @@ -1959,8 +1968,48 @@ public final UnaryCallable composeObjectCallable() // AUTO-GENERATED DOCUMENTATION AND METHOD. /** - * Deletes an object and its metadata. Deletions are permanent if versioning is not enabled for - * the bucket, or if the `generation` parameter is used. + * Deletes an object and its metadata. + * + *

Deletions are normally permanent when versioning is disabled or whenever the generation + * parameter is used. However, if soft delete is enabled for the bucket, deleted objects can be + * restored using RestoreObject until the soft delete retention period has passed. + * + *

Sample code: + * + *

{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (StorageClient storageClient = StorageClient.create()) {
+   *   BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]");
+   *   String object = "object-1023368385";
+   *   storageClient.deleteObject(bucket, object);
+   * }
+   * }
+ * + * @param bucket Required. Name of the bucket in which the object resides. + * @param object Required. The name of the finalized object to delete. Note: If you want to delete + * an unfinalized resumable upload please use `CancelResumableWrite`. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final void deleteObject(BucketName bucket, String object) { + DeleteObjectRequest request = + DeleteObjectRequest.newBuilder() + .setBucket(bucket == null ? null : bucket.toString()) + .setObject(object) + .build(); + deleteObject(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Deletes an object and its metadata. + * + *

Deletions are normally permanent when versioning is disabled or whenever the generation + * parameter is used. However, if soft delete is enabled for the bucket, deleted objects can be + * restored using RestoreObject until the soft delete retention period has passed. * *

Sample code: * @@ -1971,7 +2020,7 @@ public final UnaryCallable composeObjectCallable() * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library * try (StorageClient storageClient = StorageClient.create()) { - * String bucket = "bucket-1378203158"; + * String bucket = BucketName.of("[PROJECT]", "[BUCKET]").toString(); * String object = "object-1023368385"; * storageClient.deleteObject(bucket, object); * } @@ -1990,8 +2039,11 @@ public final void deleteObject(String bucket, String object) { // AUTO-GENERATED DOCUMENTATION AND METHOD. /** - * Deletes an object and its metadata. Deletions are permanent if versioning is not enabled for - * the bucket, or if the `generation` parameter is used. + * Deletes an object and its metadata. + * + *

Deletions are normally permanent when versioning is disabled or whenever the generation + * parameter is used. However, if soft delete is enabled for the bucket, deleted objects can be + * restored using RestoreObject until the soft delete retention period has passed. * *

Sample code: * @@ -2002,7 +2054,48 @@ public final void deleteObject(String bucket, String object) { * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library * try (StorageClient storageClient = StorageClient.create()) { - * String bucket = "bucket-1378203158"; + * BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]"); + * String object = "object-1023368385"; + * long generation = 305703192; + * storageClient.deleteObject(bucket, object, generation); + * } + * } + * + * @param bucket Required. Name of the bucket in which the object resides. + * @param object Required. The name of the finalized object to delete. Note: If you want to delete + * an unfinalized resumable upload please use `CancelResumableWrite`. + * @param generation If present, permanently deletes a specific revision of this object (as + * opposed to the latest version, the default). + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final void deleteObject(BucketName bucket, String object, long generation) { + DeleteObjectRequest request = + DeleteObjectRequest.newBuilder() + .setBucket(bucket == null ? null : bucket.toString()) + .setObject(object) + .setGeneration(generation) + .build(); + deleteObject(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Deletes an object and its metadata. + * + *

Deletions are normally permanent when versioning is disabled or whenever the generation + * parameter is used. However, if soft delete is enabled for the bucket, deleted objects can be + * restored using RestoreObject until the soft delete retention period has passed. + * + *

Sample code: + * + *

{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (StorageClient storageClient = StorageClient.create()) {
+   *   String bucket = BucketName.of("[PROJECT]", "[BUCKET]").toString();
    *   String object = "object-1023368385";
    *   long generation = 305703192;
    *   storageClient.deleteObject(bucket, object, generation);
@@ -2028,8 +2121,11 @@ public final void deleteObject(String bucket, String object, long generation) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
-   * Deletes an object and its metadata. Deletions are permanent if versioning is not enabled for
-   * the bucket, or if the `generation` parameter is used.
+   * Deletes an object and its metadata.
+   *
+   * 

Deletions are normally permanent when versioning is disabled or whenever the generation + * parameter is used. However, if soft delete is enabled for the bucket, deleted objects can be + * restored using RestoreObject until the soft delete retention period has passed. * *

Sample code: * @@ -2042,7 +2138,7 @@ public final void deleteObject(String bucket, String object, long generation) { * try (StorageClient storageClient = StorageClient.create()) { * DeleteObjectRequest request = * DeleteObjectRequest.newBuilder() - * .setBucket("bucket-1378203158") + * .setBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setObject("object-1023368385") * .setGeneration(305703192) * .setIfGenerationMatch(-1086241088) @@ -2064,8 +2160,11 @@ public final void deleteObject(DeleteObjectRequest request) { // AUTO-GENERATED DOCUMENTATION AND METHOD. /** - * Deletes an object and its metadata. Deletions are permanent if versioning is not enabled for - * the bucket, or if the `generation` parameter is used. + * Deletes an object and its metadata. + * + *

Deletions are normally permanent when versioning is disabled or whenever the generation + * parameter is used. However, if soft delete is enabled for the bucket, deleted objects can be + * restored using RestoreObject until the soft delete retention period has passed. * *

Sample code: * @@ -2078,7 +2177,7 @@ public final void deleteObject(DeleteObjectRequest request) { * try (StorageClient storageClient = StorageClient.create()) { * DeleteObjectRequest request = * DeleteObjectRequest.newBuilder() - * .setBucket("bucket-1378203158") + * .setBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setObject("object-1023368385") * .setGeneration(305703192) * .setIfGenerationMatch(-1086241088) @@ -2192,7 +2291,39 @@ public final CancelResumableWriteResponse cancelResumableWrite( * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library * try (StorageClient storageClient = StorageClient.create()) { - * String bucket = "bucket-1378203158"; + * BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]"); + * String object = "object-1023368385"; + * Object response = storageClient.getObject(bucket, object); + * } + * }

+ * + * @param bucket Required. Name of the bucket in which the object resides. + * @param object Required. Name of the object. + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final Object getObject(BucketName bucket, String object) { + GetObjectRequest request = + GetObjectRequest.newBuilder() + .setBucket(bucket == null ? null : bucket.toString()) + .setObject(object) + .build(); + return getObject(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Retrieves an object's metadata. + * + *

Sample code: + * + *

{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (StorageClient storageClient = StorageClient.create()) {
+   *   String bucket = BucketName.of("[PROJECT]", "[BUCKET]").toString();
    *   String object = "object-1023368385";
    *   Object response = storageClient.getObject(bucket, object);
    * }
@@ -2221,7 +2352,43 @@ public final Object getObject(String bucket, String object) {
    * // - It may require specifying regional endpoints when creating the service client as shown in
    * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (StorageClient storageClient = StorageClient.create()) {
-   *   String bucket = "bucket-1378203158";
+   *   BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]");
+   *   String object = "object-1023368385";
+   *   long generation = 305703192;
+   *   Object response = storageClient.getObject(bucket, object, generation);
+   * }
+   * }
+ * + * @param bucket Required. Name of the bucket in which the object resides. + * @param object Required. Name of the object. + * @param generation If present, selects a specific revision of this object (as opposed to the + * latest version, the default). + * @throws com.google.api.gax.rpc.ApiException if the remote call fails + */ + public final Object getObject(BucketName bucket, String object, long generation) { + GetObjectRequest request = + GetObjectRequest.newBuilder() + .setBucket(bucket == null ? null : bucket.toString()) + .setObject(object) + .setGeneration(generation) + .build(); + return getObject(request); + } + + // AUTO-GENERATED DOCUMENTATION AND METHOD. + /** + * Retrieves an object's metadata. + * + *

Sample code: + * + *

{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (StorageClient storageClient = StorageClient.create()) {
+   *   String bucket = BucketName.of("[PROJECT]", "[BUCKET]").toString();
    *   String object = "object-1023368385";
    *   long generation = 305703192;
    *   Object response = storageClient.getObject(bucket, object, generation);
@@ -2259,7 +2426,7 @@ public final Object getObject(String bucket, String object, long generation) {
    * try (StorageClient storageClient = StorageClient.create()) {
    *   GetObjectRequest request =
    *       GetObjectRequest.newBuilder()
-   *           .setBucket("bucket-1378203158")
+   *           .setBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString())
    *           .setObject("object-1023368385")
    *           .setGeneration(305703192)
    *           .setIfGenerationMatch(-1086241088)
@@ -2295,7 +2462,7 @@ public final Object getObject(GetObjectRequest request) {
    * try (StorageClient storageClient = StorageClient.create()) {
    *   GetObjectRequest request =
    *       GetObjectRequest.newBuilder()
-   *           .setBucket("bucket-1378203158")
+   *           .setBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString())
    *           .setObject("object-1023368385")
    *           .setGeneration(305703192)
    *           .setIfGenerationMatch(-1086241088)
@@ -2330,7 +2497,7 @@ public final UnaryCallable getObjectCallable() {
    * try (StorageClient storageClient = StorageClient.create()) {
    *   ReadObjectRequest request =
    *       ReadObjectRequest.newBuilder()
-   *           .setBucket("bucket-1378203158")
+   *           .setBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString())
    *           .setObject("object-1023368385")
    *           .setGeneration(305703192)
    *           .setReadOffset(-715377828)
@@ -2381,8 +2548,7 @@ public final ServerStreamingCallable read
    *     field with the value `*`. Note: not recommended. If a new field is introduced at a
    *     later time, an older client updating with the `*` may accidentally reset the new
    *     field's value.
-   *     

Not specifying any fields is an error. Not specifying a field while setting that field - * to a non-default value is an error. + *

Not specifying any fields is an error. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final Object updateObject(Object object, FieldMask updateMask) { @@ -2561,7 +2727,7 @@ public final UnaryCallable updateObjectCallable() { * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library * try (StorageClient storageClient = StorageClient.create()) { - * ProjectName parent = ProjectName.of("[PROJECT]"); + * BucketName parent = BucketName.of("[PROJECT]", "[BUCKET]"); * for (Object element : storageClient.listObjects(parent).iterateAll()) { * // doThingsWith(element); * } @@ -2571,7 +2737,7 @@ public final UnaryCallable updateObjectCallable() { * @param parent Required. Name of the bucket in which to look for objects. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final ListObjectsPagedResponse listObjects(ProjectName parent) { + public final ListObjectsPagedResponse listObjects(BucketName parent) { ListObjectsRequest request = ListObjectsRequest.newBuilder() .setParent(parent == null ? null : parent.toString()) @@ -2592,7 +2758,7 @@ public final ListObjectsPagedResponse listObjects(ProjectName parent) { * // - It may require specifying regional endpoints when creating the service client as shown in * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library * try (StorageClient storageClient = StorageClient.create()) { - * String parent = ProjectName.of("[PROJECT]").toString(); + * String parent = BucketName.of("[PROJECT]", "[BUCKET]").toString(); * for (Object element : storageClient.listObjects(parent).iterateAll()) { * // doThingsWith(element); * } @@ -2622,7 +2788,7 @@ public final ListObjectsPagedResponse listObjects(String parent) { * try (StorageClient storageClient = StorageClient.create()) { * ListObjectsRequest request = * ListObjectsRequest.newBuilder() - * .setParent(ProjectName.of("[PROJECT]").toString()) + * .setParent(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setPageSize(883849137) * .setPageToken("pageToken873572522") * .setDelimiter("delimiter-250518009") @@ -2661,7 +2827,7 @@ public final ListObjectsPagedResponse listObjects(ListObjectsRequest request) { * try (StorageClient storageClient = StorageClient.create()) { * ListObjectsRequest request = * ListObjectsRequest.newBuilder() - * .setParent(ProjectName.of("[PROJECT]").toString()) + * .setParent(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setPageSize(883849137) * .setPageToken("pageToken873572522") * .setDelimiter("delimiter-250518009") @@ -2700,7 +2866,7 @@ public final ListObjectsPagedResponse listObjects(ListObjectsRequest request) { * try (StorageClient storageClient = StorageClient.create()) { * ListObjectsRequest request = * ListObjectsRequest.newBuilder() - * .setParent(ProjectName.of("[PROJECT]").toString()) + * .setParent(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setPageSize(883849137) * .setPageToken("pageToken873572522") * .setDelimiter("delimiter-250518009") @@ -2751,7 +2917,7 @@ public final UnaryCallable listObjectsC * CryptoKeyName.of("[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]") * .toString()) * .setDestination(Object.newBuilder().build()) - * .setSourceBucket("sourceBucket841604581") + * .setSourceBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setSourceObject("sourceObject1196439354") * .setSourceGeneration(1232209852) * .setRewriteToken("rewriteToken80654285") @@ -2803,7 +2969,7 @@ public final RewriteResponse rewriteObject(RewriteObjectRequest request) { * CryptoKeyName.of("[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]") * .toString()) * .setDestination(Object.newBuilder().build()) - * .setSourceBucket("sourceBucket841604581") + * .setSourceBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString()) * .setSourceObject("sourceObject1196439354") * .setSourceGeneration(1232209852) * .setRewriteToken("rewriteToken80654285") @@ -3031,8 +3197,8 @@ public final QueryWriteStatusResponse queryWriteStatus(QueryWriteStatusRequest r * } * }

* - * @param project Required. Project ID, in the format of "projects/<projectIdentifier>". - * <projectIdentifier> can be the project ID or project number. + * @param project Required. Project ID, in the format of "projects/{projectIdentifier}". + * {projectIdentifier} can be the project ID or project number. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ServiceAccount getServiceAccount(ProjectName project) { @@ -3061,8 +3227,8 @@ public final ServiceAccount getServiceAccount(ProjectName project) { * } * } * - * @param project Required. Project ID, in the format of "projects/<projectIdentifier>". - * <projectIdentifier> can be the project ID or project number. + * @param project Required. Project ID, in the format of "projects/{projectIdentifier}". + * {projectIdentifier} can be the project ID or project number. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ServiceAccount getServiceAccount(String project) { @@ -3147,8 +3313,8 @@ public final UnaryCallable getServiceA * } * * @param project Required. The project that the HMAC-owning service account lives in, in the - * format of "projects/<projectIdentifier>". <projectIdentifier> can be the - * project ID or project number. + * format of "projects/{projectIdentifier}". {projectIdentifier} can be the project ID or + * project number. * @param serviceAccountEmail Required. The service account to create the HMAC for. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -3182,8 +3348,8 @@ public final CreateHmacKeyResponse createHmacKey( * } * * @param project Required. The project that the HMAC-owning service account lives in, in the - * format of "projects/<projectIdentifier>". <projectIdentifier> can be the - * project ID or project number. + * format of "projects/{projectIdentifier}". {projectIdentifier} can be the project ID or + * project number. * @param serviceAccountEmail Required. The service account to create the HMAC for. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -3275,8 +3441,8 @@ public final UnaryCallable createHm * * @param accessId Required. The identifying key for the HMAC to delete. * @param project Required. The project that owns the HMAC key, in the format of - * "projects/<projectIdentifier>". <projectIdentifier> can be the project ID or - * project number. + * "projects/{projectIdentifier}". {projectIdentifier} can be the project ID or project + * number. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final void deleteHmacKey(String accessId, ProjectName project) { @@ -3309,8 +3475,8 @@ public final void deleteHmacKey(String accessId, ProjectName project) { * * @param accessId Required. The identifying key for the HMAC to delete. * @param project Required. The project that owns the HMAC key, in the format of - * "projects/<projectIdentifier>". <projectIdentifier> can be the project ID or - * project number. + * "projects/{projectIdentifier}". {projectIdentifier} can be the project ID or project + * number. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final void deleteHmacKey(String accessId, String project) { @@ -3397,8 +3563,8 @@ public final UnaryCallable deleteHmacKeyCallable() * * @param accessId Required. The identifying key for the HMAC to delete. * @param project Required. The project the HMAC key lies in, in the format of - * "projects/<projectIdentifier>". <projectIdentifier> can be the project ID or - * project number. + * "projects/{projectIdentifier}". {projectIdentifier} can be the project ID or project + * number. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final HmacKeyMetadata getHmacKey(String accessId, ProjectName project) { @@ -3431,8 +3597,8 @@ public final HmacKeyMetadata getHmacKey(String accessId, ProjectName project) { * * @param accessId Required. The identifying key for the HMAC to delete. * @param project Required. The project the HMAC key lies in, in the format of - * "projects/<projectIdentifier>". <projectIdentifier> can be the project ID or - * project number. + * "projects/{projectIdentifier}". {projectIdentifier} can be the project ID or project + * number. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final HmacKeyMetadata getHmacKey(String accessId, String project) { @@ -3519,8 +3685,8 @@ public final UnaryCallable getHmacKeyCallabl * } * * @param project Required. The project to list HMAC keys for, in the format of - * "projects/<projectIdentifier>". <projectIdentifier> can be the project ID or - * project number. + * "projects/{projectIdentifier}". {projectIdentifier} can be the project ID or project + * number. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ListHmacKeysPagedResponse listHmacKeys(ProjectName project) { @@ -3552,8 +3718,8 @@ public final ListHmacKeysPagedResponse listHmacKeys(ProjectName project) { * } * * @param project Required. The project to list HMAC keys for, in the format of - * "projects/<projectIdentifier>". <projectIdentifier> can be the project ID or - * project number. + * "projects/{projectIdentifier}". {projectIdentifier} can be the project ID or project + * number. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final ListHmacKeysPagedResponse listHmacKeys(String project) { diff --git a/gapic-google-cloud-storage-v2/src/main/resources/com/google/storage/v2/gapic_metadata.json b/gapic-google-cloud-storage-v2/src/main/resources/com/google/storage/v2/gapic_metadata.json index 45b0f2977..830838b06 100644 --- a/gapic-google-cloud-storage-v2/src/main/resources/com/google/storage/v2/gapic_metadata.json +++ b/gapic-google-cloud-storage-v2/src/main/resources/com/google/storage/v2/gapic_metadata.json @@ -35,7 +35,7 @@ "methods": ["deleteNotificationConfig", "deleteNotificationConfig", "deleteNotificationConfig", "deleteNotificationConfigCallable"] }, "DeleteObject": { - "methods": ["deleteObject", "deleteObject", "deleteObject", "deleteObjectCallable"] + "methods": ["deleteObject", "deleteObject", "deleteObject", "deleteObject", "deleteObject", "deleteObjectCallable"] }, "GetBucket": { "methods": ["getBucket", "getBucket", "getBucket", "getBucketCallable"] @@ -50,7 +50,7 @@ "methods": ["getNotificationConfig", "getNotificationConfig", "getNotificationConfig", "getNotificationConfigCallable"] }, "GetObject": { - "methods": ["getObject", "getObject", "getObject", "getObjectCallable"] + "methods": ["getObject", "getObject", "getObject", "getObject", "getObject", "getObjectCallable"] }, "GetServiceAccount": { "methods": ["getServiceAccount", "getServiceAccount", "getServiceAccount", "getServiceAccountCallable"] diff --git a/gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java b/gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java index 8584cb4b6..084838523 100644 --- a/gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java +++ b/gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java @@ -1071,7 +1071,8 @@ public void getNotificationConfigTest() throws Exception { .build(); mockStorage.addResponse(expectedResponse); - BucketName name = BucketName.of("[PROJECT]", "[BUCKET]"); + NotificationConfigName name = + NotificationConfigName.of("[PROJECT]", "[BUCKET]", "[NOTIFICATION_CONFIG]"); NotificationConfig actualResponse = client.getNotificationConfig(name); Assert.assertEquals(expectedResponse, actualResponse); @@ -1094,7 +1095,8 @@ public void getNotificationConfigExceptionTest() throws Exception { mockStorage.addException(exception); try { - BucketName name = BucketName.of("[PROJECT]", "[BUCKET]"); + NotificationConfigName name = + NotificationConfigName.of("[PROJECT]", "[BUCKET]", "[NOTIFICATION_CONFIG]"); client.getNotificationConfig(name); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -1165,7 +1167,7 @@ public void createNotificationConfigTest() throws Exception { .build(); mockStorage.addResponse(expectedResponse); - ProjectName parent = ProjectName.of("[PROJECT]"); + BucketName parent = BucketName.of("[PROJECT]", "[BUCKET]"); NotificationConfig notificationConfig = NotificationConfig.newBuilder().build(); NotificationConfig actualResponse = client.createNotificationConfig(parent, notificationConfig); @@ -1190,7 +1192,7 @@ public void createNotificationConfigExceptionTest() throws Exception { mockStorage.addException(exception); try { - ProjectName parent = ProjectName.of("[PROJECT]"); + BucketName parent = BucketName.of("[PROJECT]", "[BUCKET]"); NotificationConfig notificationConfig = NotificationConfig.newBuilder().build(); client.createNotificationConfig(parent, notificationConfig); Assert.fail("No exception raised"); @@ -1259,7 +1261,7 @@ public void listNotificationConfigsTest() throws Exception { .build(); mockStorage.addResponse(expectedResponse); - ProjectName parent = ProjectName.of("[PROJECT]"); + BucketName parent = BucketName.of("[PROJECT]", "[BUCKET]"); ListNotificationConfigsPagedResponse pagedListResponse = client.listNotificationConfigs(parent); @@ -1286,7 +1288,7 @@ public void listNotificationConfigsExceptionTest() throws Exception { mockStorage.addException(exception); try { - ProjectName parent = ProjectName.of("[PROJECT]"); + BucketName parent = BucketName.of("[PROJECT]", "[BUCKET]"); client.listNotificationConfigs(parent); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -1444,6 +1446,43 @@ public void deleteObjectTest() throws Exception { Empty expectedResponse = Empty.newBuilder().build(); mockStorage.addResponse(expectedResponse); + BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]"); + String object = "object-1023368385"; + + client.deleteObject(bucket, object); + + List actualRequests = mockStorage.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + DeleteObjectRequest actualRequest = ((DeleteObjectRequest) actualRequests.get(0)); + + Assert.assertEquals(bucket.toString(), actualRequest.getBucket()); + Assert.assertEquals(object, actualRequest.getObject()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void deleteObjectExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockStorage.addException(exception); + + try { + BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]"); + String object = "object-1023368385"; + client.deleteObject(bucket, object); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void deleteObjectTest2() throws Exception { + Empty expectedResponse = Empty.newBuilder().build(); + mockStorage.addResponse(expectedResponse); + String bucket = "bucket-1378203158"; String object = "object-1023368385"; @@ -1462,7 +1501,7 @@ public void deleteObjectTest() throws Exception { } @Test - public void deleteObjectExceptionTest() throws Exception { + public void deleteObjectExceptionTest2() throws Exception { StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); mockStorage.addException(exception); @@ -1477,7 +1516,47 @@ public void deleteObjectExceptionTest() throws Exception { } @Test - public void deleteObjectTest2() throws Exception { + public void deleteObjectTest3() throws Exception { + Empty expectedResponse = Empty.newBuilder().build(); + mockStorage.addResponse(expectedResponse); + + BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]"); + String object = "object-1023368385"; + long generation = 305703192; + + client.deleteObject(bucket, object, generation); + + List actualRequests = mockStorage.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + DeleteObjectRequest actualRequest = ((DeleteObjectRequest) actualRequests.get(0)); + + Assert.assertEquals(bucket.toString(), actualRequest.getBucket()); + Assert.assertEquals(object, actualRequest.getObject()); + Assert.assertEquals(generation, actualRequest.getGeneration()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void deleteObjectExceptionTest3() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockStorage.addException(exception); + + try { + BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]"); + String object = "object-1023368385"; + long generation = 305703192; + client.deleteObject(bucket, object, generation); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void deleteObjectTest4() throws Exception { Empty expectedResponse = Empty.newBuilder().build(); mockStorage.addResponse(expectedResponse); @@ -1501,7 +1580,7 @@ public void deleteObjectTest2() throws Exception { } @Test - public void deleteObjectExceptionTest2() throws Exception { + public void deleteObjectExceptionTest4() throws Exception { StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); mockStorage.addException(exception); @@ -1589,6 +1668,75 @@ public void getObjectTest() throws Exception { .build(); mockStorage.addResponse(expectedResponse); + BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]"); + String object = "object-1023368385"; + + Object actualResponse = client.getObject(bucket, object); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockStorage.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + GetObjectRequest actualRequest = ((GetObjectRequest) actualRequests.get(0)); + + Assert.assertEquals(bucket.toString(), actualRequest.getBucket()); + Assert.assertEquals(object, actualRequest.getObject()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void getObjectExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockStorage.addException(exception); + + try { + BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]"); + String object = "object-1023368385"; + client.getObject(bucket, object); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void getObjectTest2() throws Exception { + Object expectedResponse = + Object.newBuilder() + .setName("name3373707") + .setBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString()) + .setEtag("etag3123477") + .setGeneration(305703192) + .setMetageneration(1048558813) + .setStorageClass("storageClass871353277") + .setSize(3530753) + .setContentEncoding("contentEncoding-160088852") + .setContentDisposition("contentDisposition1034341758") + .setCacheControl("cacheControl-1336592517") + .addAllAcl(new ArrayList()) + .setContentLanguage("contentLanguage810066673") + .setDeleteTime(Timestamp.newBuilder().build()) + .setContentType("contentType-389131437") + .setCreateTime(Timestamp.newBuilder().build()) + .setComponentCount(-485073075) + .setChecksums(ObjectChecksums.newBuilder().build()) + .setUpdateTime(Timestamp.newBuilder().build()) + .setKmsKey( + CryptoKeyName.of("[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]") + .toString()) + .setUpdateStorageClassTime(Timestamp.newBuilder().build()) + .setTemporaryHold(true) + .setRetentionExpireTime(Timestamp.newBuilder().build()) + .putAllMetadata(new HashMap()) + .setEventBasedHold(true) + .setOwner(Owner.newBuilder().build()) + .setCustomerEncryption(CustomerEncryption.newBuilder().build()) + .setCustomTime(Timestamp.newBuilder().build()) + .build(); + mockStorage.addResponse(expectedResponse); + String bucket = "bucket-1378203158"; String object = "object-1023368385"; @@ -1608,7 +1756,7 @@ public void getObjectTest() throws Exception { } @Test - public void getObjectExceptionTest() throws Exception { + public void getObjectExceptionTest2() throws Exception { StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); mockStorage.addException(exception); @@ -1623,7 +1771,79 @@ public void getObjectExceptionTest() throws Exception { } @Test - public void getObjectTest2() throws Exception { + public void getObjectTest3() throws Exception { + Object expectedResponse = + Object.newBuilder() + .setName("name3373707") + .setBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString()) + .setEtag("etag3123477") + .setGeneration(305703192) + .setMetageneration(1048558813) + .setStorageClass("storageClass871353277") + .setSize(3530753) + .setContentEncoding("contentEncoding-160088852") + .setContentDisposition("contentDisposition1034341758") + .setCacheControl("cacheControl-1336592517") + .addAllAcl(new ArrayList()) + .setContentLanguage("contentLanguage810066673") + .setDeleteTime(Timestamp.newBuilder().build()) + .setContentType("contentType-389131437") + .setCreateTime(Timestamp.newBuilder().build()) + .setComponentCount(-485073075) + .setChecksums(ObjectChecksums.newBuilder().build()) + .setUpdateTime(Timestamp.newBuilder().build()) + .setKmsKey( + CryptoKeyName.of("[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]") + .toString()) + .setUpdateStorageClassTime(Timestamp.newBuilder().build()) + .setTemporaryHold(true) + .setRetentionExpireTime(Timestamp.newBuilder().build()) + .putAllMetadata(new HashMap()) + .setEventBasedHold(true) + .setOwner(Owner.newBuilder().build()) + .setCustomerEncryption(CustomerEncryption.newBuilder().build()) + .setCustomTime(Timestamp.newBuilder().build()) + .build(); + mockStorage.addResponse(expectedResponse); + + BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]"); + String object = "object-1023368385"; + long generation = 305703192; + + Object actualResponse = client.getObject(bucket, object, generation); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockStorage.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + GetObjectRequest actualRequest = ((GetObjectRequest) actualRequests.get(0)); + + Assert.assertEquals(bucket.toString(), actualRequest.getBucket()); + Assert.assertEquals(object, actualRequest.getObject()); + Assert.assertEquals(generation, actualRequest.getGeneration()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + public void getObjectExceptionTest3() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); + mockStorage.addException(exception); + + try { + BucketName bucket = BucketName.of("[PROJECT]", "[BUCKET]"); + String object = "object-1023368385"; + long generation = 305703192; + client.getObject(bucket, object, generation); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception. + } + } + + @Test + public void getObjectTest4() throws Exception { Object expectedResponse = Object.newBuilder() .setName("name3373707") @@ -1679,7 +1899,7 @@ public void getObjectTest2() throws Exception { } @Test - public void getObjectExceptionTest2() throws Exception { + public void getObjectExceptionTest4() throws Exception { StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT); mockStorage.addException(exception); @@ -1706,7 +1926,7 @@ public void readObjectTest() throws Exception { mockStorage.addResponse(expectedResponse); ReadObjectRequest request = ReadObjectRequest.newBuilder() - .setBucket("bucket-1378203158") + .setBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString()) .setObject("object-1023368385") .setGeneration(305703192) .setReadOffset(-715377828) @@ -1736,7 +1956,7 @@ public void readObjectExceptionTest() throws Exception { mockStorage.addException(exception); ReadObjectRequest request = ReadObjectRequest.newBuilder() - .setBucket("bucket-1378203158") + .setBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString()) .setObject("object-1023368385") .setGeneration(305703192) .setReadOffset(-715377828) @@ -1902,7 +2122,7 @@ public void listObjectsTest() throws Exception { .build(); mockStorage.addResponse(expectedResponse); - ProjectName parent = ProjectName.of("[PROJECT]"); + BucketName parent = BucketName.of("[PROJECT]", "[BUCKET]"); ListObjectsPagedResponse pagedListResponse = client.listObjects(parent); @@ -1928,7 +2148,7 @@ public void listObjectsExceptionTest() throws Exception { mockStorage.addException(exception); try { - ProjectName parent = ProjectName.of("[PROJECT]"); + BucketName parent = BucketName.of("[PROJECT]", "[BUCKET]"); client.listObjects(parent); Assert.fail("No exception raised"); } catch (InvalidArgumentException e) { @@ -2000,7 +2220,7 @@ public void rewriteObjectTest() throws Exception { CryptoKeyName.of("[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]") .toString()) .setDestination(Object.newBuilder().build()) - .setSourceBucket("sourceBucket841604581") + .setSourceBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString()) .setSourceObject("sourceObject1196439354") .setSourceGeneration(1232209852) .setRewriteToken("rewriteToken80654285") @@ -2086,7 +2306,7 @@ public void rewriteObjectExceptionTest() throws Exception { CryptoKeyName.of("[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]") .toString()) .setDestination(Object.newBuilder().build()) - .setSourceBucket("sourceBucket841604581") + .setSourceBucket(BucketName.of("[PROJECT]", "[BUCKET]").toString()) .setSourceObject("sourceObject1196439354") .setSourceGeneration(1232209852) .setRewriteToken("rewriteToken80654285") diff --git a/grpc-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageGrpc.java b/grpc-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageGrpc.java index 88d497aa4..d837bfde0 100644 --- a/grpc-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageGrpc.java +++ b/grpc-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageGrpc.java @@ -1377,7 +1377,7 @@ public StorageFutureStub newStub( * any other character (no special directory semantics). * */ - public abstract static class StorageImplBase implements io.grpc.BindableService { + public interface AsyncService { /** * @@ -1386,7 +1386,7 @@ public abstract static class StorageImplBase implements io.grpc.BindableService * Permanently deletes an empty bucket. * */ - public void deleteBucket( + default void deleteBucket( com.google.storage.v2.DeleteBucketRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1400,7 +1400,7 @@ public void deleteBucket( * Returns metadata for the specified bucket. * */ - public void getBucket( + default void getBucket( com.google.storage.v2.GetBucketRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetBucketMethod(), responseObserver); @@ -1413,7 +1413,7 @@ public void getBucket( * Creates a new bucket. * */ - public void createBucket( + default void createBucket( com.google.storage.v2.CreateBucketRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1427,7 +1427,7 @@ public void createBucket( * Retrieves a list of buckets for a given project. * */ - public void listBuckets( + default void listBuckets( com.google.storage.v2.ListBucketsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1441,7 +1441,7 @@ public void listBuckets( * Locks retention policy on a bucket. * */ - public void lockBucketRetentionPolicy( + default void lockBucketRetentionPolicy( com.google.storage.v2.LockBucketRetentionPolicyRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1458,7 +1458,7 @@ public void lockBucketRetentionPolicy( * projects/_/buckets/<bucket_name>/objects/<object_name> for an object. * */ - public void getIamPolicy( + default void getIamPolicy( com.google.iam.v1.GetIamPolicyRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1475,7 +1475,7 @@ public void getIamPolicy( * projects/_/buckets/<bucket_name>/objects/<object_name> for an object. * */ - public void setIamPolicy( + default void setIamPolicy( com.google.iam.v1.SetIamPolicyRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1493,7 +1493,7 @@ public void setIamPolicy( * projects/_/buckets/<bucket_name>/objects/<object_name> for an object. * */ - public void testIamPermissions( + default void testIamPermissions( com.google.iam.v1.TestIamPermissionsRequest request, io.grpc.stub.StreamObserver responseObserver) { @@ -1508,7 +1508,7 @@ public void testIamPermissions( * Updates a bucket. Equivalent to JSON API's storage.buckets.patch method. * */ - public void updateBucket( + default void updateBucket( com.google.storage.v2.UpdateBucketRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1522,7 +1522,7 @@ public void updateBucket( * Permanently deletes a NotificationConfig. * */ - public void deleteNotificationConfig( + default void deleteNotificationConfig( com.google.storage.v2.DeleteNotificationConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1536,7 +1536,7 @@ public void deleteNotificationConfig( * View a NotificationConfig. * */ - public void getNotificationConfig( + default void getNotificationConfig( com.google.storage.v2.GetNotificationConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1553,7 +1553,7 @@ public void getNotificationConfig( * https://cloud.google.com/storage/docs/pubsub-notifications. * */ - public void createNotificationConfig( + default void createNotificationConfig( com.google.storage.v2.CreateNotificationConfigRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1567,7 +1567,7 @@ public void createNotificationConfig( * Retrieves a list of NotificationConfigs for a given bucket. * */ - public void listNotificationConfigs( + default void listNotificationConfigs( com.google.storage.v2.ListNotificationConfigsRequest request, io.grpc.stub.StreamObserver responseObserver) { @@ -1583,7 +1583,7 @@ public void listNotificationConfigs( * bucket. * */ - public void composeObject( + default void composeObject( com.google.storage.v2.ComposeObjectRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1594,11 +1594,14 @@ public void composeObject( * * *
-     * Deletes an object and its metadata. Deletions are permanent if versioning
-     * is not enabled for the bucket, or if the `generation` parameter is used.
+     * Deletes an object and its metadata.
+     * Deletions are normally permanent when versioning is disabled or whenever
+     * the generation parameter is used. However, if soft delete is enabled for
+     * the bucket, deleted objects can be restored using RestoreObject until the
+     * soft delete retention period has passed.
      * 
*/ - public void deleteObject( + default void deleteObject( com.google.storage.v2.DeleteObjectRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1612,7 +1615,7 @@ public void deleteObject( * Cancels an in-progress resumable upload. * */ - public void cancelResumableWrite( + default void cancelResumableWrite( com.google.storage.v2.CancelResumableWriteRequest request, io.grpc.stub.StreamObserver responseObserver) { @@ -1627,7 +1630,7 @@ public void cancelResumableWrite( * Retrieves an object's metadata. * */ - public void getObject( + default void getObject( com.google.storage.v2.GetObjectRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetObjectMethod(), responseObserver); @@ -1640,7 +1643,7 @@ public void getObject( * Reads an object's data. * */ - public void readObject( + default void readObject( com.google.storage.v2.ReadObjectRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getReadObjectMethod(), responseObserver); @@ -1654,7 +1657,7 @@ public void readObject( * Equivalent to JSON API's storage.objects.patch. * */ - public void updateObject( + default void updateObject( com.google.storage.v2.UpdateObjectRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1716,7 +1719,7 @@ public void updateObject( * metadata. * */ - public io.grpc.stub.StreamObserver writeObject( + default io.grpc.stub.StreamObserver writeObject( io.grpc.stub.StreamObserver responseObserver) { return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall( getWriteObjectMethod(), responseObserver); @@ -1729,7 +1732,7 @@ public io.grpc.stub.StreamObserver wri * Retrieves a list of objects matching the criteria. * */ - public void listObjects( + default void listObjects( com.google.storage.v2.ListObjectsRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1744,7 +1747,7 @@ public void listObjects( * metadata. * */ - public void rewriteObject( + default void rewriteObject( com.google.storage.v2.RewriteObjectRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1760,7 +1763,7 @@ public void rewriteObject( * service-dependent. * */ - public void startResumableWrite( + default void startResumableWrite( com.google.storage.v2.StartResumableWriteRequest request, io.grpc.stub.StreamObserver responseObserver) { @@ -1785,7 +1788,7 @@ public void startResumableWrite( * non-decreasing. * */ - public void queryWriteStatus( + default void queryWriteStatus( com.google.storage.v2.QueryWriteStatusRequest request, io.grpc.stub.StreamObserver responseObserver) { @@ -1800,7 +1803,7 @@ public void queryWriteStatus( * Retrieves the name of a project's Google Cloud Storage service account. * */ - public void getServiceAccount( + default void getServiceAccount( com.google.storage.v2.GetServiceAccountRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1814,7 +1817,7 @@ public void getServiceAccount( * Creates a new HMAC key for the given service account. * */ - public void createHmacKey( + default void createHmacKey( com.google.storage.v2.CreateHmacKeyRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1828,7 +1831,7 @@ public void createHmacKey( * Deletes a given HMAC key. Key must be in an INACTIVE state. * */ - public void deleteHmacKey( + default void deleteHmacKey( com.google.storage.v2.DeleteHmacKeyRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1842,7 +1845,7 @@ public void deleteHmacKey( * Gets an existing HMAC key metadata for the given id. * */ - public void getHmacKey( + default void getHmacKey( com.google.storage.v2.GetHmacKeyRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetHmacKeyMethod(), responseObserver); @@ -1855,7 +1858,7 @@ public void getHmacKey( * Lists HMAC keys under a given project with the additional filters provided. * */ - public void listHmacKeys( + default void listHmacKeys( com.google.storage.v2.ListHmacKeysRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( @@ -1869,209 +1872,48 @@ public void listHmacKeys( * Updates a given HMAC key state between ACTIVE and INACTIVE. * */ - public void updateHmacKey( + default void updateHmacKey( com.google.storage.v2.UpdateHmacKeyRequest request, io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall( getUpdateHmacKeyMethod(), responseObserver); } + } + + /** + * Base class for the server implementation of the service Storage. + * + *
+   * ## API Overview and Naming Syntax
+   * The Cloud Storage gRPC API allows applications to read and write data through
+   * the abstractions of buckets and objects. For a description of these
+   * abstractions please see https://cloud.google.com/storage/docs.
+   * Resources are named as follows:
+   *   - Projects are referred to as they are defined by the Resource Manager API,
+   *     using strings like `projects/123456` or `projects/my-string-id`.
+   *   - Buckets are named using string names of the form:
+   *     `projects/{project}/buckets/{bucket}`
+   *     For globally unique buckets, `_` may be substituted for the project.
+   *   - Objects are uniquely identified by their name along with the name of the
+   *     bucket they belong to, as separate strings in this API. For example:
+   *       ReadObjectRequest {
+   *         bucket: 'projects/_/buckets/my-bucket'
+   *         object: 'my-object'
+   *       }
+   *     Note that object names can contain `/` characters, which are treated as
+   *     any other character (no special directory semantics).
+   * 
+ */ + public abstract static class StorageImplBase implements io.grpc.BindableService, AsyncService { @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - getDeleteBucketMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.DeleteBucketRequest, com.google.protobuf.Empty>( - this, METHODID_DELETE_BUCKET))) - .addMethod( - getGetBucketMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.GetBucketRequest, com.google.storage.v2.Bucket>( - this, METHODID_GET_BUCKET))) - .addMethod( - getCreateBucketMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.CreateBucketRequest, com.google.storage.v2.Bucket>( - this, METHODID_CREATE_BUCKET))) - .addMethod( - getListBucketsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.ListBucketsRequest, - com.google.storage.v2.ListBucketsResponse>(this, METHODID_LIST_BUCKETS))) - .addMethod( - getLockBucketRetentionPolicyMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.LockBucketRetentionPolicyRequest, - com.google.storage.v2.Bucket>(this, METHODID_LOCK_BUCKET_RETENTION_POLICY))) - .addMethod( - getGetIamPolicyMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.iam.v1.GetIamPolicyRequest, com.google.iam.v1.Policy>( - this, METHODID_GET_IAM_POLICY))) - .addMethod( - getSetIamPolicyMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.iam.v1.SetIamPolicyRequest, com.google.iam.v1.Policy>( - this, METHODID_SET_IAM_POLICY))) - .addMethod( - getTestIamPermissionsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.iam.v1.TestIamPermissionsRequest, - com.google.iam.v1.TestIamPermissionsResponse>( - this, METHODID_TEST_IAM_PERMISSIONS))) - .addMethod( - getUpdateBucketMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.UpdateBucketRequest, com.google.storage.v2.Bucket>( - this, METHODID_UPDATE_BUCKET))) - .addMethod( - getDeleteNotificationConfigMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.DeleteNotificationConfigRequest, - com.google.protobuf.Empty>(this, METHODID_DELETE_NOTIFICATION_CONFIG))) - .addMethod( - getGetNotificationConfigMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.GetNotificationConfigRequest, - com.google.storage.v2.NotificationConfig>( - this, METHODID_GET_NOTIFICATION_CONFIG))) - .addMethod( - getCreateNotificationConfigMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.CreateNotificationConfigRequest, - com.google.storage.v2.NotificationConfig>( - this, METHODID_CREATE_NOTIFICATION_CONFIG))) - .addMethod( - getListNotificationConfigsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.ListNotificationConfigsRequest, - com.google.storage.v2.ListNotificationConfigsResponse>( - this, METHODID_LIST_NOTIFICATION_CONFIGS))) - .addMethod( - getComposeObjectMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.ComposeObjectRequest, com.google.storage.v2.Object>( - this, METHODID_COMPOSE_OBJECT))) - .addMethod( - getDeleteObjectMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.DeleteObjectRequest, com.google.protobuf.Empty>( - this, METHODID_DELETE_OBJECT))) - .addMethod( - getCancelResumableWriteMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.CancelResumableWriteRequest, - com.google.storage.v2.CancelResumableWriteResponse>( - this, METHODID_CANCEL_RESUMABLE_WRITE))) - .addMethod( - getGetObjectMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.GetObjectRequest, com.google.storage.v2.Object>( - this, METHODID_GET_OBJECT))) - .addMethod( - getReadObjectMethod(), - io.grpc.stub.ServerCalls.asyncServerStreamingCall( - new MethodHandlers< - com.google.storage.v2.ReadObjectRequest, - com.google.storage.v2.ReadObjectResponse>(this, METHODID_READ_OBJECT))) - .addMethod( - getUpdateObjectMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.UpdateObjectRequest, com.google.storage.v2.Object>( - this, METHODID_UPDATE_OBJECT))) - .addMethod( - getWriteObjectMethod(), - io.grpc.stub.ServerCalls.asyncClientStreamingCall( - new MethodHandlers< - com.google.storage.v2.WriteObjectRequest, - com.google.storage.v2.WriteObjectResponse>(this, METHODID_WRITE_OBJECT))) - .addMethod( - getListObjectsMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.ListObjectsRequest, - com.google.storage.v2.ListObjectsResponse>(this, METHODID_LIST_OBJECTS))) - .addMethod( - getRewriteObjectMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.RewriteObjectRequest, - com.google.storage.v2.RewriteResponse>(this, METHODID_REWRITE_OBJECT))) - .addMethod( - getStartResumableWriteMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.StartResumableWriteRequest, - com.google.storage.v2.StartResumableWriteResponse>( - this, METHODID_START_RESUMABLE_WRITE))) - .addMethod( - getQueryWriteStatusMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.QueryWriteStatusRequest, - com.google.storage.v2.QueryWriteStatusResponse>( - this, METHODID_QUERY_WRITE_STATUS))) - .addMethod( - getGetServiceAccountMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.GetServiceAccountRequest, - com.google.storage.v2.ServiceAccount>(this, METHODID_GET_SERVICE_ACCOUNT))) - .addMethod( - getCreateHmacKeyMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.CreateHmacKeyRequest, - com.google.storage.v2.CreateHmacKeyResponse>(this, METHODID_CREATE_HMAC_KEY))) - .addMethod( - getDeleteHmacKeyMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.DeleteHmacKeyRequest, com.google.protobuf.Empty>( - this, METHODID_DELETE_HMAC_KEY))) - .addMethod( - getGetHmacKeyMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.GetHmacKeyRequest, - com.google.storage.v2.HmacKeyMetadata>(this, METHODID_GET_HMAC_KEY))) - .addMethod( - getListHmacKeysMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.ListHmacKeysRequest, - com.google.storage.v2.ListHmacKeysResponse>(this, METHODID_LIST_HMAC_KEYS))) - .addMethod( - getUpdateHmacKeyMethod(), - io.grpc.stub.ServerCalls.asyncUnaryCall( - new MethodHandlers< - com.google.storage.v2.UpdateHmacKeyRequest, - com.google.storage.v2.HmacKeyMetadata>(this, METHODID_UPDATE_HMAC_KEY))) - .build(); + return StorageGrpc.bindService(this); } } /** - * + * A stub to allow clients to do asynchronous rpc calls to service Storage. * *
    * ## API Overview and Naming Syntax
@@ -2346,8 +2188,11 @@ public void composeObject(
      *
      *
      * 
-     * Deletes an object and its metadata. Deletions are permanent if versioning
-     * is not enabled for the bucket, or if the `generation` parameter is used.
+     * Deletes an object and its metadata.
+     * Deletions are normally permanent when versioning is disabled or whenever
+     * the generation parameter is used. However, if soft delete is enabled for
+     * the bucket, deleted objects can be restored using RestoreObject until the
+     * soft delete retention period has passed.
      * 
*/ public void deleteObject( @@ -2657,7 +2502,7 @@ public void updateHmacKey( } /** - * + * A stub to allow clients to do synchronous rpc calls to service Storage. * *
    * ## API Overview and Naming Syntax
@@ -2888,8 +2733,11 @@ public com.google.storage.v2.Object composeObject(
      *
      *
      * 
-     * Deletes an object and its metadata. Deletions are permanent if versioning
-     * is not enabled for the bucket, or if the `generation` parameter is used.
+     * Deletes an object and its metadata.
+     * Deletions are normally permanent when versioning is disabled or whenever
+     * the generation parameter is used. However, if soft delete is enabled for
+     * the bucket, deleted objects can be restored using RestoreObject until the
+     * soft delete retention period has passed.
      * 
*/ public com.google.protobuf.Empty deleteObject( @@ -3095,7 +2943,7 @@ public com.google.storage.v2.HmacKeyMetadata updateHmacKey( } /** - * + * A stub to allow clients to do ListenableFuture-style rpc calls to service Storage. * *
    * ## API Overview and Naming Syntax
@@ -3334,8 +3182,11 @@ protected StorageFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions c
      *
      *
      * 
-     * Deletes an object and its metadata. Deletions are permanent if versioning
-     * is not enabled for the bucket, or if the `generation` parameter is used.
+     * Deletes an object and its metadata.
+     * Deletions are normally permanent when versioning is disabled or whenever
+     * the generation parameter is used. However, if soft delete is enabled for
+     * the bucket, deleted objects can be restored using RestoreObject until the
+     * soft delete retention period has passed.
      * 
*/ public com.google.common.util.concurrent.ListenableFuture @@ -3570,10 +3421,10 @@ private static final class MethodHandlers io.grpc.stub.ServerCalls.ServerStreamingMethod, io.grpc.stub.ServerCalls.ClientStreamingMethod, io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final StorageImplBase serviceImpl; + private final AsyncService serviceImpl; private final int methodId; - MethodHandlers(StorageImplBase serviceImpl, int methodId) { + MethodHandlers(AsyncService serviceImpl, int methodId) { this.serviceImpl = serviceImpl; this.methodId = methodId; } @@ -3763,6 +3614,197 @@ public io.grpc.stub.StreamObserver invoke( } } + public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) { + return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) + .addMethod( + getDeleteBucketMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.DeleteBucketRequest, com.google.protobuf.Empty>( + service, METHODID_DELETE_BUCKET))) + .addMethod( + getGetBucketMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.GetBucketRequest, com.google.storage.v2.Bucket>( + service, METHODID_GET_BUCKET))) + .addMethod( + getCreateBucketMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.CreateBucketRequest, com.google.storage.v2.Bucket>( + service, METHODID_CREATE_BUCKET))) + .addMethod( + getListBucketsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.ListBucketsRequest, + com.google.storage.v2.ListBucketsResponse>(service, METHODID_LIST_BUCKETS))) + .addMethod( + getLockBucketRetentionPolicyMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.LockBucketRetentionPolicyRequest, + com.google.storage.v2.Bucket>(service, METHODID_LOCK_BUCKET_RETENTION_POLICY))) + .addMethod( + getGetIamPolicyMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers( + service, METHODID_GET_IAM_POLICY))) + .addMethod( + getSetIamPolicyMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers( + service, METHODID_SET_IAM_POLICY))) + .addMethod( + getTestIamPermissionsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.iam.v1.TestIamPermissionsRequest, + com.google.iam.v1.TestIamPermissionsResponse>( + service, METHODID_TEST_IAM_PERMISSIONS))) + .addMethod( + getUpdateBucketMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.UpdateBucketRequest, com.google.storage.v2.Bucket>( + service, METHODID_UPDATE_BUCKET))) + .addMethod( + getDeleteNotificationConfigMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.DeleteNotificationConfigRequest, + com.google.protobuf.Empty>(service, METHODID_DELETE_NOTIFICATION_CONFIG))) + .addMethod( + getGetNotificationConfigMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.GetNotificationConfigRequest, + com.google.storage.v2.NotificationConfig>( + service, METHODID_GET_NOTIFICATION_CONFIG))) + .addMethod( + getCreateNotificationConfigMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.CreateNotificationConfigRequest, + com.google.storage.v2.NotificationConfig>( + service, METHODID_CREATE_NOTIFICATION_CONFIG))) + .addMethod( + getListNotificationConfigsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.ListNotificationConfigsRequest, + com.google.storage.v2.ListNotificationConfigsResponse>( + service, METHODID_LIST_NOTIFICATION_CONFIGS))) + .addMethod( + getComposeObjectMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.ComposeObjectRequest, com.google.storage.v2.Object>( + service, METHODID_COMPOSE_OBJECT))) + .addMethod( + getDeleteObjectMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.DeleteObjectRequest, com.google.protobuf.Empty>( + service, METHODID_DELETE_OBJECT))) + .addMethod( + getCancelResumableWriteMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.CancelResumableWriteRequest, + com.google.storage.v2.CancelResumableWriteResponse>( + service, METHODID_CANCEL_RESUMABLE_WRITE))) + .addMethod( + getGetObjectMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.GetObjectRequest, com.google.storage.v2.Object>( + service, METHODID_GET_OBJECT))) + .addMethod( + getReadObjectMethod(), + io.grpc.stub.ServerCalls.asyncServerStreamingCall( + new MethodHandlers< + com.google.storage.v2.ReadObjectRequest, + com.google.storage.v2.ReadObjectResponse>(service, METHODID_READ_OBJECT))) + .addMethod( + getUpdateObjectMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.UpdateObjectRequest, com.google.storage.v2.Object>( + service, METHODID_UPDATE_OBJECT))) + .addMethod( + getWriteObjectMethod(), + io.grpc.stub.ServerCalls.asyncClientStreamingCall( + new MethodHandlers< + com.google.storage.v2.WriteObjectRequest, + com.google.storage.v2.WriteObjectResponse>(service, METHODID_WRITE_OBJECT))) + .addMethod( + getListObjectsMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.ListObjectsRequest, + com.google.storage.v2.ListObjectsResponse>(service, METHODID_LIST_OBJECTS))) + .addMethod( + getRewriteObjectMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.RewriteObjectRequest, + com.google.storage.v2.RewriteResponse>(service, METHODID_REWRITE_OBJECT))) + .addMethod( + getStartResumableWriteMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.StartResumableWriteRequest, + com.google.storage.v2.StartResumableWriteResponse>( + service, METHODID_START_RESUMABLE_WRITE))) + .addMethod( + getQueryWriteStatusMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.QueryWriteStatusRequest, + com.google.storage.v2.QueryWriteStatusResponse>( + service, METHODID_QUERY_WRITE_STATUS))) + .addMethod( + getGetServiceAccountMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.GetServiceAccountRequest, + com.google.storage.v2.ServiceAccount>(service, METHODID_GET_SERVICE_ACCOUNT))) + .addMethod( + getCreateHmacKeyMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.CreateHmacKeyRequest, + com.google.storage.v2.CreateHmacKeyResponse>( + service, METHODID_CREATE_HMAC_KEY))) + .addMethod( + getDeleteHmacKeyMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.DeleteHmacKeyRequest, com.google.protobuf.Empty>( + service, METHODID_DELETE_HMAC_KEY))) + .addMethod( + getGetHmacKeyMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.GetHmacKeyRequest, com.google.storage.v2.HmacKeyMetadata>( + service, METHODID_GET_HMAC_KEY))) + .addMethod( + getListHmacKeysMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.ListHmacKeysRequest, + com.google.storage.v2.ListHmacKeysResponse>(service, METHODID_LIST_HMAC_KEYS))) + .addMethod( + getUpdateHmacKeyMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + com.google.storage.v2.UpdateHmacKeyRequest, + com.google.storage.v2.HmacKeyMetadata>(service, METHODID_UPDATE_HMAC_KEY))) + .build(); + } + private abstract static class StorageBaseDescriptorSupplier implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier { diff --git a/proto-google-cloud-storage-v2/clirr-ignored-differences.xml b/proto-google-cloud-storage-v2/clirr-ignored-differences.xml index a46a701fe..84023400b 100644 --- a/proto-google-cloud-storage-v2/clirr-ignored-differences.xml +++ b/proto-google-cloud-storage-v2/clirr-ignored-differences.xml @@ -20,5 +20,16 @@ com/google/storage/v2/*Notification* + + + 6011 + com/google/storage/v2/* + RETENTION_PERIOD_FIELD_NUMBER + + + 7002 + com/google/storage/v2/* + * *RetentionPeriod*(*) + diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/Bucket.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/Bucket.java index 4f96c331b..5af764aad 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/Bucket.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/Bucket.java @@ -12003,37 +12003,6 @@ public interface RetentionPolicyOrBuilder */ boolean getIsLocked(); - /** - * - * - *
-     * The duration in seconds that objects need to be retained. Retention
-     * duration must be greater than zero and less than 100 years. Note that
-     * enforcement of retention periods less than a day is not guaranteed. Such
-     * periods should only be used for testing purposes.
-     * 
- * - * optional int64 retention_period = 3; - * - * @return Whether the retentionPeriod field is set. - */ - boolean hasRetentionPeriod(); - /** - * - * - *
-     * The duration in seconds that objects need to be retained. Retention
-     * duration must be greater than zero and less than 100 years. Note that
-     * enforcement of retention periods less than a day is not guaranteed. Such
-     * periods should only be used for testing purposes.
-     * 
- * - * optional int64 retention_period = 3; - * - * @return The retentionPeriod. - */ - long getRetentionPeriod(); - /** * * @@ -12128,7 +12097,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.storage.v2.Bucket.RetentionPolicy.Builder.class); } - private int bitField0_; public static final int EFFECTIVE_TIME_FIELD_NUMBER = 1; private com.google.protobuf.Timestamp effectiveTime_; /** @@ -12200,45 +12168,6 @@ public boolean getIsLocked() { return isLocked_; } - public static final int RETENTION_PERIOD_FIELD_NUMBER = 3; - private long retentionPeriod_ = 0L; - /** - * - * - *
-     * The duration in seconds that objects need to be retained. Retention
-     * duration must be greater than zero and less than 100 years. Note that
-     * enforcement of retention periods less than a day is not guaranteed. Such
-     * periods should only be used for testing purposes.
-     * 
- * - * optional int64 retention_period = 3; - * - * @return Whether the retentionPeriod field is set. - */ - @java.lang.Override - public boolean hasRetentionPeriod() { - return ((bitField0_ & 0x00000001) != 0); - } - /** - * - * - *
-     * The duration in seconds that objects need to be retained. Retention
-     * duration must be greater than zero and less than 100 years. Note that
-     * enforcement of retention periods less than a day is not guaranteed. Such
-     * periods should only be used for testing purposes.
-     * 
- * - * optional int64 retention_period = 3; - * - * @return The retentionPeriod. - */ - @java.lang.Override - public long getRetentionPeriod() { - return retentionPeriod_; - } - public static final int RETENTION_DURATION_FIELD_NUMBER = 4; private com.google.protobuf.Duration retentionDuration_; /** @@ -12321,9 +12250,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (isLocked_ != false) { output.writeBool(2, isLocked_); } - if (((bitField0_ & 0x00000001) != 0)) { - output.writeInt64(3, retentionPeriod_); - } if (retentionDuration_ != null) { output.writeMessage(4, getRetentionDuration()); } @@ -12342,9 +12268,6 @@ public int getSerializedSize() { if (isLocked_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, isLocked_); } - if (((bitField0_ & 0x00000001) != 0)) { - size += com.google.protobuf.CodedOutputStream.computeInt64Size(3, retentionPeriod_); - } if (retentionDuration_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getRetentionDuration()); } @@ -12369,10 +12292,6 @@ public boolean equals(final java.lang.Object obj) { if (!getEffectiveTime().equals(other.getEffectiveTime())) return false; } if (getIsLocked() != other.getIsLocked()) return false; - if (hasRetentionPeriod() != other.hasRetentionPeriod()) return false; - if (hasRetentionPeriod()) { - if (getRetentionPeriod() != other.getRetentionPeriod()) return false; - } if (hasRetentionDuration() != other.hasRetentionDuration()) return false; if (hasRetentionDuration()) { if (!getRetentionDuration().equals(other.getRetentionDuration())) return false; @@ -12394,10 +12313,6 @@ public int hashCode() { } hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getIsLocked()); - if (hasRetentionPeriod()) { - hash = (37 * hash) + RETENTION_PERIOD_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getRetentionPeriod()); - } if (hasRetentionDuration()) { hash = (37 * hash) + RETENTION_DURATION_FIELD_NUMBER; hash = (53 * hash) + getRetentionDuration().hashCode(); @@ -12549,7 +12464,6 @@ public Builder clear() { effectiveTimeBuilder_ = null; } isLocked_ = false; - retentionPeriod_ = 0L; retentionDuration_ = null; if (retentionDurationBuilder_ != null) { retentionDurationBuilder_.dispose(); @@ -12598,18 +12512,12 @@ private void buildPartial0(com.google.storage.v2.Bucket.RetentionPolicy result) if (((from_bitField0_ & 0x00000002) != 0)) { result.isLocked_ = isLocked_; } - int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000004) != 0)) { - result.retentionPeriod_ = retentionPeriod_; - to_bitField0_ |= 0x00000001; - } - if (((from_bitField0_ & 0x00000008) != 0)) { result.retentionDuration_ = retentionDurationBuilder_ == null ? retentionDuration_ : retentionDurationBuilder_.build(); } - result.bitField0_ |= to_bitField0_; } @java.lang.Override @@ -12665,9 +12573,6 @@ public Builder mergeFrom(com.google.storage.v2.Bucket.RetentionPolicy other) { if (other.getIsLocked() != false) { setIsLocked(other.getIsLocked()); } - if (other.hasRetentionPeriod()) { - setRetentionPeriod(other.getRetentionPeriod()); - } if (other.hasRetentionDuration()) { mergeRetentionDuration(other.getRetentionDuration()); } @@ -12709,17 +12614,11 @@ public Builder mergeFrom( bitField0_ |= 0x00000002; break; } // case 16 - case 24: - { - retentionPeriod_ = input.readInt64(); - bitField0_ |= 0x00000004; - break; - } // case 24 case 34: { input.readMessage( getRetentionDurationFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; break; } // case 34 default: @@ -12986,86 +12885,6 @@ public Builder clearIsLocked() { return this; } - private long retentionPeriod_; - /** - * - * - *
-       * The duration in seconds that objects need to be retained. Retention
-       * duration must be greater than zero and less than 100 years. Note that
-       * enforcement of retention periods less than a day is not guaranteed. Such
-       * periods should only be used for testing purposes.
-       * 
- * - * optional int64 retention_period = 3; - * - * @return Whether the retentionPeriod field is set. - */ - @java.lang.Override - public boolean hasRetentionPeriod() { - return ((bitField0_ & 0x00000004) != 0); - } - /** - * - * - *
-       * The duration in seconds that objects need to be retained. Retention
-       * duration must be greater than zero and less than 100 years. Note that
-       * enforcement of retention periods less than a day is not guaranteed. Such
-       * periods should only be used for testing purposes.
-       * 
- * - * optional int64 retention_period = 3; - * - * @return The retentionPeriod. - */ - @java.lang.Override - public long getRetentionPeriod() { - return retentionPeriod_; - } - /** - * - * - *
-       * The duration in seconds that objects need to be retained. Retention
-       * duration must be greater than zero and less than 100 years. Note that
-       * enforcement of retention periods less than a day is not guaranteed. Such
-       * periods should only be used for testing purposes.
-       * 
- * - * optional int64 retention_period = 3; - * - * @param value The retentionPeriod to set. - * @return This builder for chaining. - */ - public Builder setRetentionPeriod(long value) { - - retentionPeriod_ = value; - bitField0_ |= 0x00000004; - onChanged(); - return this; - } - /** - * - * - *
-       * The duration in seconds that objects need to be retained. Retention
-       * duration must be greater than zero and less than 100 years. Note that
-       * enforcement of retention periods less than a day is not guaranteed. Such
-       * periods should only be used for testing purposes.
-       * 
- * - * optional int64 retention_period = 3; - * - * @return This builder for chaining. - */ - public Builder clearRetentionPeriod() { - bitField0_ = (bitField0_ & ~0x00000004); - retentionPeriod_ = 0L; - onChanged(); - return this; - } - private com.google.protobuf.Duration retentionDuration_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, @@ -13088,7 +12907,7 @@ public Builder clearRetentionPeriod() { * @return Whether the retentionDuration field is set. */ public boolean hasRetentionDuration() { - return ((bitField0_ & 0x00000008) != 0); + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -13136,7 +12955,7 @@ public Builder setRetentionDuration(com.google.protobuf.Duration value) { } else { retentionDurationBuilder_.setMessage(value); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -13159,7 +12978,7 @@ public Builder setRetentionDuration(com.google.protobuf.Duration.Builder builder } else { retentionDurationBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -13178,7 +12997,7 @@ public Builder setRetentionDuration(com.google.protobuf.Duration.Builder builder */ public Builder mergeRetentionDuration(com.google.protobuf.Duration value) { if (retentionDurationBuilder_ == null) { - if (((bitField0_ & 0x00000008) != 0) + if (((bitField0_ & 0x00000004) != 0) && retentionDuration_ != null && retentionDuration_ != com.google.protobuf.Duration.getDefaultInstance()) { getRetentionDurationBuilder().mergeFrom(value); @@ -13188,7 +13007,7 @@ public Builder mergeRetentionDuration(com.google.protobuf.Duration value) { } else { retentionDurationBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -13206,7 +13025,7 @@ public Builder mergeRetentionDuration(com.google.protobuf.Duration value) { * .google.protobuf.Duration retention_duration = 4; */ public Builder clearRetentionDuration() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000004); retentionDuration_ = null; if (retentionDurationBuilder_ != null) { retentionDurationBuilder_.dispose(); @@ -13229,7 +13048,7 @@ public Builder clearRetentionDuration() { * .google.protobuf.Duration retention_duration = 4; */ public com.google.protobuf.Duration.Builder getRetentionDurationBuilder() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; onChanged(); return getRetentionDurationFieldBuilder().getBuilder(); } @@ -16667,8 +16486,8 @@ public com.google.protobuf.ByteString getEtagBytes() { * *
    * Immutable. The project which owns this bucket, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -16694,8 +16513,8 @@ public java.lang.String getProject() { * *
    * Immutable. The project which owns this bucket, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -19641,8 +19460,8 @@ public Builder setEtagBytes(com.google.protobuf.ByteString value) { * *
      * Immutable. The project which owns this bucket, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -19667,8 +19486,8 @@ public java.lang.String getProject() { * *
      * Immutable. The project which owns this bucket, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -19693,8 +19512,8 @@ public com.google.protobuf.ByteString getProjectBytes() { * *
      * Immutable. The project which owns this bucket, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -19718,8 +19537,8 @@ public Builder setProject(java.lang.String value) { * *
      * Immutable. The project which owns this bucket, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -19739,8 +19558,8 @@ public Builder clearProject() { * *
      * Immutable. The project which owns this bucket, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BucketOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BucketOrBuilder.java index 521d27630..ccb52fc31 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BucketOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BucketOrBuilder.java @@ -111,8 +111,8 @@ public interface BucketOrBuilder * *
    * Immutable. The project which owns this bucket, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -127,8 +127,8 @@ public interface BucketOrBuilder * *
    * Immutable. The project which owns this bucket, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateBucketRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateBucketRequest.java index 5c4e7b7c9..0c1067d94 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateBucketRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateBucketRequest.java @@ -132,9 +132,12 @@ public com.google.protobuf.ByteString getParentBytes() { * *
    * Properties of the new bucket being inserted.
-   * The project and name of the bucket are specified in the parent and
-   * bucket_id fields, respectively. Populating those fields in `bucket` will
-   * result in an error.
+   * The name of the bucket is specified in the `bucket_id` field. Populating
+   * `bucket.name` field will result in an error.
+   * The project of the bucket must be specified in the `bucket.project` field.
+   * This field must be in `projects/{projectIdentifier}` format,
+   * {projectIdentifier} can be the project ID or project number. The `parent`
+   * field must be either empty or `projects/_`.
    * 
* * .google.storage.v2.Bucket bucket = 2; @@ -150,9 +153,12 @@ public boolean hasBucket() { * *
    * Properties of the new bucket being inserted.
-   * The project and name of the bucket are specified in the parent and
-   * bucket_id fields, respectively. Populating those fields in `bucket` will
-   * result in an error.
+   * The name of the bucket is specified in the `bucket_id` field. Populating
+   * `bucket.name` field will result in an error.
+   * The project of the bucket must be specified in the `bucket.project` field.
+   * This field must be in `projects/{projectIdentifier}` format,
+   * {projectIdentifier} can be the project ID or project number. The `parent`
+   * field must be either empty or `projects/_`.
    * 
* * .google.storage.v2.Bucket bucket = 2; @@ -168,9 +174,12 @@ public com.google.storage.v2.Bucket getBucket() { * *
    * Properties of the new bucket being inserted.
-   * The project and name of the bucket are specified in the parent and
-   * bucket_id fields, respectively. Populating those fields in `bucket` will
-   * result in an error.
+   * The name of the bucket is specified in the `bucket_id` field. Populating
+   * `bucket.name` field will result in an error.
+   * The project of the bucket must be specified in the `bucket.project` field.
+   * This field must be in `projects/{projectIdentifier}` format,
+   * {projectIdentifier} can be the project ID or project number. The `parent`
+   * field must be either empty or `projects/_`.
    * 
* * .google.storage.v2.Bucket bucket = 2; @@ -918,9 +927,12 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * *
      * Properties of the new bucket being inserted.
-     * The project and name of the bucket are specified in the parent and
-     * bucket_id fields, respectively. Populating those fields in `bucket` will
-     * result in an error.
+     * The name of the bucket is specified in the `bucket_id` field. Populating
+     * `bucket.name` field will result in an error.
+     * The project of the bucket must be specified in the `bucket.project` field.
+     * This field must be in `projects/{projectIdentifier}` format,
+     * {projectIdentifier} can be the project ID or project number. The `parent`
+     * field must be either empty or `projects/_`.
      * 
* * .google.storage.v2.Bucket bucket = 2; @@ -935,9 +947,12 @@ public boolean hasBucket() { * *
      * Properties of the new bucket being inserted.
-     * The project and name of the bucket are specified in the parent and
-     * bucket_id fields, respectively. Populating those fields in `bucket` will
-     * result in an error.
+     * The name of the bucket is specified in the `bucket_id` field. Populating
+     * `bucket.name` field will result in an error.
+     * The project of the bucket must be specified in the `bucket.project` field.
+     * This field must be in `projects/{projectIdentifier}` format,
+     * {projectIdentifier} can be the project ID or project number. The `parent`
+     * field must be either empty or `projects/_`.
      * 
* * .google.storage.v2.Bucket bucket = 2; @@ -956,9 +971,12 @@ public com.google.storage.v2.Bucket getBucket() { * *
      * Properties of the new bucket being inserted.
-     * The project and name of the bucket are specified in the parent and
-     * bucket_id fields, respectively. Populating those fields in `bucket` will
-     * result in an error.
+     * The name of the bucket is specified in the `bucket_id` field. Populating
+     * `bucket.name` field will result in an error.
+     * The project of the bucket must be specified in the `bucket.project` field.
+     * This field must be in `projects/{projectIdentifier}` format,
+     * {projectIdentifier} can be the project ID or project number. The `parent`
+     * field must be either empty or `projects/_`.
      * 
* * .google.storage.v2.Bucket bucket = 2; @@ -981,9 +999,12 @@ public Builder setBucket(com.google.storage.v2.Bucket value) { * *
      * Properties of the new bucket being inserted.
-     * The project and name of the bucket are specified in the parent and
-     * bucket_id fields, respectively. Populating those fields in `bucket` will
-     * result in an error.
+     * The name of the bucket is specified in the `bucket_id` field. Populating
+     * `bucket.name` field will result in an error.
+     * The project of the bucket must be specified in the `bucket.project` field.
+     * This field must be in `projects/{projectIdentifier}` format,
+     * {projectIdentifier} can be the project ID or project number. The `parent`
+     * field must be either empty or `projects/_`.
      * 
* * .google.storage.v2.Bucket bucket = 2; @@ -1003,9 +1024,12 @@ public Builder setBucket(com.google.storage.v2.Bucket.Builder builderForValue) { * *
      * Properties of the new bucket being inserted.
-     * The project and name of the bucket are specified in the parent and
-     * bucket_id fields, respectively. Populating those fields in `bucket` will
-     * result in an error.
+     * The name of the bucket is specified in the `bucket_id` field. Populating
+     * `bucket.name` field will result in an error.
+     * The project of the bucket must be specified in the `bucket.project` field.
+     * This field must be in `projects/{projectIdentifier}` format,
+     * {projectIdentifier} can be the project ID or project number. The `parent`
+     * field must be either empty or `projects/_`.
      * 
* * .google.storage.v2.Bucket bucket = 2; @@ -1031,9 +1055,12 @@ public Builder mergeBucket(com.google.storage.v2.Bucket value) { * *
      * Properties of the new bucket being inserted.
-     * The project and name of the bucket are specified in the parent and
-     * bucket_id fields, respectively. Populating those fields in `bucket` will
-     * result in an error.
+     * The name of the bucket is specified in the `bucket_id` field. Populating
+     * `bucket.name` field will result in an error.
+     * The project of the bucket must be specified in the `bucket.project` field.
+     * This field must be in `projects/{projectIdentifier}` format,
+     * {projectIdentifier} can be the project ID or project number. The `parent`
+     * field must be either empty or `projects/_`.
      * 
* * .google.storage.v2.Bucket bucket = 2; @@ -1053,9 +1080,12 @@ public Builder clearBucket() { * *
      * Properties of the new bucket being inserted.
-     * The project and name of the bucket are specified in the parent and
-     * bucket_id fields, respectively. Populating those fields in `bucket` will
-     * result in an error.
+     * The name of the bucket is specified in the `bucket_id` field. Populating
+     * `bucket.name` field will result in an error.
+     * The project of the bucket must be specified in the `bucket.project` field.
+     * This field must be in `projects/{projectIdentifier}` format,
+     * {projectIdentifier} can be the project ID or project number. The `parent`
+     * field must be either empty or `projects/_`.
      * 
* * .google.storage.v2.Bucket bucket = 2; @@ -1070,9 +1100,12 @@ public com.google.storage.v2.Bucket.Builder getBucketBuilder() { * *
      * Properties of the new bucket being inserted.
-     * The project and name of the bucket are specified in the parent and
-     * bucket_id fields, respectively. Populating those fields in `bucket` will
-     * result in an error.
+     * The name of the bucket is specified in the `bucket_id` field. Populating
+     * `bucket.name` field will result in an error.
+     * The project of the bucket must be specified in the `bucket.project` field.
+     * This field must be in `projects/{projectIdentifier}` format,
+     * {projectIdentifier} can be the project ID or project number. The `parent`
+     * field must be either empty or `projects/_`.
      * 
* * .google.storage.v2.Bucket bucket = 2; @@ -1089,9 +1122,12 @@ public com.google.storage.v2.BucketOrBuilder getBucketOrBuilder() { * *
      * Properties of the new bucket being inserted.
-     * The project and name of the bucket are specified in the parent and
-     * bucket_id fields, respectively. Populating those fields in `bucket` will
-     * result in an error.
+     * The name of the bucket is specified in the `bucket_id` field. Populating
+     * `bucket.name` field will result in an error.
+     * The project of the bucket must be specified in the `bucket.project` field.
+     * This field must be in `projects/{projectIdentifier}` format,
+     * {projectIdentifier} can be the project ID or project number. The `parent`
+     * field must be either empty or `projects/_`.
      * 
* * .google.storage.v2.Bucket bucket = 2; diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateBucketRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateBucketRequestOrBuilder.java index d12100a72..7ef32cd3f 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateBucketRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateBucketRequestOrBuilder.java @@ -57,9 +57,12 @@ public interface CreateBucketRequestOrBuilder * *
    * Properties of the new bucket being inserted.
-   * The project and name of the bucket are specified in the parent and
-   * bucket_id fields, respectively. Populating those fields in `bucket` will
-   * result in an error.
+   * The name of the bucket is specified in the `bucket_id` field. Populating
+   * `bucket.name` field will result in an error.
+   * The project of the bucket must be specified in the `bucket.project` field.
+   * This field must be in `projects/{projectIdentifier}` format,
+   * {projectIdentifier} can be the project ID or project number. The `parent`
+   * field must be either empty or `projects/_`.
    * 
* * .google.storage.v2.Bucket bucket = 2; @@ -72,9 +75,12 @@ public interface CreateBucketRequestOrBuilder * *
    * Properties of the new bucket being inserted.
-   * The project and name of the bucket are specified in the parent and
-   * bucket_id fields, respectively. Populating those fields in `bucket` will
-   * result in an error.
+   * The name of the bucket is specified in the `bucket_id` field. Populating
+   * `bucket.name` field will result in an error.
+   * The project of the bucket must be specified in the `bucket.project` field.
+   * This field must be in `projects/{projectIdentifier}` format,
+   * {projectIdentifier} can be the project ID or project number. The `parent`
+   * field must be either empty or `projects/_`.
    * 
* * .google.storage.v2.Bucket bucket = 2; @@ -87,9 +93,12 @@ public interface CreateBucketRequestOrBuilder * *
    * Properties of the new bucket being inserted.
-   * The project and name of the bucket are specified in the parent and
-   * bucket_id fields, respectively. Populating those fields in `bucket` will
-   * result in an error.
+   * The name of the bucket is specified in the `bucket_id` field. Populating
+   * `bucket.name` field will result in an error.
+   * The project of the bucket must be specified in the `bucket.project` field.
+   * This field must be in `projects/{projectIdentifier}` format,
+   * {projectIdentifier} can be the project ID or project number. The `parent`
+   * field must be either empty or `projects/_`.
    * 
* * .google.storage.v2.Bucket bucket = 2; diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateHmacKeyRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateHmacKeyRequest.java index 20a64a9c5..65e3c8277 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateHmacKeyRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateHmacKeyRequest.java @@ -77,7 +77,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * *
    * Required. The project that the HMAC-owning service account lives in, in the
-   * format of "projects/<projectIdentifier>". <projectIdentifier> can be the
+   * format of "projects/{projectIdentifier}". {projectIdentifier} can be the
    * project ID or project number.
    * 
* @@ -104,7 +104,7 @@ public java.lang.String getProject() { * *
    * Required. The project that the HMAC-owning service account lives in, in the
-   * format of "projects/<projectIdentifier>". <projectIdentifier> can be the
+   * format of "projects/{projectIdentifier}". {projectIdentifier} can be the
    * project ID or project number.
    * 
* @@ -549,7 +549,7 @@ public Builder mergeFrom( * *
      * Required. The project that the HMAC-owning service account lives in, in the
-     * format of "projects/<projectIdentifier>". <projectIdentifier> can be the
+     * format of "projects/{projectIdentifier}". {projectIdentifier} can be the
      * project ID or project number.
      * 
* @@ -575,7 +575,7 @@ public java.lang.String getProject() { * *
      * Required. The project that the HMAC-owning service account lives in, in the
-     * format of "projects/<projectIdentifier>". <projectIdentifier> can be the
+     * format of "projects/{projectIdentifier}". {projectIdentifier} can be the
      * project ID or project number.
      * 
* @@ -601,7 +601,7 @@ public com.google.protobuf.ByteString getProjectBytes() { * *
      * Required. The project that the HMAC-owning service account lives in, in the
-     * format of "projects/<projectIdentifier>". <projectIdentifier> can be the
+     * format of "projects/{projectIdentifier}". {projectIdentifier} can be the
      * project ID or project number.
      * 
* @@ -626,7 +626,7 @@ public Builder setProject(java.lang.String value) { * *
      * Required. The project that the HMAC-owning service account lives in, in the
-     * format of "projects/<projectIdentifier>". <projectIdentifier> can be the
+     * format of "projects/{projectIdentifier}". {projectIdentifier} can be the
      * project ID or project number.
      * 
* @@ -647,7 +647,7 @@ public Builder clearProject() { * *
      * Required. The project that the HMAC-owning service account lives in, in the
-     * format of "projects/<projectIdentifier>". <projectIdentifier> can be the
+     * format of "projects/{projectIdentifier}". {projectIdentifier} can be the
      * project ID or project number.
      * 
* diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateHmacKeyRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateHmacKeyRequestOrBuilder.java index eb241f060..67b9cd539 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateHmacKeyRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CreateHmacKeyRequestOrBuilder.java @@ -28,7 +28,7 @@ public interface CreateHmacKeyRequestOrBuilder * *
    * Required. The project that the HMAC-owning service account lives in, in the
-   * format of "projects/<projectIdentifier>". <projectIdentifier> can be the
+   * format of "projects/{projectIdentifier}". {projectIdentifier} can be the
    * project ID or project number.
    * 
* @@ -44,7 +44,7 @@ public interface CreateHmacKeyRequestOrBuilder * *
    * Required. The project that the HMAC-owning service account lives in, in the
-   * format of "projects/<projectIdentifier>". <projectIdentifier> can be the
+   * format of "projects/{projectIdentifier}". {projectIdentifier} can be the
    * project ID or project number.
    * 
* diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteHmacKeyRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteHmacKeyRequest.java index a3ceaaa45..7d7e4d4c5 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteHmacKeyRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteHmacKeyRequest.java @@ -128,8 +128,8 @@ public com.google.protobuf.ByteString getAccessIdBytes() { * *
    * Required. The project that owns the HMAC key, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -155,8 +155,8 @@ public java.lang.String getProject() { * *
    * Required. The project that owns the HMAC key, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -655,8 +655,8 @@ public Builder setAccessIdBytes(com.google.protobuf.ByteString value) { * *
      * Required. The project that owns the HMAC key, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -681,8 +681,8 @@ public java.lang.String getProject() { * *
      * Required. The project that owns the HMAC key, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -707,8 +707,8 @@ public com.google.protobuf.ByteString getProjectBytes() { * *
      * Required. The project that owns the HMAC key, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -732,8 +732,8 @@ public Builder setProject(java.lang.String value) { * *
      * Required. The project that owns the HMAC key, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -753,8 +753,8 @@ public Builder clearProject() { * *
      * Required. The project that owns the HMAC key, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteHmacKeyRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteHmacKeyRequestOrBuilder.java index 6a3a8308b..7d11ae928 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteHmacKeyRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteHmacKeyRequestOrBuilder.java @@ -53,8 +53,8 @@ public interface DeleteHmacKeyRequestOrBuilder * *
    * Required. The project that owns the HMAC key, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -69,8 +69,8 @@ public interface DeleteHmacKeyRequestOrBuilder * *
    * Required. The project that owns the HMAC key, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteObjectRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteObjectRequest.java index 824bc8ee7..9b34b0481 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteObjectRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteObjectRequest.java @@ -81,7 +81,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * Required. Name of the bucket in which the object resides. *
* - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bucket. */ @@ -104,7 +106,9 @@ public java.lang.String getBucket() { * Required. Name of the bucket in which the object resides. *
* - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for bucket. */ @@ -940,7 +944,9 @@ public Builder mergeFrom( * Required. Name of the bucket in which the object resides. *
* - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bucket. */ @@ -962,7 +968,9 @@ public java.lang.String getBucket() { * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for bucket. */ @@ -984,7 +992,9 @@ public com.google.protobuf.ByteString getBucketBytes() { * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The bucket to set. * @return This builder for chaining. @@ -1005,7 +1015,9 @@ public Builder setBucket(java.lang.String value) { * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return This builder for chaining. */ @@ -1022,7 +1034,9 @@ public Builder clearBucket() { * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The bytes for bucket to set. * @return This builder for chaining. diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteObjectRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteObjectRequestOrBuilder.java index 7c25ed32b..c93ab4af1 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteObjectRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/DeleteObjectRequestOrBuilder.java @@ -30,7 +30,9 @@ public interface DeleteObjectRequestOrBuilder * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bucket. */ @@ -42,7 +44,9 @@ public interface DeleteObjectRequestOrBuilder * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for bucket. */ diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetHmacKeyRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetHmacKeyRequest.java index c6fed2a48..86c277924 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetHmacKeyRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetHmacKeyRequest.java @@ -128,8 +128,8 @@ public com.google.protobuf.ByteString getAccessIdBytes() { * *
    * Required. The project the HMAC key lies in, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -155,8 +155,8 @@ public java.lang.String getProject() { * *
    * Required. The project the HMAC key lies in, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -654,8 +654,8 @@ public Builder setAccessIdBytes(com.google.protobuf.ByteString value) { * *
      * Required. The project the HMAC key lies in, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -680,8 +680,8 @@ public java.lang.String getProject() { * *
      * Required. The project the HMAC key lies in, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -706,8 +706,8 @@ public com.google.protobuf.ByteString getProjectBytes() { * *
      * Required. The project the HMAC key lies in, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -731,8 +731,8 @@ public Builder setProject(java.lang.String value) { * *
      * Required. The project the HMAC key lies in, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -752,8 +752,8 @@ public Builder clearProject() { * *
      * Required. The project the HMAC key lies in, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetHmacKeyRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetHmacKeyRequestOrBuilder.java index dd96127a2..e7ba7a09b 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetHmacKeyRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetHmacKeyRequestOrBuilder.java @@ -53,8 +53,8 @@ public interface GetHmacKeyRequestOrBuilder * *
    * Required. The project the HMAC key lies in, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -69,8 +69,8 @@ public interface GetHmacKeyRequestOrBuilder * *
    * Required. The project the HMAC key lies in, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetObjectRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetObjectRequest.java index 92b469e97..fca2598d3 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetObjectRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetObjectRequest.java @@ -80,7 +80,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bucket. */ @@ -103,7 +105,9 @@ public java.lang.String getBucket() { * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for bucket. */ @@ -1030,7 +1034,9 @@ public Builder mergeFrom( * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bucket. */ @@ -1052,7 +1058,9 @@ public java.lang.String getBucket() { * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for bucket. */ @@ -1074,7 +1082,9 @@ public com.google.protobuf.ByteString getBucketBytes() { * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The bucket to set. * @return This builder for chaining. @@ -1095,7 +1105,9 @@ public Builder setBucket(java.lang.String value) { * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return This builder for chaining. */ @@ -1112,7 +1124,9 @@ public Builder clearBucket() { * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The bytes for bucket to set. * @return This builder for chaining. diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetObjectRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetObjectRequestOrBuilder.java index 8730f04d7..fd35680f3 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetObjectRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetObjectRequestOrBuilder.java @@ -30,7 +30,9 @@ public interface GetObjectRequestOrBuilder * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bucket. */ @@ -42,7 +44,9 @@ public interface GetObjectRequestOrBuilder * Required. Name of the bucket in which the object resides. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for bucket. */ diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetServiceAccountRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetServiceAccountRequest.java index ca95e6b35..d8627107b 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetServiceAccountRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetServiceAccountRequest.java @@ -75,8 +75,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * *
-   * Required. Project ID, in the format of "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * Required. Project ID, in the format of "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -101,8 +101,8 @@ public java.lang.String getProject() { * * *
-   * Required. Project ID, in the format of "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * Required. Project ID, in the format of "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -470,8 +470,8 @@ public Builder mergeFrom( * * *
-     * Required. Project ID, in the format of "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * Required. Project ID, in the format of "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -495,8 +495,8 @@ public java.lang.String getProject() { * * *
-     * Required. Project ID, in the format of "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * Required. Project ID, in the format of "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -520,8 +520,8 @@ public com.google.protobuf.ByteString getProjectBytes() { * * *
-     * Required. Project ID, in the format of "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * Required. Project ID, in the format of "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -544,8 +544,8 @@ public Builder setProject(java.lang.String value) { * * *
-     * Required. Project ID, in the format of "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * Required. Project ID, in the format of "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -564,8 +564,8 @@ public Builder clearProject() { * * *
-     * Required. Project ID, in the format of "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * Required. Project ID, in the format of "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetServiceAccountRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetServiceAccountRequestOrBuilder.java index c3a7fc00e..74f04937a 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetServiceAccountRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/GetServiceAccountRequestOrBuilder.java @@ -27,8 +27,8 @@ public interface GetServiceAccountRequestOrBuilder * * *
-   * Required. Project ID, in the format of "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * Required. Project ID, in the format of "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -42,8 +42,8 @@ public interface GetServiceAccountRequestOrBuilder * * *
-   * Required. Project ID, in the format of "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * Required. Project ID, in the format of "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/HmacKeyMetadata.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/HmacKeyMetadata.java index e86d90dfc..44298f81a 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/HmacKeyMetadata.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/HmacKeyMetadata.java @@ -81,8 +81,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * *
    * Immutable. Resource name ID of the key in the format
-   * <projectIdentifier>/<accessId>.
-   * <projectIdentifier> can be the project ID or project number.
+   * {projectIdentifier}/{accessId}.
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * string id = 1 [(.google.api.field_behavior) = IMMUTABLE]; @@ -106,8 +106,8 @@ public java.lang.String getId() { * *
    * Immutable. Resource name ID of the key in the format
-   * <projectIdentifier>/<accessId>.
-   * <projectIdentifier> can be the project ID or project number.
+   * {projectIdentifier}/{accessId}.
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * string id = 1 [(.google.api.field_behavior) = IMMUTABLE]; @@ -187,8 +187,8 @@ public com.google.protobuf.ByteString getAccessIdBytes() { * *
    * Immutable. Identifies the project that owns the service account of the
-   * specified HMAC key, in the format "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * specified HMAC key, in the format "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -214,8 +214,8 @@ public java.lang.String getProject() { * *
    * Immutable. Identifies the project that owns the service account of the
-   * specified HMAC key, in the format "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * specified HMAC key, in the format "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -1017,8 +1017,8 @@ public Builder mergeFrom( * *
      * Immutable. Resource name ID of the key in the format
-     * <projectIdentifier>/<accessId>.
-     * <projectIdentifier> can be the project ID or project number.
+     * {projectIdentifier}/{accessId}.
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * string id = 1 [(.google.api.field_behavior) = IMMUTABLE]; @@ -1041,8 +1041,8 @@ public java.lang.String getId() { * *
      * Immutable. Resource name ID of the key in the format
-     * <projectIdentifier>/<accessId>.
-     * <projectIdentifier> can be the project ID or project number.
+     * {projectIdentifier}/{accessId}.
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * string id = 1 [(.google.api.field_behavior) = IMMUTABLE]; @@ -1065,8 +1065,8 @@ public com.google.protobuf.ByteString getIdBytes() { * *
      * Immutable. Resource name ID of the key in the format
-     * <projectIdentifier>/<accessId>.
-     * <projectIdentifier> can be the project ID or project number.
+     * {projectIdentifier}/{accessId}.
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * string id = 1 [(.google.api.field_behavior) = IMMUTABLE]; @@ -1088,8 +1088,8 @@ public Builder setId(java.lang.String value) { * *
      * Immutable. Resource name ID of the key in the format
-     * <projectIdentifier>/<accessId>.
-     * <projectIdentifier> can be the project ID or project number.
+     * {projectIdentifier}/{accessId}.
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * string id = 1 [(.google.api.field_behavior) = IMMUTABLE]; @@ -1107,8 +1107,8 @@ public Builder clearId() { * *
      * Immutable. Resource name ID of the key in the format
-     * <projectIdentifier>/<accessId>.
-     * <projectIdentifier> can be the project ID or project number.
+     * {projectIdentifier}/{accessId}.
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * string id = 1 [(.google.api.field_behavior) = IMMUTABLE]; @@ -1239,8 +1239,8 @@ public Builder setAccessIdBytes(com.google.protobuf.ByteString value) { * *
      * Immutable. Identifies the project that owns the service account of the
-     * specified HMAC key, in the format "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * specified HMAC key, in the format "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -1265,8 +1265,8 @@ public java.lang.String getProject() { * *
      * Immutable. Identifies the project that owns the service account of the
-     * specified HMAC key, in the format "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * specified HMAC key, in the format "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -1291,8 +1291,8 @@ public com.google.protobuf.ByteString getProjectBytes() { * *
      * Immutable. Identifies the project that owns the service account of the
-     * specified HMAC key, in the format "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * specified HMAC key, in the format "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -1316,8 +1316,8 @@ public Builder setProject(java.lang.String value) { * *
      * Immutable. Identifies the project that owns the service account of the
-     * specified HMAC key, in the format "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * specified HMAC key, in the format "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -1337,8 +1337,8 @@ public Builder clearProject() { * *
      * Immutable. Identifies the project that owns the service account of the
-     * specified HMAC key, in the format "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * specified HMAC key, in the format "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/HmacKeyMetadataOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/HmacKeyMetadataOrBuilder.java index 41e7deae8..8dfc5ee62 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/HmacKeyMetadataOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/HmacKeyMetadataOrBuilder.java @@ -28,8 +28,8 @@ public interface HmacKeyMetadataOrBuilder * *
    * Immutable. Resource name ID of the key in the format
-   * <projectIdentifier>/<accessId>.
-   * <projectIdentifier> can be the project ID or project number.
+   * {projectIdentifier}/{accessId}.
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * string id = 1 [(.google.api.field_behavior) = IMMUTABLE]; @@ -42,8 +42,8 @@ public interface HmacKeyMetadataOrBuilder * *
    * Immutable. Resource name ID of the key in the format
-   * <projectIdentifier>/<accessId>.
-   * <projectIdentifier> can be the project ID or project number.
+   * {projectIdentifier}/{accessId}.
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * string id = 1 [(.google.api.field_behavior) = IMMUTABLE]; @@ -82,8 +82,8 @@ public interface HmacKeyMetadataOrBuilder * *
    * Immutable. Identifies the project that owns the service account of the
-   * specified HMAC key, in the format "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * specified HMAC key, in the format "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -98,8 +98,8 @@ public interface HmacKeyMetadataOrBuilder * *
    * Immutable. Identifies the project that owns the service account of the
-   * specified HMAC key, in the format "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * specified HMAC key, in the format "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ListHmacKeysRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ListHmacKeysRequest.java index 0615fbc64..3acdb3d86 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ListHmacKeysRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ListHmacKeysRequest.java @@ -78,8 +78,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * *
    * Required. The project to list HMAC keys for, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -105,8 +105,8 @@ public java.lang.String getProject() { * *
    * Required. The project to list HMAC keys for, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -705,8 +705,8 @@ public Builder mergeFrom( * *
      * Required. The project to list HMAC keys for, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -731,8 +731,8 @@ public java.lang.String getProject() { * *
      * Required. The project to list HMAC keys for, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -757,8 +757,8 @@ public com.google.protobuf.ByteString getProjectBytes() { * *
      * Required. The project to list HMAC keys for, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -782,8 +782,8 @@ public Builder setProject(java.lang.String value) { * *
      * Required. The project to list HMAC keys for, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * @@ -803,8 +803,8 @@ public Builder clearProject() { * *
      * Required. The project to list HMAC keys for, in the format of
-     * "projects/<projectIdentifier>".
-     * <projectIdentifier> can be the project ID or project number.
+     * "projects/{projectIdentifier}".
+     * {projectIdentifier} can be the project ID or project number.
      * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ListHmacKeysRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ListHmacKeysRequestOrBuilder.java index efab34381..3dbfdaea5 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ListHmacKeysRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ListHmacKeysRequestOrBuilder.java @@ -28,8 +28,8 @@ public interface ListHmacKeysRequestOrBuilder * *
    * Required. The project to list HMAC keys for, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * @@ -44,8 +44,8 @@ public interface ListHmacKeysRequestOrBuilder * *
    * Required. The project to list HMAC keys for, in the format of
-   * "projects/<projectIdentifier>".
-   * <projectIdentifier> can be the project ID or project number.
+   * "projects/{projectIdentifier}".
+   * {projectIdentifier} can be the project ID or project number.
    * 
* * diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ObjectChecksums.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ObjectChecksums.java index 825fa6b51..5ad9fc37b 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ObjectChecksums.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ObjectChecksums.java @@ -76,7 +76,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { *
    * CRC32C digest of the object data. Computed by the Cloud Storage service for
    * all written objects.
-   * If set in an WriteObjectRequest, service will validate that the stored
+   * If set in a WriteObjectRequest, service will validate that the stored
    * object matches this checksum.
    * 
* @@ -94,7 +94,7 @@ public boolean hasCrc32C() { *
    * CRC32C digest of the object data. Computed by the Cloud Storage service for
    * all written objects.
-   * If set in an WriteObjectRequest, service will validate that the stored
+   * If set in a WriteObjectRequest, service will validate that the stored
    * object matches this checksum.
    * 
* @@ -505,7 +505,7 @@ public Builder mergeFrom( *
      * CRC32C digest of the object data. Computed by the Cloud Storage service for
      * all written objects.
-     * If set in an WriteObjectRequest, service will validate that the stored
+     * If set in a WriteObjectRequest, service will validate that the stored
      * object matches this checksum.
      * 
* @@ -523,7 +523,7 @@ public boolean hasCrc32C() { *
      * CRC32C digest of the object data. Computed by the Cloud Storage service for
      * all written objects.
-     * If set in an WriteObjectRequest, service will validate that the stored
+     * If set in a WriteObjectRequest, service will validate that the stored
      * object matches this checksum.
      * 
* @@ -541,7 +541,7 @@ public int getCrc32C() { *
      * CRC32C digest of the object data. Computed by the Cloud Storage service for
      * all written objects.
-     * If set in an WriteObjectRequest, service will validate that the stored
+     * If set in a WriteObjectRequest, service will validate that the stored
      * object matches this checksum.
      * 
* @@ -563,7 +563,7 @@ public Builder setCrc32C(int value) { *
      * CRC32C digest of the object data. Computed by the Cloud Storage service for
      * all written objects.
-     * If set in an WriteObjectRequest, service will validate that the stored
+     * If set in a WriteObjectRequest, service will validate that the stored
      * object matches this checksum.
      * 
* diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ObjectChecksumsOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ObjectChecksumsOrBuilder.java index f094b2b6f..f65c59172 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ObjectChecksumsOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ObjectChecksumsOrBuilder.java @@ -29,7 +29,7 @@ public interface ObjectChecksumsOrBuilder *
    * CRC32C digest of the object data. Computed by the Cloud Storage service for
    * all written objects.
-   * If set in an WriteObjectRequest, service will validate that the stored
+   * If set in a WriteObjectRequest, service will validate that the stored
    * object matches this checksum.
    * 
* @@ -44,7 +44,7 @@ public interface ObjectChecksumsOrBuilder *
    * CRC32C digest of the object data. Computed by the Cloud Storage service for
    * all written objects.
-   * If set in an WriteObjectRequest, service will validate that the stored
+   * If set in a WriteObjectRequest, service will validate that the stored
    * object matches this checksum.
    * 
* diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectRequest.java index e8fd656f7..32cfe8db5 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectRequest.java @@ -80,7 +80,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * Required. The name of the bucket containing the object to read. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bucket. */ @@ -103,7 +105,9 @@ public java.lang.String getBucket() { * Required. The name of the bucket containing the object to read. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for bucket. */ @@ -1125,7 +1129,9 @@ public Builder mergeFrom( * Required. The name of the bucket containing the object to read. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bucket. */ @@ -1147,7 +1153,9 @@ public java.lang.String getBucket() { * Required. The name of the bucket containing the object to read. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for bucket. */ @@ -1169,7 +1177,9 @@ public com.google.protobuf.ByteString getBucketBytes() { * Required. The name of the bucket containing the object to read. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The bucket to set. * @return This builder for chaining. @@ -1190,7 +1200,9 @@ public Builder setBucket(java.lang.String value) { * Required. The name of the bucket containing the object to read. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return This builder for chaining. */ @@ -1207,7 +1219,9 @@ public Builder clearBucket() { * Required. The name of the bucket containing the object to read. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The bytes for bucket to set. * @return This builder for chaining. diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectRequestOrBuilder.java index c81247c4c..1296982fd 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectRequestOrBuilder.java @@ -30,7 +30,9 @@ public interface ReadObjectRequestOrBuilder * Required. The name of the bucket containing the object to read. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bucket. */ @@ -42,7 +44,9 @@ public interface ReadObjectRequestOrBuilder * Required. The name of the bucket containing the object to read. * * - * string bucket = 1 [(.google.api.field_behavior) = REQUIRED]; + * + * string bucket = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for bucket. */ diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectResponse.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectResponse.java index d567a99ae..4a6ae14a1 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectResponse.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectResponse.java @@ -77,7 +77,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; * * @return Whether the checksummedData field is set. */ @@ -95,7 +95,7 @@ public boolean hasChecksummedData() { * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; * * @return The checksummedData. */ @@ -115,7 +115,7 @@ public com.google.storage.v2.ChecksummedData getChecksummedData() { * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; */ @java.lang.Override public com.google.storage.v2.ChecksummedDataOrBuilder getChecksummedDataOrBuilder() { @@ -744,7 +744,7 @@ public Builder mergeFrom( * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; * * @return Whether the checksummedData field is set. */ @@ -761,7 +761,7 @@ public boolean hasChecksummedData() { * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; * * @return The checksummedData. */ @@ -784,7 +784,7 @@ public com.google.storage.v2.ChecksummedData getChecksummedData() { * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; */ public Builder setChecksummedData(com.google.storage.v2.ChecksummedData value) { if (checksummedDataBuilder_ == null) { @@ -809,7 +809,7 @@ public Builder setChecksummedData(com.google.storage.v2.ChecksummedData value) { * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; */ public Builder setChecksummedData( com.google.storage.v2.ChecksummedData.Builder builderForValue) { @@ -832,7 +832,7 @@ public Builder setChecksummedData( * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; */ public Builder mergeChecksummedData(com.google.storage.v2.ChecksummedData value) { if (checksummedDataBuilder_ == null) { @@ -860,7 +860,7 @@ public Builder mergeChecksummedData(com.google.storage.v2.ChecksummedData value) * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; */ public Builder clearChecksummedData() { bitField0_ = (bitField0_ & ~0x00000001); @@ -882,7 +882,7 @@ public Builder clearChecksummedData() { * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; */ public com.google.storage.v2.ChecksummedData.Builder getChecksummedDataBuilder() { bitField0_ |= 0x00000001; @@ -899,7 +899,7 @@ public com.google.storage.v2.ChecksummedData.Builder getChecksummedDataBuilder() * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; */ public com.google.storage.v2.ChecksummedDataOrBuilder getChecksummedDataOrBuilder() { if (checksummedDataBuilder_ != null) { @@ -920,7 +920,7 @@ public com.google.storage.v2.ChecksummedDataOrBuilder getChecksummedDataOrBuilde * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; */ private com.google.protobuf.SingleFieldBuilderV3< com.google.storage.v2.ChecksummedData, diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectResponseOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectResponseOrBuilder.java index 6fea82c9b..f660a6e3a 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectResponseOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ReadObjectResponseOrBuilder.java @@ -33,7 +33,7 @@ public interface ReadObjectResponseOrBuilder * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; * * @return Whether the checksummedData field is set. */ @@ -48,7 +48,7 @@ public interface ReadObjectResponseOrBuilder * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; * * @return The checksummedData. */ @@ -63,7 +63,7 @@ public interface ReadObjectResponseOrBuilder * generate more data. * * - * .google.storage.v2.ChecksummedData checksummed_data = 1; + * .google.storage.v2.ChecksummedData checksummed_data = 1 [ctype = CORD]; */ com.google.storage.v2.ChecksummedDataOrBuilder getChecksummedDataOrBuilder(); diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/RewriteObjectRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/RewriteObjectRequest.java index 443e553b5..243137217 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/RewriteObjectRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/RewriteObjectRequest.java @@ -342,7 +342,9 @@ public com.google.storage.v2.ObjectOrBuilder getDestinationOrBuilder() { * Required. Name of the bucket in which to find the source object. * * - * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The sourceBucket. */ @@ -365,7 +367,9 @@ public java.lang.String getSourceBucket() { * Required. Name of the bucket in which to find the source object. * * - * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for sourceBucket. */ @@ -2663,7 +2667,9 @@ public com.google.storage.v2.ObjectOrBuilder getDestinationOrBuilder() { * Required. Name of the bucket in which to find the source object. * * - * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The sourceBucket. */ @@ -2685,7 +2691,9 @@ public java.lang.String getSourceBucket() { * Required. Name of the bucket in which to find the source object. * * - * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for sourceBucket. */ @@ -2707,7 +2715,9 @@ public com.google.protobuf.ByteString getSourceBucketBytes() { * Required. Name of the bucket in which to find the source object. * * - * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The sourceBucket to set. * @return This builder for chaining. @@ -2728,7 +2738,9 @@ public Builder setSourceBucket(java.lang.String value) { * Required. Name of the bucket in which to find the source object. * * - * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return This builder for chaining. */ @@ -2745,7 +2757,9 @@ public Builder clearSourceBucket() { * Required. Name of the bucket in which to find the source object. * * - * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The bytes for sourceBucket to set. * @return This builder for chaining. diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/RewriteObjectRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/RewriteObjectRequestOrBuilder.java index d6241479b..808c42ad5 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/RewriteObjectRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/RewriteObjectRequestOrBuilder.java @@ -188,7 +188,9 @@ public interface RewriteObjectRequestOrBuilder * Required. Name of the bucket in which to find the source object. * * - * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The sourceBucket. */ @@ -200,7 +202,9 @@ public interface RewriteObjectRequestOrBuilder * Required. Name of the bucket in which to find the source object. * * - * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED]; + * + * string source_bucket = 2 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for sourceBucket. */ diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java index 2b7e581dc..066d21305 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java @@ -353,526 +353,529 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ation_not_match\030\003 \001(\003H\001\210\001\001\0222\n\tread_mask\030" + "\005 \001(\0132\032.google.protobuf.FieldMaskH\002\210\001\001B\032" + "\n\030_if_metageneration_matchB\036\n\034_if_metage" - + "neration_not_matchB\014\n\n_read_mask\"\334\001\n\023Cre" - + "ateBucketRequest\022C\n\006parent\030\001 \001(\tB3\340A\002\372A-" - + "\n+cloudresourcemanager.googleapis.com/Pr" - + "oject\022)\n\006bucket\030\002 \001(\0132\031.google.storage.v" - + "2.Bucket\022\026\n\tbucket_id\030\003 \001(\tB\003\340A\002\022\026\n\016pred" - + "efined_acl\030\006 \001(\t\022%\n\035predefined_default_o" - + "bject_acl\030\007 \001(\t\"\322\001\n\022ListBucketsRequest\022C" - + "\n\006parent\030\001 \001(\tB3\340A\002\372A-\n+cloudresourceman" - + "ager.googleapis.com/Project\022\021\n\tpage_size" - + "\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022\016\n\006prefix\030\004 \001" - + "(\t\0222\n\tread_mask\030\005 \001(\0132\032.google.protobuf." - + "FieldMaskH\000\210\001\001B\014\n\n_read_mask\"Z\n\023ListBuck" - + "etsResponse\022*\n\007buckets\030\001 \003(\0132\031.google.st" - + "orage.v2.Bucket\022\027\n\017next_page_token\030\002 \001(\t" - + "\"\177\n LockBucketRetentionPolicyRequest\0225\n\006" - + "bucket\030\001 \001(\tB%\340A\002\372A\037\n\035storage.googleapis" - + ".com/Bucket\022$\n\027if_metageneration_match\030\002" - + " \001(\003B\003\340A\002\"\306\002\n\023UpdateBucketRequest\022.\n\006buc" - + "ket\030\001 \001(\0132\031.google.storage.v2.BucketB\003\340A" - + "\002\022$\n\027if_metageneration_match\030\002 \001(\003H\000\210\001\001\022" - + "(\n\033if_metageneration_not_match\030\003 \001(\003H\001\210\001" - + "\001\022\026\n\016predefined_acl\030\010 \001(\t\022%\n\035predefined_" - + "default_object_acl\030\t \001(\t\0224\n\013update_mask\030" - + "\006 \001(\0132\032.google.protobuf.FieldMaskB\003\340A\002B\032" - + "\n\030_if_metageneration_matchB\036\n\034_if_metage" - + "neration_not_match\"b\n\037DeleteNotification" - + "ConfigRequest\022?\n\004name\030\001 \001(\tB1\340A\002\372A+\n)sto" - + "rage.googleapis.com/NotificationConfig\"S" - + "\n\034GetNotificationConfigRequest\0223\n\004name\030\001" - + " \001(\tB%\340A\002\372A\037\n\035storage.googleapis.com/Buc" - + "ket\"\241\001\n\037CreateNotificationConfigRequest\022" - + "5\n\006parent\030\001 \001(\tB%\340A\002\372A\037\022\035storage.googlea" - + "pis.com/Bucket\022G\n\023notification_config\030\002 " - + "\001(\0132%.google.storage.v2.NotificationConf" - + "igB\003\340A\002\"~\n\036ListNotificationConfigsReques" - + "t\0225\n\006parent\030\001 \001(\tB%\340A\002\372A\037\022\035storage.googl" - + "eapis.com/Bucket\022\021\n\tpage_size\030\002 \001(\005\022\022\n\np" - + "age_token\030\003 \001(\t\"\177\n\037ListNotificationConfi" - + "gsResponse\022C\n\024notification_configs\030\001 \003(\013" - + "2%.google.storage.v2.NotificationConfig\022" - + "\027\n\017next_page_token\030\002 \001(\t\"\365\005\n\024ComposeObje" - + "ctRequest\0223\n\013destination\030\001 \001(\0132\031.google." - + "storage.v2.ObjectB\003\340A\002\022L\n\016source_objects" - + "\030\002 \003(\01324.google.storage.v2.ComposeObject" - + "Request.SourceObject\022\"\n\032destination_pred" - + "efined_acl\030\t \001(\t\022 \n\023if_generation_match\030" - + "\004 \001(\003H\000\210\001\001\022$\n\027if_metageneration_match\030\005 " - + "\001(\003H\001\210\001\001\0227\n\007kms_key\030\006 \001(\tB&\372A#\n!cloudkms" - + ".googleapis.com/CryptoKey\022R\n\034common_obje" - + "ct_request_params\030\007 \001(\0132,.google.storage" - + ".v2.CommonObjectRequestParams\022<\n\020object_" - + "checksums\030\n \001(\0132\".google.storage.v2.Obje" - + "ctChecksums\032\356\001\n\014SourceObject\022\021\n\004name\030\001 \001" - + "(\tB\003\340A\002\022\022\n\ngeneration\030\002 \001(\003\022f\n\024object_pr" - + "econditions\030\003 \001(\0132H.google.storage.v2.Co" - + "mposeObjectRequest.SourceObject.ObjectPr" - + "econditions\032O\n\023ObjectPreconditions\022 \n\023if" - + "_generation_match\030\001 \001(\003H\000\210\001\001B\026\n\024_if_gene" - + "ration_matchB\026\n\024_if_generation_matchB\032\n\030" - + "_if_metageneration_match\"\257\003\n\023DeleteObjec" - + "tRequest\022\023\n\006bucket\030\001 \001(\tB\003\340A\002\022\023\n\006object\030" - + "\002 \001(\tB\003\340A\002\022\022\n\ngeneration\030\004 \001(\003\022 \n\023if_gen" - + "eration_match\030\005 \001(\003H\000\210\001\001\022$\n\027if_generatio" - + "n_not_match\030\006 \001(\003H\001\210\001\001\022$\n\027if_metagenerat" - + "ion_match\030\007 \001(\003H\002\210\001\001\022(\n\033if_metageneratio" - + "n_not_match\030\010 \001(\003H\003\210\001\001\022R\n\034common_object_" - + "request_params\030\n \001(\0132,.google.storage.v2" - + ".CommonObjectRequestParamsB\026\n\024_if_genera" - + "tion_matchB\032\n\030_if_generation_not_matchB\032" - + "\n\030_if_metageneration_matchB\036\n\034_if_metage" - + "neration_not_match\"5\n\033CancelResumableWri" - + "teRequest\022\026\n\tupload_id\030\001 \001(\tB\003\340A\002\"\036\n\034Can" - + "celResumableWriteResponse\"\230\004\n\021ReadObject" - + "Request\022\023\n\006bucket\030\001 \001(\tB\003\340A\002\022\023\n\006object\030\002" - + " \001(\tB\003\340A\002\022\022\n\ngeneration\030\003 \001(\003\022\023\n\013read_of" - + "fset\030\004 \001(\003\022\022\n\nread_limit\030\005 \001(\003\022 \n\023if_gen" - + "eration_match\030\006 \001(\003H\000\210\001\001\022$\n\027if_generatio" - + "n_not_match\030\007 \001(\003H\001\210\001\001\022$\n\027if_metagenerat" - + "ion_match\030\010 \001(\003H\002\210\001\001\022(\n\033if_metageneratio" - + "n_not_match\030\t \001(\003H\003\210\001\001\022R\n\034common_object_" - + "request_params\030\n \001(\0132,.google.storage.v2" - + ".CommonObjectRequestParams\0222\n\tread_mask\030" - + "\014 \001(\0132\032.google.protobuf.FieldMaskH\004\210\001\001B\026" - + "\n\024_if_generation_matchB\032\n\030_if_generation" - + "_not_matchB\032\n\030_if_metageneration_matchB\036" - + "\n\034_if_metageneration_not_matchB\014\n\n_read_" - + "mask\"\356\003\n\020GetObjectRequest\022\023\n\006bucket\030\001 \001(" - + "\tB\003\340A\002\022\023\n\006object\030\002 \001(\tB\003\340A\002\022\022\n\ngeneratio" - + "n\030\003 \001(\003\022 \n\023if_generation_match\030\004 \001(\003H\000\210\001" - + "\001\022$\n\027if_generation_not_match\030\005 \001(\003H\001\210\001\001\022" - + "$\n\027if_metageneration_match\030\006 \001(\003H\002\210\001\001\022(\n" - + "\033if_metageneration_not_match\030\007 \001(\003H\003\210\001\001\022" - + "R\n\034common_object_request_params\030\010 \001(\0132,." + + "neration_not_matchB\014\n\n_read_mask\"\316\001\n\023Cre" + + "ateBucketRequest\0225\n\006parent\030\001 \001(\tB%\340A\002\372A\037" + + "\022\035storage.googleapis.com/Bucket\022)\n\006bucke" + + "t\030\002 \001(\0132\031.google.storage.v2.Bucket\022\026\n\tbu" + + "cket_id\030\003 \001(\tB\003\340A\002\022\026\n\016predefined_acl\030\006 \001" + + "(\t\022%\n\035predefined_default_object_acl\030\007 \001(" + + "\t\"\304\001\n\022ListBucketsRequest\0225\n\006parent\030\001 \001(\t" + + "B%\340A\002\372A\037\022\035storage.googleapis.com/Bucket\022" + + "\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022\016" + + "\n\006prefix\030\004 \001(\t\0222\n\tread_mask\030\005 \001(\0132\032.goog" + + "le.protobuf.FieldMaskH\000\210\001\001B\014\n\n_read_mask" + + "\"Z\n\023ListBucketsResponse\022*\n\007buckets\030\001 \003(\013" + + "2\031.google.storage.v2.Bucket\022\027\n\017next_page" + + "_token\030\002 \001(\t\"\177\n LockBucketRetentionPolic" + + "yRequest\0225\n\006bucket\030\001 \001(\tB%\340A\002\372A\037\n\035storag" + + "e.googleapis.com/Bucket\022$\n\027if_metagenera" + + "tion_match\030\002 \001(\003B\003\340A\002\"\306\002\n\023UpdateBucketRe" + + "quest\022.\n\006bucket\030\001 \001(\0132\031.google.storage.v" + + "2.BucketB\003\340A\002\022$\n\027if_metageneration_match" + + "\030\002 \001(\003H\000\210\001\001\022(\n\033if_metageneration_not_mat" + + "ch\030\003 \001(\003H\001\210\001\001\022\026\n\016predefined_acl\030\010 \001(\t\022%\n" + + "\035predefined_default_object_acl\030\t \001(\t\0224\n\013" + + "update_mask\030\006 \001(\0132\032.google.protobuf.Fiel" + + "dMaskB\003\340A\002B\032\n\030_if_metageneration_matchB\036" + + "\n\034_if_metageneration_not_match\"b\n\037Delete" + + "NotificationConfigRequest\022?\n\004name\030\001 \001(\tB" + + "1\340A\002\372A+\n)storage.googleapis.com/Notifica" + + "tionConfig\"_\n\034GetNotificationConfigReque" + + "st\022?\n\004name\030\001 \001(\tB1\340A\002\372A+\n)storage.google" + + "apis.com/NotificationConfig\"\255\001\n\037CreateNo" + + "tificationConfigRequest\022A\n\006parent\030\001 \001(\tB" + + "1\340A\002\372A+\022)storage.googleapis.com/Notifica" + + "tionConfig\022G\n\023notification_config\030\002 \001(\0132" + + "%.google.storage.v2.NotificationConfigB\003" + + "\340A\002\"\212\001\n\036ListNotificationConfigsRequest\022A" + + "\n\006parent\030\001 \001(\tB1\340A\002\372A+\022)storage.googleap" + + "is.com/NotificationConfig\022\021\n\tpage_size\030\002" + + " \001(\005\022\022\n\npage_token\030\003 \001(\t\"\177\n\037ListNotifica" + + "tionConfigsResponse\022C\n\024notification_conf" + + "igs\030\001 \003(\0132%.google.storage.v2.Notificati" + + "onConfig\022\027\n\017next_page_token\030\002 \001(\t\"\365\005\n\024Co" + + "mposeObjectRequest\0223\n\013destination\030\001 \001(\0132" + + "\031.google.storage.v2.ObjectB\003\340A\002\022L\n\016sourc" + + "e_objects\030\002 \003(\01324.google.storage.v2.Comp" + + "oseObjectRequest.SourceObject\022\"\n\032destina" + + "tion_predefined_acl\030\t \001(\t\022 \n\023if_generati" + + "on_match\030\004 \001(\003H\000\210\001\001\022$\n\027if_metageneration" + + "_match\030\005 \001(\003H\001\210\001\001\0227\n\007kms_key\030\006 \001(\tB&\372A#\n" + + "!cloudkms.googleapis.com/CryptoKey\022R\n\034co" + + "mmon_object_request_params\030\007 \001(\0132,.googl" + + "e.storage.v2.CommonObjectRequestParams\022<" + + "\n\020object_checksums\030\n \001(\0132\".google.storag" + + "e.v2.ObjectChecksums\032\356\001\n\014SourceObject\022\021\n" + + "\004name\030\001 \001(\tB\003\340A\002\022\022\n\ngeneration\030\002 \001(\003\022f\n\024" + + "object_preconditions\030\003 \001(\0132H.google.stor" + + "age.v2.ComposeObjectRequest.SourceObject" + + ".ObjectPreconditions\032O\n\023ObjectPreconditi" + + "ons\022 \n\023if_generation_match\030\001 \001(\003H\000\210\001\001B\026\n" + + "\024_if_generation_matchB\026\n\024_if_generation_" + + "matchB\032\n\030_if_metageneration_match\"\321\003\n\023De" + + "leteObjectRequest\0225\n\006bucket\030\001 \001(\tB%\340A\002\372A" + + "\037\n\035storage.googleapis.com/Bucket\022\023\n\006obje" + + "ct\030\002 \001(\tB\003\340A\002\022\022\n\ngeneration\030\004 \001(\003\022 \n\023if_" + + "generation_match\030\005 \001(\003H\000\210\001\001\022$\n\027if_genera" + + "tion_not_match\030\006 \001(\003H\001\210\001\001\022$\n\027if_metagene" + + "ration_match\030\007 \001(\003H\002\210\001\001\022(\n\033if_metagenera" + + "tion_not_match\030\010 \001(\003H\003\210\001\001\022R\n\034common_obje" + + "ct_request_params\030\n \001(\0132,.google.storage" + + ".v2.CommonObjectRequestParamsB\026\n\024_if_gen" + + "eration_matchB\032\n\030_if_generation_not_matc" + + "hB\032\n\030_if_metageneration_matchB\036\n\034_if_met" + + "ageneration_not_match\"5\n\033CancelResumable" + + "WriteRequest\022\026\n\tupload_id\030\001 \001(\tB\003\340A\002\"\036\n\034" + + "CancelResumableWriteResponse\"\272\004\n\021ReadObj" + + "ectRequest\0225\n\006bucket\030\001 \001(\tB%\340A\002\372A\037\n\035stor" + + "age.googleapis.com/Bucket\022\023\n\006object\030\002 \001(" + + "\tB\003\340A\002\022\022\n\ngeneration\030\003 \001(\003\022\023\n\013read_offse" + + "t\030\004 \001(\003\022\022\n\nread_limit\030\005 \001(\003\022 \n\023if_genera" + + "tion_match\030\006 \001(\003H\000\210\001\001\022$\n\027if_generation_n" + + "ot_match\030\007 \001(\003H\001\210\001\001\022$\n\027if_metageneration" + + "_match\030\010 \001(\003H\002\210\001\001\022(\n\033if_metageneration_n" + + "ot_match\030\t \001(\003H\003\210\001\001\022R\n\034common_object_req" + + "uest_params\030\n \001(\0132,.google.storage.v2.Co" + + "mmonObjectRequestParams\0222\n\tread_mask\030\014 \001" + + "(\0132\032.google.protobuf.FieldMaskH\004\210\001\001B\026\n\024_" + + "if_generation_matchB\032\n\030_if_generation_no" + + "t_matchB\032\n\030_if_metageneration_matchB\036\n\034_" + + "if_metageneration_not_matchB\014\n\n_read_mas" + + "k\"\220\004\n\020GetObjectRequest\0225\n\006bucket\030\001 \001(\tB%" + + "\340A\002\372A\037\n\035storage.googleapis.com/Bucket\022\023\n" + + "\006object\030\002 \001(\tB\003\340A\002\022\022\n\ngeneration\030\003 \001(\003\022 " + + "\n\023if_generation_match\030\004 \001(\003H\000\210\001\001\022$\n\027if_g" + + "eneration_not_match\030\005 \001(\003H\001\210\001\001\022$\n\027if_met" + + "ageneration_match\030\006 \001(\003H\002\210\001\001\022(\n\033if_metag" + + "eneration_not_match\030\007 \001(\003H\003\210\001\001\022R\n\034common" + + "_object_request_params\030\010 \001(\0132,.google.st" + + "orage.v2.CommonObjectRequestParams\0222\n\tre" + + "ad_mask\030\n \001(\0132\032.google.protobuf.FieldMas" + + "kH\004\210\001\001B\026\n\024_if_generation_matchB\032\n\030_if_ge" + + "neration_not_matchB\032\n\030_if_metageneration" + + "_matchB\036\n\034_if_metageneration_not_matchB\014" + + "\n\n_read_mask\"\371\001\n\022ReadObjectResponse\022@\n\020c" + + "hecksummed_data\030\001 \001(\0132\".google.storage.v" + + "2.ChecksummedDataB\002\010\001\022<\n\020object_checksum" + + "s\030\002 \001(\0132\".google.storage.v2.ObjectChecks" + + "ums\0226\n\rcontent_range\030\003 \001(\0132\037.google.stor" + + "age.v2.ContentRange\022+\n\010metadata\030\004 \001(\0132\031." + + "google.storage.v2.Object\"\215\003\n\017WriteObject" + + "Spec\0220\n\010resource\030\001 \001(\0132\031.google.storage." + + "v2.ObjectB\003\340A\002\022\026\n\016predefined_acl\030\007 \001(\t\022 " + + "\n\023if_generation_match\030\003 \001(\003H\000\210\001\001\022$\n\027if_g" + + "eneration_not_match\030\004 \001(\003H\001\210\001\001\022$\n\027if_met" + + "ageneration_match\030\005 \001(\003H\002\210\001\001\022(\n\033if_metag" + + "eneration_not_match\030\006 \001(\003H\003\210\001\001\022\030\n\013object" + + "_size\030\010 \001(\003H\004\210\001\001B\026\n\024_if_generation_match" + + "B\032\n\030_if_generation_not_matchB\032\n\030_if_meta" + + "generation_matchB\036\n\034_if_metageneration_n" + + "ot_matchB\016\n\014_object_size\"\206\003\n\022WriteObject" + + "Request\022\023\n\tupload_id\030\001 \001(\tH\000\022?\n\021write_ob" + + "ject_spec\030\002 \001(\0132\".google.storage.v2.Writ" + + "eObjectSpecH\000\022\031\n\014write_offset\030\003 \001(\003B\003\340A\002" + + "\022>\n\020checksummed_data\030\004 \001(\0132\".google.stor" + + "age.v2.ChecksummedDataH\001\022<\n\020object_check" + + "sums\030\006 \001(\0132\".google.storage.v2.ObjectChe" + + "cksums\022\024\n\014finish_write\030\007 \001(\010\022R\n\034common_o" + + "bject_request_params\030\010 \001(\0132,.google.stor" + + "age.v2.CommonObjectRequestParamsB\017\n\rfirs" + + "t_messageB\006\n\004data\"n\n\023WriteObjectResponse" + + "\022\030\n\016persisted_size\030\001 \001(\003H\000\022-\n\010resource\030\002" + + " \001(\0132\031.google.storage.v2.ObjectH\000B\016\n\014wri" + + "te_status\"\317\002\n\022ListObjectsRequest\0225\n\006pare" + + "nt\030\001 \001(\tB%\340A\002\372A\037\n\035storage.googleapis.com" + + "/Bucket\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token" + + "\030\003 \001(\t\022\021\n\tdelimiter\030\004 \001(\t\022\"\n\032include_tra" + + "iling_delimiter\030\005 \001(\010\022\016\n\006prefix\030\006 \001(\t\022\020\n" + + "\010versions\030\007 \001(\010\0222\n\tread_mask\030\010 \001(\0132\032.goo" + + "gle.protobuf.FieldMaskH\000\210\001\001\022 \n\023lexicogra" + + "phic_start\030\n \001(\tB\003\340A\001\022\036\n\021lexicographic_e" + + "nd\030\013 \001(\tB\003\340A\001B\014\n\n_read_mask\"\205\001\n\027QueryWri" + + "teStatusRequest\022\026\n\tupload_id\030\001 \001(\tB\003\340A\002\022" + + "R\n\034common_object_request_params\030\002 \001(\0132,." + "google.storage.v2.CommonObjectRequestPar" - + "ams\0222\n\tread_mask\030\n \001(\0132\032.google.protobuf" - + ".FieldMaskH\004\210\001\001B\026\n\024_if_generation_matchB" - + "\032\n\030_if_generation_not_matchB\032\n\030_if_metag" - + "eneration_matchB\036\n\034_if_metageneration_no" - + "t_matchB\014\n\n_read_mask\"\365\001\n\022ReadObjectResp" - + "onse\022<\n\020checksummed_data\030\001 \001(\0132\".google." - + "storage.v2.ChecksummedData\022<\n\020object_che" - + "cksums\030\002 \001(\0132\".google.storage.v2.ObjectC" - + "hecksums\0226\n\rcontent_range\030\003 \001(\0132\037.google" - + ".storage.v2.ContentRange\022+\n\010metadata\030\004 \001" - + "(\0132\031.google.storage.v2.Object\"\215\003\n\017WriteO" - + "bjectSpec\0220\n\010resource\030\001 \001(\0132\031.google.sto" - + "rage.v2.ObjectB\003\340A\002\022\026\n\016predefined_acl\030\007 " - + "\001(\t\022 \n\023if_generation_match\030\003 \001(\003H\000\210\001\001\022$\n" - + "\027if_generation_not_match\030\004 \001(\003H\001\210\001\001\022$\n\027i" - + "f_metageneration_match\030\005 \001(\003H\002\210\001\001\022(\n\033if_" - + "metageneration_not_match\030\006 \001(\003H\003\210\001\001\022\030\n\013o" - + "bject_size\030\010 \001(\003H\004\210\001\001B\026\n\024_if_generation_" - + "matchB\032\n\030_if_generation_not_matchB\032\n\030_if" - + "_metageneration_matchB\036\n\034_if_metagenerat" - + "ion_not_matchB\016\n\014_object_size\"\206\003\n\022WriteO" - + "bjectRequest\022\023\n\tupload_id\030\001 \001(\tH\000\022?\n\021wri" - + "te_object_spec\030\002 \001(\0132\".google.storage.v2" - + ".WriteObjectSpecH\000\022\031\n\014write_offset\030\003 \001(\003" - + "B\003\340A\002\022>\n\020checksummed_data\030\004 \001(\0132\".google" - + ".storage.v2.ChecksummedDataH\001\022<\n\020object_" - + "checksums\030\006 \001(\0132\".google.storage.v2.Obje" - + "ctChecksums\022\024\n\014finish_write\030\007 \001(\010\022R\n\034com" - + "mon_object_request_params\030\010 \001(\0132,.google" - + ".storage.v2.CommonObjectRequestParamsB\017\n" - + "\rfirst_messageB\006\n\004data\"n\n\023WriteObjectRes" - + "ponse\022\030\n\016persisted_size\030\001 \001(\003H\000\022-\n\010resou" - + "rce\030\002 \001(\0132\031.google.storage.v2.ObjectH\000B\016" - + "\n\014write_status\"\317\002\n\022ListObjectsRequest\0225\n" - + "\006parent\030\001 \001(\tB%\340A\002\372A\037\022\035storage.googleapi" - + "s.com/Bucket\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_" - + "token\030\003 \001(\t\022\021\n\tdelimiter\030\004 \001(\t\022\"\n\032includ" - + "e_trailing_delimiter\030\005 \001(\010\022\016\n\006prefix\030\006 \001" - + "(\t\022\020\n\010versions\030\007 \001(\010\0222\n\tread_mask\030\010 \001(\0132" - + "\032.google.protobuf.FieldMaskH\000\210\001\001\022 \n\023lexi" - + "cographic_start\030\n \001(\tB\003\340A\001\022\036\n\021lexicograp" - + "hic_end\030\013 \001(\tB\003\340A\001B\014\n\n_read_mask\"\205\001\n\027Que" - + "ryWriteStatusRequest\022\026\n\tupload_id\030\001 \001(\tB" - + "\003\340A\002\022R\n\034common_object_request_params\030\002 \001" - + "(\0132,.google.storage.v2.CommonObjectReque" - + "stParams\"s\n\030QueryWriteStatusResponse\022\030\n\016" - + "persisted_size\030\001 \001(\003H\000\022-\n\010resource\030\002 \001(\013" - + "2\031.google.storage.v2.ObjectH\000B\016\n\014write_s" - + "tatus\"\206\n\n\024RewriteObjectRequest\022 \n\020destin" - + "ation_name\030\030 \001(\tB\006\340A\002\340A\005\022D\n\022destination_" - + "bucket\030\031 \001(\tB(\340A\002\340A\005\372A\037\n\035storage.googlea" - + "pis.com/Bucket\022C\n\023destination_kms_key\030\033 " - + "\001(\tB&\372A#\n!cloudkms.googleapis.com/Crypto" - + "Key\022.\n\013destination\030\001 \001(\0132\031.google.storag" - + "e.v2.Object\022\032\n\rsource_bucket\030\002 \001(\tB\003\340A\002\022" - + "\032\n\rsource_object\030\003 \001(\tB\003\340A\002\022\031\n\021source_ge" - + "neration\030\004 \001(\003\022\025\n\rrewrite_token\030\005 \001(\t\022\"\n" - + "\032destination_predefined_acl\030\034 \001(\t\022 \n\023if_" - + "generation_match\030\007 \001(\003H\000\210\001\001\022$\n\027if_genera" - + "tion_not_match\030\010 \001(\003H\001\210\001\001\022$\n\027if_metagene" - + "ration_match\030\t \001(\003H\002\210\001\001\022(\n\033if_metagenera" - + "tion_not_match\030\n \001(\003H\003\210\001\001\022\'\n\032if_source_g" - + "eneration_match\030\013 \001(\003H\004\210\001\001\022+\n\036if_source_" - + "generation_not_match\030\014 \001(\003H\005\210\001\001\022+\n\036if_so" - + "urce_metageneration_match\030\r \001(\003H\006\210\001\001\022/\n\"" - + "if_source_metageneration_not_match\030\016 \001(\003" - + "H\007\210\001\001\022$\n\034max_bytes_rewritten_per_call\030\017 " - + "\001(\003\022(\n copy_source_encryption_algorithm\030" - + "\020 \001(\t\022(\n copy_source_encryption_key_byte" - + "s\030\025 \001(\014\022/\n\'copy_source_encryption_key_sh" - + "a256_bytes\030\026 \001(\014\022R\n\034common_object_reques" - + "t_params\030\023 \001(\0132,.google.storage.v2.Commo" - + "nObjectRequestParams\022<\n\020object_checksums" - + "\030\035 \001(\0132\".google.storage.v2.ObjectChecksu" - + "msB\026\n\024_if_generation_matchB\032\n\030_if_genera" - + "tion_not_matchB\032\n\030_if_metageneration_mat" - + "chB\036\n\034_if_metageneration_not_matchB\035\n\033_i" - + "f_source_generation_matchB!\n\037_if_source_" - + "generation_not_matchB!\n\037_if_source_metag" - + "eneration_matchB%\n#_if_source_metagenera" - + "tion_not_match\"\227\001\n\017RewriteResponse\022\035\n\025to" - + "tal_bytes_rewritten\030\001 \001(\003\022\023\n\013object_size" - + "\030\002 \001(\003\022\014\n\004done\030\003 \001(\010\022\025\n\rrewrite_token\030\004 " - + "\001(\t\022+\n\010resource\030\005 \001(\0132\031.google.storage.v" - + "2.Object\"\362\001\n\032StartResumableWriteRequest\022" - + "B\n\021write_object_spec\030\001 \001(\0132\".google.stor" - + "age.v2.WriteObjectSpecB\003\340A\002\022R\n\034common_ob" - + "ject_request_params\030\003 \001(\0132,.google.stora" - + "ge.v2.CommonObjectRequestParams\022<\n\020objec" - + "t_checksums\030\005 \001(\0132\".google.storage.v2.Ob" - + "jectChecksums\"0\n\033StartResumableWriteResp" - + "onse\022\021\n\tupload_id\030\001 \001(\t\"\357\003\n\023UpdateObject" - + "Request\022.\n\006object\030\001 \001(\0132\031.google.storage" - + ".v2.ObjectB\003\340A\002\022 \n\023if_generation_match\030\002" - + " \001(\003H\000\210\001\001\022$\n\027if_generation_not_match\030\003 \001" - + "(\003H\001\210\001\001\022$\n\027if_metageneration_match\030\004 \001(\003" - + "H\002\210\001\001\022(\n\033if_metageneration_not_match\030\005 \001" - + "(\003H\003\210\001\001\022\026\n\016predefined_acl\030\n \001(\t\0224\n\013updat" - + "e_mask\030\007 \001(\0132\032.google.protobuf.FieldMask" - + "B\003\340A\002\022R\n\034common_object_request_params\030\010 " + + "ams\"s\n\030QueryWriteStatusResponse\022\030\n\016persi" + + "sted_size\030\001 \001(\003H\000\022-\n\010resource\030\002 \001(\0132\031.go" + + "ogle.storage.v2.ObjectH\000B\016\n\014write_status" + + "\"\250\n\n\024RewriteObjectRequest\022 \n\020destination" + + "_name\030\030 \001(\tB\006\340A\002\340A\005\022D\n\022destination_bucke" + + "t\030\031 \001(\tB(\340A\002\340A\005\372A\037\n\035storage.googleapis.c" + + "om/Bucket\022C\n\023destination_kms_key\030\033 \001(\tB&" + + "\372A#\n!cloudkms.googleapis.com/CryptoKey\022." + + "\n\013destination\030\001 \001(\0132\031.google.storage.v2." + + "Object\022<\n\rsource_bucket\030\002 \001(\tB%\340A\002\372A\037\n\035s" + + "torage.googleapis.com/Bucket\022\032\n\rsource_o" + + "bject\030\003 \001(\tB\003\340A\002\022\031\n\021source_generation\030\004 " + + "\001(\003\022\025\n\rrewrite_token\030\005 \001(\t\022\"\n\032destinatio" + + "n_predefined_acl\030\034 \001(\t\022 \n\023if_generation_" + + "match\030\007 \001(\003H\000\210\001\001\022$\n\027if_generation_not_ma" + + "tch\030\010 \001(\003H\001\210\001\001\022$\n\027if_metageneration_matc" + + "h\030\t \001(\003H\002\210\001\001\022(\n\033if_metageneration_not_ma" + + "tch\030\n \001(\003H\003\210\001\001\022\'\n\032if_source_generation_m" + + "atch\030\013 \001(\003H\004\210\001\001\022+\n\036if_source_generation_" + + "not_match\030\014 \001(\003H\005\210\001\001\022+\n\036if_source_metage" + + "neration_match\030\r \001(\003H\006\210\001\001\022/\n\"if_source_m" + + "etageneration_not_match\030\016 \001(\003H\007\210\001\001\022$\n\034ma" + + "x_bytes_rewritten_per_call\030\017 \001(\003\022(\n copy" + + "_source_encryption_algorithm\030\020 \001(\t\022(\n co" + + "py_source_encryption_key_bytes\030\025 \001(\014\022/\n\'" + + "copy_source_encryption_key_sha256_bytes\030" + + "\026 \001(\014\022R\n\034common_object_request_params\030\023 " + "\001(\0132,.google.storage.v2.CommonObjectRequ" - + "estParamsB\026\n\024_if_generation_matchB\032\n\030_if" - + "_generation_not_matchB\032\n\030_if_metagenerat" - + "ion_matchB\036\n\034_if_metageneration_not_matc" - + "h\"`\n\030GetServiceAccountRequest\022D\n\007project" - + "\030\001 \001(\tB3\340A\002\372A-\n+cloudresourcemanager.goo" - + "gleapis.com/Project\"\200\001\n\024CreateHmacKeyReq" - + "uest\022D\n\007project\030\001 \001(\tB3\340A\002\372A-\n+cloudreso" - + "urcemanager.googleapis.com/Project\022\"\n\025se" - + "rvice_account_email\030\002 \001(\tB\003\340A\002\"g\n\025Create" - + "HmacKeyResponse\0224\n\010metadata\030\001 \001(\0132\".goog" - + "le.storage.v2.HmacKeyMetadata\022\030\n\020secret_" - + "key_bytes\030\003 \001(\014\"t\n\024DeleteHmacKeyRequest\022" - + "\026\n\taccess_id\030\001 \001(\tB\003\340A\002\022D\n\007project\030\002 \001(\t" - + "B3\340A\002\372A-\n+cloudresourcemanager.googleapi" - + "s.com/Project\"q\n\021GetHmacKeyRequest\022\026\n\tac" - + "cess_id\030\001 \001(\tB\003\340A\002\022D\n\007project\030\002 \001(\tB3\340A\002" + + "estParams\022<\n\020object_checksums\030\035 \001(\0132\".go" + + "ogle.storage.v2.ObjectChecksumsB\026\n\024_if_g" + + "eneration_matchB\032\n\030_if_generation_not_ma" + + "tchB\032\n\030_if_metageneration_matchB\036\n\034_if_m" + + "etageneration_not_matchB\035\n\033_if_source_ge" + + "neration_matchB!\n\037_if_source_generation_" + + "not_matchB!\n\037_if_source_metageneration_m" + + "atchB%\n#_if_source_metageneration_not_ma" + + "tch\"\227\001\n\017RewriteResponse\022\035\n\025total_bytes_r" + + "ewritten\030\001 \001(\003\022\023\n\013object_size\030\002 \001(\003\022\014\n\004d" + + "one\030\003 \001(\010\022\025\n\rrewrite_token\030\004 \001(\t\022+\n\010reso" + + "urce\030\005 \001(\0132\031.google.storage.v2.Object\"\362\001" + + "\n\032StartResumableWriteRequest\022B\n\021write_ob" + + "ject_spec\030\001 \001(\0132\".google.storage.v2.Writ" + + "eObjectSpecB\003\340A\002\022R\n\034common_object_reques" + + "t_params\030\003 \001(\0132,.google.storage.v2.Commo" + + "nObjectRequestParams\022<\n\020object_checksums" + + "\030\005 \001(\0132\".google.storage.v2.ObjectChecksu" + + "ms\"0\n\033StartResumableWriteResponse\022\021\n\tupl" + + "oad_id\030\001 \001(\t\"\357\003\n\023UpdateObjectRequest\022.\n\006" + + "object\030\001 \001(\0132\031.google.storage.v2.ObjectB" + + "\003\340A\002\022 \n\023if_generation_match\030\002 \001(\003H\000\210\001\001\022$" + + "\n\027if_generation_not_match\030\003 \001(\003H\001\210\001\001\022$\n\027" + + "if_metageneration_match\030\004 \001(\003H\002\210\001\001\022(\n\033if" + + "_metageneration_not_match\030\005 \001(\003H\003\210\001\001\022\026\n\016" + + "predefined_acl\030\n \001(\t\0224\n\013update_mask\030\007 \001(" + + "\0132\032.google.protobuf.FieldMaskB\003\340A\002\022R\n\034co" + + "mmon_object_request_params\030\010 \001(\0132,.googl" + + "e.storage.v2.CommonObjectRequestParamsB\026" + + "\n\024_if_generation_matchB\032\n\030_if_generation" + + "_not_matchB\032\n\030_if_metageneration_matchB\036" + + "\n\034_if_metageneration_not_match\"`\n\030GetSer" + + "viceAccountRequest\022D\n\007project\030\001 \001(\tB3\340A\002" + "\372A-\n+cloudresourcemanager.googleapis.com" - + "/Project\"\274\001\n\023ListHmacKeysRequest\022D\n\007proj" - + "ect\030\001 \001(\tB3\340A\002\372A-\n+cloudresourcemanager." - + "googleapis.com/Project\022\021\n\tpage_size\030\002 \001(" - + "\005\022\022\n\npage_token\030\003 \001(\t\022\035\n\025service_account" - + "_email\030\004 \001(\t\022\031\n\021show_deleted_keys\030\005 \001(\010\"" - + "f\n\024ListHmacKeysResponse\0225\n\thmac_keys\030\001 \003" - + "(\0132\".google.storage.v2.HmacKeyMetadata\022\027" - + "\n\017next_page_token\030\002 \001(\t\"\202\001\n\024UpdateHmacKe" - + "yRequest\0229\n\010hmac_key\030\001 \001(\0132\".google.stor" - + "age.v2.HmacKeyMetadataB\003\340A\002\022/\n\013update_ma" - + "sk\030\003 \001(\0132\032.google.protobuf.FieldMask\"|\n\031" - + "CommonObjectRequestParams\022\034\n\024encryption_" - + "algorithm\030\001 \001(\t\022\034\n\024encryption_key_bytes\030" - + "\004 \001(\014\022#\n\033encryption_key_sha256_bytes\030\005 \001" - + "(\014\"\312\005\n\020ServiceConstants\"\265\005\n\006Values\022\026\n\022VA" - + "LUES_UNSPECIFIED\020\000\022\033\n\024MAX_READ_CHUNK_BYT" - + "ES\020\200\200\200\001\022\034\n\025MAX_WRITE_CHUNK_BYTES\020\200\200\200\001\022\031\n" - + "\022MAX_OBJECT_SIZE_MB\020\200\200\300\002\022)\n$MAX_CUSTOM_M" - + "ETADATA_FIELD_NAME_BYTES\020\200\010\022*\n%MAX_CUSTO" - + "M_METADATA_FIELD_VALUE_BYTES\020\200 \022)\n$MAX_C" - + "USTOM_METADATA_TOTAL_SIZE_BYTES\020\200@\022*\n$MA" - + "X_BUCKET_METADATA_TOTAL_SIZE_BYTES\020\200\240\001\022\'" - + "\n#MAX_NOTIFICATION_CONFIGS_PER_BUCKET\020d\022" - + "\"\n\036MAX_LIFECYCLE_RULES_PER_BUCKET\020d\022&\n\"M" - + "AX_NOTIFICATION_CUSTOM_ATTRIBUTES\020\005\0221\n,M" - + "AX_NOTIFICATION_CUSTOM_ATTRIBUTE_KEY_LEN" - + "GTH\020\200\002\0223\n.MAX_NOTIFICATION_CUSTOM_ATTRIB" - + "UTE_VALUE_LENGTH\020\200\010\022\034\n\030MAX_LABELS_ENTRIE" - + "S_COUNT\020@\022\037\n\033MAX_LABELS_KEY_VALUE_LENGTH" - + "\020?\022\037\n\032MAX_LABELS_KEY_VALUE_BYTES\020\200\001\022.\n)M" - + "AX_OBJECT_IDS_PER_DELETE_OBJECTS_REQUEST" - + "\020\350\007\022\036\n\032SPLIT_TOKEN_MAX_VALID_DAYS\020\016\032\002\020\001\"" - + "\206\030\n\006Bucket\022\021\n\004name\030\001 \001(\tB\003\340A\005\022\026\n\tbucket_" - + "id\030\002 \001(\tB\003\340A\003\022\014\n\004etag\030\035 \001(\t\022D\n\007project\030\003" - + " \001(\tB3\340A\005\372A-\n+cloudresourcemanager.googl" - + "eapis.com/Project\022\033\n\016metageneration\030\004 \001(" - + "\003B\003\340A\003\022\025\n\010location\030\005 \001(\tB\003\340A\005\022\032\n\rlocatio" - + "n_type\030\006 \001(\tB\003\340A\003\022\025\n\rstorage_class\030\007 \001(\t" - + "\022\013\n\003rpo\030\033 \001(\t\0223\n\003acl\030\010 \003(\0132&.google.stor" - + "age.v2.BucketAccessControl\022B\n\022default_ob" - + "ject_acl\030\t \003(\0132&.google.storage.v2.Objec" - + "tAccessControl\0226\n\tlifecycle\030\n \001(\0132#.goog" - + "le.storage.v2.Bucket.Lifecycle\0224\n\013create" - + "_time\030\013 \001(\0132\032.google.protobuf.TimestampB" - + "\003\340A\003\022,\n\004cors\030\014 \003(\0132\036.google.storage.v2.B" - + "ucket.Cors\0224\n\013update_time\030\r \001(\0132\032.google" - + ".protobuf.TimestampB\003\340A\003\022 \n\030default_even" - + "t_based_hold\030\016 \001(\010\0225\n\006labels\030\017 \003(\0132%.goo" - + "gle.storage.v2.Bucket.LabelsEntry\0222\n\007web" - + "site\030\020 \001(\0132!.google.storage.v2.Bucket.We" - + "bsite\0228\n\nversioning\030\021 \001(\0132$.google.stora" - + "ge.v2.Bucket.Versioning\0222\n\007logging\030\022 \001(\013" - + "2!.google.storage.v2.Bucket.Logging\022,\n\005o" - + "wner\030\023 \001(\0132\030.google.storage.v2.OwnerB\003\340A" - + "\003\0228\n\nencryption\030\024 \001(\0132$.google.storage.v" - + "2.Bucket.Encryption\0222\n\007billing\030\025 \001(\0132!.g" - + "oogle.storage.v2.Bucket.Billing\022C\n\020reten" - + "tion_policy\030\026 \001(\0132).google.storage.v2.Bu" - + "cket.RetentionPolicy\0227\n\niam_config\030\027 \001(\013" - + "2#.google.storage.v2.Bucket.IamConfig\022\025\n" - + "\rsatisfies_pzs\030\031 \001(\010\022P\n\027custom_placement" - + "_config\030\032 \001(\0132/.google.storage.v2.Bucket" - + ".CustomPlacementConfig\0226\n\tautoclass\030\034 \001(" - + "\0132#.google.storage.v2.Bucket.Autoclass\032!" - + "\n\007Billing\022\026\n\016requester_pays\030\001 \001(\010\032X\n\004Cor" - + "s\022\016\n\006origin\030\001 \003(\t\022\016\n\006method\030\002 \003(\t\022\027\n\017res" - + "ponse_header\030\003 \003(\t\022\027\n\017max_age_seconds\030\004 " - + "\001(\005\032M\n\nEncryption\022?\n\017default_kms_key\030\001 \001" - + "(\tB&\372A#\n!cloudkms.googleapis.com/CryptoK" - + "ey\032\354\001\n\tIamConfig\022a\n\033uniform_bucket_level" - + "_access\030\001 \001(\0132<.google.storage.v2.Bucket" - + ".IamConfig.UniformBucketLevelAccess\022 \n\030p" - + "ublic_access_prevention\030\003 \001(\t\032Z\n\030Uniform" - + "BucketLevelAccess\022\017\n\007enabled\030\001 \001(\010\022-\n\tlo" - + "ck_time\030\002 \001(\0132\032.google.protobuf.Timestam" - + "p\032\363\005\n\tLifecycle\0226\n\004rule\030\001 \003(\0132(.google.s" - + "torage.v2.Bucket.Lifecycle.Rule\032\255\005\n\004Rule" - + "\022?\n\006action\030\001 \001(\0132/.google.storage.v2.Buc" - + "ket.Lifecycle.Rule.Action\022E\n\tcondition\030\002" - + " \001(\01322.google.storage.v2.Bucket.Lifecycl" - + "e.Rule.Condition\032-\n\006Action\022\014\n\004type\030\001 \001(\t" - + "\022\025\n\rstorage_class\030\002 \001(\t\032\355\003\n\tCondition\022\025\n" - + "\010age_days\030\001 \001(\005H\000\210\001\001\022)\n\016created_before\030\002" - + " \001(\0132\021.google.type.Date\022\024\n\007is_live\030\003 \001(\010" - + "H\001\210\001\001\022\037\n\022num_newer_versions\030\004 \001(\005H\002\210\001\001\022\035" - + "\n\025matches_storage_class\030\005 \003(\t\022#\n\026days_si" - + "nce_custom_time\030\007 \001(\005H\003\210\001\001\022-\n\022custom_tim" - + "e_before\030\010 \001(\0132\021.google.type.Date\022\'\n\032day" - + "s_since_noncurrent_time\030\t \001(\005H\004\210\001\001\0221\n\026no" - + "ncurrent_time_before\030\n \001(\0132\021.google.type" - + ".Date\022\026\n\016matches_prefix\030\013 \003(\t\022\026\n\016matches" - + "_suffix\030\014 \003(\tB\013\n\t_age_daysB\n\n\010_is_liveB\025" - + "\n\023_num_newer_versionsB\031\n\027_days_since_cus" - + "tom_timeB\035\n\033_days_since_noncurrent_time\032" - + "8\n\007Logging\022\022\n\nlog_bucket\030\001 \001(\t\022\031\n\021log_ob" - + "ject_prefix\030\002 \001(\t\032\303\001\n\017RetentionPolicy\0222\n" - + "\016effective_time\030\001 \001(\0132\032.google.protobuf." - + "Timestamp\022\021\n\tis_locked\030\002 \001(\010\022\035\n\020retentio" - + "n_period\030\003 \001(\003H\000\210\001\001\0225\n\022retention_duratio" - + "n\030\004 \001(\0132\031.google.protobuf.DurationB\023\n\021_r" - + "etention_period\032\035\n\nVersioning\022\017\n\007enabled" - + "\030\001 \001(\010\032;\n\007Website\022\030\n\020main_page_suffix\030\001 " - + "\001(\t\022\026\n\016not_found_page\030\002 \001(\t\032/\n\025CustomPla" - + "cementConfig\022\026\n\016data_locations\030\001 \003(\t\032R\n\t" - + "Autoclass\022\017\n\007enabled\030\001 \001(\010\0224\n\013toggle_tim" - + "e\030\002 \001(\0132\032.google.protobuf.TimestampB\003\340A\003" - + "\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 " - + "\001(\t:\0028\001:G\352AD\n\035storage.googleapis.com/Buc" - + "ket\022#projects/{project}/buckets/{bucket}" - + "\"\316\001\n\023BucketAccessControl\022\014\n\004role\030\001 \001(\t\022\n" - + "\n\002id\030\002 \001(\t\022\016\n\006entity\030\003 \001(\t\022\027\n\nentity_alt" - + "\030\t \001(\tB\003\340A\003\022\021\n\tentity_id\030\004 \001(\t\022\014\n\004etag\030\010" - + " \001(\t\022\r\n\005email\030\005 \001(\t\022\016\n\006domain\030\006 \001(\t\0224\n\014p" - + "roject_team\030\007 \001(\0132\036.google.storage.v2.Pr" - + "ojectTeam\"B\n\017ChecksummedData\022\017\n\007content\030" - + "\001 \001(\014\022\023\n\006crc32c\030\002 \001(\007H\000\210\001\001B\t\n\007_crc32c\"C\n" - + "\017ObjectChecksums\022\023\n\006crc32c\030\001 \001(\007H\000\210\001\001\022\020\n" - + "\010md5_hash\030\002 \001(\014B\t\n\007_crc32c\"\255\002\n\017HmacKeyMe" - + "tadata\022\017\n\002id\030\001 \001(\tB\003\340A\005\022\026\n\taccess_id\030\002 \001" - + "(\tB\003\340A\005\022D\n\007project\030\003 \001(\tB3\340A\005\372A-\n+cloudr" - + "esourcemanager.googleapis.com/Project\022\"\n" - + "\025service_account_email\030\004 \001(\tB\003\340A\003\022\r\n\005sta" - + "te\030\005 \001(\t\0224\n\013create_time\030\006 \001(\0132\032.google.p" - + "rotobuf.TimestampB\003\340A\003\0224\n\013update_time\030\007 " - + "\001(\0132\032.google.protobuf.TimestampB\003\340A\003\022\014\n\004" - + "etag\030\010 \001(\t\"\247\003\n\022NotificationConfig\022\021\n\004nam" - + "e\030\001 \001(\tB\003\340A\002\022\022\n\005topic\030\002 \001(\tB\003\340A\002\022\014\n\004etag" - + "\030\007 \001(\t\022\023\n\013event_types\030\003 \003(\t\022V\n\021custom_at" - + "tributes\030\004 \003(\0132;.google.storage.v2.Notif" - + "icationConfig.CustomAttributesEntry\022\032\n\022o" - + "bject_name_prefix\030\005 \001(\t\022\033\n\016payload_forma" - + "t\030\006 \001(\tB\003\340A\002\0327\n\025CustomAttributesEntry\022\013\n" - + "\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:}\352Az\n)stor" - + "age.googleapis.com/NotificationConfig\022Mp" - + "rojects/{project}/buckets/{bucket}/notif" - + "icationConfigs/{notification_config}\"L\n\022" - + "CustomerEncryption\022\034\n\024encryption_algorit" - + "hm\030\001 \001(\t\022\030\n\020key_sha256_bytes\030\003 \001(\014\"\202\t\n\006O" - + "bject\022\021\n\004name\030\001 \001(\tB\003\340A\005\0225\n\006bucket\030\002 \001(\t" - + "B%\340A\005\372A\037\n\035storage.googleapis.com/Bucket\022" - + "\014\n\004etag\030\033 \001(\t\022\027\n\ngeneration\030\003 \001(\003B\003\340A\005\022\033" - + "\n\016metageneration\030\004 \001(\003B\003\340A\003\022\025\n\rstorage_c" - + "lass\030\005 \001(\t\022\021\n\004size\030\006 \001(\003B\003\340A\003\022\030\n\020content" - + "_encoding\030\007 \001(\t\022\033\n\023content_disposition\030\010" - + " \001(\t\022\025\n\rcache_control\030\t \001(\t\0223\n\003acl\030\n \003(\013" - + "2&.google.storage.v2.ObjectAccessControl" - + "\022\030\n\020content_language\030\013 \001(\t\0224\n\013delete_tim" - + "e\030\014 \001(\0132\032.google.protobuf.TimestampB\003\340A\003" - + "\022\024\n\014content_type\030\r \001(\t\0224\n\013create_time\030\016 " - + "\001(\0132\032.google.protobuf.TimestampB\003\340A\003\022\034\n\017" - + "component_count\030\017 \001(\005B\003\340A\003\022:\n\tchecksums\030" - + "\020 \001(\0132\".google.storage.v2.ObjectChecksum" - + "sB\003\340A\003\0224\n\013update_time\030\021 \001(\0132\032.google.pro" - + "tobuf.TimestampB\003\340A\003\0227\n\007kms_key\030\022 \001(\tB&\372" - + "A#\n!cloudkms.googleapis.com/CryptoKey\022B\n" - + "\031update_storage_class_time\030\023 \001(\0132\032.googl" - + "e.protobuf.TimestampB\003\340A\003\022\026\n\016temporary_h" - + "old\030\024 \001(\010\0229\n\025retention_expire_time\030\025 \001(\013" - + "2\032.google.protobuf.Timestamp\0229\n\010metadata" - + "\030\026 \003(\0132\'.google.storage.v2.Object.Metada" - + "taEntry\022\035\n\020event_based_hold\030\027 \001(\010H\000\210\001\001\022," - + "\n\005owner\030\030 \001(\0132\030.google.storage.v2.OwnerB" - + "\003\340A\003\022B\n\023customer_encryption\030\031 \001(\0132%.goog" - + "le.storage.v2.CustomerEncryption\022/\n\013cust" - + "om_time\030\032 \001(\0132\032.google.protobuf.Timestam" - + "p\032/\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value" - + "\030\002 \001(\t:\0028\001B\023\n\021_event_based_hold\"\316\001\n\023Obje", - "ctAccessControl\022\014\n\004role\030\001 \001(\t\022\n\n\002id\030\002 \001(" - + "\t\022\016\n\006entity\030\003 \001(\t\022\027\n\nentity_alt\030\t \001(\tB\003\340" - + "A\003\022\021\n\tentity_id\030\004 \001(\t\022\014\n\004etag\030\010 \001(\t\022\r\n\005e" - + "mail\030\005 \001(\t\022\016\n\006domain\030\006 \001(\t\0224\n\014project_te" - + "am\030\007 \001(\0132\036.google.storage.v2.ProjectTeam" - + "\"l\n\023ListObjectsResponse\022*\n\007objects\030\001 \003(\013" - + "2\031.google.storage.v2.Object\022\020\n\010prefixes\030" - + "\002 \003(\t\022\027\n\017next_page_token\030\003 \001(\t\"3\n\013Projec" - + "tTeam\022\026\n\016project_number\030\001 \001(\t\022\014\n\004team\030\002 " - + "\001(\t\"\'\n\016ServiceAccount\022\025\n\remail_address\030\001" - + " \001(\t\"*\n\005Owner\022\016\n\006entity\030\001 \001(\t\022\021\n\tentity_" - + "id\030\002 \001(\t\"C\n\014ContentRange\022\r\n\005start\030\001 \001(\003\022" - + "\013\n\003end\030\002 \001(\003\022\027\n\017complete_length\030\003 \001(\0032\230&" - + "\n\007Storage\022r\n\014DeleteBucket\022&.google.stora" - + "ge.v2.DeleteBucketRequest\032\026.google.proto" - + "buf.Empty\"\"\212\323\344\223\002\025\022\023\n\004name\022\013{bucket=**}\332A" - + "\004name\022o\n\tGetBucket\022#.google.storage.v2.G" - + "etBucketRequest\032\031.google.storage.v2.Buck" - + "et\"\"\212\323\344\223\002\025\022\023\n\004name\022\013{bucket=**}\332A\004name\022\253" - + "\001\n\014CreateBucket\022&.google.storage.v2.Crea" - + "teBucketRequest\032\031.google.storage.v2.Buck" - + "et\"X\212\323\344\223\0028\022\026\n\006parent\022\014{project=**}\022\036\n\016bu" - + "cket.project\022\014{project=**}\332A\027parent,buck" - + "et,bucket_id\022\205\001\n\013ListBuckets\022%.google.st" - + "orage.v2.ListBucketsRequest\032&.google.sto" - + "rage.v2.ListBucketsResponse\"\'\212\323\344\223\002\030\022\026\n\006p" - + "arent\022\014{project=**}\332A\006parent\022\223\001\n\031LockBuc" - + "ketRetentionPolicy\0223.google.storage.v2.L" - + "ockBucketRetentionPolicyRequest\032\031.google" - + ".storage.v2.Bucket\"&\212\323\344\223\002\027\022\025\n\006bucket\022\013{b" - + "ucket=**}\332A\006bucket\022\253\001\n\014GetIamPolicy\022\".go" - + "ogle.iam.v1.GetIamPolicyRequest\032\025.google" - + ".iam.v1.Policy\"`\212\323\344\223\002O\022\027\n\010resource\022\013{buc" - + "ket=**}\0224\n\010resource\022({bucket=projects/*/" - + "buckets/*}/objects/**\332A\010resource\022\262\001\n\014Set" - + "IamPolicy\022\".google.iam.v1.SetIamPolicyRe" - + "quest\032\025.google.iam.v1.Policy\"g\212\323\344\223\002O\022\027\n\010" - + "resource\022\013{bucket=**}\0224\n\010resource\022({buck" - + "et=projects/*/buckets/*}/objects/**\332A\017re" - + "source,policy\022\327\001\n\022TestIamPermissions\022(.g" - + "oogle.iam.v1.TestIamPermissionsRequest\032)" - + ".google.iam.v1.TestIamPermissionsRespons" - + "e\"l\212\323\344\223\002O\022\027\n\010resource\022\013{bucket=**}\0224\n\010re" - + "source\022({bucket=projects/*/buckets/*}/ob" - + "jects/**\332A\024resource,permissions\022\212\001\n\014Upda" - + "teBucket\022&.google.storage.v2.UpdateBucke" - + "tRequest\032\031.google.storage.v2.Bucket\"7\212\323\344" - + "\223\002\034\022\032\n\013bucket.name\022\013{bucket=**}\332A\022bucket" - + ",update_mask\022\237\001\n\030DeleteNotificationConfi" - + "g\0222.google.storage.v2.DeleteNotification" - + "ConfigRequest\032\026.google.protobuf.Empty\"7\212" - + "\323\344\223\002*\022(\n\004name\022 {bucket=projects/*/bucket" - + "s/*}/**\332A\004name\022\250\001\n\025GetNotificationConfig" - + "\022/.google.storage.v2.GetNotificationConf" - + "igRequest\032%.google.storage.v2.Notificati" - + "onConfig\"7\212\323\344\223\002*\022(\n\004name\022 {bucket=projec" - + "ts/*/buckets/*}/**\332A\004name\022\261\001\n\030CreateNoti" - + "ficationConfig\0222.google.storage.v2.Creat" - + "eNotificationConfigRequest\032%.google.stor" - + "age.v2.NotificationConfig\":\212\323\344\223\002\027\022\025\n\006par" - + "ent\022\013{bucket=**}\332A\032parent,notification_c" - + "onfig\022\250\001\n\027ListNotificationConfigs\0221.goog" - + "le.storage.v2.ListNotificationConfigsReq" - + "uest\0322.google.storage.v2.ListNotificatio" - + "nConfigsResponse\"&\212\323\344\223\002\027\022\025\n\006parent\022\013{buc" - + "ket=**}\332A\006parent\022~\n\rComposeObject\022\'.goog" - + "le.storage.v2.ComposeObjectRequest\032\031.goo" - + "gle.storage.v2.Object\")\212\323\344\223\002#\022!\n\022destina" - + "tion.bucket\022\013{bucket=**}\022\230\001\n\014DeleteObjec" - + "t\022&.google.storage.v2.DeleteObjectReques" - + "t\032\026.google.protobuf.Empty\"H\212\323\344\223\002\027\022\025\n\006buc" - + "ket\022\013{bucket=**}\332A\rbucket,object\332A\030bucke" - + "t,object,generation\022\272\001\n\024CancelResumableW" - + "rite\022..google.storage.v2.CancelResumable" - + "WriteRequest\032/.google.storage.v2.CancelR" - + "esumableWriteResponse\"A\212\323\344\223\002/\022-\n\tupload_" - + "id\022 {bucket=projects/*/buckets/*}/**\332A\tu" - + "pload_id\022\225\001\n\tGetObject\022#.google.storage." - + "v2.GetObjectRequest\032\031.google.storage.v2." - + "Object\"H\212\323\344\223\002\027\022\025\n\006bucket\022\013{bucket=**}\332A\r" - + "bucket,object\332A\030bucket,object,generation" - + "\022\245\001\n\nReadObject\022$.google.storage.v2.Read" - + "ObjectRequest\032%.google.storage.v2.ReadOb" - + "jectResponse\"H\212\323\344\223\002\027\022\025\n\006bucket\022\013{bucket=" - + "**}\332A\rbucket,object\332A\030bucket,object,gene" - + "ration0\001\022\214\001\n\014UpdateObject\022&.google.stora" - + "ge.v2.UpdateObjectRequest\032\031.google.stora" - + "ge.v2.Object\"9\212\323\344\223\002\036\022\034\n\robject.bucket\022\013{" - + "bucket=**}\332A\022object,update_mask\022`\n\013Write" - + "Object\022%.google.storage.v2.WriteObjectRe" - + "quest\032&.google.storage.v2.WriteObjectRes" - + "ponse\"\000(\001\022\204\001\n\013ListObjects\022%.google.stora" - + "ge.v2.ListObjectsRequest\032&.google.storag" - + "e.v2.ListObjectsResponse\"&\212\323\344\223\002\027\022\025\n\006pare" - + "nt\022\013{bucket=**}\332A\006parent\022\230\001\n\rRewriteObje" - + "ct\022\'.google.storage.v2.RewriteObjectRequ" - + "est\032\".google.storage.v2.RewriteResponse\"" - + ":\212\323\344\223\0024\022\017\n\rsource_bucket\022!\n\022destination_" - + "bucket\022\013{bucket=**}\022\256\001\n\023StartResumableWr" - + "ite\022-.google.storage.v2.StartResumableWr" - + "iteRequest\032..google.storage.v2.StartResu" - + "mableWriteResponse\"8\212\323\344\223\0022\0220\n!write_obje" - + "ct_spec.resource.bucket\022\013{bucket=**}\022\256\001\n" - + "\020QueryWriteStatus\022*.google.storage.v2.Qu" - + "eryWriteStatusRequest\032+.google.storage.v" - + "2.QueryWriteStatusResponse\"A\212\323\344\223\002/\022-\n\tup" - + "load_id\022 {bucket=projects/*/buckets/*}/*" - + "*\332A\tupload_id\022\200\001\n\021GetServiceAccount\022+.go" - + "ogle.storage.v2.GetServiceAccountRequest" - + "\032!.google.storage.v2.ServiceAccount\"\033\212\323\344" - + "\223\002\013\022\t\n\007project\332A\007project\022\225\001\n\rCreateHmacK" - + "ey\022\'.google.storage.v2.CreateHmacKeyRequ" - + "est\032(.google.storage.v2.CreateHmacKeyRes" - + "ponse\"1\212\323\344\223\002\013\022\t\n\007project\332A\035project,servi" - + "ce_account_email\022w\n\rDeleteHmacKey\022\'.goog" - + "le.storage.v2.DeleteHmacKeyRequest\032\026.goo" - + "gle.protobuf.Empty\"%\212\323\344\223\002\013\022\t\n\007project\332A\021" - + "access_id,project\022}\n\nGetHmacKey\022$.google" - + ".storage.v2.GetHmacKeyRequest\032\".google.s" - + "torage.v2.HmacKeyMetadata\"%\212\323\344\223\002\013\022\t\n\007pro" - + "ject\332A\021access_id,project\022|\n\014ListHmacKeys" - + "\022&.google.storage.v2.ListHmacKeysRequest" - + "\032\'.google.storage.v2.ListHmacKeysRespons" - + "e\"\033\212\323\344\223\002\013\022\t\n\007project\332A\007project\022\235\001\n\rUpdat" - + "eHmacKey\022\'.google.storage.v2.UpdateHmacK" - + "eyRequest\032\".google.storage.v2.HmacKeyMet" - + "adata\"?\212\323\344\223\002\"\022 \n\020hmac_key.project\022\014{proj" - + "ect=**}\332A\024hmac_key,update_mask\032\247\002\312A\026stor" - + "age.googleapis.com\322A\212\002https://www.google" - + "apis.com/auth/cloud-platform,https://www" - + ".googleapis.com/auth/cloud-platform.read" - + "-only,https://www.googleapis.com/auth/de" - + "vstorage.full_control,https://www.google" - + "apis.com/auth/devstorage.read_only,https" - + "://www.googleapis.com/auth/devstorage.re" - + "ad_writeB\334\001\n\025com.google.storage.v2B\014Stor" - + "ageProtoP\001Z8google.golang.org/genproto/g" - + "oogleapis/storage/v2;storage\352Ax\n!cloudkm" - + "s.googleapis.com/CryptoKey\022Sprojects/{pr" - + "oject}/locations/{location}/keyRings/{ke" - + "y_ring}/cryptoKeys/{crypto_key}b\006proto3" + + "/Project\"\200\001\n\024CreateHmacKeyRequest\022D\n\007pro" + + "ject\030\001 \001(\tB3\340A\002\372A-\n+cloudresourcemanager" + + ".googleapis.com/Project\022\"\n\025service_accou" + + "nt_email\030\002 \001(\tB\003\340A\002\"g\n\025CreateHmacKeyResp" + + "onse\0224\n\010metadata\030\001 \001(\0132\".google.storage." + + "v2.HmacKeyMetadata\022\030\n\020secret_key_bytes\030\003" + + " \001(\014\"t\n\024DeleteHmacKeyRequest\022\026\n\taccess_i" + + "d\030\001 \001(\tB\003\340A\002\022D\n\007project\030\002 \001(\tB3\340A\002\372A-\n+c" + + "loudresourcemanager.googleapis.com/Proje" + + "ct\"q\n\021GetHmacKeyRequest\022\026\n\taccess_id\030\001 \001" + + "(\tB\003\340A\002\022D\n\007project\030\002 \001(\tB3\340A\002\372A-\n+cloudr" + + "esourcemanager.googleapis.com/Project\"\274\001" + + "\n\023ListHmacKeysRequest\022D\n\007project\030\001 \001(\tB3" + + "\340A\002\372A-\n+cloudresourcemanager.googleapis." + + "com/Project\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_t" + + "oken\030\003 \001(\t\022\035\n\025service_account_email\030\004 \001(" + + "\t\022\031\n\021show_deleted_keys\030\005 \001(\010\"f\n\024ListHmac" + + "KeysResponse\0225\n\thmac_keys\030\001 \003(\0132\".google" + + ".storage.v2.HmacKeyMetadata\022\027\n\017next_page" + + "_token\030\002 \001(\t\"\202\001\n\024UpdateHmacKeyRequest\0229\n" + + "\010hmac_key\030\001 \001(\0132\".google.storage.v2.Hmac" + + "KeyMetadataB\003\340A\002\022/\n\013update_mask\030\003 \001(\0132\032." + + "google.protobuf.FieldMask\"|\n\031CommonObjec" + + "tRequestParams\022\034\n\024encryption_algorithm\030\001" + + " \001(\t\022\034\n\024encryption_key_bytes\030\004 \001(\014\022#\n\033en" + + "cryption_key_sha256_bytes\030\005 \001(\014\"\312\005\n\020Serv" + + "iceConstants\"\265\005\n\006Values\022\026\n\022VALUES_UNSPEC" + + "IFIED\020\000\022\033\n\024MAX_READ_CHUNK_BYTES\020\200\200\200\001\022\034\n\025" + + "MAX_WRITE_CHUNK_BYTES\020\200\200\200\001\022\031\n\022MAX_OBJECT" + + "_SIZE_MB\020\200\200\300\002\022)\n$MAX_CUSTOM_METADATA_FIE" + + "LD_NAME_BYTES\020\200\010\022*\n%MAX_CUSTOM_METADATA_" + + "FIELD_VALUE_BYTES\020\200 \022)\n$MAX_CUSTOM_METAD" + + "ATA_TOTAL_SIZE_BYTES\020\200@\022*\n$MAX_BUCKET_ME" + + "TADATA_TOTAL_SIZE_BYTES\020\200\240\001\022\'\n#MAX_NOTIF" + + "ICATION_CONFIGS_PER_BUCKET\020d\022\"\n\036MAX_LIFE" + + "CYCLE_RULES_PER_BUCKET\020d\022&\n\"MAX_NOTIFICA" + + "TION_CUSTOM_ATTRIBUTES\020\005\0221\n,MAX_NOTIFICA" + + "TION_CUSTOM_ATTRIBUTE_KEY_LENGTH\020\200\002\0223\n.M" + + "AX_NOTIFICATION_CUSTOM_ATTRIBUTE_VALUE_L" + + "ENGTH\020\200\010\022\034\n\030MAX_LABELS_ENTRIES_COUNT\020@\022\037" + + "\n\033MAX_LABELS_KEY_VALUE_LENGTH\020?\022\037\n\032MAX_L" + + "ABELS_KEY_VALUE_BYTES\020\200\001\022.\n)MAX_OBJECT_I" + + "DS_PER_DELETE_OBJECTS_REQUEST\020\350\007\022\036\n\032SPLI" + + "T_TOKEN_MAX_VALID_DAYS\020\016\032\002\020\001\"\322\027\n\006Bucket\022" + + "\021\n\004name\030\001 \001(\tB\003\340A\005\022\026\n\tbucket_id\030\002 \001(\tB\003\340" + + "A\003\022\014\n\004etag\030\035 \001(\t\022D\n\007project\030\003 \001(\tB3\340A\005\372A" + + "-\n+cloudresourcemanager.googleapis.com/P" + + "roject\022\033\n\016metageneration\030\004 \001(\003B\003\340A\003\022\025\n\010l" + + "ocation\030\005 \001(\tB\003\340A\005\022\032\n\rlocation_type\030\006 \001(" + + "\tB\003\340A\003\022\025\n\rstorage_class\030\007 \001(\t\022\013\n\003rpo\030\033 \001" + + "(\t\0223\n\003acl\030\010 \003(\0132&.google.storage.v2.Buck" + + "etAccessControl\022B\n\022default_object_acl\030\t " + + "\003(\0132&.google.storage.v2.ObjectAccessCont" + + "rol\0226\n\tlifecycle\030\n \001(\0132#.google.storage." + + "v2.Bucket.Lifecycle\0224\n\013create_time\030\013 \001(\013" + + "2\032.google.protobuf.TimestampB\003\340A\003\022,\n\004cor" + + "s\030\014 \003(\0132\036.google.storage.v2.Bucket.Cors\022" + + "4\n\013update_time\030\r \001(\0132\032.google.protobuf.T" + + "imestampB\003\340A\003\022 \n\030default_event_based_hol" + + "d\030\016 \001(\010\0225\n\006labels\030\017 \003(\0132%.google.storage" + + ".v2.Bucket.LabelsEntry\0222\n\007website\030\020 \001(\0132" + + "!.google.storage.v2.Bucket.Website\0228\n\nve" + + "rsioning\030\021 \001(\0132$.google.storage.v2.Bucke" + + "t.Versioning\0222\n\007logging\030\022 \001(\0132!.google.s" + + "torage.v2.Bucket.Logging\022,\n\005owner\030\023 \001(\0132" + + "\030.google.storage.v2.OwnerB\003\340A\003\0228\n\nencryp" + + "tion\030\024 \001(\0132$.google.storage.v2.Bucket.En" + + "cryption\0222\n\007billing\030\025 \001(\0132!.google.stora" + + "ge.v2.Bucket.Billing\022C\n\020retention_policy" + + "\030\026 \001(\0132).google.storage.v2.Bucket.Retent" + + "ionPolicy\0227\n\niam_config\030\027 \001(\0132#.google.s" + + "torage.v2.Bucket.IamConfig\022\025\n\rsatisfies_" + + "pzs\030\031 \001(\010\022P\n\027custom_placement_config\030\032 \001" + + "(\0132/.google.storage.v2.Bucket.CustomPlac" + + "ementConfig\0226\n\tautoclass\030\034 \001(\0132#.google." + + "storage.v2.Bucket.Autoclass\032!\n\007Billing\022\026" + + "\n\016requester_pays\030\001 \001(\010\032X\n\004Cors\022\016\n\006origin" + + "\030\001 \003(\t\022\016\n\006method\030\002 \003(\t\022\027\n\017response_heade" + + "r\030\003 \003(\t\022\027\n\017max_age_seconds\030\004 \001(\005\032M\n\nEncr" + + "yption\022?\n\017default_kms_key\030\001 \001(\tB&\372A#\n!cl" + + "oudkms.googleapis.com/CryptoKey\032\354\001\n\tIamC" + + "onfig\022a\n\033uniform_bucket_level_access\030\001 \001" + + "(\0132<.google.storage.v2.Bucket.IamConfig." + + "UniformBucketLevelAccess\022 \n\030public_acces" + + "s_prevention\030\003 \001(\t\032Z\n\030UniformBucketLevel" + + "Access\022\017\n\007enabled\030\001 \001(\010\022-\n\tlock_time\030\002 \001" + + "(\0132\032.google.protobuf.Timestamp\032\363\005\n\tLifec" + + "ycle\0226\n\004rule\030\001 \003(\0132(.google.storage.v2.B" + + "ucket.Lifecycle.Rule\032\255\005\n\004Rule\022?\n\006action\030" + + "\001 \001(\0132/.google.storage.v2.Bucket.Lifecyc" + + "le.Rule.Action\022E\n\tcondition\030\002 \001(\01322.goog" + + "le.storage.v2.Bucket.Lifecycle.Rule.Cond" + + "ition\032-\n\006Action\022\014\n\004type\030\001 \001(\t\022\025\n\rstorage" + + "_class\030\002 \001(\t\032\355\003\n\tCondition\022\025\n\010age_days\030\001" + + " \001(\005H\000\210\001\001\022)\n\016created_before\030\002 \001(\0132\021.goog" + + "le.type.Date\022\024\n\007is_live\030\003 \001(\010H\001\210\001\001\022\037\n\022nu" + + "m_newer_versions\030\004 \001(\005H\002\210\001\001\022\035\n\025matches_s" + + "torage_class\030\005 \003(\t\022#\n\026days_since_custom_" + + "time\030\007 \001(\005H\003\210\001\001\022-\n\022custom_time_before\030\010 " + + "\001(\0132\021.google.type.Date\022\'\n\032days_since_non" + + "current_time\030\t \001(\005H\004\210\001\001\0221\n\026noncurrent_ti" + + "me_before\030\n \001(\0132\021.google.type.Date\022\026\n\016ma" + + "tches_prefix\030\013 \003(\t\022\026\n\016matches_suffix\030\014 \003" + + "(\tB\013\n\t_age_daysB\n\n\010_is_liveB\025\n\023_num_newe" + + "r_versionsB\031\n\027_days_since_custom_timeB\035\n" + + "\033_days_since_noncurrent_time\0328\n\007Logging\022" + + "\022\n\nlog_bucket\030\001 \001(\t\022\031\n\021log_object_prefix" + + "\030\002 \001(\t\032\217\001\n\017RetentionPolicy\0222\n\016effective_" + + "time\030\001 \001(\0132\032.google.protobuf.Timestamp\022\021" + + "\n\tis_locked\030\002 \001(\010\0225\n\022retention_duration\030" + + "\004 \001(\0132\031.google.protobuf.Duration\032\035\n\nVers" + + "ioning\022\017\n\007enabled\030\001 \001(\010\032;\n\007Website\022\030\n\020ma" + + "in_page_suffix\030\001 \001(\t\022\026\n\016not_found_page\030\002" + + " \001(\t\032/\n\025CustomPlacementConfig\022\026\n\016data_lo" + + "cations\030\001 \003(\t\032R\n\tAutoclass\022\017\n\007enabled\030\001 " + + "\001(\010\0224\n\013toggle_time\030\002 \001(\0132\032.google.protob" + + "uf.TimestampB\003\340A\003\032-\n\013LabelsEntry\022\013\n\003key\030" + + "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:G\352AD\n\035storage.g" + + "oogleapis.com/Bucket\022#projects/{project}" + + "/buckets/{bucket}\"\316\001\n\023BucketAccessContro" + + "l\022\014\n\004role\030\001 \001(\t\022\n\n\002id\030\002 \001(\t\022\016\n\006entity\030\003 " + + "\001(\t\022\027\n\nentity_alt\030\t \001(\tB\003\340A\003\022\021\n\tentity_i" + + "d\030\004 \001(\t\022\014\n\004etag\030\010 \001(\t\022\r\n\005email\030\005 \001(\t\022\016\n\006" + + "domain\030\006 \001(\t\0224\n\014project_team\030\007 \001(\0132\036.goo" + + "gle.storage.v2.ProjectTeam\"B\n\017Checksumme" + + "dData\022\017\n\007content\030\001 \001(\014\022\023\n\006crc32c\030\002 \001(\007H\000" + + "\210\001\001B\t\n\007_crc32c\"C\n\017ObjectChecksums\022\023\n\006crc" + + "32c\030\001 \001(\007H\000\210\001\001\022\020\n\010md5_hash\030\002 \001(\014B\t\n\007_crc" + + "32c\"\255\002\n\017HmacKeyMetadata\022\017\n\002id\030\001 \001(\tB\003\340A\005" + + "\022\026\n\taccess_id\030\002 \001(\tB\003\340A\005\022D\n\007project\030\003 \001(" + + "\tB3\340A\005\372A-\n+cloudresourcemanager.googleap" + + "is.com/Project\022\"\n\025service_account_email\030" + + "\004 \001(\tB\003\340A\003\022\r\n\005state\030\005 \001(\t\0224\n\013create_time" + + "\030\006 \001(\0132\032.google.protobuf.TimestampB\003\340A\003\022" + + "4\n\013update_time\030\007 \001(\0132\032.google.protobuf.T" + + "imestampB\003\340A\003\022\014\n\004etag\030\010 \001(\t\"\247\003\n\022Notifica" + + "tionConfig\022\021\n\004name\030\001 \001(\tB\003\340A\002\022\022\n\005topic\030\002" + + " \001(\tB\003\340A\002\022\014\n\004etag\030\007 \001(\t\022\023\n\013event_types\030\003" + + " \003(\t\022V\n\021custom_attributes\030\004 \003(\0132;.google" + + ".storage.v2.NotificationConfig.CustomAtt" + + "ributesEntry\022\032\n\022object_name_prefix\030\005 \001(\t" + + "\022\033\n\016payload_format\030\006 \001(\tB\003\340A\002\0327\n\025CustomA" + + "ttributesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001" + + "(\t:\0028\001:}\352Az\n)storage.googleapis.com/Noti" + + "ficationConfig\022Mprojects/{project}/bucke" + + "ts/{bucket}/notificationConfigs/{notific" + + "ation_config}\"L\n\022CustomerEncryption\022\034\n\024e" + + "ncryption_algorithm\030\001 \001(\t\022\030\n\020key_sha256_" + + "bytes\030\003 \001(\014\"\202\t\n\006Object\022\021\n\004name\030\001 \001(\tB\003\340A" + + "\005\0225\n\006bucket\030\002 \001(\tB%\340A\005\372A\037\n\035storage.googl" + + "eapis.com/Bucket\022\014\n\004etag\030\033 \001(\t\022\027\n\ngenera" + + "tion\030\003 \001(\003B\003\340A\005\022\033\n\016metageneration\030\004 \001(\003B" + + "\003\340A\003\022\025\n\rstorage_class\030\005 \001(\t\022\021\n\004size\030\006 \001(" + + "\003B\003\340A\003\022\030\n\020content_encoding\030\007 \001(\t\022\033\n\023cont" + + "ent_disposition\030\010 \001(\t\022\025\n\rcache_control\030\t" + + " \001(\t\0223\n\003acl\030\n \003(\0132&.google.storage.v2.Ob" + + "jectAccessControl\022\030\n\020content_language\030\013 " + + "\001(\t\0224\n\013delete_time\030\014 \001(\0132\032.google.protob" + + "uf.TimestampB\003\340A\003\022\024\n\014content_type\030\r \001(\t\022" + + "4\n\013create_time\030\016 \001(\0132\032.google.protobuf.T" + + "imestampB\003\340A\003\022\034\n\017component_count\030\017 \001(\005B\003" + + "\340A\003\022:\n\tchecksums\030\020 \001(\0132\".google.storage." + + "v2.ObjectChecksumsB\003\340A\003\0224\n\013update_time\030\021" + + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003\0227\n" + + "\007kms_key\030\022 \001(\tB&\372A#\n!cloudkms.googleapis" + + ".com/CryptoKey\022B\n\031update_storage_class_t" + + "ime\030\023 \001(\0132\032.google.protobuf.TimestampB\003\340" + + "A\003\022\026\n\016temporary_hold\030\024 \001(\010\0229\n\025retention_" + + "expire_time\030\025 \001(\0132\032.google.protobuf.Time" + + "stamp\0229\n\010metadata\030\026 \003(\0132\'.google.storage" + + ".v2.Object.MetadataEntry\022\035\n\020event_based_" + + "hold\030\027 \001(\010H\000\210\001\001\022,\n\005owner\030\030 \001(\0132\030.google." + + "storage.v2.OwnerB\003\340A\003\022B\n\023customer_encryp" + + "tion\030\031 \001(\0132%.google.storage.v2.CustomerE" + + "ncryption\022/\n\013custom_time\030\032 \001(\0132\032.google.", + "protobuf.Timestamp\032/\n\rMetadataEntry\022\013\n\003k" + + "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\023\n\021_event_ba" + + "sed_hold\"\316\001\n\023ObjectAccessControl\022\014\n\004role" + + "\030\001 \001(\t\022\n\n\002id\030\002 \001(\t\022\016\n\006entity\030\003 \001(\t\022\027\n\nen" + + "tity_alt\030\t \001(\tB\003\340A\003\022\021\n\tentity_id\030\004 \001(\t\022\014" + + "\n\004etag\030\010 \001(\t\022\r\n\005email\030\005 \001(\t\022\016\n\006domain\030\006 " + + "\001(\t\0224\n\014project_team\030\007 \001(\0132\036.google.stora" + + "ge.v2.ProjectTeam\"l\n\023ListObjectsResponse" + + "\022*\n\007objects\030\001 \003(\0132\031.google.storage.v2.Ob" + + "ject\022\020\n\010prefixes\030\002 \003(\t\022\027\n\017next_page_toke" + + "n\030\003 \001(\t\"3\n\013ProjectTeam\022\026\n\016project_number" + + "\030\001 \001(\t\022\014\n\004team\030\002 \001(\t\"\'\n\016ServiceAccount\022\025" + + "\n\remail_address\030\001 \001(\t\"*\n\005Owner\022\016\n\006entity" + + "\030\001 \001(\t\022\021\n\tentity_id\030\002 \001(\t\"C\n\014ContentRang" + + "e\022\r\n\005start\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\027\n\017complet" + + "e_length\030\003 \001(\0032\230&\n\007Storage\022r\n\014DeleteBuck" + + "et\022&.google.storage.v2.DeleteBucketReque" + + "st\032\026.google.protobuf.Empty\"\"\212\323\344\223\002\025\022\023\n\004na" + + "me\022\013{bucket=**}\332A\004name\022o\n\tGetBucket\022#.go" + + "ogle.storage.v2.GetBucketRequest\032\031.googl" + + "e.storage.v2.Bucket\"\"\212\323\344\223\002\025\022\023\n\004name\022\013{bu" + + "cket=**}\332A\004name\022\253\001\n\014CreateBucket\022&.googl" + + "e.storage.v2.CreateBucketRequest\032\031.googl" + + "e.storage.v2.Bucket\"X\212\323\344\223\0028\022\026\n\006parent\022\014{" + + "project=**}\022\036\n\016bucket.project\022\014{project=" + + "**}\332A\027parent,bucket,bucket_id\022\205\001\n\013ListBu" + + "ckets\022%.google.storage.v2.ListBucketsReq" + + "uest\032&.google.storage.v2.ListBucketsResp" + + "onse\"\'\212\323\344\223\002\030\022\026\n\006parent\022\014{project=**}\332A\006p" + + "arent\022\223\001\n\031LockBucketRetentionPolicy\0223.go" + + "ogle.storage.v2.LockBucketRetentionPolic" + + "yRequest\032\031.google.storage.v2.Bucket\"&\212\323\344" + + "\223\002\027\022\025\n\006bucket\022\013{bucket=**}\332A\006bucket\022\253\001\n\014" + + "GetIamPolicy\022\".google.iam.v1.GetIamPolic" + + "yRequest\032\025.google.iam.v1.Policy\"`\212\323\344\223\002O\022" + + "\027\n\010resource\022\013{bucket=**}\0224\n\010resource\022({b" + + "ucket=projects/*/buckets/*}/objects/**\332A" + + "\010resource\022\262\001\n\014SetIamPolicy\022\".google.iam." + + "v1.SetIamPolicyRequest\032\025.google.iam.v1.P" + + "olicy\"g\212\323\344\223\002O\022\027\n\010resource\022\013{bucket=**}\0224" + + "\n\010resource\022({bucket=projects/*/buckets/*" + + "}/objects/**\332A\017resource,policy\022\327\001\n\022TestI" + + "amPermissions\022(.google.iam.v1.TestIamPer" + + "missionsRequest\032).google.iam.v1.TestIamP" + + "ermissionsResponse\"l\212\323\344\223\002O\022\027\n\010resource\022\013" + + "{bucket=**}\0224\n\010resource\022({bucket=project" + + "s/*/buckets/*}/objects/**\332A\024resource,per" + + "missions\022\212\001\n\014UpdateBucket\022&.google.stora" + + "ge.v2.UpdateBucketRequest\032\031.google.stora" + + "ge.v2.Bucket\"7\212\323\344\223\002\034\022\032\n\013bucket.name\022\013{bu" + + "cket=**}\332A\022bucket,update_mask\022\237\001\n\030Delete" + + "NotificationConfig\0222.google.storage.v2.D" + + "eleteNotificationConfigRequest\032\026.google." + + "protobuf.Empty\"7\212\323\344\223\002*\022(\n\004name\022 {bucket=" + + "projects/*/buckets/*}/**\332A\004name\022\250\001\n\025GetN" + + "otificationConfig\022/.google.storage.v2.Ge" + + "tNotificationConfigRequest\032%.google.stor" + + "age.v2.NotificationConfig\"7\212\323\344\223\002*\022(\n\004nam" + + "e\022 {bucket=projects/*/buckets/*}/**\332A\004na" + + "me\022\261\001\n\030CreateNotificationConfig\0222.google" + + ".storage.v2.CreateNotificationConfigRequ" + + "est\032%.google.storage.v2.NotificationConf" + + "ig\":\212\323\344\223\002\027\022\025\n\006parent\022\013{bucket=**}\332A\032pare" + + "nt,notification_config\022\250\001\n\027ListNotificat" + + "ionConfigs\0221.google.storage.v2.ListNotif" + + "icationConfigsRequest\0322.google.storage.v" + + "2.ListNotificationConfigsResponse\"&\212\323\344\223\002" + + "\027\022\025\n\006parent\022\013{bucket=**}\332A\006parent\022~\n\rCom" + + "poseObject\022\'.google.storage.v2.ComposeOb" + + "jectRequest\032\031.google.storage.v2.Object\")" + + "\212\323\344\223\002#\022!\n\022destination.bucket\022\013{bucket=**" + + "}\022\230\001\n\014DeleteObject\022&.google.storage.v2.D" + + "eleteObjectRequest\032\026.google.protobuf.Emp" + + "ty\"H\212\323\344\223\002\027\022\025\n\006bucket\022\013{bucket=**}\332A\rbuck" + + "et,object\332A\030bucket,object,generation\022\272\001\n" + + "\024CancelResumableWrite\022..google.storage.v" + + "2.CancelResumableWriteRequest\032/.google.s" + + "torage.v2.CancelResumableWriteResponse\"A" + + "\212\323\344\223\002/\022-\n\tupload_id\022 {bucket=projects/*/" + + "buckets/*}/**\332A\tupload_id\022\225\001\n\tGetObject\022" + + "#.google.storage.v2.GetObjectRequest\032\031.g" + + "oogle.storage.v2.Object\"H\212\323\344\223\002\027\022\025\n\006bucke" + + "t\022\013{bucket=**}\332A\rbucket,object\332A\030bucket," + + "object,generation\022\245\001\n\nReadObject\022$.googl" + + "e.storage.v2.ReadObjectRequest\032%.google." + + "storage.v2.ReadObjectResponse\"H\212\323\344\223\002\027\022\025\n" + + "\006bucket\022\013{bucket=**}\332A\rbucket,object\332A\030b" + + "ucket,object,generation0\001\022\214\001\n\014UpdateObje" + + "ct\022&.google.storage.v2.UpdateObjectReque" + + "st\032\031.google.storage.v2.Object\"9\212\323\344\223\002\036\022\034\n" + + "\robject.bucket\022\013{bucket=**}\332A\022object,upd" + + "ate_mask\022`\n\013WriteObject\022%.google.storage" + + ".v2.WriteObjectRequest\032&.google.storage." + + "v2.WriteObjectResponse\"\000(\001\022\204\001\n\013ListObjec" + + "ts\022%.google.storage.v2.ListObjectsReques" + + "t\032&.google.storage.v2.ListObjectsRespons" + + "e\"&\212\323\344\223\002\027\022\025\n\006parent\022\013{bucket=**}\332A\006paren" + + "t\022\230\001\n\rRewriteObject\022\'.google.storage.v2." + + "RewriteObjectRequest\032\".google.storage.v2" + + ".RewriteResponse\":\212\323\344\223\0024\022\017\n\rsource_bucke" + + "t\022!\n\022destination_bucket\022\013{bucket=**}\022\256\001\n" + + "\023StartResumableWrite\022-.google.storage.v2" + + ".StartResumableWriteRequest\032..google.sto" + + "rage.v2.StartResumableWriteResponse\"8\212\323\344" + + "\223\0022\0220\n!write_object_spec.resource.bucket" + + "\022\013{bucket=**}\022\256\001\n\020QueryWriteStatus\022*.goo" + + "gle.storage.v2.QueryWriteStatusRequest\032+" + + ".google.storage.v2.QueryWriteStatusRespo" + + "nse\"A\212\323\344\223\002/\022-\n\tupload_id\022 {bucket=projec" + + "ts/*/buckets/*}/**\332A\tupload_id\022\200\001\n\021GetSe" + + "rviceAccount\022+.google.storage.v2.GetServ" + + "iceAccountRequest\032!.google.storage.v2.Se" + + "rviceAccount\"\033\212\323\344\223\002\013\022\t\n\007project\332A\007projec" + + "t\022\225\001\n\rCreateHmacKey\022\'.google.storage.v2." + + "CreateHmacKeyRequest\032(.google.storage.v2" + + ".CreateHmacKeyResponse\"1\212\323\344\223\002\013\022\t\n\007projec" + + "t\332A\035project,service_account_email\022w\n\rDel" + + "eteHmacKey\022\'.google.storage.v2.DeleteHma" + + "cKeyRequest\032\026.google.protobuf.Empty\"%\212\323\344" + + "\223\002\013\022\t\n\007project\332A\021access_id,project\022}\n\nGe" + + "tHmacKey\022$.google.storage.v2.GetHmacKeyR" + + "equest\032\".google.storage.v2.HmacKeyMetada" + + "ta\"%\212\323\344\223\002\013\022\t\n\007project\332A\021access_id,projec" + + "t\022|\n\014ListHmacKeys\022&.google.storage.v2.Li" + + "stHmacKeysRequest\032\'.google.storage.v2.Li" + + "stHmacKeysResponse\"\033\212\323\344\223\002\013\022\t\n\007project\332A\007" + + "project\022\235\001\n\rUpdateHmacKey\022\'.google.stora" + + "ge.v2.UpdateHmacKeyRequest\032\".google.stor" + + "age.v2.HmacKeyMetadata\"?\212\323\344\223\002\"\022 \n\020hmac_k" + + "ey.project\022\014{project=**}\332A\024hmac_key,upda" + + "te_mask\032\247\002\312A\026storage.googleapis.com\322A\212\002h" + + "ttps://www.googleapis.com/auth/cloud-pla" + + "tform,https://www.googleapis.com/auth/cl" + + "oud-platform.read-only,https://www.googl" + + "eapis.com/auth/devstorage.full_control,h" + + "ttps://www.googleapis.com/auth/devstorag" + + "e.read_only,https://www.googleapis.com/a" + + "uth/devstorage.read_writeB\334\001\n\025com.google" + + ".storage.v2B\014StorageProtoP\001Z8google.gola" + + "ng.org/genproto/googleapis/storage/v2;st" + + "orage\352Ax\n!cloudkms.googleapis.com/Crypto" + + "Key\022Sprojects/{project}/locations/{locat" + + "ion}/keyRings/{key_ring}/cryptoKeys/{cry" + + "pto_key}b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -1494,11 +1497,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_storage_v2_Bucket_RetentionPolicy_descriptor, new java.lang.String[] { - "EffectiveTime", - "IsLocked", - "RetentionPeriod", - "RetentionDuration", - "RetentionPeriod", + "EffectiveTime", "IsLocked", "RetentionDuration", }); internal_static_google_storage_v2_Bucket_Versioning_descriptor = internal_static_google_storage_v2_Bucket_descriptor.getNestedTypes().get(7); diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateBucketRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateBucketRequest.java index 117393a96..13b7dd08f 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateBucketRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateBucketRequest.java @@ -310,8 +310,6 @@ public com.google.protobuf.ByteString getPredefinedDefaultObjectAclBytes() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -333,8 +331,6 @@ public boolean hasUpdateMask() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -356,8 +352,6 @@ public com.google.protobuf.FieldMask getUpdateMask() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -1435,8 +1429,6 @@ public Builder setPredefinedDefaultObjectAclBytes(com.google.protobuf.ByteString * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -1457,8 +1449,6 @@ public boolean hasUpdateMask() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -1485,8 +1475,6 @@ public com.google.protobuf.FieldMask getUpdateMask() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -1515,8 +1503,6 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -1542,8 +1528,6 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -1575,8 +1559,6 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -1602,8 +1584,6 @@ public Builder clearUpdateMask() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -1624,8 +1604,6 @@ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -1650,8 +1628,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateBucketRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateBucketRequestOrBuilder.java index b4b06d4e4..7962303a9 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateBucketRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateBucketRequestOrBuilder.java @@ -183,8 +183,6 @@ public interface UpdateBucketRequestOrBuilder * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -203,8 +201,6 @@ public interface UpdateBucketRequestOrBuilder * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; @@ -223,8 +219,6 @@ public interface UpdateBucketRequestOrBuilder * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 6 [(.google.api.field_behavior) = REQUIRED]; diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateObjectRequest.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateObjectRequest.java index 350f4409a..627697ea3 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateObjectRequest.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateObjectRequest.java @@ -339,8 +339,6 @@ public com.google.protobuf.ByteString getPredefinedAclBytes() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -362,8 +360,6 @@ public boolean hasUpdateMask() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -385,8 +381,6 @@ public com.google.protobuf.FieldMask getUpdateMask() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -1650,8 +1644,6 @@ public Builder setPredefinedAclBytes(com.google.protobuf.ByteString value) { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -1672,8 +1664,6 @@ public boolean hasUpdateMask() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -1700,8 +1690,6 @@ public com.google.protobuf.FieldMask getUpdateMask() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -1730,8 +1718,6 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask value) { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -1757,8 +1743,6 @@ public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForVal * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -1790,8 +1774,6 @@ public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -1817,8 +1799,6 @@ public Builder clearUpdateMask() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -1839,8 +1819,6 @@ public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -1865,8 +1843,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateObjectRequestOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateObjectRequestOrBuilder.java index dea9fcf13..1e2ec6c8d 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateObjectRequestOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/UpdateObjectRequestOrBuilder.java @@ -223,8 +223,6 @@ public interface UpdateObjectRequestOrBuilder * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -243,8 +241,6 @@ public interface UpdateObjectRequestOrBuilder * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; @@ -263,8 +259,6 @@ public interface UpdateObjectRequestOrBuilder * field is introduced at a later time, an older client updating with the `*` * may accidentally reset the new field's value. * Not specifying any fields is an error. - * Not specifying a field while setting that field to a non-default value is - * an error. * * * .google.protobuf.FieldMask update_mask = 7 [(.google.api.field_behavior) = REQUIRED]; diff --git a/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto b/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto index 1c1551cf3..740966830 100644 --- a/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto +++ b/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto @@ -1,4 +1,4 @@ -// Copyright 2022 Google LLC +// Copyright 2023 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -225,8 +225,12 @@ service Storage { }; } - // Deletes an object and its metadata. Deletions are permanent if versioning - // is not enabled for the bucket, or if the `generation` parameter is used. + // Deletes an object and its metadata. + // + // Deletions are normally permanent when versioning is disabled or whenever + // the generation parameter is used. However, if soft delete is enabled for + // the bucket, deleted objects can be restored using RestoreObject until the + // soft delete retention period has passed. rpc DeleteObject(DeleteObjectRequest) returns (google.protobuf.Empty) { option (google.api.routing) = { routing_parameters { field: "bucket" path_template: "{bucket=**}" } @@ -482,14 +486,17 @@ message CreateBucketRequest { string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { - type: "cloudresourcemanager.googleapis.com/Project" + child_type: "storage.googleapis.com/Bucket" } ]; // Properties of the new bucket being inserted. - // The project and name of the bucket are specified in the parent and - // bucket_id fields, respectively. Populating those fields in `bucket` will - // result in an error. + // The name of the bucket is specified in the `bucket_id` field. Populating + // `bucket.name` field will result in an error. + // The project of the bucket must be specified in the `bucket.project` field. + // This field must be in `projects/{projectIdentifier}` format, + // {projectIdentifier} can be the project ID or project number. The `parent` + // field must be either empty or `projects/_`. Bucket bucket = 2; // Required. The ID to use for this bucket, which will become the final @@ -514,7 +521,7 @@ message ListBucketsRequest { string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { - type: "cloudresourcemanager.googleapis.com/Project" + child_type: "storage.googleapis.com/Bucket" } ]; @@ -593,8 +600,6 @@ message UpdateBucketRequest { // may accidentally reset the new field's value. // // Not specifying any fields is an error. - // Not specifying a field while setting that field to a non-default value is - // an error. google.protobuf.FieldMask update_mask = 6 [(google.api.field_behavior) = REQUIRED]; } @@ -617,7 +622,9 @@ message GetNotificationConfigRequest { // `projects/{project}/buckets/{bucket}/notificationConfigs/{notificationConfig}` string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { type: "storage.googleapis.com/Bucket" } + (google.api.resource_reference) = { + type: "storage.googleapis.com/NotificationConfig" + } ]; } @@ -627,7 +634,7 @@ message CreateNotificationConfigRequest { string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { - child_type: "storage.googleapis.com/Bucket" + child_type: "storage.googleapis.com/NotificationConfig" } ]; @@ -642,7 +649,7 @@ message ListNotificationConfigsRequest { string parent = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { - child_type: "storage.googleapis.com/Bucket" + child_type: "storage.googleapis.com/NotificationConfig" } ]; @@ -732,7 +739,10 @@ message ComposeObjectRequest { // `bucket` and `object` **must** be set. message DeleteObjectRequest { // Required. Name of the bucket in which the object resides. - string bucket = 1 [(google.api.field_behavior) = REQUIRED]; + string bucket = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "storage.googleapis.com/Bucket" } + ]; // Required. The name of the finalized object to delete. // Note: If you want to delete an unfinalized resumable upload please use @@ -781,7 +791,10 @@ message CancelResumableWriteResponse {} // Request message for ReadObject. message ReadObjectRequest { // Required. The name of the bucket containing the object to read. - string bucket = 1 [(google.api.field_behavior) = REQUIRED]; + string bucket = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "storage.googleapis.com/Bucket" } + ]; // Required. The name of the object to read. string object = 2 [(google.api.field_behavior) = REQUIRED]; @@ -843,7 +856,10 @@ message ReadObjectRequest { // Request message for GetObject. message GetObjectRequest { // Required. Name of the bucket in which the object resides. - string bucket = 1 [(google.api.field_behavior) = REQUIRED]; + string bucket = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "storage.googleapis.com/Bucket" } + ]; // Required. Name of the object. string object = 2 [(google.api.field_behavior) = REQUIRED]; @@ -887,7 +903,7 @@ message ReadObjectResponse { // empty for any given `ReadResponse`. This enables the service to inform the // client that the request is still live while it is running an operation to // generate more data. - ChecksummedData checksummed_data = 1; + ChecksummedData checksummed_data = 1 [ctype = CORD]; // The checksums of the complete object. The client should compute one of // these checksums over the downloaded object and compare it against the value @@ -1017,9 +1033,7 @@ message ListObjectsRequest { // Required. Name of the bucket in which to look for objects. string parent = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { - child_type: "storage.googleapis.com/Bucket" - } + (google.api.resource_reference) = { type: "storage.googleapis.com/Bucket" } ]; // Maximum number of `items` plus `prefixes` to return @@ -1147,7 +1161,10 @@ message RewriteObjectRequest { Object destination = 1; // Required. Name of the bucket in which to find the source object. - string source_bucket = 2 [(google.api.field_behavior) = REQUIRED]; + string source_bucket = 2 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "storage.googleapis.com/Bucket" } + ]; // Required. Name of the source object. string source_object = 3 [(google.api.field_behavior) = REQUIRED]; @@ -1323,8 +1340,6 @@ message UpdateObjectRequest { // may accidentally reset the new field's value. // // Not specifying any fields is an error. - // Not specifying a field while setting that field to a non-default value is - // an error. google.protobuf.FieldMask update_mask = 7 [(google.api.field_behavior) = REQUIRED]; @@ -1334,8 +1349,8 @@ message UpdateObjectRequest { // Request message for GetServiceAccount. message GetServiceAccountRequest { - // Required. Project ID, in the format of "projects/". - // can be the project ID or project number. + // Required. Project ID, in the format of "projects/{projectIdentifier}". + // {projectIdentifier} can be the project ID or project number. string project = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -1347,7 +1362,7 @@ message GetServiceAccountRequest { // Request message for CreateHmacKey. message CreateHmacKeyRequest { // Required. The project that the HMAC-owning service account lives in, in the - // format of "projects/". can be the + // format of "projects/{projectIdentifier}". {projectIdentifier} can be the // project ID or project number. string project = 1 [ (google.api.field_behavior) = REQUIRED, @@ -1376,8 +1391,8 @@ message DeleteHmacKeyRequest { string access_id = 1 [(google.api.field_behavior) = REQUIRED]; // Required. The project that owns the HMAC key, in the format of - // "projects/". - // can be the project ID or project number. + // "projects/{projectIdentifier}". + // {projectIdentifier} can be the project ID or project number. string project = 2 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -1392,8 +1407,8 @@ message GetHmacKeyRequest { string access_id = 1 [(google.api.field_behavior) = REQUIRED]; // Required. The project the HMAC key lies in, in the format of - // "projects/". - // can be the project ID or project number. + // "projects/{projectIdentifier}". + // {projectIdentifier} can be the project ID or project number. string project = 2 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -1405,8 +1420,8 @@ message GetHmacKeyRequest { // Request to fetch a list of HMAC keys under a given project. message ListHmacKeysRequest { // Required. The project to list HMAC keys for, in the format of - // "projects/". - // can be the project ID or project number. + // "projects/{projectIdentifier}". + // {projectIdentifier} can be the project ID or project number. string project = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { @@ -1729,12 +1744,6 @@ message Bucket { // Once locked, an object retention policy cannot be modified. bool is_locked = 2; - // The duration in seconds that objects need to be retained. Retention - // duration must be greater than zero and less than 100 years. Note that - // enforcement of retention periods less than a day is not guaranteed. Such - // periods should only be used for testing purposes. - optional int64 retention_period = 3; - // The duration that objects need to be retained. Retention duration must be // greater than zero and less than 100 years. Note that enforcement of // retention periods less than a day is not guaranteed. Such periods should @@ -1804,8 +1813,8 @@ message Bucket { string etag = 29; // Immutable. The project which owns this bucket, in the format of - // "projects/". - // can be the project ID or project number. + // "projects/{projectIdentifier}". + // {projectIdentifier} can be the project ID or project number. string project = 3 [ (google.api.field_behavior) = IMMUTABLE, (google.api.resource_reference) = { @@ -2009,7 +2018,7 @@ message ChecksummedData { message ObjectChecksums { // CRC32C digest of the object data. Computed by the Cloud Storage service for // all written objects. - // If set in an WriteObjectRequest, service will validate that the stored + // If set in a WriteObjectRequest, service will validate that the stored // object matches this checksum. optional fixed32 crc32c = 1; @@ -2026,16 +2035,16 @@ message ObjectChecksums { // Hmac Key Metadata, which includes all information other than the secret. message HmacKeyMetadata { // Immutable. Resource name ID of the key in the format - // /. - // can be the project ID or project number. + // {projectIdentifier}/{accessId}. + // {projectIdentifier} can be the project ID or project number. string id = 1 [(google.api.field_behavior) = IMMUTABLE]; // Immutable. Globally unique id for keys. string access_id = 2 [(google.api.field_behavior) = IMMUTABLE]; // Immutable. Identifies the project that owns the service account of the - // specified HMAC key, in the format "projects/". - // can be the project ID or project number. + // specified HMAC key, in the format "projects/{projectIdentifier}". + // {projectIdentifier} can be the project ID or project number. string project = 3 [ (google.api.field_behavior) = IMMUTABLE, (google.api.resource_reference) = {