Merge pull request #2737 from vlsi/lang3

afranken · web-flow · commit bee04bf074fd · 2025-11-03T14:52:15.000+01:00
chore: drop commons-lang3 dependency and replace its usages with core Java
diff --git a/pom.xml b/pom.xml
@@ -178,6 +178,11 @@
         <artifactId>commons-io</artifactId>
         <version>${commons-io.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>${commons-lang3.version}</version>
+      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -248,11 +253,6 @@
         <artifactId>commons-compress</artifactId>
         <version>${commons-compress.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>${commons-lang3.version}</version>
-      </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
diff --git a/server/pom.xml b/server/pom.xml
@@ -80,10 +80,6 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
diff --git a/server/src/main/java/com/adobe/testing/s3mock/KmsValidationFilter.java b/server/src/main/java/com/adobe/testing/s3mock/KmsValidationFilter.java
@@ -18,7 +18,6 @@
 
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_SERVER_SIDE_ENCRYPTION;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_SERVER_SIDE_ENCRYPTION_AWS_KMS_KEY_ID;
-import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.MediaType.APPLICATION_XML_VALUE;
@@ -70,7 +69,7 @@ protected void doFilterInternal(HttpServletRequest request,
       var encryptionKeyId = request.getHeader(X_AMZ_SERVER_SIDE_ENCRYPTION_AWS_KMS_KEY_ID);
 
       if (AWS_KMS.equals(encryptionTypeHeader)
-          && !isBlank(encryptionKeyId)
+          && encryptionKeyId != null && !encryptionKeyId.isBlank()
           && !keystore.validateKeyId(encryptionKeyId)) {
         LOG.info("Received invalid KMS key ID {}. Sending error response.", encryptionKeyId);
 
@@ -90,7 +89,7 @@ protected void doFilterInternal(HttpServletRequest request,
 
         response.flushBuffer();
       } else if (AWS_KMS.equals(encryptionTypeHeader)
-          && !isBlank(encryptionKeyId)
+          && encryptionKeyId != null && !encryptionKeyId.isBlank()
           && keystore.validateKeyId(encryptionKeyId)) {
         LOG.info("Received valid KMS key ID {}.", encryptionKeyId);
         filterChain.doFilter(request, response);
diff --git a/server/src/main/java/com/adobe/testing/s3mock/MultipartController.java b/server/src/main/java/com/adobe/testing/s3mock/MultipartController.java
@@ -242,7 +242,7 @@ public ResponseEntity<Void> uploadPart(
     ChecksumAlgorithm checksumAlgorithm = null;
     var algorithmFromSdk = checksumAlgorithmFromSdk(httpHeaders);
     if (algorithmFromSdk != null) {
-      checksum = tempFileAndChecksum.getRight();
+      checksum = tempFileAndChecksum.checksum();
       checksumAlgorithm = algorithmFromSdk;
     }
     var algorithmFromHeader = checksumAlgorithmFromHeader(httpHeaders);
@@ -251,7 +251,7 @@ public ResponseEntity<Void> uploadPart(
       checksumAlgorithm = algorithmFromHeader;
     }
 
-    var tempFile = tempFileAndChecksum.getLeft();
+    var tempFile = tempFileAndChecksum.path();
     if (checksum != null) {
       multipartService.verifyChecksum(tempFile, checksum, checksumAlgorithm);
     }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/ObjectController.java b/server/src/main/java/com/adobe/testing/s3mock/ObjectController.java
@@ -209,7 +209,7 @@ public ResponseEntity<Void> postObject(
     var tempFileAndChecksum = objectService.toTempFile(file.getInputStream());
 
     var bucket = bucketService.verifyBucketExists(bucketName);
-    var tempFile = tempFileAndChecksum.getLeft();
+    var tempFile = tempFileAndChecksum.path();
     objectService.verifyMd5(tempFile, contentMd5);
 
     var owner = Owner.DEFAULT_OWNER;
@@ -825,7 +825,7 @@ public ResponseEntity<Void> putObject(
 
     var algorithmFromSdk = checksumAlgorithmFromSdk(httpHeaders);
     if (algorithmFromSdk != null) {
-      checksum = tempFileAndChecksum.getRight();
+      checksum = tempFileAndChecksum.checksum();
       checksumAlgorithm = algorithmFromSdk;
     }
     var algorithmFromHeader = checksumAlgorithmFromHeader(httpHeaders);
@@ -835,7 +835,7 @@ public ResponseEntity<Void> putObject(
     }
     final var bucket = bucketService.verifyBucketExists(bucketName);
     objectService.verifyObjectMatching(bucketName, key.key(), match, noneMatch);
-    var tempFile = tempFileAndChecksum.getLeft();
+    var tempFile = tempFileAndChecksum.path();
     objectService.verifyMd5(tempFile, contentMd5);
     if (checksum != null) {
       objectService.verifyChecksum(tempFile, checksum, checksumAlgorithm);
diff --git a/server/src/main/java/com/adobe/testing/s3mock/TaggingHeaderConverter.java b/server/src/main/java/com/adobe/testing/s3mock/TaggingHeaderConverter.java
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang3.StringUtils;
 import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
 
@@ -75,8 +74,11 @@ private List<Tag> convertTagXml(String source) {
 
   @Nullable
   private static List<Tag> convertTagPairs(String source) {
+    if (source.isEmpty()) {
+      return null;
+    }
     var tags = new ArrayList<Tag>();
-    String[] tagPairs = StringUtils.split(source, '&');
+    String[] tagPairs = source.split("&");
     for (String tag : tagPairs) {
       tags.add(new Tag(tag));
     }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/service/BucketService.java b/server/src/main/java/com/adobe/testing/s3mock/service/BucketService.java
@@ -31,7 +31,6 @@
 import static com.adobe.testing.s3mock.service.ServiceBase.mapContents;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_BUCKET_LOCATION_NAME;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_BUCKET_LOCATION_TYPE;
-import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 import static software.amazon.awssdk.utils.http.SdkHttpUtils.urlEncodeIgnoreSlashes;
 
 import com.adobe.testing.s3mock.dto.Bucket;
@@ -592,7 +591,7 @@ public void verifyMaxKeys(Integer maxKeys) {
   }
 
   public void verifyEncodingType(String encodingType) {
-    if (isNotEmpty(encodingType) && !"url".equals(encodingType)) {
+    if (encodingType != null && !encodingType.isEmpty() && !"url".equals(encodingType)) {
       throw INVALID_REQUEST_ENCODING_TYPE;
     }
   }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/service/FileChecksum.java b/server/src/main/java/com/adobe/testing/s3mock/service/FileChecksum.java
@@ -0,0 +1,23 @@
+/*
+ *  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.
+ *  You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.adobe.testing.s3mock.service;
+
+import java.nio.file.Path;
+import org.jspecify.annotations.Nullable;
+
+public record FileChecksum(Path path, @Nullable String checksum) {
+}
diff --git a/server/src/main/java/com/adobe/testing/s3mock/service/ServiceBase.java b/server/src/main/java/com/adobe/testing/s3mock/service/ServiceBase.java
@@ -21,8 +21,6 @@
 import static com.adobe.testing.s3mock.util.HeaderUtil.checksumAlgorithmFromSdk;
 import static com.adobe.testing.s3mock.util.HeaderUtil.isChunkedEncoding;
 import static com.adobe.testing.s3mock.util.HeaderUtil.isV4Signed;
-import static org.apache.commons.lang3.StringUtils.isEmpty;
-import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 import com.adobe.testing.s3mock.dto.ChecksumAlgorithm;
 import com.adobe.testing.s3mock.util.AbstractAwsInputStream;
@@ -37,7 +35,6 @@
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
-import org.apache.commons.lang3.tuple.Pair;
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,7 +49,7 @@ public void verifyChecksum(Path path, String checksum, ChecksumAlgorithm checksu
     DigestUtil.verifyChecksum(checksum, checksumFor, checksumAlgorithm);
   }
 
-  public Pair<Path, @Nullable String> toTempFile(InputStream inputStream, HttpHeaders httpHeaders) {
+  public FileChecksum toTempFile(InputStream inputStream, HttpHeaders httpHeaders) {
     try {
       var tempFile = Files.createTempFile("ObjectService", "toTempFile");
       try (var os = Files.newOutputStream(tempFile);
@@ -61,22 +58,22 @@ public void verifyChecksum(Path path, String checksum, ChecksumAlgorithm checksu
         ChecksumAlgorithm algorithmFromSdk = checksumAlgorithmFromSdk(httpHeaders);
         if (algorithmFromSdk != null
             && wrappedStream instanceof AbstractAwsInputStream awsInputStream) {
-          return Pair.of(tempFile, awsInputStream.getChecksum());
+          return new FileChecksum(tempFile, awsInputStream.getChecksum());
         }
-        return Pair.of(tempFile, null);
+        return new FileChecksum(tempFile, null);
       }
     } catch (IOException e) {
       LOG.error("Error reading from InputStream", e);
       throw BAD_REQUEST_CONTENT;
     }
   }
 
-  public Pair<Path, @Nullable String> toTempFile(InputStream inputStream) {
+  public FileChecksum toTempFile(InputStream inputStream) {
     try {
       var tempFile = Files.createTempFile("ObjectService", "toTempFile");
       try (var os = Files.newOutputStream(tempFile)) {
         inputStream.transferTo(os);
-        return Pair.of(tempFile, null);
+        return new FileChecksum(tempFile, null);
       }
     } catch (IOException e) {
       LOG.error("Error reading from InputStream", e);
@@ -99,7 +96,7 @@ static <T> List<T> filterBy(
       Function<T, String> function,
       @Nullable String compareTo
   ) {
-    if (isNotEmpty(compareTo)) {
+    if (compareTo != null && !compareTo.isEmpty()) {
       return contents
           .stream()
           .filter(content -> function.apply(content).compareTo(compareTo) > 0)
@@ -161,7 +158,7 @@ static <T> List<String> collapseCommonPrefixes(
       Function<T, String> function
   ) {
     var commonPrefixes = new ArrayList<String>();
-    if (isEmpty(delimiter)) {
+    if (delimiter == null || delimiter.isEmpty()) {
       return commonPrefixes;
     }
 
diff --git a/server/src/main/java/com/adobe/testing/s3mock/store/MultipartStore.java b/server/src/main/java/com/adobe/testing/s3mock/store/MultipartStore.java
@@ -22,7 +22,6 @@
 import static java.nio.file.Files.newDirectoryStream;
 import static java.nio.file.Files.newOutputStream;
 import static org.apache.commons.io.FileUtils.openInputStream;
-import static org.apache.commons.lang3.StringUtils.isBlank;
 
 import com.adobe.testing.s3mock.S3Exception;
 import com.adobe.testing.s3mock.dto.ChecksumAlgorithm;
@@ -55,7 +54,6 @@
 import java.util.stream.StreamSupport;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.input.BoundedInputStream;
-import org.apache.commons.lang3.stream.Streams;
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -135,8 +133,7 @@ public List<MultipartUpload> listMultipartUploads(BucketMetadata bucketMetadata,
       return Collections.emptyList();
     }
     try (var paths = Files.newDirectoryStream(multipartsFolder)) {
-      return Streams
-          .of(paths)
+      return StreamSupport.stream(paths.spliterator(), false)
           .map(
               path -> {
                 var fileName = path.getFileName().toString();
@@ -146,7 +143,7 @@ public List<MultipartUpload> listMultipartUploads(BucketMetadata bucketMetadata,
           .filter(Objects::nonNull)
           .filter(uploadMetadata -> !uploadMetadata.completed())
           .map(MultipartUploadInfo::upload)
-          .filter(upload -> isBlank(prefix) || upload.key().startsWith(prefix))
+          .filter(upload -> prefix == null || prefix.isBlank() || upload.key().startsWith(prefix))
           .toList();
     } catch (IOException e) {
       throw new IllegalStateException("Could not load buckets from data directory ", e);
diff --git a/server/src/main/java/com/adobe/testing/s3mock/util/DigestUtil.java b/server/src/main/java/com/adobe/testing/s3mock/util/DigestUtil.java
@@ -37,7 +37,6 @@
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.ArrayUtils;
 import org.jspecify.annotations.Nullable;
 import software.amazon.awssdk.checksums.SdkChecksum;
 import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
@@ -122,17 +121,14 @@ private static byte[] checksum(InputStream is, ChecksumAlgorithm algorithm) {
 
   private static byte[] checksum(List<Path> paths, ChecksumAlgorithm algorithm) {
     SdkChecksum sdkChecksum = SdkChecksum.forAlgorithm(algorithm);
-    var allChecksums = new byte[0];
     for (var path : paths) {
       try (var inputStream = Files.newInputStream(path)) {
-        allChecksums = ArrayUtils.addAll(allChecksums, checksum(inputStream, algorithm));
+        sdkChecksum.update(checksum(inputStream, algorithm));
       } catch (IOException e) {
         throw new IllegalStateException("Could not read from path " + path, e);
       }
     }
-    sdkChecksum.update(allChecksums, 0, allChecksums.length);
-    allChecksums = sdkChecksum.getChecksumBytes();
-    return allChecksums;
+    return sdkChecksum.getChecksumBytes();
   }
 
   /**
@@ -157,7 +153,7 @@ private static byte[] checksum(List<Path> paths, ChecksumAlgorithm algorithm) {
    * @return A special hex digest that is used for files uploaded in parts.
    */
   public static String hexDigestMultipart(List<Path> paths) {
-    return DigestUtils.md5Hex(md5(null, paths)) + "-" + paths.size();
+    return Hex.encodeHexString(md5(null, paths)) + "-" + paths.size();
   }
 
   /**
@@ -271,15 +267,15 @@ private static byte[] md5(@Nullable String salt, InputStream inputStream) {
   }
 
   private static byte[] md5(@Nullable String salt, List<Path> paths) {
-    var allMd5s = new byte[0];
+    MessageDigest md5 = getMd5Digest();
     for (var path : paths) {
       try (var inputStream = Files.newInputStream(path)) {
-        allMd5s = ArrayUtils.addAll(allMd5s, md5(salt, inputStream));
+        md5.update(md5(salt, inputStream));
       } catch (IOException e) {
         throw new IllegalStateException("Could not read from path " + path, e);
       }
     }
-    return allMd5s;
+    return md5.digest();
   }
 
   private static MessageDigest messageDigest(@Nullable String salt) {
diff --git a/server/src/main/java/com/adobe/testing/s3mock/util/HeaderUtil.java b/server/src/main/java/com/adobe/testing/s3mock/util/HeaderUtil.java
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/MultipartControllerTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/MultipartControllerTest.kt
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/ObjectControllerTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/ObjectControllerTest.kt
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/service/ObjectServiceTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/service/ObjectServiceTest.kt

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ public ResponseEntity<Void> uploadPart(`
`242`	`242`	`ChecksumAlgorithm checksumAlgorithm = null;`
`243`	`243`	`var algorithmFromSdk = checksumAlgorithmFromSdk(httpHeaders);`
`244`	`244`	`if (algorithmFromSdk != null) {`
`245`		`- checksum = tempFileAndChecksum.getRight();`
	`245`	`+ checksum = tempFileAndChecksum.checksum();`
`246`	`246`	`checksumAlgorithm = algorithmFromSdk;`
`247`	`247`	`}`
`248`	`248`	`var algorithmFromHeader = checksumAlgorithmFromHeader(httpHeaders);`
`@@ -251,7 +251,7 @@ public ResponseEntity<Void> uploadPart(`
`251`	`251`	`checksumAlgorithm = algorithmFromHeader;`
`252`	`252`	`}`
`253`	`253`
`254`		`- var tempFile = tempFileAndChecksum.getLeft();`
	`254`	`+ var tempFile = tempFileAndChecksum.path();`
`255`	`255`	`if (checksum != null) {`
`256`	`256`	`multipartService.verifyChecksum(tempFile, checksum, checksumAlgorithm);`
`257`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@`
`31`	`31`	`import static com.adobe.testing.s3mock.service.ServiceBase.mapContents;`
`32`	`32`	`import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_BUCKET_LOCATION_NAME;`
`33`	`33`	`import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_BUCKET_LOCATION_TYPE;`
`34`		`-import static org.apache.commons.lang3.StringUtils.isNotEmpty;`
`35`	`34`	`import static software.amazon.awssdk.utils.http.SdkHttpUtils.urlEncodeIgnoreSlashes;`
`36`	`35`
`37`	`36`	`import com.adobe.testing.s3mock.dto.Bucket;`
`@@ -592,7 +591,7 @@ public void verifyMaxKeys(Integer maxKeys) {`
`592`	`591`	`}`
`593`	`592`
`594`	`593`	`public void verifyEncodingType(String encodingType) {`
`595`		`- if (isNotEmpty(encodingType) && !"url".equals(encodingType)) {`
	`594`	`+ if (encodingType != null && !encodingType.isEmpty() && !"url".equals(encodingType)) {`
`596`	`595`	`throw INVALID_REQUEST_ENCODING_TYPE;`
`597`	`596`	`}`
`598`	`597`	`}`