---

Frank Natividad · Frank Natividad · commit 9ee127470e76 · 2018-05-07T10:28:27.000-07:00
yaml --- r: 9611 b: refs/heads/kms-integration c: 116220c h: refs/heads/master i: 9609: 1eb4dfb 9607: 41acbd2
diff --git a/[refs] b/[refs]
@@ -91,7 +91,7 @@ refs/tags/v0.42.1: 3d9c15dd66bbe736cfd83b695f805833d7a32299
 refs/tags/v0.43.0: af4bfcbcc7c86354b26642d65400ee4accb632a9
 refs/heads/add-pubsub-publish-error-handler: 54ac3bf7a1396a71a4ffc350cd409de4dad2d63a
 refs/heads/java-release-src-1: 23b4842b1c560f3f1d382de1e0797261307490b4
-refs/heads/kms-integration: 8d042d2544d4d22ebd8d4564074a68a39722d698
+refs/heads/kms-integration: 116220c0220e49220883975c20f809acde68fcf9
 refs/tags/v0.44.0: 1c7d06813aa4d2ac948b1ddda591406a2448371f
 refs/tags/v0.45.0: 4b4eb52d0823f5335cb8acf54a88bae199e013ae
 refs/tags/v0.46.0: 40dfc83a11b2cf2c21bf0f5a7b1e47087cbf0259
diff --git a/branches/kms-integration/google-cloud-storage/pom.xml b/branches/kms-integration/google-cloud-storage/pom.xml
@@ -29,7 +29,6 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-storage</artifactId>
-      <version>v1-rev125-1.23.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
diff --git a/branches/kms-integration/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java b/branches/kms-integration/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java
@@ -402,6 +402,7 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) {
       return this;
     }
 
+    @GcpLaunchStage.Beta
     @Override
     public Builder setKmsKeyName(String kmsKeyName) {
       infoBuilder.setKmsKeyName(kmsKeyName);
diff --git a/branches/kms-integration/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java b/branches/kms-integration/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java
@@ -24,6 +24,7 @@
 import com.google.api.services.storage.model.ObjectAccessControl;
 import com.google.api.services.storage.model.StorageObject;
 import com.google.api.services.storage.model.StorageObject.Owner;
+import com.google.cloud.GcpLaunchStage;
 import com.google.cloud.storage.Blob.Builder;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
@@ -271,6 +272,7 @@ public abstract static class Builder {
      *
      * Sets the blob's kmsKeyName.
      */
+    @GcpLaunchStage.Beta
     public abstract Builder setKmsKeyName(String kmsKeyName);
 
     /**
@@ -484,6 +486,7 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) {
       return this;
     }
 
+    @GcpLaunchStage.Beta
     @Override
     public Builder setKmsKeyName(String kmsKeyName) {
       this.kmsKeyName = kmsKeyName;
@@ -756,6 +759,7 @@ public StorageClass getStorageClass() {
   /**
    * Returns the Cloud KMS key used to encrypt the blob, if any.
    */
+  @GcpLaunchStage.Beta
   public String getKmsKeyName() {
     return kmsKeyName;
   }
diff --git a/branches/kms-integration/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java b/branches/kms-integration/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java
@@ -612,6 +612,7 @@ public Builder setLabels(Map<String, String> labels) {
       return this;
     }
 
+    @GcpLaunchStage.Beta
     @Override
     public Builder setDefaultKmsKeyName(String defaultKmsKeyName) {
       infoBuilder.setDefaultKmsKeyName(defaultKmsKeyName);
diff --git a/branches/kms-integration/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/branches/kms-integration/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
@@ -31,6 +31,7 @@
 import com.google.api.services.storage.model.Bucket.Owner;
 import com.google.api.services.storage.model.Bucket.Versioning;
 import com.google.api.services.storage.model.Bucket.Website;
+import com.google.cloud.GcpLaunchStage;
 import com.google.cloud.storage.Acl.Entity;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
@@ -428,6 +429,7 @@ public abstract static class Builder {
     /**
      * Sets the default Cloud KMS key name for this bucket.
      */
+    @GcpLaunchStage.Beta
     public abstract Builder setDefaultKmsKeyName(String defaultKmsKeyName);
 
     /**
@@ -593,6 +595,7 @@ public Builder setLabels(Map<String, String> labels) {
       return this;
     }
 
+    @GcpLaunchStage.Beta
     @Override
     public Builder setDefaultKmsKeyName(String defaultKmsKeyName) {
       this.defaultKmsKeyName = defaultKmsKeyName != null
@@ -782,6 +785,7 @@ public Map<String, String> getLabels() {
   /**
    * Returns the default Cloud KMS key to be applied to newly inserted objects in this bucket.
    */
+  @GcpLaunchStage.Beta
   public String getDefaultKmsKeyName() {
     return defaultKmsKeyName;
   }
diff --git a/branches/kms-integration/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/branches/kms-integration/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
@@ -82,7 +82,6 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
 import org.apache.http.HttpStatus;
 
 public class HttpStorageRpc implements StorageRpc {

Original file line number	Diff line number	Diff line change
`@@ -402,6 +402,7 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) {`
`402`	`402`	`return this;`
`403`	`403`	`}`
`404`	`404`
	`405`	`+ @GcpLaunchStage.Beta`
`405`	`406`	`@Override`
`406`	`407`	`public Builder setKmsKeyName(String kmsKeyName) {`
`407`	`408`	`infoBuilder.setKmsKeyName(kmsKeyName);`
Original file line number	Diff line number	Diff line change
`@@ -612,6 +612,7 @@ public Builder setLabels(Map<String, String> labels) {`
`612`	`612`	`return this;`
`613`	`613`	`}`
`614`	`614`
	`615`	`+ @GcpLaunchStage.Beta`
`615`	`616`	`@Override`
`616`	`617`	`public Builder setDefaultKmsKeyName(String defaultKmsKeyName) {`
`617`	`618`	`infoBuilder.setDefaultKmsKeyName(defaultKmsKeyName);`