aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2017-02-28 20:48:36 -0800
committervlad <vlad@driver.xyz>2017-02-28 20:48:36 -0800
commit3209ec811ef8f9e58eee0ec4813b4a0c3ae7fda8 (patch)
tree89657f7463e5f05a8d266a2dfe3dbd4bfc9490c8
parent6be457e455be14657fcc6619e4a1556bd9fe0eec (diff)
downloaddriver-core-3209ec811ef8f9e58eee0ec4813b4a0c3ae7fda8.tar.gz
driver-core-3209ec811ef8f9e58eee0ec4813b4a0c3ae7fda8.tar.bz2
driver-core-3209ec811ef8f9e58eee0ec4813b4a0c3ae7fda8.zip
Nice utils to implement rest services. Json format typev0.10.19
-rw-r--r--src/main/scala/xyz/driver/core/rest.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala
index c559199..28bdc67 100644
--- a/src/main/scala/xyz/driver/core/rest.scala
+++ b/src/main/scala/xyz/driver/core/rest.scala
@@ -141,7 +141,7 @@ object rest {
protected implicit val materializer: ActorMaterializer
implicit class ResponseEntityFoldable(entity: Unmarshal[ResponseEntity]) {
- def fold[T](default: => T)(implicit reader: RootJsonReader[T]) = {
+ def fold[T](default: => T)(implicit reader: RootJsonFormat[T]) = {
if (entity.value.isKnownEmpty()) {
Future.successful[T](default)
} else {
@@ -151,15 +151,15 @@ object rest {
}
protected def unitResponse(request: Future[Unmarshal[ResponseEntity]])(
- implicit reader: RootJsonReader[Option[Unit]]): OptionT[Future, Unit] =
+ implicit reader: RootJsonFormat[Option[Unit]]): OptionT[Future, Unit] =
OptionT[Future, Unit](request.flatMap(_.fold(Option.empty[Unit])))
protected def optionalResponse[T](request: Future[Unmarshal[ResponseEntity]])(
- implicit reader: RootJsonReader[Option[T]]): OptionT[Future, T] =
+ implicit reader: RootJsonFormat[Option[T]]): OptionT[Future, T] =
OptionT[Future, T](request.flatMap(_.fold(Option.empty[T])))
protected def listResponse[T](request: Future[Unmarshal[ResponseEntity]])(
- implicit reader: RootJsonReader[List[T]]): ListT[Future, T] =
+ implicit reader: RootJsonFormat[List[T]]): ListT[Future, T] =
ListT[Future, T](request.flatMap(_.fold(List.empty[T])))
protected def jsonEntity(json: JsValue): RequestEntity =