Let Spring convert StorageClass in postObject

Also add tests.

Author: afranken

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

@@ -16,6 +16,7 @@
 package com.adobe.testing.s3mock.its
 
 import com.adobe.testing.s3mock.dto.InitiateMultipartUploadResult
+import com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_STORAGE_CLASS
 import com.adobe.testing.s3mock.util.DigestUtil
 import org.apache.http.HttpHeaders
 import org.apache.http.HttpHeaders.CONTENT_TYPE
@@ -36,6 +37,7 @@ import org.junit.jupiter.api.TestInfo
 import software.amazon.awssdk.core.sync.RequestBody
 import software.amazon.awssdk.services.s3.S3Client
 import software.amazon.awssdk.services.s3.model.CompletedPart
+import software.amazon.awssdk.services.s3.model.StorageClass
 import software.amazon.awssdk.services.s3.presigner.S3Presigner
 import tel.schich.awss3postobjectpresigner.S3PostObjectPresigner
 import tel.schich.awss3postobjectpresigner.S3PostObjectRequest
@@ -79,7 +81,7 @@ internal class PresignedUrlIT : S3TestBase() {
             .create()
             .addTextBody("key", key)
             .addTextBody(CONTENT_TYPE, "application/octet-stream")
-            // .addTextBody(X_AMZ_STORAGE_CLASS, "INTELLIGENT_TIERING")
+            .addTextBody(X_AMZ_STORAGE_CLASS, "INTELLIGENT_TIERING")
             .addTextBody("tagging", "<Tagging><TagSet><Tag><Key>Tag Name</Key><Value>Tag Value</Value></Tag></TagSet></Tagging>")
             .addBinaryBody("file", randomMBytes.inputStream(), ContentType.APPLICATION_OCTET_STREAM, key)
             .build()
@@ -101,6 +103,7 @@ internal class PresignedUrlIT : S3TestBase() {
       }.use {
         val actualEtag = "\"${DigestUtil.hexDigest(it)}\""
         assertThat(actualEtag).isEqualTo(expectedEtag)
+        assertThat(it.response().storageClass()).isEqualTo(StorageClass.INTELLIGENT_TIERING)
       }
     s3Client
       .getObjectTagging {

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

@@ -199,12 +199,9 @@ public ResponseEntity<Void> postObject(
       @RequestParam(value = TAGGING, required = false) @Nullable List<Tag> tags,
       @RequestParam(value = CONTENT_TYPE, required = false) String contentType,
       @RequestParam(value = CONTENT_MD5, required = false) String contentMd5,
-      @RequestParam(value = X_AMZ_STORAGE_CLASS, required = false) @Nullable String rawStorageClass,
+      @RequestParam(value = X_AMZ_STORAGE_CLASS, required = false,
+          defaultValue = "STANDARD") StorageClass storageClass,
       @RequestPart(FILE) MultipartFile file) throws IOException {
-    StorageClass storageClass = null;
-    if (rawStorageClass != null) {
-      storageClass = StorageClass.valueOf(rawStorageClass);
-    }
 
     String checksum = null;
     ChecksumAlgorithm checksumAlgorithm = null;
@@ -228,7 +225,8 @@ public ResponseEntity<Void> postObject(
             checksumAlgorithm,
             checksum,
             owner,
-            storageClass);
+            storageClass
+        );
 
     FileUtils.deleteQuietly(tempFile.toFile());
 

server/src/test/kotlin/com/adobe/testing/s3mock/ObjectControllerTest.kt

@@ -39,6 +39,7 @@ import com.adobe.testing.s3mock.service.MultipartService
 import com.adobe.testing.s3mock.service.ObjectService
 import com.adobe.testing.s3mock.store.KmsKeyStore
 import com.adobe.testing.s3mock.util.AwsHttpHeaders
+import com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_STORAGE_CLASS
 import com.adobe.testing.s3mock.util.AwsHttpParameters
 import com.adobe.testing.s3mock.util.DigestUtil
 import com.fasterxml.jackson.core.JsonProcessingException
@@ -844,7 +845,7 @@ internal class ObjectControllerTest : BaseControllerTest() {
     val returned = s3ObjectMetadata(key, DigestUtil.hexDigest(Files.newInputStream(testFile.toPath())))
     whenever(
       objectService.putS3Object(
-        eq(bucket), eq(key), any(), anyMap(), any(Path::class.java), anyMap(), anyMap(), isNull(), isNull(), isNull(), eq(Owner.DEFAULT_OWNER), isNull()
+        eq(bucket), eq(key), any(), anyMap(), any(Path::class.java), anyMap(), anyMap(), isNull(), isNull(), isNull(), eq(Owner.DEFAULT_OWNER), eq(StorageClass.DEEP_ARCHIVE)
       )
     ).thenReturn(returned)
 
@@ -853,6 +854,7 @@ internal class ObjectControllerTest : BaseControllerTest() {
       multipart("/$bucket")
         .file(MockMultipartFile("file", key, MediaType.APPLICATION_OCTET_STREAM_VALUE, testFile.readBytes()))
         .param("key", key)
+        .param(X_AMZ_STORAGE_CLASS, StorageClass.DEEP_ARCHIVE.toString())
         .accept(MediaType.APPLICATION_XML)
     )
       .andExpect(status().isOk)