Clean up and add tests

Author: Frank Natividad

google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java

@@ -190,9 +190,6 @@ private Tuple<BlobInfo, Storage.BlobTargetOption> toTargetOption(BlobInfo blobIn
         case USER_PROJECT:
           return Tuple.of(blobInfo,
               Storage.BlobTargetOption.userProject((String) getValue()));
-        case KMS_KEY_NAME:
-          return Tuple.of(blobInfo,
-              Storage.BlobTargetOption.kmsKeyName((String) getValue()));
         default:
           throw new AssertionError("Unexpected enum value");
       }
@@ -277,13 +274,6 @@ public static BlobTargetOption userProject(String userProject) {
       return new BlobTargetOption(StorageRpc.Option.USER_PROJECT, userProject);
     }
 
-    /**
-     * Returns an option for blob's kms key name.
-     */
-    public static BlobTargetOption kmsKeyName(String kmsKeyName) {
-      return new BlobTargetOption(StorageRpc.Option.KMS_KEY_NAME, kmsKeyName);
-    }
-
     static Tuple<BlobInfo, Storage.BlobTargetOption[]> toTargetOptions(
         BlobInfo info, BlobTargetOption... options) {
       Set<StorageRpc.Option> optionSet =
@@ -355,8 +345,6 @@ private Tuple<BlobInfo, Storage.BlobWriteOption> toWriteOption(BlobInfo blobInfo
               Storage.BlobWriteOption.encryptionKey((String) value));
         case USER_PROJECT:
           return Tuple.of(blobInfo, Storage.BlobWriteOption.userProject((String) value));
-        case KMS_KEY_NAME:
-          return Tuple.of(blobInfo, Storage.BlobWriteOption.kmsKeyName((String) value));
         default:
           throw new AssertionError("Unexpected enum value");
       }
@@ -482,13 +470,6 @@ public static BlobWriteOption userProject(String userProject) {
       return new BlobWriteOption(Storage.BlobWriteOption.Option.USER_PROJECT, userProject);
     }
 
