Merge pull request #2453 from adobe/spring-boot-4-snapshot

S3Mock 5.0.0

Author: afranken

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
 wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-5/apache-maven-4.0.0-rc-5-bin.zip

CHANGELOG.md

@@ -7,6 +7,7 @@ Whenever a 3rd party library is updated, S3Mock will update it's MINOR version.
 * [Changelog](#changelog)
 * [PLANNED - 5.x - RELEASE TBD](#planned---5x---release-tbd)
   * [Planned changes](#planned-changes)
+  * [5.0.0 - PLANNED](#500---planned)
 * [CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT](#current---4x---this-version-is-under-active-development)
   * [4.11.0](#4110)
   * [4.10.0](#4100)
@@ -130,22 +131,35 @@ Running S3Mock in unit tests is still supported by using [TestContainers](https:
 * Features and fixes
   * TBD
 * Refactorings
-  * Removal of legacy-style Spring properties in favor of current environment variables.
-  * AWS has deprecated SDK for Java v1, and will remove support EOY 2025.
-    * S3Mock will remove bundled support for Java SDK v1 in late 2025.
-  * JUnit 4.x deprecation
-    * S3Mock will remove bundled support for JUnit 4.x in late 2025.
   * Looking to Remove unit test modules. This enables
     * Refactoring S3Mock to a "standard" Spring Boot application.
     * Removal of workarounds to use `S3MockApplication#start` from a static context
-    * Removal of properties workarounds
-  * Migration to `Kotlin` - the IntegrationTests and unit tests were migrated already.
 * Version updates
-  * Bump Spring Boot version to 4.x
-  * Bump Spring Framework version to 7.x
+  * TBD
+
+## 5.0.0 - PLANNED
+
+* Features and fixes
+  * Get object with range now returns the same headers as non-range calls.
+* Refactorings
+  * Use Jackson 3 annotations and mappers.
+  * AWS has deprecated SDK for Java v1 and will remove support EOY 2025.
+    * Remove Java SDK v1.
+  * JUnit 4.x deprecation
+    * Remove JUnit 4.x support.
+  * Remove legacy properties for S3Mock configuration.
+  * Move all controller-related code from "com.adobe.testing.s3mock" to "com.adobe.testing.s3mock.controller" package.
+  * Remove Apache libraries like "commons-compress", "commons-codec" or "commons-lang3" from dependencies. Kotlin and Java standard library provide similar functionality.
+* Version updates
+  * Bump Spring Boot version to 4.0.0
+  * Bump Spring Framework version to 7.0.1
   * Bump java version from 17 to 25
-    * S3Mock will use the baseline Spring chooses to support.
-    * The Docker container will run Java 25 LTS.
+    * Compile with Java 25, target Java 17
+    * Docker container runs Java 25
+  * Bump TestContainers to 2.0.2
+  * Bump Alpine Linux to 3.23.0 (release: December 2025)
+    * This is the latest version of Alpine Linux that supports Java 25.
+  * Bump Maven to 4.0.0
 
 # CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.

README.md

@@ -37,7 +37,6 @@
         * [Expanded example](#expanded-example)
       * [Start using a self-signed SSL certificate](#start-using-a-self-signed-ssl-certificate)
     * [S3Mock Java](#s3mock-java)
-      * [Start using the JUnit4 Rule](#start-using-the-junit4-rule)
       * [Start using the JUnit5 Extension](#start-using-the-junit5-extension)
       * [Start using the TestNG Listener](#start-using-the-testng-listener)
       * [Start programmatically](#start-programmatically)
@@ -73,8 +72,7 @@
 the [Amazon S3 API](https://docs.aws.amazon.com/AmazonS3/latest/API/Welcome.html).  
 It has been created to support local integration testing by reducing infrastructure dependencies.
 
-The `S3Mock` server can be started as a standalone *Docker* container, using *Testcontainers*, *JUnit4*, *JUnit5* and
-*TestNG* support, or programmatically.
+The `S3Mock` server can be started as a standalone *Docker* container, using *Testcontainers*, *JUnit5* and *TestNG* support, or programmatically.
 
 ## Changelog
 
@@ -303,7 +301,6 @@ curl --insecure --request GET https://localhost:9191/my-test-bucket/my-file -O
 The mock can be configured with the following environment variables:
 
 - `COM_ADOBE_TESTING_S3MOCK_STORE_VALID_KMS_KEYS`: list of KMS Key-Refs that are to be treated as *valid*.
-  - Legacy name: `validKmsKeys`
   - Default: none
   - KMS keys must be configured as valid ARNs in the format of "`arn:aws:kms:region:acct-id:key/key-id`", for example "
     `arn:aws:kms:us-east-1:1234567890:key/valid-test-key-id`"
@@ -313,21 +310,20 @@ The mock can be configured with the following environment variables:
   - *S3Mock does not implement KMS encryption*, if a key ID is passed in a request, S3Mock will just validate if a given
     Key was configured during startup and reject the request if the given Key was not configured.
 - `COM_ADOBE_TESTING_S3MOCK_STORE_INITIAL_BUCKETS`: list of names for buckets that will be available initially.
-  - Legacy name: `initialBuckets`
   - Default: none
   - The list must be comma separated names like `bucketa, bucketb`
 - `COM_ADOBE_TESTING_S3MOCK_STORE_REGION`: the region the S3Mock is supposed to mock.
-  - Legacy name: `COM_ADOBE_TESTING_S3MOCK_REGION`
-  - Example: `eu-west-1`
   - Default: `us-east-1`
+  - Value must be a valid AWS region identifier like `eu-west-1`
 - `COM_ADOBE_TESTING_S3MOCK_STORE_ROOT`: the base directory to place the temporary files exposed by the mock. If S3Mock is started in Docker, a volume
   must be mounted as the `root` directory, see examples below.
-  - Legacy name: `root`
   - Default: Java temp directory
 - `COM_ADOBE_TESTING_S3MOCK_STORE_RETAIN_FILES_ON_EXIT`: set to `true` to let S3Mock keep all files that were created during its lifetime. Default is
   `false`, all files are removed if S3Mock shuts down.
-  - Legacy name: `retainFilesOnExit`
   - Default: false
+- `COM_ADOBE_TESTING_S3MOCK_CONTROLLER_CONTEXT_PATH`: the base context path for all controllers. 
+  Use if you start S3Mock within your application's unit tests and need to separate the context paths.
+  - Default: ""
 - `debug`: set to `true` to
   enable [Spring Boot's debug output](https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.logging.console-output).
 - `trace`: set to `true` to
@@ -579,22 +575,6 @@ integration..._
 
 **See also [the Java section below](#Java)**
 
-#### Start using the JUnit4 Rule
-
-The example [`S3MockRuleTest`](testsupport/junit4/src/test/java/com/adobe/testing/s3mock/junit4/S3MockRuleTest.java)
-demonstrates the usage of the `S3MockRule`, which can be configured through a _builder_.
-
-To use the JUnit4 Rule, use the following Maven artifact in `test` scope:
-
-```xml
-<dependency>
-  <groupId>com.adobe.testing</groupId>
-  <artifactId>s3mock-junit4</artifactId>
-  <version>...</version>
-  <scope>test</scope>
-</dependency>
-```
-
 #### Start using the JUnit5 Extension
 
 The `S3MockExtension` can currently be used in two ways:

docker/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.11.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-docker</artifactId>

integration-tests/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.11.1-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-integration-tests</artifactId>
@@ -62,6 +62,7 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
+      <version>${kotlin.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -73,7 +74,13 @@
     <!-- Force Kotlin coroutines alignment to match aws-sdk-kotlin 1.5.x requirements -->
     <dependency>
       <groupId>org.jetbrains.kotlinx</groupId>
-      <artifactId>kotlinx-coroutines-core-jvm</artifactId>
+      <artifactId>kotlinx-coroutines-core</artifactId>
+      <version>${kotlin-coroutines.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlinx</groupId>
+      <artifactId>kotlinx-coroutines-test</artifactId>
       <version>${kotlin-coroutines.version}</version>
       <scope>test</scope>
     </dependency>
@@ -192,9 +199,9 @@
                     <time>30000</time>
                   </wait>
                   <env>
-                    <COM_ADOBE_TESTING_S3MOCK_DOMAIN_VALID_KMS_KEYS>arn:aws:kms:us-east-1:1234567890:key/valid-test-key-id</COM_ADOBE_TESTING_S3MOCK_DOMAIN_VALID_KMS_KEYS>
-                    <COM_ADOBE_TESTING_S3MOCK_DOMAIN_INITIAL_BUCKETS>bucket-a, bucket-b</COM_ADOBE_TESTING_S3MOCK_DOMAIN_INITIAL_BUCKETS>
-                    <COM_ADOBE_TESTING_S3MOCK_REGION>eu-west-1</COM_ADOBE_TESTING_S3MOCK_REGION>
+                    <COM_ADOBE_TESTING_S3MOCK_STORE_VALID_KMS_KEYS>arn:aws:kms:us-east-1:1234567890:key/valid-test-key-id</COM_ADOBE_TESTING_S3MOCK_STORE_VALID_KMS_KEYS>
+                    <COM_ADOBE_TESTING_S3MOCK_STORE_INITIAL_BUCKETS>bucket-a, bucket-b</COM_ADOBE_TESTING_S3MOCK_STORE_INITIAL_BUCKETS>
+                    <COM_ADOBE_TESTING_S3MOCK_STORE_REGION>eu-west-1</COM_ADOBE_TESTING_S3MOCK_STORE_REGION>
                   </env>
                   <memory>256000000</memory>
                 </run>

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

@@ -16,7 +16,7 @@
 
 package com.adobe.testing.s3mock.its
 
-import com.adobe.testing.s3mock.dto.Owner.DEFAULT_OWNER
+import com.adobe.testing.s3mock.dto.Owner.Companion.DEFAULT_OWNER
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo

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

@@ -16,78 +16,76 @@
 
 package com.adobe.testing.s3mock.its
 
+import aws.sdk.kotlin.services.s3.S3Client
+import aws.sdk.kotlin.services.s3.model.DeleteObjectRequest
+import aws.sdk.kotlin.services.s3.model.GetObjectRequest
+import aws.sdk.kotlin.services.s3.model.PutObjectRequest
+import aws.smithy.kotlin.runtime.content.ByteStream
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.test.runTest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo
-import software.amazon.awssdk.core.sync.RequestBody
-import software.amazon.awssdk.services.s3.S3Client
-import java.util.concurrent.Callable
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicInteger
+import kotlin.time.Duration.Companion.minutes
 
 internal class ConcurrencyIT : S3TestBase() {
-  private val s3Client: S3Client = createS3Client()
+  private val s3Client: S3Client = createS3ClientKotlin()
 
-  /**
-   * Test that there are no inconsistencies when multiple threads PUT, GET and DELETE objects in
-   * the same bucket.
-   */
   @Test
-  @S3VerifiedFailure(
-    year = 2022,
-    reason = "No need to test S3 concurrency.",
-  )
-  fun `concurrent bucket puts, gets and deletes are successful`(testInfo: TestInfo) {
-    val bucketName = givenBucket(testInfo)
-    val runners = (1..100).map { Runner(bucketName, "test/key$it") }
-    val pool = Executors.newFixedThreadPool(100)
-    val futures = pool.invokeAll(runners)
-    assertThat(futures).hasSize(100).allSatisfy { future ->
-      assertThat(future.get()).isTrue
-    }
-    assertThat(DONE.get()).isEqualTo(100)
-  }
+  fun `concurrent bucket puts, gets and deletes are successful`(testInfo: TestInfo) =
+    runTest(timeout = 3.minutes) {
+      val bucketName = givenBucket(testInfo)
+      val totalRequests = 1000
+      val maxConcurrency = 20
+      val done = AtomicInteger(0)
+
+      val limitedDispatcher = Dispatchers.IO.limitedParallelism(maxConcurrency)
+
+      coroutineScope {
+        (1..totalRequests)
+          .map { i ->
+            async(limitedDispatcher) {
+              val key = "test/key-$i"
+
+              val putResponse =
+                s3Client.putObject(
+                  PutObjectRequest {
+                    bucket = bucketName
+                    this.key = key
+                    body = ByteStream.fromBytes(byteArrayOf())
+                  },
+                )
+              assertThat(putResponse.eTag).isNotNull
+              assertThat(putResponse.eTag!!.isNotBlank()).isTrue()
 
-  companion object {
-    private val LATCH = CountDownLatch(100)
-    private val DONE = AtomicInteger(0)
-  }
+              val getResponse =
+                s3Client.getObject(
+                  GetObjectRequest {
+                    bucket = bucketName
+                    this.key = key
+                  },
+                ) {
+                  it
+                }
+              assertThat(getResponse.eTag).isNotNull
+              assertThat(getResponse.eTag!!.isNotBlank()).isTrue()
 
-  inner class Runner(
-    val bucketName: String,
-    val key: String,
-  ) : Callable<Boolean> {
-    override fun call(): Boolean {
-      LATCH.countDown()
-      s3Client
-        .putObject(
-          {
-            it.bucket(bucketName)
-            it.key(key)
-          },
-          RequestBody.empty(),
-        ).let { response ->
-          assertThat(response.eTag()).isNotBlank
-        }
+              s3Client.deleteObject(
+                DeleteObjectRequest {
+                  bucket = bucketName
+                  this.key = key
+                },
+              )
 
-      s3Client
-        .getObject {
-          it.bucket(bucketName)
-          it.key(key)
-        }.use {
-          assertThat(it.response().eTag()).isNotBlank
-        }
+              done.incrementAndGet()
+            }
+          }.awaitAll()
+      }
 
-      s3Client
-        .deleteObject {
-          it.bucket(bucketName)
-          it.key(key)
-        }.let { response ->
-          assertThat(response.deleteMarker()).isTrue
-        }
-      DONE.incrementAndGet()
-      return true
+      assertThat(done.get()).isEqualTo(totalRequests)
     }
-  }
 }

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

@@ -16,7 +16,7 @@
 
 package com.adobe.testing.s3mock.its
 
-import com.adobe.testing.s3mock.S3Exception.PRECONDITION_FAILED
+import com.adobe.testing.s3mock.S3Exception.Companion.PRECONDITION_FAILED
 import com.adobe.testing.s3mock.util.DigestUtil
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy

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

@@ -17,7 +17,6 @@
 package com.adobe.testing.s3mock.its
 
 import com.adobe.testing.s3mock.util.DigestUtil
-import org.apache.commons.codec.digest.DigestUtils
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo
@@ -29,6 +28,7 @@ import software.amazon.awssdk.transfer.s3.S3TransferManager
 import software.amazon.awssdk.transfer.s3.model.DownloadRequest
 import java.io.ByteArrayInputStream
 import java.nio.charset.StandardCharsets
+import java.security.MessageDigest
 
 internal class CrtAsyncIT : S3TestBase() {
   private val autoS3CrtAsyncClient: S3AsyncClient = createAutoS3CrtAsyncClient()
@@ -163,10 +163,11 @@ internal class CrtAsyncIT : S3TestBase() {
         }, AsyncResponseTransformer.toBytes())
         .join()
 
+    val md5 = MessageDigest.getInstance("MD5")
     val uploadFileBytes = readStreamIntoByteArray(UPLOAD_FILE.inputStream())
-    (DigestUtils.md5(randomBytes) + DigestUtils.md5(uploadFileBytes)).also {
+    (md5.digest(randomBytes) + md5.digest(uploadFileBytes)).also {
       // verify special etag
-      assertThat(completeMultipartUploadResponse.eTag()).isEqualTo("\"${DigestUtils.md5Hex(it)}-2\"")
+      assertThat(completeMultipartUploadResponse.eTag()).isEqualTo("\"${md5.digest(it).joinToString("") { "%02x".format(it) }}-2\"")
     }
 
     // verify content size