diff options
author | Vlad Uspensky <v.uspenskiy@icloud.com> | 2017-05-24 18:15:14 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-24 18:15:14 -0700 |
commit | 98fcc358e25186b34aef82c94893b6d320c28311 (patch) | |
tree | 664bb207b6243c81bcf5703157c6717977993e7f /src/main/scala/xyz/driver/core/file/S3Storage.scala | |
parent | 6427b9dc1a60b670c70aca05f419e3fc3313cf6a (diff) | |
parent | 5d3de80a62fcf4cebec7d87cc3ef503d40c30b5a (diff) | |
download | driver-core-98fcc358e25186b34aef82c94893b6d320c28311.tar.gz driver-core-98fcc358e25186b34aef82c94893b6d320c28311.tar.bz2 driver-core-98fcc358e25186b34aef82c94893b6d320c28311.zip |
Merge pull request #35 from drivergroup/zsmith/PDW-600-query-params
PDW-600 Cached Permissions JWT
Diffstat (limited to 'src/main/scala/xyz/driver/core/file/S3Storage.scala')
-rw-r--r-- | src/main/scala/xyz/driver/core/file/S3Storage.scala | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/scala/xyz/driver/core/file/S3Storage.scala b/src/main/scala/xyz/driver/core/file/S3Storage.scala index 50bfe85..933b01a 100644 --- a/src/main/scala/xyz/driver/core/file/S3Storage.scala +++ b/src/main/scala/xyz/driver/core/file/S3Storage.scala @@ -53,11 +53,13 @@ class S3Storage(s3: AmazonS3, bucket: Name[Bucket], executionContext: ExecutionC result.isTruncated } flatMap { result => result.getObjectSummaries.asScala.toList.map { summary => - FileLink(Name[File](summary.getKey), - Paths.get(path.toString + "/" + summary.getKey), - Revision[File](summary.getETag), - Time(summary.getLastModified.getTime), - summary.getSize) + FileLink( + Name[File](summary.getKey), + Paths.get(path.toString + "/" + summary.getKey), + Revision[File](summary.getETag), + Time(summary.getLastModified.getTime), + summary.getSize + ) } filterNot isInSubFolder(path) } toList }) |