Fixed a part of routes, that have wrong spray json writer types

9 files changed, 14 insertions, 14 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/criterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/criterion.scala
index 8da719c..89c843f 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/criterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/criterion.scala
@@ -10,7 +10,7 @@ object criterion {
   import DefaultJsonProtocol._
   import common._
 
-  implicit val criterionLabelWriter = new JsonWriter[CriterionLabel] {
+  implicit val criterionLabelWriter = new RootJsonWriter[CriterionLabel] {
     override def write(obj: CriterionLabel) = JsObject(
       "labelId"    -> obj.labelId.toJson,
       "categoryId" -> obj.categoryId.toJson,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patient.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patient.scala
index 724c391..5cf95a5 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patient.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patient.scala
@@ -26,7 +26,7 @@ object patient {
     }
   }
 
-  implicit val patientWriter: JsonWriter[Patient] = new JsonWriter[Patient] {
+  implicit val patientWriter: JsonWriter[Patient] = new RootJsonWriter[Patient] {
     override def write(patient: Patient): JsValue =
       JsObject(
         "id"               -> patient.id.toJson,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
index 8da153d..affb346 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
@@ -37,8 +37,8 @@ object patientcriterion {
     override def read(json: JsValue) = json.convertTo[List[JsValue]].map(_.convertTo[DraftPatientCriterion])
   }
 
-  implicit val patientCriterionWriter: JsonWriter[RichPatientCriterion] =
-    new JsonWriter[RichPatientCriterion] {
+  implicit val patientCriterionWriter: RootJsonWriter[RichPatientCriterion] =
+    new RootJsonWriter[RichPatientCriterion] {
       override def write(obj: RichPatientCriterion): JsValue = {
         JsObject(
           "id"            -> obj.patientCriterion.id.toJson,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienteligibletrial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienteligibletrial.scala
index 894e453..041d9da 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienteligibletrial.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienteligibletrial.scala
@@ -21,8 +21,8 @@ object patienteligibletrial {
       case _ => deserializationError(s"Expected Json Object as partial PatientTrialArmGroupView, but got $json")
     }
 
-  implicit val patientEligibleTrialWriter: JsonWriter[RichPatientEligibleTrial] =
-    new JsonWriter[RichPatientEligibleTrial] {
+  implicit val patientEligibleTrialWriter: RootJsonWriter[RichPatientEligibleTrial] =
+    new RootJsonWriter[RichPatientEligibleTrial] {
       override def write(obj: RichPatientEligibleTrial) =
         JsObject(
           "id"                        -> obj.group.id.toJson,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienthypothesis.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienthypothesis.scala
index a85d8af..82759ab 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienthypothesis.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienthypothesis.scala
@@ -19,8 +19,8 @@ object patienthypothesis {
     case _ => deserializationError(s"Expected Json Object as partial PatientHypothesis, but got $json")
   }
 
-  implicit val patientHypothesisWriter: JsonWriter[RichPatientHypothesis] =
-    new JsonWriter[RichPatientHypothesis] {
+  implicit val patientHypothesisWriter: RootJsonWriter[RichPatientHypothesis] =
+    new RootJsonWriter[RichPatientHypothesis] {
       override def write(obj: RichPatientHypothesis): JsValue = {
         JsObject(
           "id"                  -> obj.patientHypothesis.id.toJson,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientissue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientissue.scala
index 7d35bd1..d325a53 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientissue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientissue.scala
@@ -40,7 +40,7 @@ object patientissue {
 
   }
 
-  implicit val patientIssueWriter = new JsonWriter[PatientIssue] {
+  implicit val patientIssueWriter = new RootJsonWriter[PatientIssue] {
     override def write(obj: PatientIssue) = JsObject(
       "id"              -> obj.id.toJson,
       "text"            -> obj.text.toJson,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala
index d7ff5a4..f4af376 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala
@@ -29,7 +29,7 @@ object patientlabel {
     case _ => deserializationError(s"Expected Json Object as PatientLabel, but got $json")
   }
 
-  implicit val patientLabelWriter: JsonWriter[RichPatientLabel] = new JsonWriter[RichPatientLabel] {
+  implicit val patientLabelWriter: RootJsonWriter[RichPatientLabel] = new RootJsonWriter[RichPatientLabel] {
     override def write(obj: RichPatientLabel): JsValue = {
       JsObject(
         "id"                   -> obj.patientLabel.id.toJson,
@@ -44,8 +44,8 @@ object patientlabel {
     }
   }
 
-  implicit val patientLabelEvidenceWriter: JsonWriter[PatientLabelEvidenceView] =
-    new JsonWriter[PatientLabelEvidenceView] {
+  implicit val patientLabelEvidenceWriter: RootJsonWriter[PatientLabelEvidenceView] =
+    new RootJsonWriter[PatientLabelEvidenceView] {
       override def write(evidence: PatientLabelEvidenceView): JsValue =
         JsObject(
           "id"           -> evidence.id.toJson,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala
index c1751bf..8000a27 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trial.scala
@@ -30,7 +30,7 @@ object trial {
     "Prostate" -> Condition.Prostate
   )
 
-  implicit val trialWriter: JsonWriter[Trial] = new JsonWriter[Trial] {
+  implicit val trialWriter: RootJsonWriter[Trial] = new RootJsonWriter[Trial] {
     override def write(obj: Trial) =
       JsObject(
         "id"                    -> obj.id.toJson,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trialissue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trialissue.scala
index 572f44d..d1ca191 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trialissue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/trialissue.scala
@@ -44,7 +44,7 @@ object trialissue {
 
   }
 
-  implicit val trialIssueWriter = new JsonWriter[TrialIssue] {
+  implicit val trialIssueWriter = new RootJsonWriter[TrialIssue] {
     override def write(obj: TrialIssue) = JsObject(
       "id"              -> obj.id.toJson,
       "text"            -> obj.text.toJson,