Remove commons-codec dependency

We used this only in tests, Java security provides the functionality.

Author: afranken

CHANGELOG.md

@@ -150,6 +150,7 @@ Running S3Mock in unit tests is still supported by using [TestContainers](https:
     * 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.x
   * Bump Spring Framework version to 7.x

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

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

@@ -18,7 +18,6 @@ package com.adobe.testing.s3mock.its
 import com.adobe.testing.s3mock.S3Exception.Companion.PRECONDITION_FAILED
 import com.adobe.testing.s3mock.util.DigestUtil
 import com.adobe.testing.s3mock.util.DigestUtil.hexDigest
-import org.apache.commons.codec.digest.DigestUtils
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.assertj.core.api.InstanceOfAssertFactories
@@ -50,6 +49,7 @@ import software.amazon.awssdk.utils.http.SdkHttpUtils
 import java.io.ByteArrayInputStream
 import java.io.File
 import java.nio.charset.StandardCharsets
+import java.security.MessageDigest
 import java.time.Instant
 import java.util.UUID
 import java.util.concurrent.CompletionException
@@ -239,10 +239,10 @@ internal class MultipartIT : S3TestBase() {
       }
 
     val uploadFileBytes = readStreamIntoByteArray(UPLOAD_FILE.inputStream())
-
-    (DigestUtils.md5(randomBytes) + DigestUtils.md5(uploadFileBytes)).also {
+    val md5 = MessageDigest.getInstance("MD5")
+    (md5.digest(randomBytes) + md5.digest(uploadFileBytes)).also {
       // verify special etag
-      assertThat(completeMultipartUpload.eTag()).isEqualTo("\"${DigestUtils.md5Hex(it)}-2\"")
+      assertThat(completeMultipartUpload.eTag()).isEqualTo("\"${md5.digest(it).joinToString("") { "%02x".format(it) }}-2\"")
     }
 
     s3Client
@@ -345,9 +345,10 @@ internal class MultipartIT : S3TestBase() {
         }
       }
 
-    (DigestUtils.md5(tempFile.readBytes()) + DigestUtils.md5(readStreamIntoByteArray(uploadFile.inputStream()))).also {
+    val md5 = MessageDigest.getInstance("MD5")
+    (md5.digest(tempFile.readBytes()) + md5.digest(readStreamIntoByteArray(uploadFile.inputStream()))).also {
       // verify special etag
-      assertThat(completeMultipartUpload.eTag()).isEqualTo("\"${DigestUtils.md5Hex(it)}-2\"")
+      assertThat(completeMultipartUpload.eTag()).isEqualTo("\"${md5.digest(it).joinToString("") { "%02x".format(it) }}-2\"")
     }
 
     s3Client
@@ -663,7 +664,8 @@ internal class MultipartIT : S3TestBase() {
   fun `list parts lists all uploaded parts`(testInfo: TestInfo) {
     val bucketName = givenBucket(testInfo)
     val objectMetadata = mapOf("key" to "value")
-    val hash = UPLOAD_FILE.inputStream().use { DigestUtils.md5Hex(it) }
+    val md5 = MessageDigest.getInstance("MD5")
+    val hash = UPLOAD_FILE.inputStream().use { md5.digest(it.readBytes()).joinToString("") { "%02x".format(it) } }
     val initiateMultipartUploadResult =
       s3Client.createMultipartUpload {
         it.bucket(bucketName)
@@ -725,7 +727,8 @@ internal class MultipartIT : S3TestBase() {
   fun `list parts lists uploaded parts matching parameters`(testInfo: TestInfo) {
     val bucketName = givenBucket(testInfo)
     val objectMetadata = mapOf("key" to "value")
-    val hash = UPLOAD_FILE.inputStream().use { DigestUtils.md5Hex(it) }
+    val md5 = MessageDigest.getInstance("MD5")
+    val hash = UPLOAD_FILE.inputStream().use { md5.digest(it.readBytes()).joinToString("") { "%02x".format(it) } }
     val initiateMultipartUploadResult =
       s3Client.createMultipartUpload {
         it.bucket(bucketName)
@@ -1084,10 +1087,11 @@ internal class MultipartIT : S3TestBase() {
         }
       }
 
+    val md5 = MessageDigest.getInstance("MD5")
     // Verify only 1st and 3rd counts
-    (DigestUtils.md5(randomBytes1) + DigestUtils.md5(randomBytes3)).also {
+    (md5.digest(randomBytes1) + md5.digest(randomBytes3)).also {
       // verify special etag
-      assertThat(result.eTag()).isEqualTo("\"${DigestUtils.md5Hex(it)}-2\"")
+      assertThat(result.eTag()).isEqualTo("\"${md5.digest(it).joinToString("") { "%02x".format(it) }}-2\"")
     }
 
     s3Client
@@ -1247,10 +1251,11 @@ internal class MultipartIT : S3TestBase() {
           it.parts(parts)
         }
       }
+    val md5 = MessageDigest.getInstance("MD5")
     // Verify parts
-    (DigestUtils.md5(allRandomBytes[0]) + DigestUtils.md5(allRandomBytes[1])).also {
+    (md5.digest(allRandomBytes[0]) + md5.digest(allRandomBytes[1])).also {
       // verify etag
-      assertThat(result.eTag()).isEqualTo("\"${DigestUtils.md5Hex(it)}-2\"")
+      assertThat(result.eTag()).isEqualTo("\"${md5.digest(it).joinToString("") { "%02x".format(it) }}-2\"")
     }
 
     s3Client

pom.xml

@@ -88,7 +88,6 @@
 
     <aws-kotlin.version>1.5.77</aws-kotlin.version>
 
-    <commons-codec.version>1.20.0</commons-codec.version>
     <httpclient.version>4.5.14</httpclient.version>
     <httpmime.version>4.5.14</httpmime.version>
     <httpcore.version>4.4.16</httpcore.version>
@@ -216,11 +215,6 @@
         <artifactId>testcontainers-bom</artifactId>
         <version>${testcontainers.version}</version>
       </dependency>
-      <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>${commons-codec.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.testng</groupId>
         <artifactId>testng</artifactId>

server/pom.xml

@@ -78,10 +78,6 @@
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>aws-crt-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>

server/src/test/kotlin/com/adobe/testing/s3mock/store/MultipartStoreTest.kt

@@ -24,7 +24,6 @@ import com.adobe.testing.s3mock.dto.Part
 import com.adobe.testing.s3mock.dto.StorageClass
 import com.adobe.testing.s3mock.util.DigestUtil
 import com.adobe.testing.s3mock.util.HeaderUtil
-import org.apache.commons.codec.digest.DigestUtils
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.jupiter.api.AfterAll
@@ -46,6 +45,7 @@ import java.io.IOException
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Paths
+import java.security.MessageDigest
 import java.util.Collections
 import java.util.Date
 import java.util.UUID
@@ -213,7 +213,8 @@ internal class MultipartStoreTest : StoreTestBase() {
         NO_CHECKSUM,
         NO_CHECKSUM_ALGORITHM,
       )
-    val allMd5s = DigestUtils.md5("Part1") + DigestUtils.md5("Part2")
+    val md5 = MessageDigest.getInstance("MD5")
+    val allMd5s = md5.digest("Part1".toByteArray()) + md5.digest("Part2".toByteArray())
 
     assertThat(
       Paths.get(
@@ -227,7 +228,7 @@ internal class MultipartStoreTest : StoreTestBase() {
         TEST_BUCKET_NAME, id.toString(), "objectMetadata.json"
       ).toFile()
     ).exists()
-    assertThat(result.etag).isEqualTo("\"${DigestUtils.md5Hex(allMd5s)}-2\"")
+    assertThat(result.etag).isEqualTo("\"${md5.digest(allMd5s).joinToString("") {"%02x".format(it)} }-2\"")
   }
 
   @Test
@@ -650,9 +651,10 @@ internal class MultipartStoreTest : StoreTestBase() {
   }
 
   private fun prepareExpectedPart(partNumber: Int, lastModified: Date, content: String): Part {
+    val md5 = MessageDigest.getInstance("MD5")
     return Part(
       partNumber,
-      DigestUtils.md5Hex(content),
+      md5.digest(content.toByteArray()).joinToString("") { "%02x".format(it) },
       lastModified,
       content.toByteArray().size.toLong()
     )

server/src/test/kotlin/com/adobe/testing/s3mock/util/DigestUtilTest.kt

@@ -15,7 +15,7 @@
  */
 package com.adobe.testing.s3mock.util
 
-import org.apache.commons.codec.digest.DigestUtils
+import java.security.MessageDigest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo
@@ -25,14 +25,16 @@ import software.amazon.awssdk.utils.BinaryUtils
 internal class DigestUtilTest {
   @Test
   fun testHexDigestOfMultipleFiles(testInfo: TestInfo) {
+    val md5 = MessageDigest.getInstance("MD5")
+
     //yes, this is correct - AWS calculates a Multipart digest by calculating the digest of every
     //file involved, and then calculates the digest on the result.
     //a hyphen with the part count is added as a suffix.
     val expected = "${
-      DigestUtils.md5Hex(
-        DigestUtils.md5("Part1")  //testFile1
-          + DigestUtils.md5("Part2") //testFile2
-      )
+      md5.digest(
+        md5.digest("Part1".toByteArray())  //testFile1
+          + md5.digest("Part2".toByteArray()) //testFile2
+      ).joinToString("") { "%02x".format(it) }
     }-2"
 
     //files contain the exact content seen above
@@ -46,13 +48,15 @@ internal class DigestUtilTest {
 
   @Test
   fun testChecksumOfMultipleFiles(testInfo: TestInfo) {
+    val sha256 = MessageDigest.getInstance("SHA-256")
+
     //yes, this is correct - AWS calculates a Multipart digest by calculating the digest of every
     //file involved, and then calculates the digest on the result.
     //a hyphen with the part count is added as a suffix.
     val expected = "${
-      BinaryUtils.toBase64(DigestUtils.sha256(
-        DigestUtils.sha256("Part1")  //testFile1
-          + DigestUtils.sha256("Part2") //testFile2
+      BinaryUtils.toBase64(sha256.digest(
+        sha256.digest("Part1".toByteArray())  //testFile1
+          + sha256.digest("Part2".toByteArray()) //testFile2
       ))
     }-2"