lint

aws-amplify · Mar 22, 2024 · a2887b5 · a2887b5
1 parent 7d17677
commit a2887b5
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/...e-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StoragePathDownloadTest.kt b/...e-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StoragePathDownloadTest.kt
@@ -39,16 +39,15 @@ import com.amplifyframework.testutils.FileAssert
 import com.amplifyframework.testutils.random.RandomTempFile
 import com.amplifyframework.testutils.sync.SynchronousAuth
 import com.amplifyframework.testutils.sync.SynchronousStorage
+import java.io.File
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicReference
 import org.junit.After
-import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.BeforeClass
 import org.junit.Test
-import java.io.File
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicReference
 
 /**
  * Instrumentation test for operational work on download.
@@ -67,7 +66,7 @@ class AWSS3StoragePathDownloadTest {
         private val LARGE_FILE_NAME = "large-${System.currentTimeMillis()}"
         private val LARGE_FILE_PATH = StoragePath.fromString("public/$LARGE_FILE_NAME")
         private val SMALL_FILE_NAME = "small-${System.currentTimeMillis()}"
-        private val SMALL_FILE_PATH =  StoragePath.fromString("public/$SMALL_FILE_NAME")
+        private val SMALL_FILE_PATH = StoragePath.fromString("public/$SMALL_FILE_NAME")
 
         lateinit var storageCategory: StorageCategory
         lateinit var synchronousStorage: SynchronousStorage

diff --git a/aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/extensions/StoragePath.kt b/aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/extensions/StoragePath.kt
@@ -38,4 +38,4 @@ internal fun StoragePath.toS3ServiceKey(authCredentialsProvider: AuthCredentials
     }
 
     return stringPath
-}
+}
diff --git a/...ain/java/com/amplifyframework/storage/s3/operation/AWSS3StoragePathUploadFileOperation.kt b/...ain/java/com/amplifyframework/storage/s3/operation/AWSS3StoragePathUploadFileOperation.kt
@@ -49,7 +49,13 @@ internal class AWSS3StoragePathUploadFileOperation @JvmOverloads internal constr
     onProgress: Consumer<StorageTransferProgress>? = null,
     onSuccess: Consumer<StorageUploadFileResult>? = null,
     onError: Consumer<StorageException>? = null
-) : StorageUploadFileOperation<AWSS3StoragePathUploadRequest<File>>(request, transferId, onProgress, onSuccess, onError) {
+) : StorageUploadFileOperation<AWSS3StoragePathUploadRequest<File>>(
+    request,
+    transferId,
+    onProgress,
+    onSuccess,
+    onError
+) {
 
     private var serviceKey: String? = null
 

diff --git a/aws-storage-s3/src/test/java/com/amplifyframework/storage/StoragePathTest.kt b/aws-storage-s3/src/test/java/com/amplifyframework/storage/StoragePathTest.kt
@@ -22,4 +22,4 @@ class StoragePathTest {
 
         assertEquals(expectedString, path.resolvePath("123"))
     }
-}
+}
diff --git a/...va/com/amplifyframework/storage/s3/operation/AWSS3StoragePathDownloadFileOperationTest.kt b/...va/com/amplifyframework/storage/s3/operation/AWSS3StoragePathDownloadFileOperationTest.kt
@@ -85,7 +85,7 @@ class AWSS3StoragePathDownloadFileOperationTest {
     fun `success identityId storage path`() {
         // GIVEN
         coEvery { authCredentialsProvider.getIdentityId() } returns "123"
-        val path = StoragePath.fromIdentityId { "protected/${it}/picture.jpg" }
+        val path = StoragePath.fromIdentityId { "protected/$it/picture.jpg" }
         val tempFile = File.createTempFile("new", "file.tmp")
         val expectedServiceKey = "protected/123/picture.jpg"
         val request = AWSS3StoragePathDownloadFileRequest(
@@ -123,7 +123,7 @@ class AWSS3StoragePathDownloadFileOperationTest {
     fun `invalid storage path fails with invalid path`() {
         // GIVEN
         coEvery { authCredentialsProvider.getIdentityId() } returns "123"
-        val path = StoragePath.fromIdentityId { "/protected/${it}/picture.jpg" }
+        val path = StoragePath.fromIdentityId { "/protected/$it/picture.jpg" }
         val tempFile = File.createTempFile("new", "file.tmp")
         val request = AWSS3StoragePathDownloadFileRequest(
             path,
@@ -156,7 +156,7 @@ class AWSS3StoragePathDownloadFileOperationTest {
         // GIVEN
         val expectedException = Exception("test")
         coEvery { authCredentialsProvider.getIdentityId() } throws expectedException
-        val path = StoragePath.fromIdentityId { "protected/${it}/picture.jpg" }
+        val path = StoragePath.fromIdentityId { "protected/$it/picture.jpg" }
         val tempFile = File.createTempFile("new", "file.tmp")
         val request = AWSS3StoragePathDownloadFileRequest(
             path,

diff --git a/...java/com/amplifyframework/storage/s3/operation/AWSS3StoragePathUploadFileOperationTest.kt b/...java/com/amplifyframework/storage/s3/operation/AWSS3StoragePathUploadFileOperationTest.kt
@@ -90,7 +90,7 @@ class AWSS3StoragePathUploadFileOperationTest {
     fun `success identityId storage path`() {
         // GIVEN
         coEvery { authCredentialsProvider.getIdentityId() } returns "123"
-        val path = StoragePath.fromIdentityId { "protected/${it}/picture.jpg" }
+        val path = StoragePath.fromIdentityId { "protected/$it/picture.jpg" }
         val tempFile = File.createTempFile("new", "file.tmp")
         val expectedServiceKey = "protected/123/picture.jpg"
         val request = AWSS3StoragePathUploadRequest(
@@ -132,7 +132,7 @@ class AWSS3StoragePathUploadFileOperationTest {
     fun `invalid storage path fails with invalid path`() {
         // GIVEN
         coEvery { authCredentialsProvider.getIdentityId() } returns "123"
-        val path = StoragePath.fromIdentityId { "/protected/${it}/picture.jpg" }
+        val path = StoragePath.fromIdentityId { "/protected/$it/picture.jpg" }
         val tempFile = File.createTempFile("new", "file.tmp")
         val request = AWSS3StoragePathUploadRequest(
             path,
@@ -153,7 +153,6 @@ class AWSS3StoragePathUploadFileOperationTest {
             onError
         )
 
-
         // WHEN
         awsS3StorageUploadFileOperation.start()
 
@@ -169,7 +168,7 @@ class AWSS3StoragePathUploadFileOperationTest {
         // GIVEN
         val expectedException = Exception("test")
         coEvery { authCredentialsProvider.getIdentityId() } throws expectedException
-        val path = StoragePath.fromIdentityId { "protected/${it}/picture.jpg" }
+        val path = StoragePath.fromIdentityId { "protected/$it/picture.jpg" }
         val tempFile = File.createTempFile("new", "file.tmp")
         val request = AWSS3StoragePathUploadRequest(
             path,
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         return stringPath
-    }
+    }