Idiomatic Kotlin part 2

Author: afranken

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

@@ -16,22 +16,20 @@
 package com.adobe.testing.s3mock.util
 
 import com.adobe.testing.s3mock.ChecksumTestUtil
-import com.adobe.testing.s3mock.dto.ChecksumAlgorithm
 import com.adobe.testing.s3mock.ChecksumTestUtil.prepareInputStream
+import com.adobe.testing.s3mock.dto.ChecksumAlgorithm
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import software.amazon.awssdk.checksums.DefaultChecksumAlgorithm
 import java.io.File
-import java.io.IOException
-import java.nio.file.Files
 import java.util.stream.Stream
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm as AwsChecksumAlgorithm
 
 internal class AwsChunkedDecodingChecksumInputStreamTest {
   @Test
-  @Throws(IOException::class)
   fun `test decoding aws inputstream with fixed checksum`(testInfo: TestInfo) {
     val sampleFile = TestUtil.getFileFromClasspath(testInfo, "sampleFile.txt")
     val sampleFileLarge = TestUtil.getFileFromClasspath(testInfo, "sampleFile_large.txt")
@@ -53,9 +51,8 @@ internal class AwsChunkedDecodingChecksumInputStreamTest {
 
   @ParameterizedTest
   @MethodSource("algorithms")
-  @Throws(IOException::class)
   fun `test decoding aws inputstream with calculated checksum`(
-    algorithm: software.amazon.awssdk.checksums.spi.ChecksumAlgorithm,
+    algorithm: AwsChecksumAlgorithm,
     testInfo: TestInfo
   ) {
     val checksumAlgorithm = ChecksumAlgorithm.fromString(algorithm.toString())
@@ -95,7 +92,6 @@ internal class AwsChunkedDecodingChecksumInputStreamTest {
   }
 
   @Test
-  @Throws(IOException::class)
   fun `test decoding aws inputstream without checksum`(testInfo: TestInfo) {
     val sampleFile = TestUtil.getFileFromClasspath(testInfo, "sampleFile.txt")
     val sampleFileLarge = TestUtil.getFileFromClasspath(testInfo, "sampleFile_large.txt")
@@ -107,11 +103,10 @@ internal class AwsChunkedDecodingChecksumInputStreamTest {
     doTest(testImage, 17)
   }
 
-  @Throws(IOException::class)
   private fun doTest(
     input: File,
     chunks: Int = 0,
-    algorithm: software.amazon.awssdk.checksums.spi.ChecksumAlgorithm? = null,
+    algorithm: AwsChecksumAlgorithm? = null,
     checksum: String? = null,
     checksumAlgorithm: ChecksumAlgorithm? = null
   ) {
@@ -121,7 +116,7 @@ internal class AwsChunkedDecodingChecksumInputStreamTest {
       algorithm,
     )
     val iut = AwsChunkedDecodingChecksumInputStream(chunkedEncodingInputStream, decodedLength)
-    assertThat(iut).hasSameContentAs(Files.newInputStream(input.toPath()))
+    assertThat(iut).hasSameContentAs(input.inputStream())
     assertThat(iut.getAlgorithm()).isEqualTo(checksumAlgorithm)
     assertThat(iut.getChecksum()).isEqualTo(checksum)
     assertThat(iut.decodedLength).isEqualTo(decodedLength)
@@ -131,8 +126,6 @@ internal class AwsChunkedDecodingChecksumInputStreamTest {
 
   companion object {
     @JvmStatic
-    fun algorithms(): Stream<software.amazon.awssdk.checksums.spi.ChecksumAlgorithm> {
-      return ChecksumTestUtil.algorithms()
-    }
+    fun algorithms(): Stream<AwsChecksumAlgorithm> = ChecksumTestUtil.algorithms()
   }
 }

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

@@ -16,22 +16,20 @@
 package com.adobe.testing.s3mock.util
 
 import com.adobe.testing.s3mock.ChecksumTestUtil
-import com.adobe.testing.s3mock.dto.ChecksumAlgorithm
 import com.adobe.testing.s3mock.ChecksumTestUtil.prepareInputStream
+import com.adobe.testing.s3mock.dto.ChecksumAlgorithm
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import software.amazon.awssdk.checksums.DefaultChecksumAlgorithm
 import java.io.File
-import java.io.IOException
-import java.nio.file.Files
 import java.util.stream.Stream
+import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm as AwsChecksumAlgorithm
 
 internal class AwsUnsignedChunkedDecodingChecksumInputStreamTest {
   @Test
-  @Throws(IOException::class)
   fun `test decoding aws inputstream with fixed checksum`(testInfo: TestInfo) {
     val sampleFile = TestUtil.getFileFromClasspath(testInfo, "sampleFile.txt")
     val sampleFileLarge = TestUtil.getFileFromClasspath(testInfo, "sampleFile_large.txt")
@@ -53,9 +51,8 @@ internal class AwsUnsignedChunkedDecodingChecksumInputStreamTest {
 
   @ParameterizedTest
   @MethodSource("algorithms")
-  @Throws(IOException::class)
   fun `test decoding aws inputstream with calculated checksum`(
-    algorithm: software.amazon.awssdk.checksums.spi.ChecksumAlgorithm,
+    algorithm: AwsChecksumAlgorithm,
     testInfo: TestInfo
   ) {
     val checksumAlgorithm = ChecksumAlgorithm.fromString(algorithm.toString())
@@ -95,7 +92,6 @@ internal class AwsUnsignedChunkedDecodingChecksumInputStreamTest {
   }
 
   @Test
-  @Throws(IOException::class)
   fun `test decoding aws inputstream without checksum`(testInfo: TestInfo) {
     val sampleFile = TestUtil.getFileFromClasspath(testInfo, "sampleFile.txt")
     val sampleFileLarge = TestUtil.getFileFromClasspath(testInfo, "sampleFile_large.txt")
@@ -107,11 +103,10 @@ internal class AwsUnsignedChunkedDecodingChecksumInputStreamTest {
     doTest(testImage, 17)
   }
 
-  @Throws(IOException::class)
   private fun doTest(
     input: File,
     chunks: Int = 0,
-    algorithm: software.amazon.awssdk.checksums.spi.ChecksumAlgorithm? = null,
+    algorithm: AwsChecksumAlgorithm? = null,
     checksum: String? = null,
     checksumAlgorithm: ChecksumAlgorithm? = null
   ) {
@@ -121,7 +116,7 @@ internal class AwsUnsignedChunkedDecodingChecksumInputStreamTest {
       algorithm,
     )
     val iut = AwsUnsignedChunkedDecodingChecksumInputStream(chunkedEncodingInputStream, decodedLength)
-    assertThat(iut).hasSameContentAs(Files.newInputStream(input.toPath()))
+    assertThat(iut).hasSameContentAs(input.inputStream())
     assertThat(iut.getAlgorithm()).isEqualTo(checksumAlgorithm)
     assertThat(iut.getChecksum()).isEqualTo(checksum)
     assertThat(iut.decodedLength).isEqualTo(decodedLength)
@@ -131,8 +126,6 @@ internal class AwsUnsignedChunkedDecodingChecksumInputStreamTest {
 
   companion object {
     @JvmStatic
-    fun algorithms(): Stream<software.amazon.awssdk.checksums.spi.ChecksumAlgorithm> {
-      return ChecksumTestUtil.algorithms()
-    }
+    fun algorithms(): Stream<AwsChecksumAlgorithm> = ChecksumTestUtil.algorithms()
   }
 }

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

@@ -30,17 +30,15 @@ import java.util.UUID
 internal class HeaderUtilTest {
   @Test
   fun testGetUserMetadata_canonical() {
-    val httpHeaders = HttpHeaders()
-    httpHeaders.add(X_AMZ_CANONICAL_HEADER, TEST_VALUE)
+    val httpHeaders = HttpHeaders().apply { add(X_AMZ_CANONICAL_HEADER, TEST_VALUE) }
 
     val userMetadata = HeaderUtil.userMetadataFrom(httpHeaders)
     assertThat(userMetadata).containsEntry(X_AMZ_CANONICAL_HEADER, TEST_VALUE)
   }
 
   @Test
   fun testGetUserMetadata_javaSdk() {
-    val httpHeaders = HttpHeaders()
-    httpHeaders.add(X_AMZ_LOWERCASE_HEADER, TEST_VALUE)
+    val httpHeaders = HttpHeaders().apply { add(X_AMZ_LOWERCASE_HEADER, TEST_VALUE) }
 
     val userMetadata = HeaderUtil.userMetadataFrom(httpHeaders)
     assertThat(userMetadata).containsEntry(X_AMZ_LOWERCASE_HEADER, TEST_VALUE)
@@ -64,25 +62,25 @@ internal class HeaderUtilTest {
     assertThat(userMetadataHeaders).containsEntry(X_AMZ_LOWERCASE_HEADER, TEST_VALUE)
   }
 
-  private fun s3ObjectMetadata(id: UUID = UUID.randomUUID(), key: String = "key", userMetadata: Map<String, String>? = null): S3ObjectMetadata {
-    val lastModified = "lastModified"
-    val etag = "etag"
-    val size = "size"
-    val owner = Owner("name", 0L.toString())
-    return S3ObjectMetadata(
+  private fun s3ObjectMetadata(
+    id: UUID = UUID.randomUUID(),
+    key: String = "key",
+    userMetadata: Map<String, String>? = null
+  ): S3ObjectMetadata =
+    S3ObjectMetadata(
       id,
       key,
-      size,
-      lastModified,
-      "\"$etag\"",
+      "size",
+      "lastModified",
+      "\"etag\"",
       null,
       Instant.now().toEpochMilli(),
       Path.of("test"),
       userMetadata,
       null,
       null,
       null,
-      owner,
+      Owner("name", 0L.toString()),
       null,
       null,
       ChecksumAlgorithm.SHA256,
@@ -93,7 +91,6 @@ internal class HeaderUtilTest {
       false,
       ChecksumType.FULL_OBJECT
     )
-  }
 
   companion object {
     private const val X_AMZ_CANONICAL_HEADER = "X-Amz-Meta-Some-header"

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  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.
@@ -17,40 +17,42 @@ package com.adobe.testing.s3mock.util
 
 import org.junit.jupiter.api.TestInfo
 import java.io.File
-import java.util.Objects
 
 object TestUtil {
   fun getTestFile(testInfo: TestInfo, name: String?): File {
-    val testClass = testInfo.testClass.get()
-    val packageName = testClass.getPackage().name
-    val className = testClass.simpleName
-    val methodName = testInfo.testMethod.get().name
-    val fileName = "${packageName.replace(".", "/")}/${className}_${methodName}_$name"
+    val (packagePath, className, methodName) = testMeta(testInfo)
+    val safeName = name.orEmpty()
+    val fileName = "$packagePath/${className}_${methodName}_$safeName"
     return getFileFromClasspath(testInfo, fileName)
   }
 
   fun getPayloadFile(testInfo: TestInfo, name: String?): File {
-    val testClass = testInfo.testClass.get()
-    val packageName = testClass.getPackage().name
-    val className = testClass.simpleName
-    val fileName = "${packageName.replace(".", "/")}/${className}_payload_$name"
+    val (packagePath, className) = testMeta(testInfo)
+    val safeName = name.orEmpty()
+    val fileName = "$packagePath/${className}_payload_$safeName"
     return getFileFromClasspath(testInfo, fileName)
   }
 
   fun getFileFromPackage(testInfo: TestInfo, name: String?): File {
-    val testClass = testInfo.testClass.get()
-    val packageName = testClass.getPackage().name
-    val fileName = "${packageName.replace(".", "/")}/$name"
+    val (packagePath) = testMeta(testInfo)
+    val fileName = "$packagePath/${name.orEmpty()}"
     return getFileFromClasspath(testInfo, fileName)
   }
 
-  fun getSampleFile(testInfo: TestInfo): File {
-    return getFileFromClasspath(testInfo, "sampleFile.txt")
-  }
+  fun getSampleFile(testInfo: TestInfo): File =
+    getFileFromClasspath(testInfo, "sampleFile.txt")
 
   fun getFileFromClasspath(testInfo: TestInfo, fileName: String?): File {
-    val testClass = testInfo.testClass.get()
-    val classLoader = testClass.classLoader
-    return File(Objects.requireNonNull(classLoader.getResource(fileName)).file)
+    val testClass = requireNotNull(testInfo.testClass.orElse(null)) { "Test class is not present in TestInfo" }
+    val resource = requireNotNull(testClass.classLoader.getResource(fileName)) { "Resource not found on classpath: $fileName" }
+    return File(resource.toURI())
+  }
+
+  private fun testMeta(testInfo: TestInfo): Triple<String, String, String?> {
+    val testClass = requireNotNull(testInfo.testClass.orElse(null)) { "Test class is not present in TestInfo" }
+    val packagePath = testClass.packageName.replace('.', '/')
+    val className = testClass.simpleName
+    val methodName = testInfo.testMethod.orElse(null)?.name
+    return Triple(packagePath, className, methodName)
   }
 }