Skip to content

Commit

Permalink
#2420 Fix parsing of analyzers without dataType list
Browse files Browse the repository at this point in the history
  • Loading branch information
To-om committed Sep 12, 2022
1 parent 099bc74 commit 6f1bdda
Showing 1 changed file with 18 additions and 19 deletions.
37 changes: 18 additions & 19 deletions cortex/dto/src/main/scala/org/thp/cortex/dto/v0/Worker.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
)
}

Expand Down

0 comments on commit 6f1bdda

Please sign in to comment.