diff options
| author | Jakob Odersky <jakob@odersky.com> | 2017-11-20 21:38:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-20 21:38:21 -0800 |
| commit | f2a56045d0b29291a18054607701d5863722121e (patch) | |
| tree | 34b5fc63cc425a27969c73354fd7a2071ea67ba3 /src/main/scala/xyz/driver/core/rest/RestService.scala | |
| parent | 8d30baada3a9c25ef61ef80511f4b4f25799f0cb (diff) | |
| parent | b872ee2649c7b56df413fbde746ee68312c17abd (diff) | |
| download | driver-core-f2a56045d0b29291a18054607701d5863722121e.tar.gz driver-core-f2a56045d0b29291a18054607701d5863722121e.tar.bz2 driver-core-f2a56045d0b29291a18054607701d5863722121e.zip | |
Merge pull request #91 from drivergroup/new-creds-and-format
New creds and format
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest/RestService.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/core/rest/RestService.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/core/rest/RestService.scala b/src/main/scala/xyz/driver/core/rest/RestService.scala index aed8d28..c1d883a 100644 --- a/src/main/scala/xyz/driver/core/rest/RestService.scala +++ b/src/main/scala/xyz/driver/core/rest/RestService.scala @@ -24,11 +24,11 @@ trait RestService extends Service { OptionT[Future, Unit](request.flatMap(_.to[String]).map(_ => Option(()))) protected def optionalResponse[T](request: Future[Unmarshal[ResponseEntity]])( - implicit um: Unmarshaller[ResponseEntity, Option[T]]): OptionT[Future, T] = + implicit um: Unmarshaller[ResponseEntity, Option[T]]): OptionT[Future, T] = OptionT[Future, T](request.flatMap(_.fold(Option.empty[T]))) protected def listResponse[T](request: Future[Unmarshal[ResponseEntity]])( - implicit um: Unmarshaller[ResponseEntity, List[T]]): ListT[Future, T] = + implicit um: Unmarshaller[ResponseEntity, List[T]]): ListT[Future, T] = ListT[Future, T](request.flatMap(_.fold(List.empty[T]))) protected def jsonEntity(json: JsValue): RequestEntity = |