---

Frank Natividad · Frank Natividad · commit ee836cc87bf4 · 2018-05-08T08:15:50.000-07:00
yaml --- r: 9643 b: refs/heads/master c: 4da3796 h: refs/heads/master i: 9641: 811ba6e 9639: 8e6bfff
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fa6b526dea6437aaf463cf9876823d494ac867d1
+refs/heads/master: 4da3796f6978eda777b9f3d300bf286d8cb92482
 refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
 refs/heads/gh-pages: a9cc59cb77938ae027038f2041e9459553038de7
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java b/trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java
@@ -404,7 +404,7 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) {
 
     @GcpLaunchStage.Beta
     @Override
-    public Builder setKmsKeyName(String kmsKeyName) {
+    Builder setKmsKeyName(String kmsKeyName) {
       infoBuilder.setKmsKeyName(kmsKeyName);
       return this;
     }
diff --git a/trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java b/trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobInfo.java
@@ -488,7 +488,7 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) {
 
     @GcpLaunchStage.Beta
     @Override
-    public Builder setKmsKeyName(String kmsKeyName) {
+    Builder setKmsKeyName(String kmsKeyName) {
       this.kmsKeyName = kmsKeyName;
       return this;
     }
diff --git a/trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
@@ -22,8 +22,14 @@
 import com.google.api.gax.paging.Page;
 import com.google.auth.ServiceAccountSigner;
 import com.google.auth.ServiceAccountSigner.SigningException;
-import com.google.cloud.*;
+import com.google.cloud.FieldSelector;
 import com.google.cloud.FieldSelector.Helper;
+import com.google.cloud.GcpLaunchStage;
+import com.google.cloud.Policy;
+import com.google.cloud.ReadChannel;
+import com.google.cloud.Service;
+import com.google.cloud.Tuple;
+import com.google.cloud.WriteChannel;
 import com.google.cloud.storage.Acl.Entity;
 import com.google.cloud.storage.spi.v1.StorageRpc;
 import com.google.common.collect.ImmutableList;
diff --git a/trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/trunk/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
@@ -81,7 +81,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.http.HttpStatus;
 
 public class HttpStorageRpc implements StorageRpc {

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) {`
`404`	`404`
`405`	`405`	`@GcpLaunchStage.Beta`
`406`	`406`	`@Override`
`407`		`- public Builder setKmsKeyName(String kmsKeyName) {`
	`407`	`+ Builder setKmsKeyName(String kmsKeyName) {`
`408`	`408`	`infoBuilder.setKmsKeyName(kmsKeyName);`
`409`	`409`	`return this;`
`410`	`410`	`}`
Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ Builder setCustomerEncryption(CustomerEncryption customerEncryption) {`
`488`	`488`
`489`	`489`	`@GcpLaunchStage.Beta`
`490`	`490`	`@Override`
`491`		`- public Builder setKmsKeyName(String kmsKeyName) {`
	`491`	`+ Builder setKmsKeyName(String kmsKeyName) {`
`492`	`492`	`this.kmsKeyName = kmsKeyName;`
`493`	`493`	`return this;`
`494`	`494`	`}`