---

aozarov · aozarov · commit 4bd3f6659298 · 2015-05-11T17:12:38.000-07:00
yaml --- r: 5989 b: refs/heads/tswast-patch-1 c: 294cfb4 h: refs/heads/master i: 5987: b8c5e74
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 502365303e2a961b61bf851f94a2ac40bf30513b
+refs/heads/tswast-patch-1: 294cfb4e76c7df4de5fe0c52c0ff999dfbca33ea
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/BatchResponse.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/BatchResponse.java
@@ -36,10 +36,12 @@ public class BatchResponse implements Serializable {
   public static class Result<T extends Serializable> implements Serializable {
 
     private static final long serialVersionUID = -1946539570170529094L;
+    private static final Result EMPTY = new BatchResponse.Result(null);
 
     private final T value;
     private final StorageServiceException exception;
 
+
     Result(T value) {
       this.value = value;
       this.exception = null;
@@ -50,13 +52,15 @@ public static class Result<T extends Serializable> implements Serializable {
       this.value = null;
     }
 
-
     /**
      * Returns the result.
      *
      * @throws StorageServiceException if failed
      */
     public T result() throws StorageServiceException {
+      if (failed()) {
+        throw failure();
+      }
       return value;
     }
 
@@ -76,7 +80,15 @@ public boolean failed() {
 
     @Override
     public String toString() {
-      return MoreObjects.firstNonNull(value, exception).toString();
+      return MoreObjects.toStringHelper(this)
+          .add("value", value)
+          .add("exception", exception)
+          .toString();
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T extends Serializable> Result<T> empty() {
+      return EMPTY;
     }
   }
 
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/StorageServiceImpl.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/StorageServiceImpl.java
@@ -37,6 +37,8 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.common.primitives.Ints;
 import com.google.gcloud.BaseService;
 import com.google.gcloud.ExceptionHandler;
 import com.google.gcloud.ExceptionHandler.Interceptor;
@@ -52,6 +54,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Callable;
 
 final class StorageServiceImpl extends BaseService<StorageServiceOptions> implements StorageService {
@@ -325,20 +328,28 @@ public BatchResponse apply(BatchRequest batchRequest) {
     List<BatchResponse.Result<Blob>> updates = transformBatchResult(
         toUpdate, response.updates, Blob.FROM_PB_FUNCTION);
     List<BatchResponse.Result<Blob>> gets = transformBatchResult(
-        toGet, response.gets, Blob.FROM_PB_FUNCTION);
+        toGet, response.gets, Blob.FROM_PB_FUNCTION, 404);
     return new BatchResponse(deletes, updates, gets);
   }
 
   private <I, O extends Serializable> List<BatchResponse.Result<O>> transformBatchResult(
       Iterable<Tuple<StorageObject, Map<StorageRpc.Option, ?>>> request,
-      Map<StorageObject, Tuple<I, StorageServiceException>> results, Function<I, O> transform) {
+      Map<StorageObject, Tuple<I, StorageServiceException>> results, Function<I, O> transform,
+      int... nullOnErrorCodes) {
+    Set nullOnErrorCodesSet = Sets.newHashSet(Ints.asList(nullOnErrorCodes));
     List<BatchResponse.Result<O>> response = Lists.newArrayListWithCapacity(results.size());
     for (Tuple<StorageObject, ?> tuple : request) {
       Tuple<I, StorageServiceException> result = results.get(tuple.x());
       if (result.x() != null) {
         response.add(new BatchResponse.Result<>(transform.apply(result.x())));
       } else {
-        response.add(new BatchResponse.Result<O>(result.y()));
+        StorageServiceException exception = result.y();
+        if (nullOnErrorCodesSet.contains(exception.code())) {
+          //noinspection unchecked
+          response.add(BatchResponse.Result.<O>empty());
+        } else {
+          response.add(new BatchResponse.Result<O>(result.y()));
+        }
       }
     }
     return response;
