From b331892f87846945f69a28e9f3ee786cd4b93577 Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Thu, 2 Nov 2017 16:22:11 -0700
Subject: Using common request contexts and user objects

---
 src/main/scala/xyz/driver/pdsuicommon/error/ErrorsResponse.scala | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/main/scala/xyz/driver/pdsuicommon/error')

diff --git a/src/main/scala/xyz/driver/pdsuicommon/error/ErrorsResponse.scala b/src/main/scala/xyz/driver/pdsuicommon/error/ErrorsResponse.scala
index ccb84c2..4d6aa0b 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/error/ErrorsResponse.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/error/ErrorsResponse.scala
@@ -2,9 +2,8 @@ package xyz.driver.pdsuicommon.error
 
 import spray.json._
 import ErrorsResponse.ResponseError
-import xyz.driver.pdsuicommon.auth.RequestId
 
-final case class ErrorsResponse(errors: Seq[ResponseError], requestId: RequestId)
+final case class ErrorsResponse(errors: Seq[ResponseError], requestId: String)
 
 object ErrorsResponse {
   import DefaultJsonProtocol._
@@ -28,11 +27,11 @@ object ErrorsResponse {
     override def write(obj: ErrorsResponse): JsValue = {
       JsObject(
         "errors"    -> obj.errors.map(_.toJson).toJson,
-        "requestId" -> obj.requestId.value.toJson
+        "requestId" -> obj.requestId.toJson
       )
     }
 
-    override def read(json: JsValue) = json match {
+    override def read(json: JsValue): ErrorsResponse = json match {
       case JsObject(fields) =>
         val errors = fields
           .get("errors")
@@ -41,7 +40,7 @@ object ErrorsResponse {
 
         val requestId = fields
           .get("requestId")
-          .map(id => RequestId(id.convertTo[String]))
+          .map(id => id.convertTo[String])
           .getOrElse(deserializationError(s"ErrorsResponse json object does not contain `requestId` field: $json"))
 
         ErrorsResponse(errors, requestId)
-- 
cgit v1.2.3