Latest PDS UI utils

2 files changed, 13 insertions, 8 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala
index dad7a1e..ec4185f 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala
@@ -26,12 +26,17 @@ object ApiExtractedData {
       (JsPath \ "keywordId").formatNullable[Long] and
       (JsPath \ "evidence").formatNullable[String] and
       (JsPath \ "meta").formatNullable[String] and
-      (JsPath \ "labels").formatNullable[List[ApiExtractedDataLabel]](Format(
-        Reads.of[List[ApiExtractedDataLabel]].filter(ValidationError("empty labels"))({
-          case x if x.nonEmpty => true
-          case _ => false
-        }), Writes.of[List[ApiExtractedDataLabel]]))
-    ) (ApiExtractedData.apply, unlift(ApiExtractedData.unapply))
+      (JsPath \ "labels").formatNullable[List[ApiExtractedDataLabel]](
+        Format(
+          Reads
+            .of[List[ApiExtractedDataLabel]]
+            .filter(ValidationError("empty labels"))({
+              case x if x.nonEmpty => true
+              case _               => false
+            }),
+          Writes.of[List[ApiExtractedDataLabel]]
+        ))
+  )(ApiExtractedData.apply, unlift(ApiExtractedData.unapply))
 
   def fromDomain(extractedDataWithLabels: RichExtractedData) = ApiExtractedData(
     id = extractedDataWithLabels.extractedData.id.id,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiPartialExtractedData.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiPartialExtractedData.scala
index 69b5627..cfd55fd 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiPartialExtractedData.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiPartialExtractedData.scala
@@ -66,7 +66,7 @@ object ApiPartialExtractedData {
       (JsPath \ "evidence").readTristate[String] and
       (JsPath \ "meta").readTristate[String] and
       (JsPath \ "labels").readTristate[List[ApiExtractedDataLabel]]
-    ) (ApiPartialExtractedData.apply _)
+  )(ApiPartialExtractedData.apply _)
 
   private val writes: Writes[ApiPartialExtractedData] = (
     (JsPath \ "documentId").writeNullable[Long] and
@@ -74,7 +74,7 @@ object ApiPartialExtractedData {
       (JsPath \ "evidence").writeTristate[String] and
       (JsPath \ "meta").writeTristate[String] and
       (JsPath \ "labels").writeTristate[List[ApiExtractedDataLabel]]
-    ) (unlift(ApiPartialExtractedData.unapply))
+  )(unlift(ApiPartialExtractedData.unapply))
 
   implicit val format: Format[ApiPartialExtractedData] = Format(reads, writes)
 }