feat(storage): Add support to define the S3 Storage Class

aws-storage-s3/api/aws-storage-s3.api

@@ -242,6 +242,7 @@ public final class com/amplifyframework/storage/s3/options/AWSS3StorageUploadFil
 	public fun equals (Ljava/lang/Object;)Z
 	public static fun from (Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadFileOptions;)Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadFileOptions$Builder;
 	public fun getServerSideEncryption ()Lcom/amplifyframework/storage/s3/ServerSideEncryption;
+	public fun getStorageClass ()Laws/sdk/kotlin/services/s3/model/StorageClass;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 	public fun useAccelerateEndpoint ()Z
@@ -253,6 +254,7 @@ public final class com/amplifyframework/storage/s3/options/AWSS3StorageUploadFil
 	public fun build ()Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadFileOptions;
 	public fun serverSideEncryption (Lcom/amplifyframework/storage/s3/ServerSideEncryption;)Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadFileOptions$Builder;
 	public fun setUseAccelerateEndpoint (Z)Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadFileOptions$Builder;
+	public fun storageClass (Laws/sdk/kotlin/services/s3/model/StorageClass;)Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadFileOptions$Builder;
 }
 
 public final class com/amplifyframework/storage/s3/options/AWSS3StorageUploadInputStreamOptions : com/amplifyframework/storage/options/StorageUploadInputStreamOptions {
@@ -261,6 +263,7 @@ public final class com/amplifyframework/storage/s3/options/AWSS3StorageUploadInp
 	public fun equals (Ljava/lang/Object;)Z
 	public static fun from (Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadInputStreamOptions;)Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadInputStreamOptions$Builder;
 	public fun getServerSideEncryption ()Lcom/amplifyframework/storage/s3/ServerSideEncryption;
+	public fun getStorageClass ()Laws/sdk/kotlin/services/s3/model/StorageClass;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 	public fun useAccelerateEndpoint ()Z
@@ -272,6 +275,7 @@ public final class com/amplifyframework/storage/s3/options/AWSS3StorageUploadInp
 	public fun build ()Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadInputStreamOptions;
 	public fun serverSideEncryption (Lcom/amplifyframework/storage/s3/ServerSideEncryption;)Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadInputStreamOptions$Builder;
 	public fun setUseAccelerateEndpoint (Z)Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadInputStreamOptions$Builder;
+	public fun storageClass (Laws/sdk/kotlin/services/s3/model/StorageClass;)Lcom/amplifyframework/storage/s3/options/AWSS3StorageUploadInputStreamOptions$Builder;
 }
 
 public final class com/amplifyframework/storage/s3/request/AWSS3StorageDownloadFileRequest {
@@ -314,13 +318,14 @@ public final class com/amplifyframework/storage/s3/request/AWSS3StorageRemoveReq
 }
 
 public final class com/amplifyframework/storage/s3/request/AWSS3StorageUploadRequest {
-	public fun <init> (Ljava/lang/String;Ljava/lang/Object;Lcom/amplifyframework/storage/StorageAccessLevel;Ljava/lang/String;Ljava/lang/String;Lcom/amplifyframework/storage/s3/ServerSideEncryption;Ljava/util/Map;Z)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Object;Lcom/amplifyframework/storage/StorageAccessLevel;Ljava/lang/String;Ljava/lang/String;Lcom/amplifyframework/storage/s3/ServerSideEncryption;Laws/sdk/kotlin/services/s3/model/StorageClass;Ljava/util/Map;Z)V
 	public fun getAccessLevel ()Lcom/amplifyframework/storage/StorageAccessLevel;
 	public fun getContentType ()Ljava/lang/String;
 	public fun getKey ()Ljava/lang/String;
 	public fun getLocal ()Ljava/lang/Object;
 	public fun getMetadata ()Ljava/util/Map;
 	public fun getServerSideEncryption ()Lcom/amplifyframework/storage/s3/ServerSideEncryption;
+	public fun getStorageClass ()Laws/sdk/kotlin/services/s3/model/StorageClass;
 	public fun getTargetIdentityId ()Ljava/lang/String;
 	public fun useAccelerateEndpoint ()Z
 }

aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/AWSS3StoragePlugin.java

@@ -101,6 +101,7 @@
 import java.util.concurrent.TimeUnit;
 
 import aws.sdk.kotlin.services.s3.S3Client;
