#1501 Mapping macro cleanup

migration/src/main/scala/org/thp/thehive/migration/th3/DBGet.scala

@@ -19,19 +19,18 @@ class DBGet @Inject() (db: DBConfiguration, implicit val ec: ExecutionContext) {
     */
   def apply(modelName: String, id: String): Future[JsObject] =
     db.execute {
-        // Search by id is not possible on child entity without routing information ⇒ id query
-        search(db.indexName)
-          .query(idsQuery(id) /*.types(modelName)*/ )
-          .size(1)
-          .version(true)
-      }
-      .map { searchResponse =>
-        searchResponse
-          .hits
-          .hits
-          .headOption
-          .fold[JsObject](throw NotFoundError(s"$modelName $id not found")) { hit =>
-            DBUtils.hit2json(hit)
-          }
-      }
+      // Search by id is not possible on child entity without routing information => id query
+      search(db.indexName)
+        .query(idsQuery(id) /*.types(modelName)*/ )
+        .size(1)
+        .version(true)
+    }.map { searchResponse =>
+      searchResponse
+        .hits
+        .hits
+        .headOption
+        .fold[JsObject](throw NotFoundError(s"$modelName $id not found")) { hit =>
+          DBUtils.hit2json(hit)
+        }
+    }
 }

thehive/app/org/thp/thehive/controllers/v0/Router.scala

