NIO: Fix FakeStorageRpc that doesn't set the blob size when returning blobs from the list method. (#5185)

maxtomassi · chingor13 · commit 4748868df47c · 2019-06-07T11:55:54.000-07:00
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
@@ -163,6 +163,7 @@ public Tuple<String, Iterable<StorageObject>> list(String bucket, Map<Option, ?>
       if (processedAsFolder(so, delimiter, prefix, folders)) {
         continue;
       }
+      so.setSize(size(so));
       values.add(so);
     }
     values.addAll(folders.values());
@@ -205,9 +206,7 @@ public StorageObject get(StorageObject object, Map<Option, ?> options) throws St
     String key = fullname(object);
     if (metadata.containsKey(key)) {
       StorageObject ret = metadata.get(key);
-      if (contents.containsKey(key)) {
-        ret.setSize(BigInteger.valueOf(contents.get(key).length));
-      }
+      ret.setSize(size(ret));
       ret.setId(key);
 
       return ret;
@@ -474,6 +473,16 @@ private String fullname(StorageObject so) {
     return (so.getBucket() + "/" + so.getName());
   }
 
+  private BigInteger size(StorageObject so) {
+    String key = fullname(so);
+
+    if (contents.containsKey(key)) {
+      return BigInteger.valueOf(contents.get(key).length);
+    }
+
+    return null;
+  }
+
   private void potentiallyThrow(Map<Option, ?> options) throws UnsupportedOperationException {
     if (throwIfOption && !options.isEmpty()) {
       throw new UnsupportedOperationException();
@@ -525,6 +534,7 @@ private static boolean processedAsFolder(
     fakeFolder.setBucket(so.getBucket());
     fakeFolder.setGeneration(so.getGeneration());
     fakeFolder.set("isDirectory", true);
+    fakeFolder.setSize(BigInteger.ZERO);
     folders.put(folderName, fakeFolder);
     return true;
   }
