Review from github

Author: joviegas

test/http-client-benchmarks/pom.xml

@@ -114,7 +114,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.1</version>
+                    <version>3.11.0</version>
                     <!-- Override the configuration in the parent-->
                     <configuration combine.self="override">
                         <compilerVersion>${javac.target}</compilerVersion>

test/http-client-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apache5/Apache5Benchmark.java

@@ -35,6 +35,7 @@
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
+import software.amazon.awssdk.benchmark.core.CoreBenchmark;
 import software.amazon.awssdk.benchmark.core.S3BenchmarkImpl;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.apache5.Apache5HttpClient;
@@ -47,12 +48,12 @@
 import java.util.logging.Logger;
 
 @BenchmarkMode(Mode.Throughput)
-@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Benchmark)
 @Fork(value = 1, jvmArgs = {"-Xms2G", "-Xmx2G", "--enable-preview"})
 @Warmup(iterations = 3, time = 15, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 5, time = 10, timeUnit = TimeUnit.SECONDS)
-public class Apache5Benchmark {
+public class Apache5Benchmark implements CoreBenchmark {
     private static final Logger logger = Logger.getLogger(Apache5Benchmark.class.getName());
 
     @Param({"50","200"})
@@ -112,16 +113,19 @@ public void setup() {
     }
 
     @Benchmark
+    @Override
     public void simpleGet(Blackhole blackhole) throws Exception {
         benchmark.executeGet("medium", blackhole);
     }
 
     @Benchmark
+    @Override
     public void simplePut(Blackhole blackhole) throws Exception {
         benchmark.executePut("medium", blackhole);
     }
 
     @Benchmark
+    @Override
     public void multiThreadedGet(Blackhole blackhole) throws Exception {
         List<Future<?>> futures = new ArrayList<>(threadCount);
 
@@ -142,6 +146,7 @@ public void multiThreadedGet(Blackhole blackhole) throws Exception {
     }
 
     @Benchmark
+    @Override
     public void multiThreadedPut(Blackhole blackhole) throws Exception {
         List<Future<?>> futures = new ArrayList<>(threadCount);
 

test/http-client-benchmarks/src/main/java/software/amazon/awssdk/benchmark/core/S3BenchmarkImpl.java

@@ -121,25 +121,26 @@ public void executePut(String size, Blackhole blackhole) {
 
     public void cleanup() {
         try {
-            // Delete all objects
-            ListObjectsV2Response listResponse = s3Client.listObjectsV2(
-                ListObjectsV2Request.builder()
-                                    .bucket(bucketName)
-                                    .build()
-            );
-
-            for (S3Object object : listResponse.contents()) {
-                s3Client.deleteObject(DeleteObjectRequest.builder()
-                                                         .bucket(bucketName)
-                                                         .key(object.key())
-                                                         .build());
-            }
-
+            // Delete all objects (handle pagination)
+            ListObjectsV2Request.Builder listRequestBuilder = ListObjectsV2Request.builder();
+            String continuationToken = null;
+            do {
+                if (continuationToken != null) {
+                    listRequestBuilder.continuationToken(continuationToken);
+                }
+                ListObjectsV2Response listResponse = s3Client.listObjectsV2(listRequestBuilder.build());
+                for (S3Object object : listResponse.contents()) {
+                    s3Client.deleteObject(DeleteObjectRequest.builder()
+                                                             .bucket(bucketName)
+                                                             .key(object.key())
+                                                             .build());
+                }
+                continuationToken = listResponse.nextContinuationToken();
+            } while (continuationToken != null);
             // Delete bucket
             s3Client.deleteBucket(DeleteBucketRequest.builder()
                                                      .bucket(bucketName)
                                                      .build());
-
             logger.info("Cleaned up bucket: " + bucketName);
 
         } catch (Exception e) {