@@ -75,7 +75,7 @@ class Router @Inject() (
     //    case GET(p"/case/task/log/$logId") => logCtrl.get(logId)
 
     case POST(p"/case/artifact/_search") => observableCtrl.search
-    //    case POST(p"/case/:caseId/artifact/_search")    ⇒ observableCtrl.findInCase(caseId)
+    //    case POST(p"/case/:caseId/artifact/_search")    => observableCtrl.findInCase(caseId)
     case POST(p"/case/artifact/_stats")               => observableCtrl.stats
     case POST(p"/case/$caseId/artifact")              => observableCtrl.create(caseId)       // Audit ok
     case GET(p"/case/artifact/$observableId")         => observableCtrl.get(observableId)

thehive/app/org/thp/thehive/controllers/v1/Conversion.scala

@@ -48,13 +48,13 @@ object Conversion {
       .withFieldComputed(_._createdAt, _._createdAt)
       .withFieldComputed(_._createdBy, _._createdBy)
       .withFieldComputed(_.obj, a => a.`object`.map(OutputEntity.apply))
-      //        .withFieldComputed(_.obj, a ⇒ OutputEntity(a.obj))
+      //        .withFieldComputed(_.obj, a => OutputEntity(a.obj))
       //        .withFieldComputed(
       //          _.summary,
       //          _.summary.mapValues(
-      //            opCount ⇒
+      //            opCount =>
       //              opCount.map {
-      //                case (op, count) ⇒ op.toString → count
+      //                case (op, count) => op.toString → count
       //              }
       //          )
       .withFieldConst(_.attributeName, None) // FIXME

thehive/app/org/thp/thehive/controllers/v1/Router.scala

@@ -36,16 +36,16 @@ class Router @Inject() (
     case PATCH(p"/case/$caseId")        => caseCtrl.update(caseId)
     case POST(p"/case/_merge/$caseIds") => caseCtrl.merge(caseIds)
     case DELETE(p"/case/$caseId")       => caseCtrl.delete(caseId)
-//    case PATCH(p"api/case/_bulk") ⇒                          caseCtrl.bulkUpdate()
-//    case POST(p"/case/_stats") ⇒                        caseCtrl.stats()
-//    case DELETE(p"/case/$caseId/force") ⇒                  caseCtrl.realDelete(caseId)
-//    case GET(p"/case/$caseId/links") ⇒                  caseCtrl.linkedCases(caseId)
+//    case PATCH(p"api/case/_bulk") =>                          caseCtrl.bulkUpdate()
+//    case POST(p"/case/_stats") =>                        caseCtrl.stats()
+//    case DELETE(p"/case/$caseId/force") =>                  caseCtrl.realDelete(caseId)
+//    case GET(p"/case/$caseId/links") =>                  caseCtrl.linkedCases(caseId)
 
     case GET(p"/caseTemplate")                   => caseTemplateCtrl.list
     case POST(p"/caseTemplate")                  => caseTemplateCtrl.create
     case GET(p"/caseTemplate/$caseTemplateId")   => caseTemplateCtrl.get(caseTemplateId)
     case PATCH(p"/caseTemplate/$caseTemplateId") => caseTemplateCtrl.update(caseTemplateId)
-    //case DELETE(p"/caseTemplate/$caseTemplateId") ⇒ caseTemplateCtrl.delete(caseTemplateId)
+    //case DELETE(p"/caseTemplate/$caseTemplateId") => caseTemplateCtrl.delete(caseTemplateId)
 
     case POST(p"/user")                                                   => userCtrl.create
     case GET(p"/user/current")                                            => userCtrl.current
@@ -64,10 +64,10 @@ class Router @Inject() (
     case GET(p"/organisation/$organisationId")   => organisationCtrl.get(organisationId)
     case PATCH(p"/organisation/$organisationId") => organisationCtrl.update(organisationId)
 
-//    case GET(p"/share")            ⇒ shareCtrl.list
-//    case POST(p"/share")           ⇒ shareCtrl.create
-//    case GET(p"/share/$shareId")   ⇒ shareCtrl.get(shareId)
-//    case PATCH(p"/share/$shareId") ⇒ shareCtrl.update(shareId)
+//    case GET(p"/share")            => shareCtrl.list
+//    case POST(p"/share")           => shareCtrl.create
+//    case GET(p"/share/$shareId")   => shareCtrl.get(shareId)
+//    case PATCH(p"/share/$shareId") => shareCtrl.update(shareId)
 
     case GET(p"/task")           => taskCtrl.list
     case POST(p"/task")          => taskCtrl.create

thehive/app/org/thp/thehive/services/CaseSrv.scala

@@ -310,8 +310,8 @@ class CaseSrv @Inject() (
 //      .flatMap(_.customFields().toList
 //      .groupBy(_.name)
 //      .foreach {
-//        case (name, l) ⇒
-//          val values = l.collect { case cfwv: CustomFieldWithValue if cfwv.value.isDefined ⇒ cfwv.value.get }
+//        case (name, l) =>
+//          val values = l.collect { case cfwv: CustomFieldWithValue if cfwv.value.isDefined => cfwv.value.get }
 //          val cf     = customFieldSrv.getOrFail(name)
 //          val caseCustomField =
 //            if (values.size == 1) cf.`type`.setValue(CaseCustomField(), values.head)
@@ -324,12 +324,12 @@ class CaseSrv @Inject() (
 //    cases
 //      .map(get)
 //      .flatMap(_.tasks.toList
-//      .foreach(task ⇒ caseTaskSrv.create(CaseTask(), task, mergedCase))
+//      .foreach(task => caseTaskSrv.create(CaseTask(), task, mergedCase))
 //
 //    cases
 //      .map(get)
 //      .flatMap(_.observables.toList
-//      .foreach(observable ⇒ observableCaseSrv.create(ObservableCase(), observable, mergedCase))
+//      .foreach(observable => observableCaseSrv.create(ObservableCase(), observable, mergedCase))
 //
 //    get(mergedCase).richCase.head
 //  }

thehive/test/org/thp/thehive/services/CaseSrvTest.scala

@@ -143,7 +143,7 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
     "merge two cases" in testApp { app =>
       pending
     //      app[Database].transaction { implicit graph =>
-    //        Seq("#2", "#3").toTry(app[CaseSrv].getOrFail) must beSuccessfulTry.which { cases: Seq[Case with Entity] ⇒
+    //        Seq("#2", "#3").toTry(app[CaseSrv].getOrFail) must beSuccessfulTry.which { cases: Seq[Case with Entity] =>
     //          val mergedCase = app[CaseSrv].merge(cases)(graph, dummyUserSrv.getSystemAuthContext)
     //
     //          mergedCase.title must_=== "case#2 / case#3"
@@ -159,7 +159,7 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder {
     //          mergedCase.summary must beNone
     //          mergedCase.impactStatus must beNone
     //          mergedCase.user must beSome("test")
-    //          mergedCase.customFields.map(f ⇒ (f.name, f.typeName, f.value)) must contain(
+    //          mergedCase.customFields.map(f => (f.name, f.typeName, f.value)) must contain(
     //            allOf[(String, String, Option[Any])](
     //              ("boolean1", "boolean", Some(true)),
     //              ("string1", "string", Some("string1 custom field"))