updated S3 Java file

Author: scmacdon

.doc_gen/metadata/s3-control_metadata.yaml

@@ -24,13 +24,13 @@ s3-control_CreateJob:
           github: javav2/example_code/s3
           sdkguide:
           excerpts:
-            - description: create an asynchronous S3 job
+            - description: Create an asynchronous S3 job.
               snippet_tags:
                 - s3control.java2.create_job.async.main
-            - description: create a compliance retention job
+            - description: Create a compliance retention job.
               snippet_tags:
                 - s3control.java2.create_job.compliance.main   
-            - description: creates a legal hold off job
+            - description: Create a legal hold off job.
               snippet_tags:
                 - s3control.java2.create_job.compliance.main       
   services:

javav2/example_code/s3/src/main/java/com/example/s3/batch/HelloS3Batch.java

@@ -5,6 +5,7 @@
 // snippet-start:[s3control.java2.list_jobs.main]
 import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
 import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
@@ -30,9 +31,10 @@
  */
 public class HelloS3Batch {
     private static S3ControlAsyncClient asyncClient;
-    public static void main(String []args ) {
+
+    public static void main(String[] args) {
         S3BatchActions actions = new S3BatchActions();
-        String accountId= actions.getAccountId();
+        String accountId = actions.getAccountId();
         try {
             listBatchJobsAsync(accountId)
                 .exceptionally(ex -> {
@@ -77,9 +79,7 @@ private static S3ControlAsyncClient getAsyncClient() {
             ClientOverrideConfiguration overrideConfig = ClientOverrideConfiguration.builder()
                 .apiCallTimeout(Duration.ofMinutes(2))
                 .apiCallAttemptTimeout(Duration.ofSeconds(90))
-                .retryPolicy(RetryPolicy.builder()
-                    .numRetries(3)
-                    .build())
+                .retryStrategy(RetryMode.STANDARD)
                 .build();
 
             asyncClient = S3ControlAsyncClient.builder()
@@ -92,7 +92,6 @@ private static S3ControlAsyncClient getAsyncClient() {
         return asyncClient;
     }
 
-
     /**
      * Asynchronously lists batch jobs that have completed for the specified account.
      *

javav2/example_code/s3/src/main/java/com/example/s3/scenario/S3Actions.java

@@ -38,6 +38,7 @@
 import software.amazon.awssdk.services.s3.model.UploadPartRequest;
 import software.amazon.awssdk.services.s3.paginators.ListObjectsV2Publisher;
 import software.amazon.awssdk.services.s3.waiters.S3AsyncWaiter;
+
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -54,6 +55,7 @@ public class S3Actions {
 
     private static final Logger logger = LoggerFactory.getLogger(S3Actions.class);
     private static S3AsyncClient s3AsyncClient;
+
     public static S3AsyncClient getAsyncClient() {
         if (s3AsyncClient == null) {
             /*
@@ -86,6 +88,7 @@ public static S3AsyncClient getAsyncClient() {
     }
 
     // snippet-start:[s3.java2.create_bucket_waiters.main]
+
     /**
      * Creates an S3 bucket asynchronously.
      *
@@ -121,11 +124,12 @@ public CompletableFuture<Void> createBucketAsync(String bucketName) {
     // snippet-end:[s3.java2.create_bucket_waiters.main]
 
     // snippet-start:[s3.java2.s3_object_upload.main]
+
     /**
      * Uploads a local file to an AWS S3 bucket asynchronously.
      *
      * @param bucketName the name of the S3 bucket to upload the file to
-     * @param key the key (object name) to use for the uploaded file
+     * @param key        the key (object name) to use for the uploaded file
      * @param objectPath the local file path of the file to be uploaded
      * @return a {@link CompletableFuture} that completes with the {@link PutObjectResponse} when the upload is successful, or throws a {@link RuntimeException} if the upload fails
      */
@@ -138,19 +142,20 @@ public CompletableFuture<PutObjectResponse> uploadLocalFileAsync(String bucketNa
         CompletableFuture<PutObjectResponse> response = getAsyncClient().putObject(objectRequest, AsyncRequestBody.fromFile(Paths.get(objectPath)));
         return response.whenComplete((resp, ex) -> {
             if (ex != null) {
-              throw new RuntimeException("Failed to upload file", ex);
+                throw new RuntimeException("Failed to upload file", ex);
             }
         });
     }
     // snippet-end:[s3.java2.s3_object_upload.main]
 
     // snippet-start:[s3.java2.getobjectdata.main]
+
     /**
      * Asynchronously retrieves the bytes of an object from an Amazon S3 bucket and writes them to a local file.
      *
      * @param bucketName the name of the S3 bucket containing the object
-     * @param keyName the key (or name) of the S3 object to retrieve
-     * @param path the local file path where the object's bytes will be written
+     * @param keyName    the key (or name) of the S3 object to retrieve
+     * @param path       the local file path where the object's bytes will be written
      * @return a {@link CompletableFuture} that completes when the object bytes have been written to the local file
      */
     public CompletableFuture<Void> getObjectBytesAsync(String bucketName, String keyName, String path) {
@@ -178,6 +183,7 @@ public CompletableFuture<Void> getObjectBytesAsync(String bucketName, String key
     // snippet-end:[s3.java2.getobjectdata.main]
 
     // snippet-start:[s3.java2.list_objects.main]
+
     /**
      * Asynchronously lists all objects in the specified S3 bucket.
      *
@@ -204,12 +210,13 @@ public CompletableFuture<Void> listAllObjectsAsync(String bucketName) {
     // snippet-end:[s3.java2.list_objects.main]
 
     // snippet-start:[s3.java2.copy_object.main]
+
     /**
      * Asynchronously copies an object from one S3 bucket to another.
      *
      * @param fromBucket the name of the source S3 bucket
-     * @param objectKey the key (name) of the object to be copied
-     * @param toBucket the name of the destination S3 bucket
+     * @param objectKey  the key (name) of the object to be copied
+     * @param toBucket   the name of the destination S3 bucket
      * @return a {@link CompletableFuture} that completes with the copy result as a {@link String}
      * @throws RuntimeException if the URL could not be encoded or an S3 exception occurred during the copy
      */
@@ -239,7 +246,7 @@ public CompletableFuture<String> copyBucketObjectAsync(String fromBucket, String
      * Performs a multipart upload to an Amazon S3 bucket.
      *
      * @param bucketName the name of the S3 bucket to upload the file to
-     * @param key the key (name) of the file to be uploaded
+     * @param key        the key (name) of the file to be uploaded
      * @return a {@link CompletableFuture} that completes when the multipart upload is successful
      */
     public CompletableFuture<Void> multipartUpload(String bucketName, String key) {
@@ -316,11 +323,12 @@ public CompletableFuture<Void> multipartUpload(String bucketName, String key) {
     }
 
     // snippet-start:[s3.java2.delete_objects.main]
+
     /**
      * Deletes an object from an S3 bucket asynchronously.
      *
      * @param bucketName the name of the S3 bucket
-     * @param key the key (file name) of the object to be deleted
+     * @param key        the key (file name) of the object to be deleted
      * @return a {@link CompletableFuture} that completes when the object has been deleted
      */
     public CompletableFuture<Void> deleteObjectFromBucketAsync(String bucketName, String key) {
@@ -343,12 +351,13 @@ public CompletableFuture<Void> deleteObjectFromBucketAsync(String bucketName, St
     // snippet-end:[s3.java2.delete_objects.main]
 
     // snippet-start:[s3.java2.bucket_deletion.main]
+
     /**
      * Deletes an S3 bucket asynchronously.
      *
      * @param bucket the name of the bucket to be deleted
      * @return a {@link CompletableFuture} that completes when the bucket deletion is successful, or throws a {@link RuntimeException}
-     *         if an error occurs during the deletion process
+     * if an error occurs during the deletion process
      */
     public CompletableFuture<Void> deleteBucketAsync(String bucket) {
         DeleteBucketRequest deleteBucketRequest = DeleteBucketRequest.builder()
@@ -369,7 +378,6 @@ public CompletableFuture<Void> deleteBucketAsync(String bucket) {
 
     // snippet-start:[s3.java2.multi_copy.main]
     public CompletableFuture<String> performMultiCopy(String toBucket, String bucketName, String key) {
-        // Step 1: Initiate multipart upload.
         CreateMultipartUploadRequest createMultipartUploadRequest = CreateMultipartUploadRequest.builder()
             .bucket(toBucket)
             .key(key)
@@ -380,7 +388,6 @@ public CompletableFuture<String> performMultiCopy(String toBucket, String bucket
                 String uploadId = createMultipartUploadResponse.uploadId();
                 System.out.println("Upload ID: " + uploadId);
 
-                // Step 2: Set the parameters for the upload part copy request.
                 UploadPartCopyRequest uploadPartCopyRequest = UploadPartCopyRequest.builder()
                     .sourceBucket(bucketName)
                     .destinationBucket(toBucket)
@@ -391,7 +398,6 @@ public CompletableFuture<String> performMultiCopy(String toBucket, String bucket
                     .copySourceRange("bytes=0-1023")  // Adjust range as needed
                     .build();
 
-                // Step 3: Perform the upload part copy operation asynchronously.
                 return getAsyncClient().uploadPartCopy(uploadPartCopyRequest);
             })
             .thenCompose(uploadPartCopyFuture -> uploadPartCopyFuture)