Move storage and messaging to separate projects

14 files changed, 14 insertions, 14 deletions

diff --git a/src/main/scala/xyz/driver/core/messaging/AliyunBus.scala b/core-messaging/src/main/scala/xyz/driver/core/messaging/AliyunBus.scala
index 8b7bca7..8b7bca7 100644
--- a/src/main/scala/xyz/driver/core/messaging/AliyunBus.scala
+++ b/core-messaging/src/main/scala/xyz/driver/core/messaging/AliyunBus.scala
diff --git a/src/main/scala/xyz/driver/core/messaging/Bus.scala b/core-messaging/src/main/scala/xyz/driver/core/messaging/Bus.scala
index 75954f4..75954f4 100644
--- a/src/main/scala/xyz/driver/core/messaging/Bus.scala
+++ b/core-messaging/src/main/scala/xyz/driver/core/messaging/Bus.scala
diff --git a/src/main/scala/xyz/driver/core/messaging/CreateOnDemand.scala b/core-messaging/src/main/scala/xyz/driver/core/messaging/CreateOnDemand.scala
index 1af5308..1af5308 100644
--- a/src/main/scala/xyz/driver/core/messaging/CreateOnDemand.scala
+++ b/core-messaging/src/main/scala/xyz/driver/core/messaging/CreateOnDemand.scala
diff --git a/src/main/scala/xyz/driver/core/messaging/GoogleBus.scala b/core-messaging/src/main/scala/xyz/driver/core/messaging/GoogleBus.scala
index b296c50..b296c50 100644
--- a/src/main/scala/xyz/driver/core/messaging/GoogleBus.scala
+++ b/core-messaging/src/main/scala/xyz/driver/core/messaging/GoogleBus.scala
diff --git a/src/main/scala/xyz/driver/core/messaging/QueueBus.scala b/core-messaging/src/main/scala/xyz/driver/core/messaging/QueueBus.scala
index 45c9ed5..45c9ed5 100644
--- a/src/main/scala/xyz/driver/core/messaging/QueueBus.scala
+++ b/core-messaging/src/main/scala/xyz/driver/core/messaging/QueueBus.scala
diff --git a/src/main/scala/xyz/driver/core/messaging/StreamBus.scala b/core-messaging/src/main/scala/xyz/driver/core/messaging/StreamBus.scala
index 44d75cd..44d75cd 100644
--- a/src/main/scala/xyz/driver/core/messaging/StreamBus.scala
+++ b/core-messaging/src/main/scala/xyz/driver/core/messaging/StreamBus.scala
diff --git a/src/main/scala/xyz/driver/core/messaging/Topic.scala b/core-messaging/src/main/scala/xyz/driver/core/messaging/Topic.scala
index 32fd764..32fd764 100644
--- a/src/main/scala/xyz/driver/core/messaging/Topic.scala
+++ b/core-messaging/src/main/scala/xyz/driver/core/messaging/Topic.scala
diff --git a/src/test/scala/xyz/driver/core/messaging/QueueBusTest.scala b/core-messaging/src/test/scala/xyz/driver/core/messaging/QueueBusTest.scala
index 8dd0776..8dd0776 100644
--- a/src/test/scala/xyz/driver/core/messaging/QueueBusTest.scala
+++ b/core-messaging/src/test/scala/xyz/driver/core/messaging/QueueBusTest.scala
diff --git a/src/main/scala/xyz/driver/core/storage/AliyunBlobStorage.scala b/core-storage/src/main/scala/xyz/driver/core/storage/AliyunBlobStorage.scala
index b5e8678..7e59df4 100644
--- a/src/main/scala/xyz/driver/core/storage/AliyunBlobStorage.scala
+++ b/core-storage/src/main/scala/xyz/driver/core/storage/AliyunBlobStorage.scala
@@ -3,6 +3,7 @@ package xyz.driver.core.storage
 import java.io.ByteArrayInputStream
 import java.net.URL
 import java.nio.file.Path
+import java.time.Clock
 import java.util.Date
 
 import akka.Done
@@ -11,18 +12,17 @@ import akka.util.ByteString
 import com.aliyun.oss.OSSClient
 import com.aliyun.oss.model.ObjectPermission
 import com.typesafe.config.Config
