From 9752d96ab4c76a9d130095fc2b04f60d4b64104d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 5 Aug 2019 10:04:46 +0200 Subject: [PATCH] Update zio to 1.0.0-RC11 (#148) * Update zio to 1.0.0-RC11 * Update to be compatible with ZIO-1.0.0-RC11 --- build.sbt | 2 +- .../thorp/config/ParseConfigFile.scala | 4 +-- .../kemitix/thorp/core/LocalFileStream.scala | 13 ++++--- .../net/kemitix/thorp/core/PlanBuilder.scala | 6 ++-- .../scala/net/kemitix/thorp/core/Remote.scala | 6 ++-- .../net/kemitix/thorp/core/ThorpArchive.scala | 6 ++-- .../thorp/core/UnversionedMirrorArchive.scala | 4 +-- .../kemitix/thorp/core/hasher/Hasher.scala | 34 +++++++++---------- .../thorp/core/hasher/MD5HashGenerator.scala | 6 ++-- .../thorp/core/DummyStorageService.scala | 6 ++-- .../kemitix/thorp/filesystem/FileSystem.scala | 18 +++++----- .../kemitix/thorp/storage/api/Storage.scala | 11 +++--- .../kemitix/thorp/storage/aws/Copier.scala | 2 +- .../kemitix/thorp/storage/aws/Lister.scala | 12 +++---- .../thorp/storage/aws/ListerLogger.scala | 4 +-- .../kemitix/thorp/storage/aws/S3Storage.scala | 7 ++-- .../storage/aws/hasher/ETagGenerator.scala | 4 +-- .../thorp/storage/aws/hasher/S3Hasher.scala | 10 +++--- .../aws/AmazonS3ClientTestFixture.scala | 4 +-- 19 files changed, 78 insertions(+), 81 deletions(-) diff --git a/build.sbt b/build.sbt index 6f46ceb..e9784b3 100644 --- a/build.sbt +++ b/build.sbt @@ -54,7 +54,7 @@ val awsSdkDependencies = Seq( ) val zioDependencies = Seq( libraryDependencies ++= Seq ( - "dev.zio" %% "zio" % "1.0.0-RC10-1" + "dev.zio" %% "zio" % "1.0.0-RC11" ) ) diff --git a/config/src/main/scala/net/kemitix/thorp/config/ParseConfigFile.scala b/config/src/main/scala/net/kemitix/thorp/config/ParseConfigFile.scala index 2f68094..5afdbba 100644 --- a/config/src/main/scala/net/kemitix/thorp/config/ParseConfigFile.scala +++ b/config/src/main/scala/net/kemitix/thorp/config/ParseConfigFile.scala @@ -3,7 +3,7 @@ package net.kemitix.thorp.config import java.io.File import net.kemitix.thorp.filesystem.FileSystem -import zio.{IO, TaskR, ZIO} +import zio.{IO, RIO, ZIO} trait ParseConfigFile { @@ -14,7 +14,7 @@ trait ParseConfigFile { IO.fail(List(ConfigValidation.ErrorReadingFile(file, h.getMessage)))) private def readLines(file: File)( - exists: Boolean): TaskR[FileSystem, Seq[String]] = + exists: Boolean): RIO[FileSystem, Seq[String]] = if (exists) FileSystem.lines(file) else ZIO.succeed(Seq.empty) diff --git a/core/src/main/scala/net/kemitix/thorp/core/LocalFileStream.scala b/core/src/main/scala/net/kemitix/thorp/core/LocalFileStream.scala index a7e4603..0db9baf 100644 --- a/core/src/main/scala/net/kemitix/thorp/core/LocalFileStream.scala +++ b/core/src/main/scala/net/kemitix/thorp/core/LocalFileStream.scala @@ -7,29 +7,28 @@ import net.kemitix.thorp.config.Config import net.kemitix.thorp.core.hasher.Hasher import net.kemitix.thorp.domain.Sources import net.kemitix.thorp.filesystem.FileSystem -import zio.{Task, TaskR, ZIO} +import zio.{Task, RIO, ZIO} object LocalFileStream { def findFiles( source: Path - ): TaskR[Config with FileSystem with Hasher, LocalFiles] = { + ): RIO[Config with FileSystem with Hasher, LocalFiles] = { def recurseIntoSubDirectories( - path: Path): TaskR[Config with FileSystem with Hasher, LocalFiles] = + path: Path): RIO[Config with FileSystem with Hasher, LocalFiles] = path.toFile match { case f if f.isDirectory => loop(path) case _ => localFile(path) } def recurse(paths: Stream[Path]) - : TaskR[Config with FileSystem with Hasher, LocalFiles] = + : RIO[Config with FileSystem with Hasher, LocalFiles] = for { recursed <- ZIO.foreach(paths)(path => recurseIntoSubDirectories(path)) } yield LocalFiles.reduce(recursed.toStream) - def loop( - path: Path): TaskR[Config with FileSystem with Hasher, LocalFiles] = + def loop(path: Path): RIO[Config with FileSystem with Hasher, LocalFiles] = dirPaths(path) >>= recurse loop(source) @@ -40,7 +39,7 @@ object LocalFileStream { private def includedDirPaths(paths: Stream[Path]) = for { - flaggedPaths <- TaskR.foreach(paths)(path => + flaggedPaths <- RIO.foreach(paths)(path => isIncluded(path).map((path, _))) } yield flaggedPaths.toStream diff --git a/core/src/main/scala/net/kemitix/thorp/core/PlanBuilder.scala b/core/src/main/scala/net/kemitix/thorp/core/PlanBuilder.scala index e04d54c..b08b341 100644 --- a/core/src/main/scala/net/kemitix/thorp/core/PlanBuilder.scala +++ b/core/src/main/scala/net/kemitix/thorp/core/PlanBuilder.scala @@ -7,13 +7,13 @@ import net.kemitix.thorp.core.hasher.Hasher import net.kemitix.thorp.domain._ import net.kemitix.thorp.filesystem.FileSystem import net.kemitix.thorp.storage.api.Storage -import zio.{TaskR, ZIO} +import zio.{RIO, ZIO} object PlanBuilder { def createPlan - : TaskR[Storage with Console with Config with FileSystem with Hasher, - SyncPlan] = + : RIO[Storage with Console with Config with FileSystem with Hasher, + SyncPlan] = SyncLogging.logRunStart *> buildPlan private def buildPlan = diff --git a/core/src/main/scala/net/kemitix/thorp/core/Remote.scala b/core/src/main/scala/net/kemitix/thorp/core/Remote.scala index d9a2b2a..cc840c6 100644 --- a/core/src/main/scala/net/kemitix/thorp/core/Remote.scala +++ b/core/src/main/scala/net/kemitix/thorp/core/Remote.scala @@ -4,19 +4,19 @@ import java.nio.file.Path import net.kemitix.thorp.domain.{RemoteKey, Sources} import net.kemitix.thorp.filesystem.FileSystem -import zio.{TaskR, ZIO} +import zio.{RIO, ZIO} object Remote { def isMissingLocally(sources: Sources, prefix: RemoteKey)( remoteKey: RemoteKey - ): TaskR[FileSystem, Boolean] = + ): RIO[FileSystem, Boolean] = existsLocally(sources, prefix)(remoteKey) .map(exists => !exists) def existsLocally(sources: Sources, prefix: RemoteKey)( remoteKey: RemoteKey - ): TaskR[FileSystem, Boolean] = { + ): RIO[FileSystem, Boolean] = { def existsInSource(source: Path) = RemoteKey.asFile(source, prefix)(remoteKey) match { case Some(file) => FileSystem.exists(file) diff --git a/core/src/main/scala/net/kemitix/thorp/core/ThorpArchive.scala b/core/src/main/scala/net/kemitix/thorp/core/ThorpArchive.scala index 1244f38..64d73ac 100644 --- a/core/src/main/scala/net/kemitix/thorp/core/ThorpArchive.scala +++ b/core/src/main/scala/net/kemitix/thorp/core/ThorpArchive.scala @@ -11,17 +11,17 @@ import net.kemitix.thorp.console._ import net.kemitix.thorp.domain.StorageQueueEvent import net.kemitix.thorp.domain.StorageQueueEvent._ import net.kemitix.thorp.storage.api.Storage -import zio.{TaskR, ZIO} +import zio.{RIO, ZIO} trait ThorpArchive { def update( sequencedAction: SequencedAction, totalBytesSoFar: Long - ): TaskR[Storage with Console with Config, StorageQueueEvent] + ): RIO[Storage with Console with Config, StorageQueueEvent] def logEvent( - event: StorageQueueEvent): TaskR[Console with Config, StorageQueueEvent] = + event: StorageQueueEvent): RIO[Console with Config, StorageQueueEvent] = event match { case UploadQueueEvent(remoteKey, _) => ZIO(event) <* Console.putMessageLn(UploadComplete(remoteKey)) diff --git a/core/src/main/scala/net/kemitix/thorp/core/UnversionedMirrorArchive.scala b/core/src/main/scala/net/kemitix/thorp/core/UnversionedMirrorArchive.scala index d6969ff..484617b 100644 --- a/core/src/main/scala/net/kemitix/thorp/core/UnversionedMirrorArchive.scala +++ b/core/src/main/scala/net/kemitix/thorp/core/UnversionedMirrorArchive.scala @@ -6,7 +6,7 @@ import net.kemitix.thorp.core.Action.{DoNothing, ToCopy, ToDelete, ToUpload} import net.kemitix.thorp.domain.StorageQueueEvent.DoNothingQueueEvent import net.kemitix.thorp.domain._ import net.kemitix.thorp.storage.api.Storage -import zio.{Task, TaskR} +import zio.{Task, RIO} case class UnversionedMirrorArchive(syncTotals: SyncTotals) extends ThorpArchive { @@ -14,7 +14,7 @@ case class UnversionedMirrorArchive(syncTotals: SyncTotals) override def update( sequencedAction: SequencedAction, totalBytesSoFar: Long - ): TaskR[Storage with Console with Config, StorageQueueEvent] = + ): RIO[Storage with Console with Config, StorageQueueEvent] = sequencedAction match { case SequencedAction(ToUpload(bucket, localFile, _), index) => doUpload(index, totalBytesSoFar, bucket, localFile) >>= logEvent diff --git a/core/src/main/scala/net/kemitix/thorp/core/hasher/Hasher.scala b/core/src/main/scala/net/kemitix/thorp/core/hasher/Hasher.scala index 476b328..8972a2f 100644 --- a/core/src/main/scala/net/kemitix/thorp/core/hasher/Hasher.scala +++ b/core/src/main/scala/net/kemitix/thorp/core/hasher/Hasher.scala @@ -6,7 +6,7 @@ import java.util.concurrent.atomic.AtomicReference import net.kemitix.thorp.domain.HashType.MD5 import net.kemitix.thorp.domain.{HashType, MD5Hash} import net.kemitix.thorp.filesystem.FileSystem -import zio.{TaskR, ZIO} +import zio.{RIO, ZIO} /** * Creates one, or more, hashes for local objects. @@ -17,18 +17,18 @@ trait Hasher { object Hasher { trait Service { def hashObject( - path: Path): TaskR[Hasher with FileSystem, Map[HashType, MD5Hash]] + path: Path): RIO[Hasher with FileSystem, Map[HashType, MD5Hash]] def hashObjectChunk( path: Path, chunkNumber: Long, - chunkSize: Long): TaskR[Hasher with FileSystem, Map[HashType, MD5Hash]] - def hex(in: Array[Byte]): TaskR[Hasher, String] - def digest(in: String): TaskR[Hasher, Array[Byte]] + chunkSize: Long): RIO[Hasher with FileSystem, Map[HashType, MD5Hash]] + def hex(in: Array[Byte]): RIO[Hasher, String] + def digest(in: String): RIO[Hasher, Array[Byte]] } trait Live extends Hasher { val hasher: Service = new Service { override def hashObject( - path: Path): TaskR[FileSystem, Map[HashType, MD5Hash]] = + path: Path): RIO[FileSystem, Map[HashType, MD5Hash]] = for { md5 <- MD5HashGenerator.md5File(path) } yield Map(MD5 -> md5) @@ -36,17 +36,17 @@ object Hasher { override def hashObjectChunk(path: Path, chunkNumber: Long, chunkSize: Long) - : TaskR[Hasher with FileSystem, Map[HashType, MD5Hash]] = + : RIO[Hasher with FileSystem, Map[HashType, MD5Hash]] = for { md5 <- MD5HashGenerator.md5FileChunk(path, chunkNumber * chunkSize, chunkSize) } yield Map(MD5 -> md5) - override def hex(in: Array[Byte]): TaskR[Hasher, String] = + override def hex(in: Array[Byte]): RIO[Hasher, String] = ZIO(MD5HashGenerator.hex(in)) - override def digest(in: String): TaskR[Hasher, Array[Byte]] = + override def digest(in: String): RIO[Hasher, Array[Byte]] = ZIO(MD5HashGenerator.digest(in)) } } @@ -60,37 +60,37 @@ object Hasher { new AtomicReference(Map.empty) val hasher: Service = new Service { override def hashObject( - path: Path): TaskR[Hasher with FileSystem, Map[HashType, MD5Hash]] = + path: Path): RIO[Hasher with FileSystem, Map[HashType, MD5Hash]] = ZIO(hashes.get()(path)) override def hashObjectChunk(path: Path, chunkNumber: Long, chunkSize: Long) - : TaskR[Hasher with FileSystem, Map[HashType, MD5Hash]] = + : RIO[Hasher with FileSystem, Map[HashType, MD5Hash]] = ZIO(hashChunks.get()(path)(chunkNumber)) - override def hex(in: Array[Byte]): TaskR[Hasher, String] = + override def hex(in: Array[Byte]): RIO[Hasher, String] = ZIO(MD5HashGenerator.hex(in)) - override def digest(in: String): TaskR[Hasher, Array[Byte]] = + override def digest(in: String): RIO[Hasher, Array[Byte]] = ZIO(MD5HashGenerator.digest(in)) } } object Test extends Test final def hashObject( - path: Path): TaskR[Hasher with FileSystem, Map[HashType, MD5Hash]] = + path: Path): RIO[Hasher with FileSystem, Map[HashType, MD5Hash]] = ZIO.accessM(_.hasher hashObject path) final def hashObjectChunk( path: Path, chunkNumber: Long, - chunkSize: Long): TaskR[Hasher with FileSystem, Map[HashType, MD5Hash]] = + chunkSize: Long): RIO[Hasher with FileSystem, Map[HashType, MD5Hash]] = ZIO.accessM(_.hasher hashObjectChunk (path, chunkNumber, chunkSize)) - final def hex(in: Array[Byte]): TaskR[Hasher, String] = + final def hex(in: Array[Byte]): RIO[Hasher, String] = ZIO.accessM(_.hasher hex in) - final def digest(in: String): TaskR[Hasher, Array[Byte]] = + final def digest(in: String): RIO[Hasher, Array[Byte]] = ZIO.accessM(_.hasher digest in) } diff --git a/core/src/main/scala/net/kemitix/thorp/core/hasher/MD5HashGenerator.scala b/core/src/main/scala/net/kemitix/thorp/core/hasher/MD5HashGenerator.scala index 140168a..f33b36a 100644 --- a/core/src/main/scala/net/kemitix/thorp/core/hasher/MD5HashGenerator.scala +++ b/core/src/main/scala/net/kemitix/thorp/core/hasher/MD5HashGenerator.scala @@ -6,7 +6,7 @@ import java.security.MessageDigest import net.kemitix.thorp.domain.MD5Hash import net.kemitix.thorp.filesystem.FileSystem -import zio.{Task, TaskR} +import zio.{Task, RIO} import scala.collection.immutable.NumericRange @@ -27,14 +27,14 @@ private object MD5HashGenerator { md5.digest } - def md5File(path: Path): TaskR[FileSystem, MD5Hash] = + def md5File(path: Path): RIO[FileSystem, MD5Hash] = md5FileChunk(path, 0, path.toFile.length) def md5FileChunk( path: Path, offset: Long, size: Long - ): TaskR[FileSystem, MD5Hash] = { + ): RIO[FileSystem, MD5Hash] = { val file = path.toFile val endOffset = Math.min(offset + size, file.length) for { diff --git a/core/src/test/scala/net/kemitix/thorp/core/DummyStorageService.scala b/core/src/test/scala/net/kemitix/thorp/core/DummyStorageService.scala index b82a9bf..5d863e3 100644 --- a/core/src/test/scala/net/kemitix/thorp/core/DummyStorageService.scala +++ b/core/src/test/scala/net/kemitix/thorp/core/DummyStorageService.scala @@ -5,7 +5,7 @@ import java.io.File import net.kemitix.thorp.console._ import net.kemitix.thorp.domain._ import net.kemitix.thorp.storage.api.Storage -import zio.{TaskR, UIO} +import zio.{RIO, UIO} case class DummyStorageService(s3ObjectData: S3ObjectsData, uploadFiles: Map[File, (RemoteKey, MD5Hash)]) @@ -17,8 +17,8 @@ case class DummyStorageService(s3ObjectData: S3ObjectsData, override def listObjects( bucket: Bucket, prefix: RemoteKey - ): TaskR[Console, S3ObjectsData] = - TaskR(s3ObjectData) + ): RIO[Console, S3ObjectsData] = + RIO(s3ObjectData) override def upload( localFile: LocalFile, diff --git a/filesystem/src/main/scala/net/kemitix/thorp/filesystem/FileSystem.scala b/filesystem/src/main/scala/net/kemitix/thorp/filesystem/FileSystem.scala index e43bb4b..ec61044 100644 --- a/filesystem/src/main/scala/net/kemitix/thorp/filesystem/FileSystem.scala +++ b/filesystem/src/main/scala/net/kemitix/thorp/filesystem/FileSystem.scala @@ -4,7 +4,7 @@ import java.io.{File, FileInputStream} import java.nio.file.{Files, Path} import java.util.stream -import zio.{Task, TaskR, UIO, ZIO, ZManaged} +import zio.{Task, RIO, UIO, ZIO, ZManaged} import scala.collection.JavaConverters._ @@ -17,8 +17,8 @@ object FileSystem { trait Service { def fileExists(file: File): ZIO[FileSystem, Throwable, Boolean] def openManagedFileInputStream(file: File, offset: Long = 0L) - : TaskR[FileSystem, ZManaged[Any, Throwable, FileInputStream]] - def fileLines(file: File): TaskR[FileSystem, Seq[String]] + : RIO[FileSystem, ZManaged[Any, Throwable, FileInputStream]] + def fileLines(file: File): RIO[FileSystem, Seq[String]] } trait Live extends FileSystem { override val filesystem: Service = new Service { @@ -27,7 +27,7 @@ object FileSystem { ): ZIO[FileSystem, Throwable, Boolean] = ZIO(file.exists) override def openManagedFileInputStream(file: File, offset: Long) - : TaskR[FileSystem, ZManaged[Any, Throwable, FileInputStream]] = { + : RIO[FileSystem, ZManaged[Any, Throwable, FileInputStream]] = { def acquire = Task { @@ -42,7 +42,7 @@ object FileSystem { ZIO(ZManaged.make(acquire)(release)) } - override def fileLines(file: File): TaskR[FileSystem, Seq[String]] = { + override def fileLines(file: File): RIO[FileSystem, Seq[String]] = { def acquire = ZIO(Files.lines(file.toPath)) def use(lines: stream.Stream[String]) = ZIO.effectTotal(lines.iterator.asScala.toList) @@ -63,10 +63,10 @@ object FileSystem { fileExistsResultMap.map(m => m.keys.exists(_ equals file.toPath)) override def openManagedFileInputStream(file: File, offset: Long) - : TaskR[FileSystem, ZManaged[Any, Throwable, FileInputStream]] = + : RIO[FileSystem, ZManaged[Any, Throwable, FileInputStream]] = managedFileInputStream - override def fileLines(file: File): TaskR[FileSystem, List[String]] = + override def fileLines(file: File): RIO[FileSystem, List[String]] = fileLinesResult } } @@ -75,9 +75,9 @@ object FileSystem { ZIO.accessM(_.filesystem fileExists file) final def open(file: File, offset: Long = 0) - : TaskR[FileSystem, ZManaged[FileSystem, Throwable, FileInputStream]] = + : RIO[FileSystem, ZManaged[FileSystem, Throwable, FileInputStream]] = ZIO.accessM(_.filesystem openManagedFileInputStream (file, offset)) - final def lines(file: File): TaskR[FileSystem, Seq[String]] = + final def lines(file: File): RIO[FileSystem, Seq[String]] = ZIO.accessM(_.filesystem fileLines (file)) } diff --git a/storage-api/src/main/scala/net/kemitix/thorp/storage/api/Storage.scala b/storage-api/src/main/scala/net/kemitix/thorp/storage/api/Storage.scala index fc6f15a..fc2c82c 100644 --- a/storage-api/src/main/scala/net/kemitix/thorp/storage/api/Storage.scala +++ b/storage-api/src/main/scala/net/kemitix/thorp/storage/api/Storage.scala @@ -3,7 +3,7 @@ package net.kemitix.thorp.storage.api import net.kemitix.thorp.config.Config import net.kemitix.thorp.console.Console import net.kemitix.thorp.domain._ -import zio.{Task, TaskR, UIO, ZIO} +import zio.{Task, RIO, UIO, ZIO} trait Storage { val storage: Storage.Service @@ -15,7 +15,7 @@ object Storage { def listObjects( bucket: Bucket, prefix: RemoteKey - ): TaskR[Storage with Console, S3ObjectsData] + ): RIO[Storage with Console, S3ObjectsData] def upload( localFile: LocalFile, @@ -50,7 +50,7 @@ object Storage { override def listObjects( bucket: Bucket, - prefix: RemoteKey): TaskR[Storage with Console, S3ObjectsData] = + prefix: RemoteKey): RIO[Storage with Console, S3ObjectsData] = listResult override def upload( @@ -90,9 +90,8 @@ object Storage { Task.die(new NotImplementedError) } - final def list( - bucket: Bucket, - prefix: RemoteKey): TaskR[Storage with Console, S3ObjectsData] = + final def list(bucket: Bucket, + prefix: RemoteKey): RIO[Storage with Console, S3ObjectsData] = ZIO.accessM(_.storage listObjects (bucket, prefix)) final def upload( diff --git a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/Copier.scala b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/Copier.scala index 17436f4..c8fa0c1 100644 --- a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/Copier.scala +++ b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/Copier.scala @@ -45,7 +45,7 @@ trait Copier { private def foldFailure( sourceKey: RemoteKey, - targetKey: RemoteKey): S3ClientException => StorageQueueEvent = { + targetKey: RemoteKey): Throwable => StorageQueueEvent = { case error: SdkClientException => errorEvent(sourceKey, targetKey, error) case error => diff --git a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/Lister.scala b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/Lister.scala index 6bca9df..4c31a4e 100644 --- a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/Lister.scala +++ b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/Lister.scala @@ -9,7 +9,7 @@ import net.kemitix.thorp.console._ import net.kemitix.thorp.domain.{Bucket, RemoteKey, S3ObjectsData} import net.kemitix.thorp.storage.aws.S3ObjectsByHash.byHash import net.kemitix.thorp.storage.aws.S3ObjectsByKey.byKey -import zio.{Task, TaskR} +import zio.{Task, RIO} import scala.collection.JavaConverters._ @@ -21,7 +21,7 @@ trait Lister { def listObjects(amazonS3: AmazonS3.Client)( bucket: Bucket, prefix: RemoteKey - ): TaskR[Console, S3ObjectsData] = { + ): RIO[Console, S3ObjectsData] = { def request = new ListObjectsV2Request() @@ -31,15 +31,15 @@ trait Lister { def requestMore: Token => ListObjectsV2Request = token => request.withContinuationToken(token) - def fetchBatch: ListObjectsV2Request => TaskR[Console, Batch] = + def fetchBatch: ListObjectsV2Request => RIO[Console, Batch] = request => ListerLogger.logFetchBatch *> tryFetchBatch(amazonS3)(request) - def fetchMore: Option[Token] => TaskR[Console, Stream[S3ObjectSummary]] = { - case None => TaskR.succeed(Stream.empty) + def fetchMore: Option[Token] => RIO[Console, Stream[S3ObjectSummary]] = { + case None => RIO.succeed(Stream.empty) case Some(token) => fetch(requestMore(token)) } - def fetch: ListObjectsV2Request => TaskR[Console, Stream[S3ObjectSummary]] = + def fetch: ListObjectsV2Request => RIO[Console, Stream[S3ObjectSummary]] = request => for { batch <- fetchBatch(request) diff --git a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/ListerLogger.scala b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/ListerLogger.scala index d9f70da..2bb6591 100644 --- a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/ListerLogger.scala +++ b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/ListerLogger.scala @@ -1,10 +1,10 @@ package net.kemitix.thorp.storage.aws import net.kemitix.thorp.console._ -import zio.TaskR +import zio.RIO trait ListerLogger { - def logFetchBatch: TaskR[Console, Unit] = + def logFetchBatch: RIO[Console, Unit] = Console.putStrLn("Fetching remote summaries...") } object ListerLogger extends ListerLogger diff --git a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/S3Storage.scala b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/S3Storage.scala index 8e7aaa2..eedfc68 100644 --- a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/S3Storage.scala +++ b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/S3Storage.scala @@ -8,7 +8,7 @@ import net.kemitix.thorp.domain.StorageQueueEvent.ShutdownQueueEvent import net.kemitix.thorp.domain._ import net.kemitix.thorp.storage.api.Storage import net.kemitix.thorp.storage.api.Storage.Service -import zio.{TaskR, UIO, ZIO} +import zio.{RIO, UIO, ZIO} object S3Storage { trait Live extends Storage { @@ -19,9 +19,8 @@ object S3Storage { private val transferManager: AmazonTransferManager = AmazonTransferManager(TransferManagerBuilder.defaultTransferManager) - override def listObjects( - bucket: Bucket, - prefix: RemoteKey): TaskR[Console, S3ObjectsData] = + override def listObjects(bucket: Bucket, + prefix: RemoteKey): RIO[Console, S3ObjectsData] = Lister.listObjects(client)(bucket, prefix) override def upload( diff --git a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/hasher/ETagGenerator.scala b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/hasher/ETagGenerator.scala index b3f9265..a7d218d 100644 --- a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/hasher/ETagGenerator.scala +++ b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/hasher/ETagGenerator.scala @@ -9,13 +9,13 @@ import net.kemitix.thorp.core.hasher.Hasher import net.kemitix.thorp.domain.HashType.MD5 import net.kemitix.thorp.domain.MD5Hash import net.kemitix.thorp.filesystem.FileSystem -import zio.{TaskR, ZIO} +import zio.{RIO, ZIO} private trait ETagGenerator { def eTag( path: Path - ): TaskR[Hasher with FileSystem, String] = { + ): RIO[Hasher with FileSystem, String] = { val partSize = calculatePartSize(path) val parts = numParts(path.toFile.length, partSize) eTagHex(path, partSize, parts) diff --git a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/hasher/S3Hasher.scala b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/hasher/S3Hasher.scala index 7cca3fe..9add325 100644 --- a/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/hasher/S3Hasher.scala +++ b/storage-aws/src/main/scala/net/kemitix/thorp/storage/aws/hasher/S3Hasher.scala @@ -8,7 +8,7 @@ import net.kemitix.thorp.core.hasher.Hasher.Service import net.kemitix.thorp.domain.{HashType, MD5Hash} import net.kemitix.thorp.filesystem.FileSystem import net.kemitix.thorp.storage.aws.ETag -import zio.TaskR +import zio.RIO object S3Hasher { @@ -22,7 +22,7 @@ object S3Hasher { * @return a set of hash values */ override def hashObject( - path: Path): TaskR[Hasher with FileSystem, Map[HashType, MD5Hash]] = + path: Path): RIO[Hasher with FileSystem, Map[HashType, MD5Hash]] = for { base <- CoreHasher.hashObject(path) etag <- ETagGenerator.eTag(path).map(MD5Hash(_)) @@ -31,13 +31,13 @@ object S3Hasher { override def hashObjectChunk(path: Path, chunkNumber: Long, chunkSize: Long) - : TaskR[Hasher with FileSystem, Map[HashType, MD5Hash]] = + : RIO[Hasher with FileSystem, Map[HashType, MD5Hash]] = CoreHasher.hashObjectChunk(path, chunkNumber, chunkSize) - override def hex(in: Array[Byte]): TaskR[Hasher, String] = + override def hex(in: Array[Byte]): RIO[Hasher, String] = CoreHasher.hex(in) - override def digest(in: String): TaskR[Hasher, Array[Byte]] = + override def digest(in: String): RIO[Hasher, Array[Byte]] = CoreHasher.digest(in) } diff --git a/storage-aws/src/test/scala/net/kemitix/thorp/storage/aws/AmazonS3ClientTestFixture.scala b/storage-aws/src/test/scala/net/kemitix/thorp/storage/aws/AmazonS3ClientTestFixture.scala index 5f65a50..5dc2b80 100644 --- a/storage-aws/src/test/scala/net/kemitix/thorp/storage/aws/AmazonS3ClientTestFixture.scala +++ b/storage-aws/src/test/scala/net/kemitix/thorp/storage/aws/AmazonS3ClientTestFixture.scala @@ -6,7 +6,7 @@ import net.kemitix.thorp.domain.StorageQueueEvent.ShutdownQueueEvent import net.kemitix.thorp.domain._ import net.kemitix.thorp.storage.api.Storage import org.scalamock.scalatest.MockFactory -import zio.{TaskR, UIO, ZIO} +import zio.{RIO, UIO, ZIO} trait AmazonS3ClientTestFixture extends MockFactory { @@ -26,7 +26,7 @@ trait AmazonS3ClientTestFixture extends MockFactory { override def listObjects( bucket: Bucket, prefix: RemoteKey - ): TaskR[Console, S3ObjectsData] = + ): RIO[Console, S3ObjectsData] = Lister.listObjects(client)(bucket, prefix) override def upload(