docs: Update DeleteObject Sample to be clearer on object versioning behavior (#2595)

sydney-munro · gcf-owl-bot[bot] · BenWhitehead · web-flow · commit 79b7cf05326e · 2024-06-26T11:42:44.000-07:00
* docs: Update DeleteObject Sample to be clearer on object versioning behavior * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Update samples/snippets/src/main/java/com/example/storage/object/DeleteObject.java Co-authored-by: BenWhitehead <BenWhitehead@users.noreply.github.com> * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * adding in imports * rephrase comments --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: BenWhitehead <BenWhitehead@users.noreply.github.com>
diff --git a/samples/snippets/src/main/java/com/example/storage/object/DeleteObject.java b/samples/snippets/src/main/java/com/example/storage/object/DeleteObject.java
@@ -18,6 +18,7 @@
 
 // [START storage_delete_file]
 import com.google.cloud.storage.Blob;
+import com.google.cloud.storage.BlobId;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
 
@@ -38,16 +39,19 @@ public static void deleteObject(String projectId, String bucketName, String obje
       System.out.println("The object " + objectName + " wasn't found in " + bucketName);
       return;
     }
-
-    // Optional: set a generation-match precondition to avoid potential race
-    // conditions and data corruptions. The request to upload returns a 412 error if
-    // the object's generation number does not match your precondition.
-    Storage.BlobSourceOption precondition =
-        Storage.BlobSourceOption.generationMatch(blob.getGeneration());
-
-    storage.delete(bucketName, objectName, precondition);
-
-    System.out.println("Object " + objectName + " was deleted from " + bucketName);
+    BlobId idWithGeneration = blob.getBlobId();
+    // Deletes the blob specified by its id. When the generation is present and non-null it will be
+    // specified in the request.
+    // If versioning is enabled on the bucket and the generation is present in the delete request,
+    // only the version of the object with the matching generation will be deleted.
+    // If instead you want to delete the current version, the generation should be dropped by
+    // performing the following.
+    // BlobId idWithoutGeneration =
+    //    BlobId.of(idWithGeneration.getBucket(), idWithGeneration.getName());
+    // storage.delete(idWithoutGeneration);
+    storage.delete(idWithGeneration);
+
+    System.out.println("Object " + objectName + " was permanently deleted from " + bucketName);
   }
 }
 // [END storage_delete_file]
