---

andreamlin · web-flow · commit 6f7777124c8e · 2017-10-31T09:42:30.000-07:00
yaml --- r: 8815 b: refs/heads/lesv-patch-1 c: ca27145 h: refs/heads/master i: 8813: 467e6a0 8811: fc97a4d 8807: 9423665 8799: cd8fd8e
diff --git a/[refs] b/[refs]
@@ -66,7 +66,7 @@ refs/tags/v0.22.0: 18b298fe4bfe8ec2f20b0e0bf7ffdcce5cc3c5fe
 refs/heads/vam-google-patch-1: d0c8fee3a4074d0bf7360ce8c4f7f7223d0ee7b9
 refs/heads/vam-google-patch-CODEOWNERS: 2ac1616e25229e51d08a984708ef1918f91a35ee
 refs/heads/danoscarmike-patch-1: 7342a9916bce4ed00002c7202e2a16c5d46afaea
-refs/heads/lesv-patch-1: 5ddb61a1f6fc1fabaa567d59762a0b73d070a838
+refs/heads/lesv-patch-1: ca271453a6d62e302832eef460849812fd7ce4ab
 refs/heads/ml-update-branch: 079dd6610017f5c51b9d1938c12d6d55b61513cf
 refs/heads/vkedia-patch-2: 7d8241388a9769a5c069334761b06c7012c878e7
 refs/heads/vkedia-patch-3: 4d128043acaa7db9160faf439d2ca6104e8a88cb
diff --git a/branches/lesv-patch-1/google-cloud-storage/pom.xml b/branches/lesv-patch-1/google-cloud-storage/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-storage</artifactId>
-      <version>v1-rev108-1.22.0</version>
+      <version>v1-rev114-1.23.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
diff --git a/branches/lesv-patch-1/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/branches/lesv-patch-1/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
@@ -764,6 +764,15 @@ public static BucketListOption prefix(String prefix) {
       return new BucketListOption(StorageRpc.Option.PREFIX, prefix);
     }
 
+    /**
+     * Returns an option for bucket's billing user project. This option is only used by the buckets with
+     * 'requester_pays' flag.
+     */
+    @GcpLaunchStage.Alpha
+    public static BucketListOption userProject(String userProject) {
+      return new BucketListOption(StorageRpc.Option.USER_PROJECT, userProject);
+    }
+
     /**
      * Returns an option to specify the bucket's fields to be returned by the RPC call. If this
      * option is not provided all bucket's fields are returned. {@code BucketListOption.fields}) can
diff --git a/branches/lesv-patch-1/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/branches/lesv-patch-1/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
@@ -252,6 +252,7 @@ public Tuple<String, Iterable<Bucket>> list(Map<Option, ?> options) {
           .setMaxResults(Option.MAX_RESULTS.getLong(options))
           .setPageToken(Option.PAGE_TOKEN.getString(options))
           .setFields(Option.FIELDS.getString(options))
+          .setUserProject(Option.USER_PROJECT.getString(options))
           .execute();
       return Tuple.<String, Iterable<Bucket>>of(buckets.getNextPageToken(), buckets.getItems());
     } catch (IOException ex) {
diff --git a/branches/lesv-patch-1/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/branches/lesv-patch-1/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
@@ -1519,4 +1519,22 @@ public void testUpdateBucketRequesterPays() {
     assertArrayEquals(BLOB_BYTE_CONTENT, readBytes);
     assertTrue(remoteBlob.delete());
   }
+
+  @Test
+  public void testListBucketRequesterPaysFails() throws InterruptedException {
+    String projectId = remoteStorageHelper.getOptions().getProjectId();
+    Iterator<Bucket> bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
+          Storage.BucketListOption.fields(), Storage.BucketListOption.userProject(projectId)).iterateAll().iterator();
+    while (!bucketIterator.hasNext()) {
+      Thread.sleep(500);
+      bucketIterator = storage.list(Storage.BucketListOption.prefix(BUCKET),
+          Storage.BucketListOption.fields()).iterateAll().iterator();
+    }
+    while (bucketIterator.hasNext()) {
+      Bucket remoteBucket = bucketIterator.next();
+      assertTrue(remoteBucket.getName().startsWith(BUCKET));
+      assertNull(remoteBucket.getCreateTime());
+      assertNull(remoteBucket.getSelfLink());
+    }
+  }
 }
diff --git a/branches/lesv-patch-1/pom.xml b/branches/lesv-patch-1/pom.xml
@@ -137,7 +137,7 @@
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud</site.installationModule>
 
-    <api-client.version>1.22.0</api-client.version>
+    <api-client.version>1.23.0</api-client.version>
 
     <api-common.version>1.1.0</api-common.version>
     <gax.version>1.9.1</gax.version>
@@ -147,7 +147,7 @@
     <grpc.version>1.7.0</grpc.version>
     <nettyssl.version>2.0.6.Final</nettyssl.version>
     <guava.version>20.0</guava.version>
-    <http-client.version>1.22.0</http-client.version>
+    <http-client.version>1.23.0</http-client.version>
     <protobuf.version>3.4.0</protobuf.version>
 
     <easymock.version>3.4</easymock.version>
@@ -767,7 +767,7 @@
       <dependency>
         <groupId>com.google.oauth-client</groupId>
         <artifactId>google-oauth-client</artifactId>
-        <version>1.22.0</version>
+        <version>1.23.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