-import xyz.driver.core.time.provider.TimeProvider
 
 import scala.collection.JavaConverters._
 import scala.concurrent.duration.Duration
 import scala.concurrent.{ExecutionContext, Future}
 
 class AliyunBlobStorage(
-    client: OSSClient,
-    bucketId: String,
-    timeProvider: TimeProvider,
-    chunkSize: Int = AliyunBlobStorage.DefaultChunkSize)(implicit ec: ExecutionContext)
-    extends SignedBlobStorage {
+                         client: OSSClient,
+                         bucketId: String,
+                         clock: Clock,
+                         chunkSize: Int = AliyunBlobStorage.DefaultChunkSize)(implicit ec: ExecutionContext)
+  extends SignedBlobStorage {
   override def uploadContent(name: String, content: Array[Byte]): Future[String] = Future {
     client.putObject(bucketId, name, new ByteArrayInputStream(content))
     name
@@ -61,7 +61,7 @@ class AliyunBlobStorage(
         Future {
           client.putObject(bucketId, name, is)
           Done
-      })
+        })
   }
 
   override def delete(name: String): Future[String] = Future {
@@ -81,7 +81,7 @@ class AliyunBlobStorage(
 
   override def signedDownloadUrl(name: String, duration: Duration): Future[Option[URL]] = Future {
     if (client.doesObjectExist(bucketId, name)) {
-      val expiration = new Date(timeProvider.currentTime().advanceBy(duration).millis)
+      val expiration = new Date(clock.millis() + duration.toMillis)
       Some(client.generatePresignedUrl(bucketId, name, expiration))
     } else {
       None
@@ -92,17 +92,17 @@ class AliyunBlobStorage(
 object AliyunBlobStorage {
   val DefaultChunkSize: Int = 8192
 
-  def apply(config: Config, bucketId: String, timeProvider: TimeProvider)(
-      implicit ec: ExecutionContext): AliyunBlobStorage = {
+  def apply(config: Config, bucketId: String, clock: Clock)(
+    implicit ec: ExecutionContext): AliyunBlobStorage = {
     val clientId     = config.getString("storage.aliyun.clientId")
     val clientSecret = config.getString("storage.aliyun.clientSecret")
     val endpoint     = config.getString("storage.aliyun.endpoint")
-    this(clientId, clientSecret, endpoint, bucketId, timeProvider)
+    this(clientId, clientSecret, endpoint, bucketId, clock)
   }
 
-  def apply(clientId: String, clientSecret: String, endpoint: String, bucketId: String, timeProvider: TimeProvider)(
-      implicit ec: ExecutionContext): AliyunBlobStorage = {
+  def apply(clientId: String, clientSecret: String, endpoint: String, bucketId: String, clock: Clock)(
+    implicit ec: ExecutionContext): AliyunBlobStorage = {
     val client = new OSSClient(endpoint, clientId, clientSecret)
-    new AliyunBlobStorage(client, bucketId, timeProvider)
+    new AliyunBlobStorage(client, bucketId, clock)
   }
 }
diff --git a/src/main/scala/xyz/driver/core/storage/BlobStorage.scala b/core-storage/src/main/scala/xyz/driver/core/storage/BlobStorage.scala
index 0cde96a..0cde96a 100644
--- a/src/main/scala/xyz/driver/core/storage/BlobStorage.scala
+++ b/core-storage/src/main/scala/xyz/driver/core/storage/BlobStorage.scala
diff --git a/src/main/scala/xyz/driver/core/storage/FileSystemBlobStorage.scala b/core-storage/src/main/scala/xyz/driver/core/storage/FileSystemBlobStorage.scala
index e12c73d..e12c73d 100644
--- a/src/main/scala/xyz/driver/core/storage/FileSystemBlobStorage.scala
+++ b/core-storage/src/main/scala/xyz/driver/core/storage/FileSystemBlobStorage.scala
diff --git a/src/main/scala/xyz/driver/core/storage/GcsBlobStorage.scala b/core-storage/src/main/scala/xyz/driver/core/storage/GcsBlobStorage.scala
index 95164c7..95164c7 100644
--- a/src/main/scala/xyz/driver/core/storage/GcsBlobStorage.scala
+++ b/core-storage/src/main/scala/xyz/driver/core/storage/GcsBlobStorage.scala
diff --git a/src/main/scala/xyz/driver/core/storage/channelStreams.scala b/core-storage/src/main/scala/xyz/driver/core/storage/channelStreams.scala
index fc652be..fc652be 100644
--- a/src/main/scala/xyz/driver/core/storage/channelStreams.scala
+++ b/core-storage/src/main/scala/xyz/driver/core/storage/channelStreams.scala
diff --git a/src/test/scala/xyz/driver/core/BlobStorageTest.scala b/core-storage/src/test/scala/xyz/driver/core/BlobStorageTest.scala
index 811cc60..811cc60 100644
--- a/src/test/scala/xyz/driver/core/BlobStorageTest.scala
+++ b/core-storage/src/test/scala/xyz/driver/core/BlobStorageTest.scala