Replace JsBoolean by JsTrue/JsFalse

TheHive-Project · Nov 20, 2017 · 955bc67 · 955bc67
1 parent de922d6
commit 955bc67
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/thehive-backend/app/models/Case.scala b/thehive-backend/app/models/Case.scala
@@ -79,7 +79,7 @@ class CaseModel @Inject() (
       case Some(CaseStatus.Resolved) if !updateAttrs.keys.contains("endDate") ⇒
         updateAttrs +
           ("endDate" → Json.toJson(new Date)) +
-          ("flag" → JsBoolean(false))
+          ("flag" → JsFalse)
       case Some(CaseStatus.Open) ⇒
         updateAttrs + ("endDate" → JsArray(Nil))
       case _ ⇒

diff --git a/thehive-backend/app/models/Migration.scala b/thehive-backend/app/models/Migration.scala
@@ -33,11 +33,11 @@ class Migration(
     implicit val ec: ExecutionContext,
     implicit val materializer: Materializer) extends MigrationOperations {
   @Inject() def this(
-    configuration: Configuration,
-    dblists: DBLists,
-    eventSrv: EventSrv,
-    ec: ExecutionContext,
-    materializer: Materializer) = {
+      configuration: Configuration,
+      dblists: DBLists,
+      eventSrv: EventSrv,
+      ec: ExecutionContext,
+      materializer: Materializer) = {
     this(
       configuration.getOptional[String]("misp.caseTemplate"),
       configuration.get[String]("datastore.hash.main"),

diff --git a/thehive-backend/app/models/Task.scala b/thehive-backend/app/models/Task.scala
@@ -6,7 +6,7 @@ import javax.inject.{ Inject, Singleton }
 import scala.concurrent.Future
 
 import play.api.libs.json.JsValue.jsValueToJsLookup
-import play.api.libs.json.{ JsBoolean, JsObject }
+import play.api.libs.json.{ JsFalse, JsObject }
 
 import models.JsonFormat.taskStatusFormat
 import services.AuditedModel
@@ -43,7 +43,7 @@ class TaskModel @Inject() (caseModel: CaseModel) extends ChildModelDef[TaskModel
       case Some(TaskStatus.Completed) ⇒
         updateAttrs
           .setIfAbsent("endDate", new Date) +
-          ("flag" → JsBoolean(false))
+          ("flag" → JsFalse)
       case _ ⇒ updateAttrs
     }
   }

diff --git a/thehive-backend/app/services/TaskSrv.scala b/thehive-backend/app/services/TaskSrv.scala
@@ -5,7 +5,7 @@ import javax.inject.{ Inject, Singleton }
 import scala.concurrent.{ ExecutionContext, Future }
 import scala.util.Try
 
-import play.api.libs.json.{ JsBoolean, JsObject }
+import play.api.libs.json.{ JsFalse, JsObject }
 
 import akka.NotUsed
 import akka.stream.Materializer
@@ -64,8 +64,8 @@ class TaskSrv @Inject() (
     import org.elastic4play.services.QueryDSL._
     val filter = and(parent("case", withId(caseIds: _*)), "status" in (TaskStatus.Waiting.toString, TaskStatus.InProgress.toString))
     val range = Some("all")
-    val completeTask = Fields.empty.set("status", TaskStatus.Completed.toString).set("flag", JsBoolean(false))
-    val cancelTask = Fields.empty.set("status", TaskStatus.Cancel.toString).set("flag", JsBoolean(false))
+    val completeTask = Fields.empty.set("status", TaskStatus.Completed.toString).set("flag", JsFalse)
+    val cancelTask = Fields.empty.set("status", TaskStatus.Cancel.toString).set("flag", JsFalse)
 
     find(filter, range, Nil)
       ._1

diff --git a/thehive-cortex/app/connectors/cortex/controllers/ReportTemplateCtrl.scala b/thehive-cortex/app/connectors/cortex/controllers/ReportTemplateCtrl.scala
@@ -11,7 +11,7 @@ import akka.stream.Materializer
 import akka.stream.scaladsl.Sink
 import play.api.Logger
 import play.api.http.Status
-import play.api.libs.json.{ JsBoolean, JsObject }
+import play.api.libs.json.{ JsBoolean, JsFalse, JsObject, JsTrue }
 import play.api.mvc._
 
 import org.elastic4play.{ BadRequestError, Timed }
@@ -115,12 +115,12 @@ class ReportTemplateCtrl @Inject() (
               val reportTemplateId = analyzerId + "_" + reportType
               reportTemplateSrv.update(reportTemplateId, Fields.empty.set("content", content))
           }
-          .map(_.id → JsBoolean(true))
+          .map(_.id → JsTrue)
           .recoverWith {
             case NonFatal(e) ⇒
               logger.error(s"The import of the report template $analyzerId ($reportType) has failed", e)
               val reportTemplateId = analyzerId + "_" + reportType
-              Future.successful(reportTemplateId → JsBoolean(false))
+              Future.successful(reportTemplateId → JsFalse)
           }
     }