diff options
author | Aleksandr <ognelisar@gmail.com> | 2018-04-10 11:12:33 +0700 |
---|---|---|
committer | Aleksandr <ognelisar@gmail.com> | 2018-04-10 11:12:33 +0700 |
commit | d396c3b6b510c3ed77c17c64df3e58af4146b9a4 (patch) | |
tree | 3533ce548006a836e947e77aa9890d2da666c2fa /src/main/scala/xyz/driver/core/file | |
parent | 9a73fb5628f494bcae73496012f8c3baf13a26f1 (diff) | |
parent | 1f49149ba768ac86263d11cb18e7a365b0bb0210 (diff) | |
download | driver-core-d396c3b6b510c3ed77c17c64df3e58af4146b9a4.tar.gz driver-core-d396c3b6b510c3ed77c17c64df3e58af4146b9a4.tar.bz2 driver-core-d396c3b6b510c3ed77c17c64df3e58af4146b9a4.zip |
Merge branch 'master' into TM-1431
Diffstat (limited to 'src/main/scala/xyz/driver/core/file')
-rw-r--r-- | src/main/scala/xyz/driver/core/file/FileSystemStorage.scala | 1 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/file/GcsStorage.scala | 1 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/file/S3Storage.scala | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/main/scala/xyz/driver/core/file/FileSystemStorage.scala b/src/main/scala/xyz/driver/core/file/FileSystemStorage.scala index 5a0df39..ce26fe4 100644 --- a/src/main/scala/xyz/driver/core/file/FileSystemStorage.scala +++ b/src/main/scala/xyz/driver/core/file/FileSystemStorage.scala @@ -12,6 +12,7 @@ import xyz.driver.core.time.Time import scala.concurrent.{ExecutionContext, Future} import scalaz.{ListT, OptionT} +@deprecated("Consider using xyz.driver.core.storage.FileSystemBlobStorage instead", "driver-core 1.8.14") class FileSystemStorage(executionContext: ExecutionContext) extends FileStorage { implicit private val execution = executionContext diff --git a/src/main/scala/xyz/driver/core/file/GcsStorage.scala b/src/main/scala/xyz/driver/core/file/GcsStorage.scala index 0970092..5c94645 100644 --- a/src/main/scala/xyz/driver/core/file/GcsStorage.scala +++ b/src/main/scala/xyz/driver/core/file/GcsStorage.scala @@ -20,6 +20,7 @@ import scala.concurrent.duration.Duration import scala.concurrent.{ExecutionContext, Future} import scalaz.{ListT, OptionT} +@deprecated("Consider using xyz.driver.core.storage.GcsBlobStorage instead", "driver-core 1.8.14") class GcsStorage( storageClient: Storage, bucketName: Name[Bucket], diff --git a/src/main/scala/xyz/driver/core/file/S3Storage.scala b/src/main/scala/xyz/driver/core/file/S3Storage.scala index 311aab3..5158d4d 100644 --- a/src/main/scala/xyz/driver/core/file/S3Storage.scala +++ b/src/main/scala/xyz/driver/core/file/S3Storage.scala @@ -15,6 +15,11 @@ import xyz.driver.core.time.Time import scala.concurrent.{ExecutionContext, Future} import scalaz.{ListT, OptionT} +@deprecated( + "Blob storage functionality has been reimplemented in xyz.driver.core.storage.BlobStorage. " + + "It has not been ported to S3 storage. Please raise an issue if this required for your use-case.", + "driver-core 1.8.14" +) class S3Storage(s3: AmazonS3, bucket: Name[Bucket], executionContext: ExecutionContext, chunkSize: Int = 4096) extends FileStorage { implicit private val execution = executionContext |