APIS-4689 - Tidied up Json formatting for Validation

hmrc · Mar 31, 2020 · 331344c · 331344c
1 parent 25cd1e8
commit 331344c
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/app/uk/gov/hmrc/apisubscriptionfields/model/JsonFormatters.scala b/app/uk/gov/hmrc/apisubscriptionfields/model/JsonFormatters.scala
@@ -59,17 +59,11 @@ trait JsonFormatters extends SharedJsonFormatters {
       Format(reads, writes)
   }
 
-
   implicit val validationRuleFormat: OFormat[ValidationRule] = derived.withTypeTag.oformat(TypeTagSetting.ShortClassName)
 
   implicit val nelValidationRuleFormat: Format[NEL[ValidationRule]] = NonEmptyListOps.format[ValidationRule]
 
-  val validationReads: Reads[Validation] = (
-    (JsPath \ "errorMessage").read[String] and
-      (JsPath \ "rules").read[NEL[ValidationRule]]
-  )(Validation.apply _)
-  val validationWrites = Json.writes[Validation]
-  implicit val ValidationJF = Format(validationReads, validationWrites)
+  implicit val ValidationJF = Json.format[Validation]
 
   implicit val FieldDefinitionTypeReads = Reads.enumNameReads(FieldDefinitionType)
   val fieldDefinitionReads: Reads[FieldDefinition] = (