Skip to content

Commit 1a67473

Browse files
author
Frank Natividad
committed
---
yaml --- r: 9981 b: refs/heads/gcs-bucket-lock c: 7078d02 h: refs/heads/master i: 9979: 2a2a498
1 parent e226628 commit 1a67473

7 files changed

Lines changed: 1 addition & 17 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,4 @@ refs/heads/hzyi-remove-dups: a234865bfd4c5ce781086bc61fa1af53b6269c5b
113113
refs/tags/v0.55.0: 01b46f9b12b2b8a3070467d7dceeb040bbce4ee2
114114
refs/tags/v0.55.1: 9c9664b8be47a8548100c42df02f03a7888a982a
115115
refs/tags/v0.56.0: c31fb69430b7e6d4139db41d8491c0ed56028436
116-
refs/heads/gcs-bucket-lock: 339e38dfc26e3917073d43ff05c7a6c93f8850ea
116+
refs/heads/gcs-bucket-lock: 7078d02f89c6f10eb9989876091545dbf21f1d79

‎branches/gcs-bucket-lock/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,6 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) {
402402
return this;
403403
}
404404

405-
@GcpLaunchStage.Beta
406405
@Override
407406
Builder setKmsKeyName(String kmsKeyName) {
408407
infoBuilder.setKmsKeyName(kmsKeyName);

‎branches/gcs-bucket-lock/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,6 @@ public abstract static class Builder {
271271

272272
abstract Builder setCustomerEncryption(CustomerEncryption customerEncryption);
273273

274-
@GcpLaunchStage.Beta
275274
abstract Builder setKmsKeyName(String kmsKeyName);
276275

277276
/**
@@ -503,7 +502,6 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) {
503502
return this;
504503
}
505504

506-
@GcpLaunchStage.Beta
507505
@Override
508506
Builder setKmsKeyName(String kmsKeyName) {
509507
this.kmsKeyName = kmsKeyName;
@@ -797,7 +795,6 @@ public StorageClass getStorageClass() {
797795
/**
798796
* Returns the Cloud KMS key used to encrypt the blob, if any.
799797
*/
800-
@GcpLaunchStage.Beta
801798
public String getKmsKeyName() {
802799
return kmsKeyName;
803800
}

‎branches/gcs-bucket-lock/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,6 @@ public Builder setLabels(Map<String, String> labels) {
628628
return this;
629629
}
630630

631-
@GcpLaunchStage.Beta
632631
@Override
633632
public Builder setDefaultKmsKeyName(String defaultKmsKeyName) {
634633
infoBuilder.setDefaultKmsKeyName(defaultKmsKeyName);

‎branches/gcs-bucket-lock/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ public abstract static class Builder {
350350
* Sets whether a user accessing the bucket or an object it contains should assume the transit costs
351351
* related to the access.
352352
*
353-
* GcpLaunchStage.Alpha
354353
*/
355354
public abstract Builder setRequesterPays(Boolean requesterPays);
356355

@@ -433,7 +432,6 @@ public abstract static class Builder {
433432
/**
434433
* Sets the default Cloud KMS key name for this bucket.
435434
*/
436-
@GcpLaunchStage.Beta
437435
public abstract Builder setDefaultKmsKeyName(String defaultKmsKeyName);
438436

439437
/**
@@ -543,7 +541,6 @@ public Builder setVersioningEnabled(Boolean enable) {
543541
return this;
544542
}
545543

546-
/** GcpLaunchStage.Alpha */
547544
@Override
548545
public Builder setRequesterPays(Boolean enable) {
549546
this.requesterPays = firstNonNull(enable, Data.<Boolean>nullOf(Boolean.class));
@@ -622,7 +619,6 @@ public Builder setLabels(Map<String, String> labels) {
622619
return this;
623620
}
624621

625-
@GcpLaunchStage.Beta
626622
@Override
627623
public Builder setDefaultKmsKeyName(String defaultKmsKeyName) {
628624
this.defaultKmsKeyName = defaultKmsKeyName != null
@@ -727,7 +723,6 @@ public Boolean versioningEnabled() {
727723
* Returns {@code true} if a user accessing the bucket or an object it contains should assume the transit costs
728724
* related to the access, {@code false} otherwise.
729725
*
730-
* GcpLaunchStage.Alpha
731726
*/
732727
public Boolean requesterPays() {
733728
return Data.isNull(requesterPays) ? null : requesterPays;
@@ -840,7 +835,6 @@ public Map<String, String> getLabels() {
840835
/**
841836
* Returns the default Cloud KMS key to be applied to newly inserted objects in this bucket.
842837
*/
843-
@GcpLaunchStage.Beta
844838
public String getDefaultKmsKeyName() {
845839
return defaultKmsKeyName;
846840
}

‎branches/gcs-bucket-lock/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ enum BucketField implements FieldSelector {
9393
CORS("cors"),
9494
STORAGE_CLASS("storageClass"),
9595
ETAG("etag"),
96-
@GcpLaunchStage.Beta
9796
ENCRYPTION("encryption"),
9897
BILLING("billing"),
9998
DEFAULT_EVENT_BASED_HOLD("defaultEventBasedHold"),
@@ -138,7 +137,6 @@ enum BlobField implements FieldSelector {
138137
SIZE("size"),
139138
STORAGE_CLASS("storageClass"),
140139
TIME_DELETED("timeDeleted"),
141-
@GcpLaunchStage.Beta
142140
KMS_KEY_NAME("kmsKeyName"),
143141
EVENT_BASED_HOLD("eventBasedHold"),
144142
TEMPORARY_HOLD("temporaryHold"),
@@ -393,7 +391,6 @@ public static BlobTargetOption encryptionKey(String key) {
393391
/**
394392
* Returns an option to set a customer-managed key for server-side encryption of the blob.
395393
*/
396-
@GcpLaunchStage.Beta
397394
public static BlobTargetOption kmsKeyName(String kmsKeyName) {
398395
return new BlobTargetOption(StorageRpc.Option.KMS_KEY_NAME, kmsKeyName);
399396
}
@@ -555,7 +552,6 @@ public static BlobWriteOption encryptionKey(String key) {
555552
*
556553
* @param kmsKeyName the KMS key resource id
557554
*/
558-
@GcpLaunchStage.Beta
559555
public static BlobWriteOption kmsKeyName(String kmsKeyName) {
560556
return new BlobWriteOption(Option.KMS_KEY_NAME, kmsKeyName);
561557
}

‎branches/gcs-bucket-lock/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ enum Option {
5757
FIELDS("fields"),
5858
CUSTOMER_SUPPLIED_KEY("customerSuppliedKey"),
5959
USER_PROJECT("userProject"),
60-
@GcpLaunchStage.Beta
6160
KMS_KEY_NAME("kmsKeyName");
6261

6362
private final String value;

0 commit comments

Comments
 (0)