From 6a925b07d0ffb084cb07051ed334ce17defab128 Mon Sep 17 00:00:00 2001 From: Aleksandr Date: Thu, 12 Oct 2017 16:49:49 +0700 Subject: Code is formatted --- .../formats/json/sprayformats/eligibilityarm.scala | 35 +++++++++------------- 1 file changed, 14 insertions(+), 21 deletions(-) (limited to 'src/main/scala/xyz/driver') diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibilityarm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibilityarm.scala index 4b72096..039e088 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibilityarm.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibilityarm.scala @@ -19,21 +19,19 @@ object eligibilityarm { deserializationError(s"Expected Json Object as $className, but got $json") } - implicit def eligibilityArmWithDiseasesWriter: RootJsonWriter[EligibilityArmWithDiseases] = new RootJsonWriter[EligibilityArmWithDiseases] { override def write(obj: EligibilityArmWithDiseases): JsValue = { JsObject( - "id" -> obj.eligibilityArm.id.toJson, - "name" -> obj.eligibilityArm.name.toJson, + "id" -> obj.eligibilityArm.id.toJson, + "name" -> obj.eligibilityArm.name.toJson, "originalName" -> obj.eligibilityArm.originalName.toJson, - "trialId" -> obj.eligibilityArm.trialId.toJson, - "diseases" -> obj.eligibilityArmDiseases.map(_.disease.toJson).toJson + "trialId" -> obj.eligibilityArm.trialId.toJson, + "diseases" -> obj.eligibilityArmDiseases.map(_.disease.toJson).toJson ) } } - implicit def eligibilityArmWithDiseasesReader: RootJsonReader[EligibilityArmWithDiseases] = { new RootJsonReader[EligibilityArmWithDiseases] { implicit val className: String = "create EligibilityArmWithDiseases" @@ -56,8 +54,6 @@ object eligibilityarm { .map(_.convertTo[Seq[String]]) .getOrElse(deserializationErrorFieldMessage("diseases", json)) - - val eligibilityArm = EligibilityArm( id = LongId(0), name = name, @@ -80,7 +76,8 @@ object eligibilityarm { } } - def applyUpdateToEligibilityArmWithDiseases(json: JsValue, orig: EligibilityArmWithDiseases): EligibilityArmWithDiseases = { + def applyUpdateToEligibilityArmWithDiseases(json: JsValue, + orig: EligibilityArmWithDiseases): EligibilityArmWithDiseases = { implicit val className: String = "update EligibilityArmWithDiseases" json match { case JsObject(fields) => @@ -95,18 +92,14 @@ object eligibilityarm { .getOrElse(orig.eligibilityArmDiseases.map(_.disease)) orig.copy( - eligibilityArm = - orig - .eligibilityArm - .copy(name = name), - eligibilityArmDiseases = - orig - .eligibilityArmDiseases - .zip(diseases) - .map { - case (eligibilityArmDisease, disease) => - eligibilityArmDisease.copy(disease = disease) - } + eligibilityArm = orig.eligibilityArm + .copy(name = name), + eligibilityArmDiseases = orig.eligibilityArmDiseases + .zip(diseases) + .map { + case (eligibilityArmDisease, disease) => + eligibilityArmDisease.copy(disease = disease) + } ) case _ => deserializationErrorEntityMessage(json) -- cgit v1.2.3