IT correctness, refactoring, remove V1 SDK

Test all ITs against S3 again to see if there are differences in
behaviour, fix S3Mock if necessary.
Migrate all SDK V1 tests to SDK V2.
Remove SDK V1 tests.
Use Lambdas where possible for functions accepting Consumer<Builder>.
Kotlification.

Author: afranken

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/AclITV2.kt

@@ -32,7 +32,7 @@ internal class AclITV2 : S3TestBase() {
 
   @Test
   @S3VerifiedSuccess(year = 2024)
-  fun testPutCannedAcl_OK(testInfo: TestInfo) {
+  fun `put canned ACL returns OK, get ACL returns the ACL`(testInfo: TestInfo) {
     val sourceKey = UPLOAD_FILE_NAME
     val bucketName = bucketName(testInfo)
 
@@ -44,7 +44,7 @@ internal class AclITV2 : S3TestBase() {
       assertThat(it.sdkHttpResponse().isSuccessful).isTrue()
     }
 
-    givenObjectV2(bucketName, sourceKey)
+    givenObject(bucketName, sourceKey)
 
     s3ClientV2.putObjectAcl {
       it.bucket(bucketName)
@@ -69,9 +69,9 @@ internal class AclITV2 : S3TestBase() {
   @Test
   @S3VerifiedFailure(year = 2022,
     reason = "Owner and Grantee not available on test AWS account.")
-  fun testGetAcl_noAcl(testInfo: TestInfo) {
+  fun `get ACL returns canned 'private' ACL`(testInfo: TestInfo) {
     val sourceKey = UPLOAD_FILE_NAME
-    val (bucketName, _) = givenBucketAndObjectV2(testInfo, sourceKey)
+    val (bucketName, _) = givenBucketAndObject(testInfo, sourceKey)
 
     val acl = s3ClientV2.getObjectAcl {
       it.bucket(bucketName)
@@ -100,9 +100,9 @@ internal class AclITV2 : S3TestBase() {
   @Test
   @S3VerifiedFailure(year = 2022,
     reason = "Owner and Grantee not available on test AWS account.")
-  fun testPutAndGetAcl(testInfo: TestInfo) {
+  fun `put ACL returns OK, get ACL returns the ACL`(testInfo: TestInfo) {
     val sourceKey = UPLOAD_FILE_NAME
-    val (bucketName, _) = givenBucketAndObjectV2(testInfo, sourceKey)
+    val (bucketName, _) = givenBucketAndObject(testInfo, sourceKey)
 
     val userId = "79a59df900b949e55d96a1e698fbacedfd6e09d98eacf8f8d5218e7cd47ef2ab"
     val userName = "John Doe"

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/AwsChunkedEndcodingITV2.kt

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -23,8 +23,6 @@ import org.junit.jupiter.api.TestInfo
 import software.amazon.awssdk.core.checksums.Algorithm
 import software.amazon.awssdk.core.sync.RequestBody
 import software.amazon.awssdk.services.s3.model.ChecksumAlgorithm
-import software.amazon.awssdk.services.s3.model.GetObjectRequest
-import software.amazon.awssdk.services.s3.model.PutObjectRequest
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
@@ -46,19 +44,19 @@ internal class AwsChunkedEndcodingITV2 : S3TestBase() {
     year = 2023,
     reason = "Only works with http endpoints"
   )
-  fun testPutObject_checksum(testInfo: TestInfo) {
-    val bucket = givenBucketV2(testInfo)
+  fun `put object with checksum returns correct checksum, get object returns checksum`(testInfo: TestInfo) {
+    val bucket = givenBucket(testInfo)
     val uploadFile = File(UPLOAD_FILE_NAME)
     val uploadFileIs: InputStream = FileInputStream(uploadFile)
     val expectedEtag = "\"${DigestUtil.hexDigest(uploadFileIs)}\""
     val expectedChecksum = DigestUtil.checksumFor(uploadFile.toPath(), Algorithm.SHA256)
 
     val putObjectResponse = s3ClientV2.putObject(
-      PutObjectRequest.builder()
-        .bucket(bucket)
-        .key(UPLOAD_FILE_NAME)
-        .checksumAlgorithm(ChecksumAlgorithm.SHA256)
-        .build(),
+      {
+        it.bucket(bucket)
+        it.key(UPLOAD_FILE_NAME)
+        it.checksumAlgorithm(ChecksumAlgorithm.SHA256)
+      },
       RequestBody.fromFile(uploadFile)
     )
 
@@ -67,12 +65,10 @@ internal class AwsChunkedEndcodingITV2 : S3TestBase() {
       assertThat(it).isEqualTo(expectedChecksum)
     }
 
-    s3ClientV2.getObject(
-      GetObjectRequest.builder()
-        .bucket(bucket)
-        .key(UPLOAD_FILE_NAME)
-        .build()
-    ).also { getObjectResponse ->
+    s3ClientV2.getObject {
+      it.bucket(bucket)
+      it.key(UPLOAD_FILE_NAME)
+    }.also { getObjectResponse ->
       assertThat(getObjectResponse.response().eTag()).isEqualTo(expectedEtag)
       assertThat(getObjectResponse.response().contentLength()).isEqualTo(uploadFile.length())
 
@@ -93,26 +89,24 @@ internal class AwsChunkedEndcodingITV2 : S3TestBase() {
     year = 2023,
     reason = "Only works with http endpoints"
   )
-  fun testPutObject_etagCreation(testInfo: TestInfo) {
-    val bucket = givenBucketV2(testInfo)
+  fun `put object creates correct etag, get object returns etag`(testInfo: TestInfo) {
+    val bucket = givenBucket(testInfo)
     val uploadFile = File(UPLOAD_FILE_NAME)
     val uploadFileIs: InputStream = FileInputStream(uploadFile)
     val expectedEtag = "\"${DigestUtil.hexDigest(uploadFileIs)}\""
 
     s3ClientV2.putObject(
-      PutObjectRequest.builder()
-        .bucket(bucket)
-        .key(UPLOAD_FILE_NAME)
-        .build(),
+      {
+        it.bucket(bucket)
+        it.key(UPLOAD_FILE_NAME)
+      },
       RequestBody.fromFile(uploadFile)
     )
 
-    s3ClientV2.getObject(
-      GetObjectRequest.builder()
-        .bucket(bucket)
-        .key(UPLOAD_FILE_NAME)
-        .build()
-    ).also {
+    s3ClientV2.getObject {
+      it.bucket(bucket)
+      it.key(UPLOAD_FILE_NAME)
+    }.also {
       assertThat(it.response().eTag()).isEqualTo(expectedEtag)
       assertThat(it.response().contentLength()).isEqualTo(uploadFile.length())
     }