From 6f1bddab1b0ae24e5f4676592a81135ccf6f8d4f Mon Sep 17 00:00:00 2001 From: To-om Date: Mon, 12 Sep 2022 13:57:26 +0200 Subject: [PATCH] #2420 Fix parsing of analyzers without dataType list --- .../scala/org/thp/cortex/dto/v0/Worker.scala | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Worker.scala b/cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Worker.scala index 7d83728d77..888b7e339e 100644 --- a/cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Worker.scala +++ b/cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Worker.scala @@ -14,25 +14,24 @@ case class OutputWorker( object OutputWorker { implicit val writes: Writes[OutputWorker] = Json.writes[OutputWorker] - implicit val reads: Reads[OutputWorker] = Reads[OutputWorker]( - json => - for { - id <- (json \ "id").validate[String] - name <- (json \ "name").validate[String] - version <- (json \ "version").validate[String] - description <- (json \ "description").validate[String] - dataTypeList <- (json \ "dataTypeList").validate[Seq[String]] - maxTlp = (json \ "maxTlp").asOpt[Long].getOrElse(3L) - maxPap = (json \ "maxPap").asOpt[Long].getOrElse(3L) - } yield OutputWorker( - id, - name, - version, - description, - dataTypeList, - maxTlp, - maxPap - ) + implicit val reads: Reads[OutputWorker] = Reads[OutputWorker](json => + for { + id <- (json \ "id").validate[String] + name <- (json \ "name").validate[String] + version <- (json \ "version").validate[String] + description <- (json \ "description").validate[String] + dataTypeList <- (json \ "dataTypeList").validateOpt[Seq[String]] + maxTlp = (json \ "maxTlp").asOpt[Long].getOrElse(3L) + maxPap = (json \ "maxPap").asOpt[Long].getOrElse(3L) + } yield OutputWorker( + id, + name, + version, + description, + dataTypeList.getOrElse(Nil), + maxTlp, + maxPap + ) ) }