+import aws.sdk.kotlin.services.s3.model.StorageClass;
 
 /**
  * A plugin for the storage category which uses S3 as a storage
@@ -579,6 +580,9 @@ public StorageUploadFileOperation<?> uploadFile(
             options instanceof AWSS3StorageUploadFileOptions
                 ? ((AWSS3StorageUploadFileOptions) options).getServerSideEncryption()
                 : ServerSideEncryption.NONE,
+            options instanceof AWSS3StorageUploadFileOptions
+                ? ((AWSS3StorageUploadFileOptions) options).getStorageClass()
+                : StorageClass.Standard.INSTANCE,
             options.getMetadata(),
             useAccelerateEndpoint
         );
@@ -617,6 +621,9 @@ public StorageUploadFileOperation<?> uploadFile(
                 options instanceof AWSS3StorageUploadFileOptions
                         ? ((AWSS3StorageUploadFileOptions) options).getServerSideEncryption()
                         : ServerSideEncryption.NONE,
+                options instanceof AWSS3StorageUploadFileOptions
+                        ? ((AWSS3StorageUploadFileOptions) options).getStorageClass()
+                        : StorageClass.Standard.INSTANCE,
                 options.getMetadata(),
                 useAccelerateEndpoint
         );
@@ -707,6 +714,9 @@ public StorageUploadInputStreamOperation<?> uploadInputStream(
             options instanceof AWSS3StorageUploadInputStreamOptions
                 ? ((AWSS3StorageUploadInputStreamOptions) options).getServerSideEncryption()
                 : ServerSideEncryption.NONE,
+            options instanceof AWSS3StorageUploadInputStreamOptions
+                ? ((AWSS3StorageUploadInputStreamOptions) options).getStorageClass()
+                : StorageClass.Standard.INSTANCE,
             options.getMetadata(),
             useAccelerateEndpoint
         );
@@ -745,6 +755,9 @@ public StorageUploadInputStreamOperation<?> uploadInputStream(
                 options instanceof AWSS3StorageUploadInputStreamOptions
                         ? ((AWSS3StorageUploadInputStreamOptions) options).getServerSideEncryption()
                         : ServerSideEncryption.NONE,
+                options instanceof AWSS3StorageUploadInputStreamOptions
+                        ? ((AWSS3StorageUploadInputStreamOptions) options).getStorageClass()
+                        : StorageClass.Standard.INSTANCE,
                 options.getMetadata(),
                 useAccelerateEndpoint
         );

aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/operation/AWSS3StoragePathUploadFileOperation.kt

@@ -111,6 +111,7 @@ internal class AWSS3StoragePathUploadFileOperation internal constructor(
                     objectMetadata.metaData[ObjectMetadata.SERVER_SIDE_ENCRYPTION] =
                         storageServerSideEncryption.getName()
                 }
+                objectMetadata.metaData[ObjectMetadata.STORAGE_CLASS] = uploadRequest.storageClass.value
                 transferObserver = storageService.uploadFile(
                     transferId,
                     serviceKey,

aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/operation/AWSS3StoragePathUploadInputStreamOperation.kt

@@ -14,6 +14,7 @@
  */
 package com.amplifyframework.storage.s3.operation
 
+import aws.sdk.kotlin.services.s3.model.StorageClass
 import com.amplifyframework.auth.AuthCredentialsProvider
 import com.amplifyframework.core.Amplify
 import com.amplifyframework.core.Consumer
@@ -110,6 +111,7 @@ internal class AWSS3StoragePathUploadInputStreamOperation internal constructor(
                     objectMetadata.metaData[ObjectMetadata.SERVER_SIDE_ENCRYPTION] =
                         storageServerSideEncryption.getName()
                 }
