Fix requester pays issues (#2464)

vam-google · web-flow · commit 8f7792580e9e · 2017-09-26T17:09:29.000-07:00
Fixes #2392, #2391 and #2439
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Blob.java
@@ -23,6 +23,7 @@
 import com.google.api.services.storage.model.StorageObject;
 import com.google.auth.ServiceAccountSigner;
 import com.google.auth.ServiceAccountSigner.SigningException;
+import com.google.cloud.GcpLaunchStage;
 import com.google.cloud.ReadChannel;
 import com.google.cloud.Tuple;
 import com.google.cloud.WriteChannel;
@@ -104,6 +105,8 @@ private Storage.BlobSourceOption toSourceOptions(BlobInfo blobInfo) {
           return Storage.BlobSourceOption.metagenerationNotMatch(blobInfo.getMetageneration());
         case CUSTOMER_SUPPLIED_KEY:
           return Storage.BlobSourceOption.decryptionKey((String) getValue());
+        case USER_PROJECT:
+          return Storage.BlobSourceOption.userProject((String) getValue());
         default:
           throw new AssertionError("Unexpected enum value");
       }
@@ -119,6 +122,8 @@ private Storage.BlobGetOption toGetOption(BlobInfo blobInfo) {
           return Storage.BlobGetOption.metagenerationMatch(blobInfo.getMetageneration());
         case IF_METAGENERATION_NOT_MATCH:
           return Storage.BlobGetOption.metagenerationNotMatch(blobInfo.getMetageneration());
+        case USER_PROJECT:
+          return Storage.BlobGetOption.userProject((String) getValue());
         default:
           throw new AssertionError("Unexpected enum value");
       }
@@ -175,6 +180,15 @@ public static BlobSourceOption decryptionKey(String key) {
       return new BlobSourceOption(StorageRpc.Option.CUSTOMER_SUPPLIED_KEY, key);
     }
 
+    /**
+     * Returns an option for blob's billing user project. This option is used only if the blob's
+     * bucket has requester_pays flag enabled.
+     */
+    @GcpLaunchStage.Alpha
+    public static BlobSourceOption userProject(String userProject) {
+      return new BlobSourceOption(StorageRpc.Option.USER_PROJECT, userProject);
+    }
+
     static Storage.BlobSourceOption[] toSourceOptions(BlobInfo blobInfo,
         BlobSourceOption... options) {
       Storage.BlobSourceOption[] convertedOptions = new Storage.BlobSourceOption[options.length];
@@ -196,15 +210,16 @@ static Storage.BlobGetOption[] toGetOptions(BlobInfo blobInfo, BlobSourceOption.
   }
 
   /**
-   * Downloads this blob to the given file path.
+   * Downloads this blob to the given file path using specified blob read options.
    *
    * @param path destination
+   * @param options blob read options
    * @throws StorageException upon failure
    */
-  public void downloadTo(Path path) throws StorageException {
+  public void downloadTo(Path path, BlobSourceOption... options) {
     try (
         OutputStream outputStream = Files.newOutputStream(path);
-        ReadChannel reader = reader()
+        ReadChannel reader = reader(options)
     ) {
       WritableByteChannel channel = Channels.newChannel(outputStream);
       ByteBuffer bytes = ByteBuffer.allocate(DEFAULT_CHUNK_SIZE);
@@ -218,6 +233,19 @@ public void downloadTo(Path path) throws StorageException {
     }
   }
 
+  /**
+   * Downloads this blob to the given file path.
+   *
+   * This method is replaced with {@link #downloadTo(Path, BlobSourceOption...)}, but is kept here
+   * for binary compatibility with the older versions of the client library.
+   *
+   * @param path destination
+   * @throws StorageException upon failure
+   */
+  public void downloadTo(Path path) {
+    downloadTo(path, new BlobSourceOption[0]);
+  }
+
   /**
    * Builder for {@code Blob}.
    */
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
@@ -92,7 +92,9 @@ enum BucketField implements FieldSelector {
     VERSIONING("versioning"),
     CORS("cors"),
     STORAGE_CLASS("storageClass"),
-    ETAG("etag");
+    ETAG("etag"),
+    @GcpLaunchStage.Alpha
+    BILLING("billing");
 
     static final List<? extends FieldSelector> REQUIRED_FIELDS = ImmutableList.of(NAME);
 
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java
@@ -693,7 +693,7 @@ public void testBuilder() {
     assertEquals(STORAGE_CLASS, bucket.getStorageClass());
     assertEquals(VERSIONING_ENABLED, bucket.versioningEnabled());
     assertEquals(BUCKET_LABELS, bucket.getLabels());
-    assertEquals(VERSIONING_ENABLED, bucket.requesterPays());
+    assertEquals(REQUESTER_PAYS, bucket.requesterPays());
     assertEquals(storage.getOptions(), bucket.getStorage().getOptions());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -693,7 +693,7 @@ public void testBuilder() {`
`693`	`693`	`assertEquals(STORAGE_CLASS, bucket.getStorageClass());`
`694`	`694`	`assertEquals(VERSIONING_ENABLED, bucket.versioningEnabled());`
`695`	`695`	`assertEquals(BUCKET_LABELS, bucket.getLabels());`
`696`		`- assertEquals(VERSIONING_ENABLED, bucket.requesterPays());`
	`696`	`+ assertEquals(REQUESTER_PAYS, bucket.requesterPays());`
`697`	`697`	`assertEquals(storage.getOptions(), bucket.getStorage().getOptions());`
`698`	`698`	`}`
`699`	`699`	`}`