Update to Spring-Boot 4.4.0-SNAPSHOT / Kotlin 2.2.0-RC

Author: afranken

CHANGELOG.md

@@ -139,6 +139,20 @@ Running S3Mock in unit tests is still supported by using [TestContainers](https:
     * S3Mock will use the baseline Spring chooses to support.
     * The Docker container will run Java 25 LTS.
 
+## 5.0.0 - PLANNED
+
+* Features and fixes
+  * TBD
+* Refactorings
+  * AWS has deprecated SDK for Java v1, and will remove support EOY 2025.
+    * Remove Java v1.
+  * JUnit 4.x deprecation
+    * Remove JUnit 4.x support.
+* Version updates
+  * Bump Spring Boot version to 4.x
+  * Bump Spring Framework version to 7.x
+  * Bump java version from 17 to 25
+
 # CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 

pom.xml

@@ -65,6 +65,40 @@
     <url>https://github.com/adobe/S3Mock/tree/main</url>
   </scm>
 
+  <repositories>
+    <!--  TODO: remove after upgrading to Spring Boot 4 release in November  -->
+    <repository>
+      <id>spring-milestones</id>
+      <name>Spring Milestone Repository</name>
+      <url>https://repo.spring.io/milestone</url>
+    </repository>
+    <repository>
+      <id>spring-snapshots</id>
+      <name>Spring Snapshot Repository</name>
+      <url>https://repo.spring.io/snapshot</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <!--  TODO: remove after upgrading to Spring Boot 4 release in November  -->
+    <pluginRepository>
+      <id>spring-milestones</id>
+      <name>Spring Milestone Repository</name>
+      <url>https://repo.spring.io/milestone</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>spring-snapshots</id>
+      <name>Spring Snapshot Repository</name>
+      <url>https://repo.spring.io/snapshot</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <distributionManagement>
     <repository>
       <id>ossrh</id>
@@ -77,11 +111,13 @@
   </distributionManagement>
 
   <properties>
-    <java.version>17</java.version>
-    <kotlin.version>2.1.21</kotlin.version>
+    <!--  TODO: Upgrade to Java 25 release in November  -->
+    <java.version>21</java.version>
+    <!--  TODO: Upgrade to Kotlin 2.2.0 after release  -->
+    <kotlin.version>2.2.0-RC</kotlin.version>
     <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
-    <kotlin.compiler.apiVersion>2.1</kotlin.compiler.apiVersion>
-    <kotlin.compiler.languageVersion>2.1</kotlin.compiler.languageVersion>
+    <kotlin.compiler.apiVersion>2.2</kotlin.compiler.apiVersion>
+    <kotlin.compiler.languageVersion>2.2</kotlin.compiler.languageVersion>
 
     <aws-v2.version>2.31.50</aws-v2.version>
 
@@ -127,7 +163,8 @@
     <!-- Run Docker build by default -->
     <skipDocker>false</skipDocker>
     <sortpom-maven-plugin.version>4.0.0</sortpom-maven-plugin.version>
-    <spring-boot.version>3.5.0</spring-boot.version>
+    <!--  TODO: update to 4.0.0 after Spring Boot 4 release in November  -->
+    <spring-boot.version>4.0.0-SNAPSHOT</spring-boot.version>
     <testcontainers.version>1.21.1</testcontainers.version>
     <testng.version>7.11.0</testng.version>
     <xmlunit-assertj3.version>2.10.2</xmlunit-assertj3.version>

server/src/main/java/com/adobe/testing/s3mock/S3MockConfiguration.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;

server/src/main/java/com/adobe/testing/s3mock/util/HeaderUtil.java

@@ -136,15 +136,14 @@ public static Map<String, String> encryptionHeadersFrom(HttpHeaders headers) {
   private static Map<String, String> parseHeadersToMap(HttpHeaders headers,
       Predicate<String> matcher) {
     return headers
-        .entrySet()
+        .headerSet()
         .stream()
         .map(
             entry -> {
               if (matcher.test(entry.getKey())
-                  && entry.getValue() != null
                   && !entry.getValue().isEmpty()
-                  && isNotBlank(entry.getValue().get(0))) {
-                return new SimpleEntry<>(entry.getKey(), entry.getValue().get(0));
+                  && isNotBlank(entry.getValue().getFirst())) {
+                return new SimpleEntry<>(entry.getKey(), entry.getValue().getFirst());
               } else {
                 return null;
               }
@@ -227,17 +226,17 @@ public static Map<String, String> checksumHeaderFrom(
 
   @Nullable
   public static ChecksumAlgorithm checksumAlgorithmFromHeader(HttpHeaders headers) {
-    if (headers.containsKey(X_AMZ_CHECKSUM_SHA256)) {
+    if (headers.containsHeader(X_AMZ_CHECKSUM_SHA256)) {
       return ChecksumAlgorithm.SHA256;
-    } else if (headers.containsKey(X_AMZ_CHECKSUM_SHA1)) {
+    } else if (headers.containsHeader(X_AMZ_CHECKSUM_SHA1)) {
       return ChecksumAlgorithm.SHA1;
-    } else if (headers.containsKey(X_AMZ_CHECKSUM_CRC32)) {
+    } else if (headers.containsHeader(X_AMZ_CHECKSUM_CRC32)) {
       return ChecksumAlgorithm.CRC32;
-    } else if (headers.containsKey(X_AMZ_CHECKSUM_CRC32C)) {
+    } else if (headers.containsHeader(X_AMZ_CHECKSUM_CRC32C)) {
       return ChecksumAlgorithm.CRC32C;
-    } else if (headers.containsKey(X_AMZ_CHECKSUM_CRC64NVME)) {
+    } else if (headers.containsHeader(X_AMZ_CHECKSUM_CRC64NVME)) {
       return ChecksumAlgorithm.CRC64NVME;
-    } else if (headers.containsKey(X_AMZ_CHECKSUM_ALGORITHM)) {
+    } else if (headers.containsHeader(X_AMZ_CHECKSUM_ALGORITHM)) {
       var checksumAlgorithm = headers.getFirst(X_AMZ_CHECKSUM_ALGORITHM);
       return ChecksumAlgorithm.fromString(checksumAlgorithm);
     } else {
@@ -247,7 +246,7 @@ public static ChecksumAlgorithm checksumAlgorithmFromHeader(HttpHeaders headers)
 
   @Nullable
   public static ChecksumAlgorithm checksumAlgorithmFromSdk(HttpHeaders headers) {
-    if (headers.containsKey(X_AMZ_SDK_CHECKSUM_ALGORITHM)) {
+    if (headers.containsHeader(X_AMZ_SDK_CHECKSUM_ALGORITHM)) {
       return ChecksumAlgorithm.fromString(headers.getFirst(X_AMZ_SDK_CHECKSUM_ALGORITHM));
     } else {
       return null;
@@ -256,15 +255,15 @@ public static ChecksumAlgorithm checksumAlgorithmFromSdk(HttpHeaders headers) {
 
   @Nullable
   public static String checksumFrom(HttpHeaders headers) {
-    if (headers.containsKey(X_AMZ_CHECKSUM_SHA256)) {
+    if (headers.containsHeader(X_AMZ_CHECKSUM_SHA256)) {
       return headers.getFirst(X_AMZ_CHECKSUM_SHA256);
-    } else if (headers.containsKey(X_AMZ_CHECKSUM_SHA1)) {
+    } else if (headers.containsHeader(X_AMZ_CHECKSUM_SHA1)) {
       return headers.getFirst(X_AMZ_CHECKSUM_SHA1);
-    } else if (headers.containsKey(X_AMZ_CHECKSUM_CRC32)) {
+    } else if (headers.containsHeader(X_AMZ_CHECKSUM_CRC32)) {
       return headers.getFirst(X_AMZ_CHECKSUM_CRC32);
-    } else if (headers.containsKey(X_AMZ_CHECKSUM_CRC32C)) {
+    } else if (headers.containsHeader(X_AMZ_CHECKSUM_CRC32C)) {
       return headers.getFirst(X_AMZ_CHECKSUM_CRC32C);
-    } else if (headers.containsKey(X_AMZ_CHECKSUM_CRC64NVME)) {
+    } else if (headers.containsHeader(X_AMZ_CHECKSUM_CRC64NVME)) {
       return headers.getFirst(X_AMZ_CHECKSUM_CRC64NVME);
     }
     return null;