remove joda-time runtime dependency (it's already present in test sco…

…pe and not really needed in main)
findify · Aug 28, 2016 · 003816d · 003816d
1 parent a09ab85
commit 003816d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/build.sbt b/build.sbt
@@ -12,7 +12,6 @@ libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-stream" % akkaVersion,
   "com.typesafe.akka" %% "akka-http-experimental" % akkaVersion,
   "org.scala-lang.modules" %% "scala-xml" % "1.0.5",
-  "joda-time" % "joda-time" % "2.9.4",
   "com.github.pathikrit" %% "better-files" % "2.16.0",
   "com.typesafe.scala-logging" %% "scala-logging" % "3.4.0",
   "org.scalatest" %% "scalatest" % "3.0.0" % "test",

diff --git a/src/main/scala/io/findify/s3mock/provider/FileProvider.scala b/src/main/scala/io/findify/s3mock/provider/FileProvider.scala
@@ -2,28 +2,28 @@ package io.findify.s3mock.provider
 import java.nio.charset.Charset
 import java.util.{Base64, UUID}
 
+import akka.http.scaladsl.model.DateTime
 import better.files.File
 import better.files.File.OpenOptions
 import com.typesafe.scalalogging.LazyLogging
 import io.findify.s3mock.error.{NoSuchBucketException, NoSuchKeyException}
 import io.findify.s3mock.request.{CompleteMultipartUpload, CreateBucketConfiguration}
 import io.findify.s3mock.response._
-import org.joda.time.{DateTime, LocalDateTime}
 import scala.util.Random
 
 /**
   * Created by shutty on 8/9/16.
   */
 class FileProvider(dir:String) extends Provider with LazyLogging {
   def listBuckets: ListAllMyBuckets = {
-    val buckets = File(dir).list.map(f => Bucket(f.name, new DateTime(f.lastModifiedTime.toEpochMilli))).toList
+    val buckets = File(dir).list.map(f => Bucket(f.name, DateTime(f.lastModifiedTime.toEpochMilli))).toList
     logger.debug(s"listing buckets: ${buckets.map(_.name)}")
     ListAllMyBuckets("root", UUID.randomUUID().toString, buckets)
   }
 
   def listBucket(bucket: String, prefix: String) = {
     val files = if (File(s"$dir/$bucket/$prefix").isDirectory) {
-      File(s"$dir/$bucket/$prefix").list.filterNot(_.name.startsWith(".")).map(f => Content(s"$prefix/${f.name}", new DateTime(f.lastModifiedTime.toEpochMilli), "0", f.size, "STANDARD"))
+      File(s"$dir/$bucket/$prefix").list.filterNot(_.name.startsWith(".")).map(f => Content(s"$prefix/${f.name}", DateTime(f.lastModifiedTime.toEpochMilli), "0", f.size, "STANDARD"))
     } else {
       val fullPath = prefix.split("/").filter(_.nonEmpty)
       val filter = fullPath.last
@@ -35,7 +35,7 @@ class FileProvider(dir:String) extends Provider with LazyLogging {
           .filter(_.name.startsWith(filter))
           .map(f => {
             val filePath = List(parent, f.name).filter(_.nonEmpty).mkString("/")
-            Content(filePath, new DateTime(f.lastModifiedTime.toEpochMilli), "0", f.size, "STANDARD")
+            Content(filePath, DateTime(f.lastModifiedTime.toEpochMilli), "0", f.size, "STANDARD")
           })
       else
         List()

diff --git a/src/main/scala/io/findify/s3mock/response/ListAllMyBuckets.scala b/src/main/scala/io/findify/s3mock/response/ListAllMyBuckets.scala
@@ -1,6 +1,7 @@
 package io.findify.s3mock.response
 
-import org.joda.time.DateTime
+import akka.http.scaladsl.model.DateTime
+
 
 /**
   * Created by shutty on 8/9/16.
@@ -18,7 +19,7 @@ case class ListAllMyBuckets(ownerName:String, ownerUUID:String, buckets:List[Buc
         buckets.map(bucket =>
           <Bucket>
             <Name>{bucket.name}</Name>
-            <CreationDate>{bucket.creationDate.toString}</CreationDate>
+            <CreationDate>{bucket.creationDate.toString}Z</CreationDate>
           </Bucket>)
         }
       </Buckets>

diff --git a/src/main/scala/io/findify/s3mock/response/ListBucket.scala b/src/main/scala/io/findify/s3mock/response/ListBucket.scala
@@ -1,6 +1,7 @@
 package io.findify.s3mock.response
 
-import org.joda.time.DateTime
+import akka.http.scaladsl.model.DateTime
+
 
 /**
   * Created by shutty on 8/9/16.
@@ -17,7 +18,7 @@ case class ListBucket(bucket:String, prefix:String, contents:List[Content]) {
         {contents.map(content =>
         <Contents>
           <Key>{content.key}</Key>
-          <LastModified>{content.lastModified.toString}</LastModified>
+          <LastModified>{content.lastModified.toString}Z</LastModified>
           <ETag>{content.md5}</ETag>
           <Size>{content.size}</Size>
           <StorageClass>{content.storageClass}</StorageClass>