update zipdownloader s3 to sdk v2

Author: qqmyers

scripts/zipdownload/pom.xml

@@ -23,8 +23,9 @@
             <artifactId>postgresql</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-s3</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <!-- no version here as managed by BOM above! -->
         </dependency>
     </dependencies>
     <build>

scripts/zipdownload/src/main/java/edu/harvard/iq/dataverse/custom/service/util/DirectAccessUtil.java

@@ -31,16 +31,31 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+package edu.harvard.iq.dataverse.custom.service.util;
+
+import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
 /**
  * Utility methods for directly accessing storage locations
  * Supports file system and S3. 
  * (S3 has only been tested with AWS; non-standard auth may not be supported yet)
  * 
  * @author Leonid Andreev
  */
-public class DirectAccessUtil implements java.io.Serializable  {
+public class DirectAccessUtil implements java.io.Serializable {
 
-    private AmazonS3 s3 = null;
+    private S3Client s3 = null;
 
     public InputStream openDirectAccess(String storageLocation) {
         InputStream inputStream = null;
@@ -57,31 +72,17 @@ public InputStream openDirectAccess(String storageLocation) {
             String bucket = storageLocation.substring(0, storageLocation.indexOf('/'));
             String key = storageLocation.substring(storageLocation.indexOf('/') + 1);
 
-            //System.out.println("bucket: "+bucket);
-            //System.out.println("key: "+key);
-            
-            /* commented-out code below is for looking up S3 metatadata
-               properties, such as size, etc. prior to making an access call:
-            ObjectMetadata objectMetadata = null;
-            long fileSize = 0L;
-            try {
-                objectMetadata = s3.getObjectMetadata(bucket, key);
-                fileSize = objectMetadata.getContentLength();
-                //System.out.println("byte size: "+objectMetadata.getContentLength());
-            } catch (SdkClientException sce) {
-                System.err.println("Cannot get S3 object metadata " + key + " from bucket " + bucket);
-            }*/
-
             try {
-                inputStream = s3.getObject(new GetObjectRequest(bucket, key)).getObjectContent();
-            } catch (SdkClientException sce) {
+                ResponseInputStream<GetObjectResponse> s3Object = s3.getObject(GetObjectRequest.builder()
+                        .bucket(bucket)
+                        .key(key)
+                        .build());
+                inputStream = s3Object;
+            } catch (S3Exception se) {
                 System.err.println("Cannot get S3 object " + key + " from bucket " + bucket);
             }
 
         } else if (storageLocation.startsWith("file://")) {
-            // This could be a static method; since no reusable client/maintainable
-            // state is required
-            
             storageLocation = storageLocation.substring(7);
 
             try {
@@ -98,14 +99,13 @@ public InputStream openDirectAccess(String storageLocation) {
     private void createOrReuseAwsClient() {
         if (this.s3 == null) {
             try {
-                AmazonS3ClientBuilder s3CB = AmazonS3ClientBuilder.standard();
-                s3CB.setCredentials(new ProfileCredentialsProvider("default"));
-                this.s3 = s3CB.build();
-
+                this.s3 = S3Client.builder()
+                        .region(Region.US_EAST_1) // You may want to make this configurable
+                        .credentialsProvider(ProfileCredentialsProvider.create("default"))
+                        .build();
             } catch (Exception e) {
-                System.err.println("cannot instantiate an S3 client");
+                System.err.println("Cannot instantiate an S3 client: " + e.getMessage());
             }
         }
     }
-
 }