From be9fc12bc033341b3e13e9908ad8c246fcd0783f Mon Sep 17 00:00:00 2001 From: Robin Riclet Date: Wed, 3 Mar 2021 11:38:35 +0100 Subject: [PATCH] #1264 Fixed procedure rendering --- .../thp/thehive/controllers/v1/ProcedureRenderer.scala | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/thehive/app/org/thp/thehive/controllers/v1/ProcedureRenderer.scala b/thehive/app/org/thp/thehive/controllers/v1/ProcedureRenderer.scala index 41758ac6f9..80237ffa27 100644 --- a/thehive/app/org/thp/thehive/controllers/v1/ProcedureRenderer.scala +++ b/thehive/app/org/thp/thehive/controllers/v1/ProcedureRenderer.scala @@ -1,20 +1,21 @@ package org.thp.thehive.controllers.v1 +import org.thp.scalligraph.traversal.TraversalOps.TraversalOpsDefs import org.thp.scalligraph.traversal.{Converter, Traversal} import org.thp.thehive.controllers.v1.Conversion._ import org.thp.thehive.models.Procedure import org.thp.thehive.services.PatternOps._ import org.thp.thehive.services.ProcedureOps._ -import play.api.libs.json.JsValue +import play.api.libs.json.{JsNull, JsValue} -import java.util.{Map => JMap} +import java.util.{List => JList, Map => JMap} trait ProcedureRenderer extends BaseRenderer[Procedure] { def patternStats: Traversal.V[Procedure] => Traversal[JsValue, JMap[String, Any], Converter[JsValue, JMap[String, Any]]] = _.pattern.richPattern.domainMap(_.toJson) - def patternParentStats: Traversal.V[Procedure] => Traversal[JsValue, JMap[String, Any], Converter[JsValue, JMap[String, Any]]] = - _.pattern.parent.richPattern.domainMap(_.toJson) + def patternParentStats: Traversal.V[Procedure] => Traversal[JsValue, JList[JMap[String, Any]], Converter[JsValue, JList[JMap[String, Any]]]] = + _.pattern.parent.richPattern.fold.domainMap(_.headOption.fold[JsValue](JsNull)(_.toJson)) def procedureStatsRenderer(extraData: Set[String]): Traversal.V[Procedure] => JsTraversal = { implicit traversal => baseRenderer(