-    /**
-     * Returns an option for blob's kms key name.
-     */
-    public static BlobWriteOption kmsKeyName(String kmsKeyName) {
-      return new BlobWriteOption(Storage.BlobWriteOption.Option.KMS_KEY_NAME, kmsKeyName);
-    }
-
     static Tuple<BlobInfo, Storage.BlobWriteOption[]> toWriteOptions(
         BlobInfo info, BlobWriteOption... options) {
       Set<Storage.BlobWriteOption.Option> optionSet =

google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java

@@ -208,15 +208,6 @@ public static BucketTargetOption metagenerationNotMatch() {
     public static BucketTargetOption userProject(String userProject) {
       return new BucketTargetOption(StorageRpc.Option.USER_PROJECT, userProject);
     }
-
-//    /**
-//     * Returns an option to define the defaultKmsKeyName.
-//     */
-//    public static BucketTargetOption defaultKmsKeyName(String defaultKmsKeyName) {
-//      defaultKmsKeyName = defaultKmsKeyName != null
-//              ? new String(defaultKmsKeyName) : Data.<String>nullOf(String.class);
-//      return new BucketTargetOption(StorageRpc.Option.KMS_KEY_NAME, defaultKmsKeyName);
-//    }
   }
 
   /**
@@ -394,15 +385,6 @@ public static BlobTargetOption encryptionKey(String key) {
       return new BlobTargetOption(StorageRpc.Option.CUSTOMER_SUPPLIED_KEY, key);
     }
 
-    /**
-     * Returns an option to set a KMS key resource name of the blob.
-     *
-     * @param kmsKeyName the KMS crypto key resource name
-     */
-      public static BlobTargetOption kmsKeyName(String kmsKeyName) {
-          return new BlobTargetOption(StorageRpc.Option.KMS_KEY_NAME, kmsKeyName);
-      }
-
     static Tuple<BlobInfo, BlobTargetOption[]> convert(BlobInfo info, BlobWriteOption... options) {
       BlobInfo.Builder infoBuilder = info.toBuilder().setCrc32c(null).setMd5(null);
       List<BlobTargetOption> targetOptions = Lists.newArrayListWithCapacity(options.length);
@@ -436,7 +418,7 @@ class BlobWriteOption implements Serializable {
 
     enum Option {
       PREDEFINED_ACL, IF_GENERATION_MATCH, IF_GENERATION_NOT_MATCH, IF_METAGENERATION_MATCH,
-      IF_METAGENERATION_NOT_MATCH, IF_MD5_MATCH, IF_CRC32C_MATCH, CUSTOMER_SUPPLIED_KEY, USER_PROJECT, KMS_KEY_NAME;
+      IF_METAGENERATION_NOT_MATCH, IF_MD5_MATCH, IF_CRC32C_MATCH, CUSTOMER_SUPPLIED_KEY, USER_PROJECT;
 
       StorageRpc.Option toRpcOption() {
         return StorageRpc.Option.valueOf(this.name());
@@ -561,10 +543,6 @@ public static BlobWriteOption encryptionKey(String key) {
     public static BlobWriteOption userProject(String userProject) {
       return new BlobWriteOption(Option.USER_PROJECT, userProject);
     }
-
-    public static BlobWriteOption kmsKeyName(String kmsKeyName) {
-      return new BlobWriteOption(Option.KMS_KEY_NAME, kmsKeyName);
-    }
   }
 
   /**

google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java

@@ -437,11 +437,9 @@ public CopyWriter copy(final CopyRequest copyRequest) {
       RewriteResponse rewriteResponse = runWithRetries(new Callable<RewriteResponse>() {
         @Override
         public RewriteResponse call() {
-
           return storageRpc.openRewrite(new StorageRpc.RewriteRequest(source, sourceOptions,
               copyRequest.overrideInfo(), targetObject, targetOptions,
               copyRequest.getMegabytesCopiedPerChunk()));
-
         }
       }, getOptions().getRetrySettings(), EXCEPTION_HANDLER, getOptions().getClock());
       return new CopyWriter(getOptions(), rewriteResponse);

google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java

@@ -81,6 +81,8 @@
 import java.util.LinkedList;
 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 {
@@ -426,7 +428,6 @@ public StorageObject get(StorageObject object, Map<Option, ?> options) {
   public Bucket patch(Bucket bucket, Map<Option, ?> options) {
     Span span = startSpan(HttpStorageRpcSpans.SPAN_NAME_PATCH_BUCKET);
     Scope scope = tracer.withSpan(span);
-
     try {
       return storage.buckets()
           .patch(bucket.getName(), bucket)
@@ -790,11 +791,7 @@ private RewriteResponse rewrite(RewriteRequest req, String token) {
       if (userProject == null) {
         userProject = Option.USER_PROJECT.getString(req.targetOptions);
       }
-
-      String kmsKeyName = Option.KMS_KEY_NAME.getString(req.targetOptions);
-      if (kmsKeyName == null) {
-        kmsKeyName = req.target.getKmsKeyName();
-      }
+      String kmsKeyName = req.target.getKmsKeyName();
 
       Long maxBytesRewrittenPerCall = req.megabytesRewrittenPerCall != null
           ? req.megabytesRewrittenPerCall * MEGABYTE : null;
@@ -816,7 +813,6 @@ private RewriteResponse rewrite(RewriteRequest req, String token) {
           .setIfGenerationNotMatch(Option.IF_GENERATION_NOT_MATCH.getLong(req.targetOptions))
           .setUserProject(userProject)
           .setDestinationKmsKeyName(kmsKeyName);
-
       HttpHeaders requestHeaders = rewrite.getRequestHeaders();
       setEncryptionHeaders(requestHeaders, SOURCE_ENCRYPTION_KEY_PREFIX, req.sourceOptions);
       setEncryptionHeaders(requestHeaders, ENCRYPTION_KEY_PREFIX, req.targetOptions);

google-cloud-storage/src/test/java/com/google/cloud/storage/BlobTest.java

@@ -91,7 +91,6 @@ public class BlobTest {
   private static final String KEY_SHA256 = "keySha";
   private static final BlobInfo.CustomerEncryption CUSTOMER_ENCRYPTION =
       new BlobInfo.CustomerEncryption(ENCRYPTION_ALGORITHM, KEY_SHA256);
-  // TODO: Figure out CMEK + CSEK world
   private static final BlobInfo FULL_BLOB_INFO = BlobInfo.newBuilder("b", "n", GENERATION)
       .setAcl(ACLS)
       .setComponentCount(COMPONENT_COUNT)

google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java

@@ -41,7 +41,6 @@
 import com.google.common.collect.Lists;
 import com.google.common.io.BaseEncoding;
 
-import com.sun.net.ssl.KeyManagerFactorySpi;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -135,12 +134,12 @@ private void initializeExpectedBucket(int optionsCalls) {
     replay(serviceMockReturnsOptions);
     expectedBucket = new Bucket(serviceMockReturnsOptions, new BucketInfo.BuilderImpl(BUCKET_INFO));
     blobResults = ImmutableList.of(
-            new Blob(serviceMockReturnsOptions,
-                    new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n1").build())),
-            new Blob(serviceMockReturnsOptions,
-                    new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n2").build())),
-            new Blob(serviceMockReturnsOptions,
-                    new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n3").build())));
+        new Blob(serviceMockReturnsOptions,
+            new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n1").build())),
+        new Blob(serviceMockReturnsOptions,
+            new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n2").build())),
+        new Blob(serviceMockReturnsOptions,
+            new BlobInfo.BuilderImpl(BlobInfo.newBuilder("b", "n3").build())));
   }
 
   private void initializeBucket() {

google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java

@@ -561,8 +561,6 @@ public void testCreateBlobWithEncryptionKey() throws IOException {
     assertEquals(-1, byteStream.read(streamBytes));
   }
 
-  // TODO: Add tests for KMS Key name
-
   @Test
   public void testCreateBlobFromStream() throws IOException {
     Capture<ByteArrayInputStream> capturedStream = Capture.newInstance();