Merge branch 'feature/master/s3mpu' into olapplin/fix-subscriber-dowloader

Author: L-Applin

test/s3-benchmarks/src/main/java/software/amazon/awssdk/s3benchmarks/BenchmarkRunner.java

@@ -140,7 +140,11 @@ public static void main(String... args) throws org.apache.commons.cli.ParseExcep
                     benchmark = new JavaS3ClientCopyBenchmark(config);
                     break;
                 }
-                throw new UnsupportedOperationException("Java based s3 client benchmark only support upload and copy");
+                if (operation == TransferManagerOperation.DOWNLOAD) {
+                    benchmark = new JavaS3ClientDownloadBenchmark(config);
+                    break;
+                }
+                throw new UnsupportedOperationException();
             default:
                 throw new UnsupportedOperationException();
         }

test/s3-benchmarks/src/main/java/software/amazon/awssdk/s3benchmarks/JavaS3ClientDownloadBenchmark.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.s3benchmarks;
+
+import java.io.File;
+import java.util.List;
+import software.amazon.awssdk.core.async.AsyncResponseTransformer;
+import software.amazon.awssdk.utils.Logger;
+
+public class JavaS3ClientDownloadBenchmark extends BaseJavaS3ClientBenchmark {
+    private static final Logger log = Logger.loggerFor(JavaS3ClientDownloadBenchmark.class);
+    private final String filePath;
+
+    public JavaS3ClientDownloadBenchmark(TransferManagerBenchmarkConfig config) {
+        super(config);
+        this.filePath = config.filePath();
+    }
+
+    @Override
+    protected void sendOneRequest(List<Double> latencies) throws Exception {
+        Double latency;
+        if (filePath == null) {
+            log.info(() -> "Starting download to memory");
+            latency = runWithTime(s3AsyncClient.getObject(
+                req -> req.key(key).bucket(bucket), AsyncResponseTransformer.toBytes()
+            )::join).latency();
+        } else {
+            log.info(() -> "Starting download to file");
+            latency = runWithTime(s3AsyncClient.getObject(
+                req -> req.key(key).bucket(bucket), new File(filePath).toPath()
+            )::join).latency();
+        }
+        latencies.add(latency);
+    }
+
+    @Override
+    protected long contentLength() throws Exception {
+        return s3Client.headObject(b -> b.bucket(bucket).key(key)).contentLength();
+    }
+}