diff options
| author | vlad <vlad@drivergrp.com> | 2016-09-09 14:37:33 -0700 |
|---|---|---|
| committer | vlad <vlad@drivergrp.com> | 2016-09-09 14:37:33 -0700 |
| commit | 968a702c359cd1de3359109edda6af5dd26fc74a (patch) | |
| tree | 0f336555fe3caad3c77855c4ae9a81cd37c29aaf /src/main/scala/com/drivergrp | |
| parent | a39ab2cb0e19f84176513d7b1e145351c3ceef8b (diff) | |
| download | driver-core-968a702c359cd1de3359109edda6af5dd26fc74a.tar.gz driver-core-968a702c359cd1de3359109edda6af5dd26fc74a.tar.bz2 driver-core-968a702c359cd1de3359109edda6af5dd26fc74a.zip | |
14 new test + Couple of bug fixes
Diffstat (limited to 'src/main/scala/com/drivergrp')
| -rw-r--r-- | src/main/scala/com/drivergrp/core/core.scala | 4 | ||||
| -rw-r--r-- | src/main/scala/com/drivergrp/core/file.scala | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/main/scala/com/drivergrp/core/core.scala b/src/main/scala/com/drivergrp/core/core.scala index f5f79df..158447f 100644 --- a/src/main/scala/com/drivergrp/core/core.scala +++ b/src/main/scala/com/drivergrp/core/core.scala @@ -28,7 +28,7 @@ package object core { def apply[Tag](value: Long) = value.asInstanceOf[Id[Tag]] } implicit def idEqual[T]: Equal[Id[T]] = Equal.equal[Id[T]](_ == _) - implicit def idOrdering[T]: Ordering[Id[T]] = Ordering.by(identity) + implicit def idOrdering[T]: Ordering[Id[T]] = Ordering.by(i => i: Long) type Name[+Tag] = String @@ Tag object Name { @@ -36,7 +36,7 @@ package object core { } implicit def nameEqual[T]: Equal[Name[T]] = Equal.equal[Name[T]](_ == _) - implicit def nameOrdering[T]: Ordering[Name[T]] = Ordering.by(identity) + implicit def nameOrdering[T]: Ordering[Name[T]] = Ordering.by(n => n: String) object revision { final case class Revision[T](id: String) diff --git a/src/main/scala/com/drivergrp/core/file.scala b/src/main/scala/com/drivergrp/core/file.scala index 2c6a990..20bd36e 100644 --- a/src/main/scala/com/drivergrp/core/file.scala +++ b/src/main/scala/com/drivergrp/core/file.scala @@ -94,9 +94,8 @@ object file { result.isTruncated } flatMap { result => result.getObjectSummaries.asScala.toList.map { summary => - val file = new File(summary.getKey) - FileLink(Name[File](file.getName), - Paths.get(file.getPath), + FileLink(Name[File](summary.getKey), + Paths.get(path.toString + "/" + summary.getKey), Revision[File](summary.getETag), Time(summary.getLastModified.getTime)) } filterNot isInSubFolder(path) |