diff options
author | Aleksandr <ognelisar@gmail.com> | 2017-10-20 14:56:06 +0700 |
---|---|---|
committer | Aleksandr <ognelisar@gmail.com> | 2017-10-20 14:56:06 +0700 |
commit | 0e0da76f6a8866a7c04d01a42d305aceb94c2e75 (patch) | |
tree | da1a3adc13dcb8c64891d5ef5361ce89a89d21ab /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats | |
parent | 997407855c2293264dd160e6841f342aeaccf02a (diff) | |
parent | 6d6e732368e97e319653f00e498189afceeb4671 (diff) | |
download | rest-query-0e0da76f6a8866a7c04d01a42d305aceb94c2e75.tar.gz rest-query-0e0da76f6a8866a7c04d01a42d305aceb94c2e75.tar.bz2 rest-query-0e0da76f6a8866a7c04d01a42d305aceb94c2e75.zip |
Merge branch 'master' into TRIAL-55
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/arm.scala | 2 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/listresponse.scala (renamed from src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponse.scala) | 25 |
2 files changed, 5 insertions, 22 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/arm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/arm.scala index 39af1c3..e182b4b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/arm.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/arm.scala @@ -19,7 +19,7 @@ object arm { case _ => deserializationError(s"Expected Json Object as partial Arm, but got $json") } - def armFormat: RootJsonFormat[Arm] = new RootJsonFormat[Arm] { + implicit val armFormat: RootJsonFormat[Arm] = new RootJsonFormat[Arm] { override def write(obj: Arm): JsValue = JsObject( "id" -> obj.id.toJson, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponse.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/listresponse.scala index 4afe0ee..20644dc 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponse.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/listresponse.scala @@ -1,32 +1,15 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats -import java.time.LocalDateTime - import spray.json._ import spray.json.DefaultJsonProtocol._ -import xyz.driver.pdsuicommon.db.Pagination +import xyz.driver.pdsuidomain.ListResponse import xyz.driver.pdsuidomain.formats.json.sprayformats.common._ -final case class ListResponse[+T](items: Seq[T], meta: ListResponse.Meta) - -object ListResponse { +object listresponse { private val itemsField = "items" private val metaField = "meta" - final case class Meta(itemsCount: Int, pageNumber: Int, pageSize: Int, lastUpdate: Option[LocalDateTime]) - - object Meta { - def apply(itemsCount: Int, pagination: Pagination, lastUpdate: Option[LocalDateTime]): Meta = { - Meta( - itemsCount, - pagination.pageNumber, - pagination.pageSize, - lastUpdate - ) - } - } - - implicit val listResponseMetaFormat: RootJsonFormat[Meta] = jsonFormat4(Meta.apply) + implicit val listResponseMetaFormat: RootJsonFormat[ListResponse.Meta] = jsonFormat4(ListResponse.Meta.apply) implicit def listResponseWriter[T: JsonWriter]: RootJsonWriter[ListResponse[T]] = new RootJsonWriter[ListResponse[T]] { @@ -52,7 +35,7 @@ object ListResponse { val meta = fields .get(metaField) - .map(_.convertTo[Meta]) + .map(_.convertTo[ListResponse.Meta]) .getOrElse(deserializationError(s"ListResponse json object does not contain `$metaField` field: $json")) ListResponse(items, meta) |