---

mziccard · mziccard · commit 937e9230e90b · 2015-10-12T07:38:21.000+02:00
yaml --- r: 1005 b: refs/heads/master c: c552ede h: refs/heads/master i: 1003: 71bd268 v: v3
diff --git a/[refs] b/[refs]
@@ -1,4 +1,4 @@
 ---
-refs/heads/master: b1918ca205078c37b249d4367d3d8b584e922ca0
+refs/heads/master: c552edebd9bcd349366d45875a9e9d8d35db2514
 refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
 refs/heads/gh-pages: 5a10432ecc75f29812e33a8236c900379509fe99
diff --git a/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -25,6 +25,7 @@
 import com.google.gcloud.storage.Storage.BucketTargetOption;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -146,21 +147,26 @@ public Blob get(String blob, BlobSourceOption... options) {
   /**
    * Returns a list of requested blobs in this bucket. Blobs that do not exist are null.
    * 
-   * @param blobNames names of the requested blobs
+   * @param blobName1 first blob to get
+   * @param blobName2 second blob to get
+   * @param blobNames other blobs to get
+   * @return an immutable list of {@code Blob} objects.
    * @throws StorageException upon failure
    */
-  public List<Blob> getAll(String... blobNames) {
+  public List<Blob> get(String blobName1, String blobName2, String... blobNames) {
     BatchRequest.Builder batch = BatchRequest.builder();
-    for (String blobName : blobNames) {
-      batch.get(info.name(), blobName);
+    batch.get(info.name(), blobName1);
+    batch.get(info.name(), blobName2);
+    for (String name : blobNames) {
+      batch.get(info.name(), name);
     }
     List<Blob> blobs = new ArrayList<>(blobNames.length);
     BatchResponse response = storage.apply(batch.build());
     for (BatchResponse.Result<BlobInfo> result : response.gets()) {
       BlobInfo blobInfo = result.get();
       blobs.add(blobInfo != null ? new Blob(storage, blobInfo) : null);
     }
-    return blobs;
+    return Collections.unmodifiableList(blobs);
   }
 
   /**
diff --git a/trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -143,7 +143,7 @@ public void testGetAll() throws Exception {
         new BatchResponse(Collections.EMPTY_LIST, Collections.EMPTY_LIST, batchResultList);
     expect(storage.apply(capture(capturedBatchRequest))).andReturn(response);
     replay(storage);
-    List<Blob> blobs = bucket.getAll("n1", "n2", "n3");
+    List<Blob> blobs = bucket.get("n1", "n2", "n3");
     Set<BlobInfo> blobInfoSet = capturedBatchRequest.getValue().toGet().keySet();
     assertEquals(batchResultList.size(), blobInfoSet.size());
     for (BlobInfo info : BLOB_INFO_RESULTS) {
