chore: ensure appendable finalize after close works

BenWhitehead · BenWhitehead · commit e2a3e3c2ca8e · 2025-03-14T17:38:20.000-04:00
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/GapicBidiUnbufferedAppendableWriteableByteChannel.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/GapicBidiUnbufferedAppendableWriteableByteChannel.java
@@ -147,6 +147,9 @@ public void close() throws IOException {
   }
 
   public void finalizeWrite() throws IOException {
+    if (stream == null) {
+      restart();
+    }
     BidiWriteObjectRequest message = finishMessage();
     lastWrittenRequest = message;
     begin = writeCtx.getConfirmedBytes().get();
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/ITAppendableUploadTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/ITAppendableUploadTest.java
@@ -18,6 +18,8 @@
 import static com.google.cloud.storage.ByteSizeConstants._2MiB;
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.cloud.storage.Storage.BlobField;
+import com.google.cloud.storage.Storage.BlobGetOption;
 import com.google.cloud.storage.it.runner.StorageITRunner;
 import com.google.cloud.storage.it.runner.annotations.Backend;
 import com.google.cloud.storage.it.runner.annotations.Inject;
@@ -119,4 +121,36 @@ public void testUploadFileUsingAppendable() throws Exception {
       }
     }
   }
+
+  @Test
+  public void finalizeAfterCloseWorks() throws Exception {
+    BlobId bid = BlobId.of(bucket.getName(), generator.randomObjectName());
+
+    AppendableBlobUpload appendable =
+        storage.appendableBlobUpload(BlobInfo.newBuilder(bid).build(), 1024);
+    appendable.write(DataGenerator.base64Characters().genByteBuffer(3587));
+
+    appendable.close();
+    BlobInfo bi = appendable.finalizeUpload();
+    assertThat(bi.getSize()).isEqualTo(3587);
+  }
+
+  @Test
+  public void takeoverJustToFinalizeWorks() throws Exception {
+    BlobId bid = BlobId.of(bucket.getName(), generator.randomObjectName());
+
+    AppendableBlobUpload upload = storage.appendableBlobUpload(BlobInfo.newBuilder(bid).build(), 5);
+
+    upload.write(DataGenerator.base64Characters().genByteBuffer(20));
+    upload.close();
+
+    Blob blob =
+        storage.get(
+            bid, BlobGetOption.fields(BlobField.BUCKET, BlobField.NAME, BlobField.GENERATION));
+
+    AppendableBlobUpload takeOver =
+        storage.appendableBlobUpload(BlobInfo.newBuilder(blob.getBlobId()).build(), 5);
+    BlobInfo i = takeOver.finalizeUpload();
+    assertThat(i.getSize()).isEqualTo(20);
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,9 @@ public void close() throws IOException {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`public void finalizeWrite() throws IOException {`
	`150`	`+ if (stream == null) {`
	`151`	`+ restart();`
	`152`	`+ }`
`150`	`153`	`BidiWriteObjectRequest message = finishMessage();`
`151`	`154`	`lastWrittenRequest = message;`
`152`	`155`	`begin = writeCtx.getConfirmedBytes().get();`