+                objectMetadata.metaData[ObjectMetadata.STORAGE_CLASS] = request.storageClass.value
                 transferObserver = storageService.uploadInputStream(
                     transferId,
                     serviceKey,

aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/operation/AWSS3StorageUploadFileOperation.kt

@@ -109,6 +109,7 @@ class AWSS3StorageUploadFileOperation @JvmOverloads internal constructor(
                                 objectMetadata.metaData[ObjectMetadata.SERVER_SIDE_ENCRYPTION] =
                                     storageServerSideEncryption.getName()
                             }
+                            objectMetadata.metaData[ObjectMetadata.STORAGE_CLASS] = uploadRequest.storageClass.value
                             transferObserver = storageService.uploadFile(
                                 transferId,
                                 serviceKey,

aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/operation/AWSS3StorageUploadInputStreamOperation.kt

@@ -116,6 +116,7 @@ class AWSS3StorageUploadInputStreamOperation @JvmOverloads internal constructor(
                                 objectMetadata.metaData[ObjectMetadata.SERVER_SIDE_ENCRYPTION] =
                                     storageServerSideEncryption.getName()
                             }
+                            objectMetadata.metaData[ObjectMetadata.STORAGE_CLASS] = uploadRequest.storageClass.value
                             transferObserver = storageService.uploadInputStream(
                                 transferId,
                                 serviceKey,

aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/options/AWSS3StorageUploadFileOptions.java

@@ -23,16 +23,20 @@
 
 import java.util.Objects;
 
+import aws.sdk.kotlin.services.s3.model.StorageClass;
+
 /**
  * Options to specify attributes of object upload operation to an AWS S3 bucket.
  */
 public final class AWSS3StorageUploadFileOptions extends StorageUploadFileOptions {
     private final ServerSideEncryption serverSideEncryption;
+    private final StorageClass storageClass;
     private final boolean useAccelerationMode;
 
     private AWSS3StorageUploadFileOptions(final Builder builder) {
         super(builder);
         this.serverSideEncryption = builder.getServerSideEncryption();
+        this.storageClass = builder.getStorageClass();
         this.useAccelerationMode = builder.useAccelerateEndpoint;
     }
 
@@ -45,6 +49,15 @@ public ServerSideEncryption getServerSideEncryption() {
         return serverSideEncryption;
     }
 
+    /**
+     * Storage class.
+     * @return Storage class
+     */
+    @NonNull
+    public StorageClass getStorageClass() {
+        return storageClass;
+    }
+
     /**
      * Factory method to create a new instance of the
      * {@link Builder}.  The builder can be
@@ -75,6 +88,7 @@ public static Builder from(@NonNull final AWSS3StorageUploadFileOptions options)
             .targetIdentityId(options.getTargetIdentityId())
             .contentType(options.getContentType())
             .serverSideEncryption(options.getServerSideEncryption())
+            .storageClass(options.getStorageClass())
             .metadata(options.getMetadata());
     }
 
@@ -109,6 +123,7 @@ public boolean equals(Object obj) {
                     ObjectsCompat.equals(getTargetIdentityId(), that.getTargetIdentityId()) &&
                     ObjectsCompat.equals(getContentType(), that.getContentType()) &&
                     ObjectsCompat.equals(getServerSideEncryption(), that.getServerSideEncryption()) &&
+                    ObjectsCompat.equals(getStorageClass(), that.getStorageClass()) &&
                     ObjectsCompat.equals(getMetadata(), that.getMetadata());
         }
     }
@@ -121,6 +136,7 @@ public int hashCode() {
                 getTargetIdentityId(),
                 getContentType(),
                 getServerSideEncryption(),
+                getStorageClass(),
                 getMetadata()
         );
     }
@@ -134,6 +150,7 @@ public String toString() {
                 ", targetIdentityId=" + getTargetIdentityId() +
                 ", contentType=" + getContentType() +
                 ", serverSideEncryption=" + getServerSideEncryption().getName() +
+                ", storageClass=" + getStorageClass() +
                 ", metadata=" + getMetadata() +
                 '}';
     }
@@ -145,11 +162,13 @@ public String toString() {
      */
     public static final class Builder extends StorageUploadFileOptions.Builder<Builder> {
         private ServerSideEncryption serverSideEncryption;
+        private StorageClass storageClass;
         private boolean useAccelerateEndpoint;
 
         private Builder() {
             super();
             this.serverSideEncryption = ServerSideEncryption.NONE;
+            this.storageClass = StorageClass.Standard.INSTANCE;
         }
 
         /**
@@ -173,11 +192,27 @@ public Builder serverSideEncryption(@NonNull ServerSideEncryption serverSideEncr
             return this;
         }
 
+        /**
+         * Configures the storage class for a new AWSS3StorageUploadFileOptions instance.
+         * @param storageClass storage class
+         * @return Current Builder instance for fluent chaining
+         */
+        @NonNull
+        public Builder storageClass(@NonNull StorageClass storageClass) {
+            this.storageClass = Objects.requireNonNull(storageClass);
+            return this;
+        }
+
         @NonNull
         ServerSideEncryption getServerSideEncryption() {
             return serverSideEncryption;
         }
 
+        @NonNull
+        StorageClass getStorageClass() {
+            return storageClass;
+        }
+
         @Override
         @NonNull
         public AWSS3StorageUploadFileOptions build() {

aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/options/AWSS3StorageUploadInputStreamOptions.java

@@ -23,16 +23,20 @@
 
 import java.util.Objects;
 
+import aws.sdk.kotlin.services.s3.model.StorageClass;
+
 /**
  * Options to specify attributes of object upload operation to an AWS S3 bucket.
  */
 public final class AWSS3StorageUploadInputStreamOptions extends StorageUploadInputStreamOptions {
     private final ServerSideEncryption serverSideEncryption;
+    private final StorageClass storageClass;
     private final boolean useAccelerationMode;
 
     private AWSS3StorageUploadInputStreamOptions(final Builder builder) {
         super(builder);
         this.serverSideEncryption = builder.serverSideEncryption;
+        this.storageClass = builder.storageClass;
         this.useAccelerationMode = builder.useAccelerateEndpoint;
     }
 
@@ -45,6 +49,15 @@ public ServerSideEncryption getServerSideEncryption() {
         return serverSideEncryption;
     }
 
+    /**
+     * Storage class.
+     * @return Storage class
+     */
+    @NonNull
+    public StorageClass getStorageClass() {
+        return storageClass;
+    }
+
     /**
      * Factory method to create a new instance of the
      * {@link Builder}.  The builder can be
@@ -75,6 +88,7 @@ public static Builder from(@NonNull final AWSS3StorageUploadInputStreamOptions o
                 .targetIdentityId(options.getTargetIdentityId())
                 .contentType(options.getContentType())
                 .serverSideEncryption(options.getServerSideEncryption())
+                .storageClass(options.getStorageClass())
                 .metadata(options.getMetadata());
     }
 
@@ -109,6 +123,7 @@ public boolean equals(Object obj) {
                     ObjectsCompat.equals(getTargetIdentityId(), that.getTargetIdentityId()) &&
                     ObjectsCompat.equals(getContentType(), that.getContentType()) &&
                     ObjectsCompat.equals(getServerSideEncryption(), that.getServerSideEncryption()) &&
+                    ObjectsCompat.equals(getStorageClass(), that.getStorageClass()) &&
                     ObjectsCompat.equals(getMetadata(), that.getMetadata());
         }
     }
@@ -121,6 +136,7 @@ public int hashCode() {
                 getTargetIdentityId(),
                 getContentType(),
                 getServerSideEncryption(),
+                getStorageClass(),
                 getMetadata()
         );
     }
@@ -134,6 +150,7 @@ public String toString() {
                 ", targetIdentityId=" + getTargetIdentityId() +
                 ", contentType=" + getContentType() +
                 ", serverSideEncryption=" + getServerSideEncryption().getName() +
+                ", storageClass=" + getStorageClass() +
                 ", metadata=" + getMetadata() +
                 '}';
     }
@@ -145,11 +162,13 @@ public String toString() {
      */
     public static final class Builder extends StorageUploadInputStreamOptions.Builder<Builder> {
         private ServerSideEncryption serverSideEncryption;
+        private StorageClass storageClass;
         private boolean useAccelerateEndpoint;
 
         private Builder() {
             super();
             this.serverSideEncryption = ServerSideEncryption.NONE;
+            this.storageClass = StorageClass.Standard.INSTANCE;
         }
 
         /**
@@ -173,6 +192,17 @@ public Builder serverSideEncryption(@NonNull ServerSideEncryption serverSideEncr
             return this;
         }
 
+        /**
+         * Configures the storage class for a new AWSS3StorageUploadInputStreamOptions instance.
+         * @param storageClass storage class
+         * @return Current Builder instance for fluent chaining
+         */
+        @NonNull
+        public Builder storageClass(@NonNull StorageClass storageClass) {
+            this.storageClass = Objects.requireNonNull(storageClass);
+            return this;
+        }
+
         @Override
         @NonNull
         public AWSS3StorageUploadInputStreamOptions build() {

aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/request/AWSS3StoragePathUploadRequest.kt

@@ -14,6 +14,7 @@
  */
 package com.amplifyframework.storage.s3.request
 
+import aws.sdk.kotlin.services.s3.model.StorageClass
 import com.amplifyframework.storage.StoragePath
 import com.amplifyframework.storage.s3.ServerSideEncryption
 
@@ -26,6 +27,7 @@ internal data class AWSS3StoragePathUploadRequest<L>(
     val local: L,
     val contentType: String?,
     val serverSideEncryption: ServerSideEncryption,
+    val storageClass: StorageClass,
     val metadata: Map<String, String>,
     val useAccelerateEndpoint: Boolean
 )