---

aozarov · aozarov · commit 557a5f346659 · 2016-02-29T15:10:12.000-08:00
yaml --- r: 1735 b: refs/heads/master c: 21e68cc h: refs/heads/master i: 1733: 2f8f896 1731: 11a5a14 1727: 7ffb4e4
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bbe7b500a63bd7bce92e73a13cdb097265b85092
+refs/heads/master: 21e68cce2c133463fcc4d74e06e3114c5e25ef65
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
diff --git a/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -700,6 +700,16 @@ public static BlobListOption recursive(boolean recursive) {
       return new BlobListOption(StorageRpc.Option.DELIMITER, recursive);
     }
 
+    /**
+     * If set to {@code true}, lists all versions of a blob.
+     * The default is {@code false}.
+     *
+     * @see <a href ="https://cloud.google.com/storage/docs/object-versioning">Object Versioning</a>
+     */
+    public static BlobListOption versions(boolean versions) {
+      return new BlobListOption(StorageRpc.Option.VERSIONS, versions);
+    }
+
     /**
      * Returns an option to specify the blob's fields to be returned by the RPC call. If this option
      * is not provided all blob's fields are returned. {@code BlobListOption.fields}) can be used to
diff --git a/trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -200,11 +200,14 @@ public class StorageImplTest {
       Storage.BlobListOption.prefix("prefix");
   private static final Storage.BlobListOption BLOB_LIST_FIELDS =
       Storage.BlobListOption.fields(Storage.BlobField.CONTENT_TYPE, Storage.BlobField.MD5HASH);
+  private static final Storage.BlobListOption BLOB_LIST_VERSIONS =
+      Storage.BlobListOption.versions(false);
   private static final Storage.BlobListOption BLOB_LIST_EMPTY_FIELDS =
       Storage.BlobListOption.fields();
   private static final Map<StorageRpc.Option, ?> BLOB_LIST_OPTIONS = ImmutableMap.of(
       StorageRpc.Option.MAX_RESULTS, BLOB_LIST_MAX_RESULT.value(),
-      StorageRpc.Option.PREFIX, BLOB_LIST_PREFIX.value());
+      StorageRpc.Option.PREFIX, BLOB_LIST_PREFIX.value(),
+      StorageRpc.Option.VERSIONS, BLOB_LIST_VERSIONS.value());
 
   private static final String PRIVATE_KEY_STRING = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoG"
           + "BAL2xolH1zrISQ8+GzOV29BNjjzq4/HIP8Psd1+cZb81vDklSF+95wB250MSE0BDc81pvIMwj5OmIfLg1NY6uB"
@@ -650,7 +653,8 @@ public void testListBlobsWithOptions() {
     EasyMock.replay(storageRpcMock);
     initializeService();
     ImmutableList<Blob> blobList = ImmutableList.of(expectedBlob1, expectedBlob2);
-    Page<Blob> page = storage.list(BUCKET_NAME1, BLOB_LIST_MAX_RESULT, BLOB_LIST_PREFIX);
+    Page<Blob> page =
+        storage.list(BUCKET_NAME1, BLOB_LIST_MAX_RESULT, BLOB_LIST_PREFIX, BLOB_LIST_VERSIONS);
     assertEquals(cursor, page.nextPageCursor());
     assertArrayEquals(blobList.toArray(), Iterables.toArray(page.values(), Blob.class));
   }
