From 2c1ca3f83070155a27166d4e6f1fcc5827e2ce6e Mon Sep 17 00:00:00 2001
From: Hosain <contact@hosain.net>
Date: Sun, 19 Jul 2020 21:48:42 +0100
Subject: [PATCH] fix: set storage update time in FakeStorageRpc

---
 .../contrib/nio/testing/FakeStorageRpc.java   | 13 ++++++++++++
 .../nio/testing/LocalStorageHelperTest.java   | 20 +++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java b/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
index 55d0b52b..f47f3024 100644
--- a/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
+++ b/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.storage.contrib.nio.testing;
 
+import com.google.api.client.util.DateTime;
 import com.google.api.services.storage.model.Bucket;
 import com.google.api.services.storage.model.ServiceAccount;
 import com.google.api.services.storage.model.StorageObject;
@@ -29,8 +30,10 @@
 import java.io.OutputStream;
 import java.math.BigInteger;
 import java.nio.file.FileAlreadyExistsException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,6 +73,9 @@
 @NotThreadSafe
 class FakeStorageRpc extends StorageRpcTestBase {
 
+  private static final SimpleDateFormat RFC_3339_FORMATTER =
+      new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+
   // fullname -> metadata
   Map<String, StorageObject> metadata = new HashMap<>();
   // fullname -> contents
@@ -95,6 +101,7 @@ public StorageObject create(StorageObject object, InputStream content, Map<Optio
       throws StorageException {
     potentiallyThrow(options);
     String key = fullname(object);
+    object.setUpdated(now());
     metadata.put(key, object);
     try {
       contents.put(key, com.google.common.io.ByteStreams.toByteArray(content));
@@ -357,6 +364,7 @@ public void write(
       futureContents.remove(uploadId);
       if (metadata.containsKey(uploadId)) {
         StorageObject storageObject = metadata.get(uploadId);
+        storageObject.setUpdated(now());
         Long generation = storageObject.getGeneration();
         if (null == generation) {
           generation = Long.valueOf(0);
@@ -401,6 +409,7 @@ public RewriteResponse openRewrite(RewriteRequest rewriteRequest) throws Storage
 
     rewriteRequest.target.setGeneration(generation);
     rewriteRequest.target.setSize(BigInteger.valueOf(data.length));
+    rewriteRequest.target.setUpdated(metadata.get(sourceKey).getUpdated());
 
     metadata.put(destKey, rewriteRequest.target);
 
@@ -414,6 +423,10 @@ public RewriteResponse openRewrite(RewriteRequest rewriteRequest) throws Storage
         data.length);
   }
 
+  private static DateTime now() {
+    return DateTime.parseRfc3339(RFC_3339_FORMATTER.format(new Date()));
+  }
+
   private String fullname(StorageObject so) {
     return (so.getBucket() + "/" + so.getName());
   }
diff --git a/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelperTest.java b/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelperTest.java
index 742e65ce..8c29ac40 100644
--- a/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelperTest.java
+++ b/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/testing/LocalStorageHelperTest.java
@@ -52,11 +52,8 @@ public void before() throws IOException {
     BlobId id = BlobId.of(testBucket, sourceFile);
     BlobInfo info = BlobInfo.newBuilder(id).build();
 
-    WriteChannel writer = localStorageService.writer(info);
-    try {
+    try (WriteChannel writer = localStorageService.writer(info)) {
       writer.write(ByteBuffer.wrap(payloadBytes));
-    } finally {
-      writer.close();
     }
   }
 
@@ -105,4 +102,19 @@ public void testCopyIncrementsGenerations() {
     assertThat(obj.getGeneration()).isEqualTo(2);
     assertThat(obj.getSize()).isEqualTo(7);
   }
+
+  @Test
+  public void testWriteNewFileSetsUpdateTime() {
+    Blob obj = localStorageService.get(BlobId.of(testBucket, sourceFile));
+
+    assertThat(obj.getUpdateTime()).isNotNull();
+  }
+
+  @Test
+  public void testCreateNewFileSetsUpdateTime() {
+    BlobInfo info = BlobInfo.newBuilder(BlobId.of(testBucket, "newFile")).build();
+    Blob obj = localStorageService.create(info);
+
+    assertThat(obj.getUpdateTime()).isNotNull();
+  }
 }