Merge pull request #562 from mziccard/rename-apply

Rename Storage.apply to Storage.submit
googleapis · Jan 21, 2016 · 9fba603 · 9fba603
2 parents 483b4d8 + 3026e77
commit 9fba603
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -319,7 +319,7 @@ public List<Blob> get(String blobName1, String blobName2, String... blobNames) {
       batch.get(info.name(), name);
     }
     List<Blob> blobs = new ArrayList<>(blobNames.length);
-    BatchResponse response = storage.apply(batch.build());
+    BatchResponse response = storage.submit(batch.build());
     for (BatchResponse.Result<BlobInfo> result : response.gets()) {
       BlobInfo blobInfo = result.get();
       blobs.add(blobInfo != null ? new Blob(storage, blobInfo) : null);

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -1412,7 +1412,7 @@ private static void checkContentType(BlobInfo blobInfo) throws IllegalArgumentEx
    * @return the batch response
    * @throws StorageException upon failure
    */
-  BatchResponse apply(BatchRequest batchRequest);
+  BatchResponse submit(BatchRequest batchRequest);
 
   /**
    * Return a channel for reading the blob's content. The blob's latest generation is read. If the

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -441,7 +441,7 @@ public byte[] call() {
   }
 
   @Override
-  public BatchResponse apply(BatchRequest batchRequest) {
+  public BatchResponse submit(BatchRequest batchRequest) {
     List<Tuple<StorageObject, Map<StorageRpc.Option, ?>>> toDelete =
         Lists.newArrayListWithCapacity(batchRequest.toDelete().size());
     for (Map.Entry<BlobId, Iterable<BlobSourceOption>> entry : batchRequest.toDelete().entrySet()) {
@@ -592,7 +592,7 @@ public List<BlobInfo> get(BlobId... blobIds) {
     for (BlobId blob : blobIds) {
       requestBuilder.get(blob);
     }
-    BatchResponse response = apply(requestBuilder.build());
+    BatchResponse response = submit(requestBuilder.build());
     return Collections.unmodifiableList(transformResultList(response.gets(), null));
   }
 
@@ -602,7 +602,7 @@ public List<BlobInfo> update(BlobInfo... blobInfos) {
     for (BlobInfo blobInfo : blobInfos) {
       requestBuilder.update(blobInfo);
     }
-    BatchResponse response = apply(requestBuilder.build());
+    BatchResponse response = submit(requestBuilder.build());
     return Collections.unmodifiableList(transformResultList(response.updates(), null));
   }
 
@@ -612,7 +612,7 @@ public List<Boolean> delete(BlobId... blobIds) {
     for (BlobId blob : blobIds) {
       requestBuilder.delete(blob);
     }
-    BatchResponse response = apply(requestBuilder.build());
+    BatchResponse response = submit(requestBuilder.build());
     return Collections.unmodifiableList(transformResultList(response.deletes(), Boolean.FALSE));
   }
 

diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -175,7 +175,7 @@ public void testGetAll() throws Exception {
     }
     BatchResponse response = new BatchResponse(Collections.<Result<Boolean>>emptyList(),
         Collections.<Result<BlobInfo>>emptyList(), batchResultList);
-    expect(storage.apply(capture(capturedBatchRequest))).andReturn(response);
+    expect(storage.submit(capture(capturedBatchRequest))).andReturn(response);
     replay(storage);
     List<Blob> blobs = bucket.get("n1", "n2", "n3");
     Set<BlobId> blobInfoSet = capturedBatchRequest.getValue().toGet().keySet();

diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -584,7 +584,7 @@ public void testBatchRequest() {
         .update(updatedBlob1)
         .update(updatedBlob2)
         .build();
-    BatchResponse updateResponse = storage.apply(updateRequest);
+    BatchResponse updateResponse = storage.submit(updateRequest);
     assertEquals(2, updateResponse.updates().size());
     assertEquals(0, updateResponse.deletes().size());
     assertEquals(0, updateResponse.gets().size());
@@ -602,7 +602,7 @@ public void testBatchRequest() {
         .get(BUCKET, sourceBlobName1)
         .get(BUCKET, sourceBlobName2)
         .build();
-    BatchResponse getResponse = storage.apply(getRequest);
+    BatchResponse getResponse = storage.submit(getRequest);
     assertEquals(2, getResponse.gets().size());
     assertEquals(0, getResponse.deletes().size());
     assertEquals(0, getResponse.updates().size());
@@ -616,7 +616,7 @@ public void testBatchRequest() {
         .delete(BUCKET, sourceBlobName1)
         .delete(BUCKET, sourceBlobName2)
         .build();
-    BatchResponse deleteResponse = storage.apply(deleteRequest);
+    BatchResponse deleteResponse = storage.submit(deleteRequest);
     assertEquals(2, deleteResponse.deletes().size());
     assertEquals(0, deleteResponse.gets().size());
     assertEquals(0, deleteResponse.updates().size());
@@ -646,7 +646,7 @@ public void testBatchRequestManyDeletes() {
         .get(BUCKET, sourceBlobName1)
         .update(updatedBlob2)
         .build();
-    BatchResponse response = storage.apply(updateRequest);
+    BatchResponse response = storage.submit(updateRequest);
     assertEquals(2 * MAX_BATCH_DELETES, response.deletes().size());
     assertEquals(1, response.updates().size());
     assertEquals(1, response.gets().size());
@@ -685,7 +685,7 @@ public void testBatchRequestFail() {
         .get(BUCKET, blobName, Storage.BlobGetOption.generationMatch(-1L))
         .get(BlobId.of(BUCKET, blobName, -1L))
         .build();
-    BatchResponse batchResponse = storage.apply(batchRequest);
+    BatchResponse batchResponse = storage.submit(batchRequest);
     assertEquals(1, batchResponse.updates().size());
     assertEquals(2, batchResponse.deletes().size());
     assertEquals(2, batchResponse.gets().size());

diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java
@@ -975,7 +975,7 @@ public Tuple<StorageObject, StorageException> apply(StorageObject f) {
     EasyMock.expect(storageRpcMock.batch(EasyMock.capture(capturedBatchRequest))).andReturn(res);
     EasyMock.replay(storageRpcMock);
     storage = options.service();
-    BatchResponse batchResponse = storage.apply(req);
+    BatchResponse batchResponse = storage.submit(req);
 
     // Verify captured StorageRpc.BatchRequest
     List<Tuple<StorageObject, Map<StorageRpc.Option, ?>>> capturedToDelete =