Merge pull request #2470 from adobe/fixes-4.5.0

Deprecate legacy properties, README fixes.

Author: afranken

CHANGELOG.md

@@ -123,6 +123,7 @@ 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
@@ -164,11 +165,17 @@ Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
 * Refactorings
   * Add JSpecify annotations to S3Mock code
   * Migrate unit tests in "testsupport" modules to Kotlin
+  * Deprecation of legacy-style Spring properties in favor of current environment variables.
+  * Various fixes and clarifications in README.md
 * Version updates (deliverable dependencies)
   * Bump alpine from 3.21.3 to 3.22.0 in /docker
-  * Bump aws.version from 1.12.783 to 1.12.785
-  * Bump testcontainers.version from 1.21.0 to 1.21.1
+  * Bump aws-v2.version from 2.31.50 to 2.31.67
+  * Bump aws.version from 1.12.783 to 1.12.787
+  * Bump spring-boot.version from 3.5.0 to 3.5.3
+  * Bump testcontainers.version from 1.21.0 to 1.21.2
 * Version updates (build dependencies)
+  * Bump aws.sdk.kotlin:s3-jvm from 1.4.91 to 1.4.109
+  * Bump org.xmlunit:xmlunit-assertj3 from 2.10.2 to 2.10.3
   * Bump org.codehaus.mojo:exec-maven-plugin from 3.5.0 to 3.5.1
   * Bump org.apache.maven.plugins:maven-clean-plugin from 3.4.1 to 3.5.0
   * Bump com.puppycrawl.tools:checkstyle from 10.24.0 to 10.25.0

README.md

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.4.1-SNAPSHOT</version>
+    <version>4.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-build-config</artifactId>

build-config/pom.xml

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

docker/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.4.1-SNAPSHOT</version>
+    <version>4.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-integration-tests</artifactId>

integration-tests/pom.xml

@@ -21,7 +21,7 @@
 
   <groupId>com.adobe.testing</groupId>
   <artifactId>s3mock-parent</artifactId>
-  <version>4.4.1-SNAPSHOT</version>
+  <version>4.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>S3Mock - Parent</name>

pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.4.1-SNAPSHOT</version>
+    <version>4.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock</artifactId>

server/pom.xml

@@ -76,11 +76,9 @@
 @RequestMapping("${com.adobe.testing.s3mock.contextPath:}")
 public class BucketController {
   private final BucketService bucketService;
-  private final Region region;
 
-  public BucketController(BucketService bucketService, Region region) {
+  public BucketController(BucketService bucketService) {
     this.bucketService = bucketService;
-    this.region = region;
   }
 
   //================================================================================================
@@ -376,8 +374,9 @@ public ResponseEntity<LocationConstraint> getBucketLocation(@PathVariable String
 
   /**
    * <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjects.html">API Reference</a>.
-   * @deprecated Long since replaced by listObjectsV2
+   *
    * @see #listObjectsV2
+   * @deprecated Long since replaced by listObjectsV2
    */
   @GetMapping(
       value = {
@@ -486,12 +485,12 @@ public ResponseEntity<ListVersionsResult> listObjectVersions(
     return ResponseEntity.ok(listVersionsResult);
   }
 
+  @Nullable
   private String regionFrom(@Nullable CreateBucketConfiguration createBucketRequest) {
-    if (createBucketRequest != null
-            && createBucketRequest.locationConstraint() != null
-            && createBucketRequest.locationConstraint().region() != null) {
-      return createBucketRequest.locationConstraint().region().toString();
+    if (createBucketRequest != null) {
+      return createBucketRequest.regionFrom();
+    } else {
+      return null;
     }
-    return this.region.toString();
   }
 }

server/src/main/java/com/adobe/testing/s3mock/BucketController.java

@@ -20,7 +20,6 @@
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 
 import com.adobe.testing.s3mock.dto.ErrorResponse;
-import com.adobe.testing.s3mock.dto.Region;
 import com.adobe.testing.s3mock.service.BucketService;
 import com.adobe.testing.s3mock.service.MultipartService;
 import com.adobe.testing.s3mock.service.ObjectService;
@@ -159,8 +158,8 @@ ObjectController fileStoreController(ObjectService objectService, BucketService
   }
 
   @Bean
-  BucketController bucketController(BucketService bucketService, S3MockProperties properties) {
-    return new BucketController(bucketService, properties.region());
+  BucketController bucketController(BucketService bucketService) {
+    return new BucketController(bucketService);
   }
 
   @Bean

server/src/main/java/com/adobe/testing/s3mock/S3MockConfiguration.java

@@ -32,11 +32,7 @@ public record S3MockProperties(
     // For example if set to `s3-mock` all endpoints will be available at
     // `http://host:port/s3-mock` instead of `http://host:port/`
     @DefaultValue("")
-    String contextPath,
-
-    // Region is S3Mock is supposed to mock.
-    // Must be an official AWS region string like "us-east-1"
-    Region region
+    String contextPath
 ) {
 
 }