Skip to content

Commit b862f87

Browse files
author
To-om
committed
#28 Format code using scalariform
1 parent 27fc76e commit b862f87

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1109
-1069
lines changed

‎build.sbt

+2-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ import com.typesafe.sbt.SbtScalariform.ScalariformKeys
115115

116116
SbtScalariform.defaultScalariformSettings
117117

118-
ScalariformKeys.preferences := ScalariformKeys.preferences.value
118+
ScalariformKeys.preferences in ThisBuild := ScalariformKeys.preferences.value
119119
.setPreference(AlignParameters, false)
120120
// .setPreference(FirstParameterOnNewline, Force)
121121
.setPreference(AlignArguments, true)
@@ -136,6 +136,7 @@ ScalariformKeys.preferences := ScalariformKeys.preferences.value
136136
.setPreference(PlaceScaladocAsterisksBeneathSecondAsterisk, false)
137137
.setPreference(PreserveSpaceBeforeArguments, false)
138138
// .setPreference(PreserveDanglingCloseParenthesis, false)
139+
.setPreference(DanglingCloseParenthesis, Prevent)
139140
.setPreference(RewriteArrowSymbols, true)
140141
.setPreference(SpaceBeforeColon, false)
141142
// .setPreference(SpaceBeforeContextColon, false)

‎thehive-backend/app/connectors/Connectors.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ trait Connector {
1919

2020
class ConnectorRouter @Inject() (connectors: immutable.Set[Connector]) extends SimpleRouter {
2121
def routes = {
22-
case request @ p"/$connector/$path<.*>" =>
22+
case request @ p"/$connector/$path<.*>" ⇒
2323
connectors
2424
.find(_.name == connector)
2525
.flatMap(_.router.withPrefix(s"/$connector/").handlerFor(request))
26-
.getOrElse(Action { _ => Results.NotFound(s"connector $connector not found") })
26+
.getOrElse(Action { _ ⇒ Results.NotFound(s"connector $connector not found") })
2727
}
2828
}
2929

‎thehive-backend/app/controllers/Analyzer.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ class AnalyzerCtrl @Inject() (
2525
implicit val ec: ExecutionContext) extends Controller with Status {
2626

2727
@Timed
28-
def get(id: String) = authenticated(Role.read).async { implicit request =>
28+
def get(id: String) = authenticated(Role.read).async { implicit request ⇒
2929
analyzerSrv.get(id.replaceAll("\\.", "_")) // FIXME replace "." by "_" should not be usefull after migration
30-
.map(analyzer => renderer.toOutput(OK, analyzer))
30+
.map(analyzer ⇒ renderer.toOutput(OK, analyzer))
3131
}
3232

3333
@Timed
34-
def find = authenticated(Role.read).async(fieldsBodyParser) { implicit request =>
34+
def find = authenticated(Role.read).async(fieldsBodyParser) { implicit request ⇒
3535
val query = request.body.getValue("query").fold[QueryDef](QueryDSL.any)(_.as[QueryDef])
3636
val range = request.body.getString("range")
3737
val sort = request.body.getStrings("sort").getOrElse(Nil)
@@ -44,8 +44,8 @@ class AnalyzerCtrl @Inject() (
4444
}
4545

4646
@Timed
47-
def getReport(analyzerId: String, flavor: String) = authenticated(Role.read).async { request =>
47+
def getReport(analyzerId: String, flavor: String) = authenticated(Role.read).async { request ⇒
4848
analyzerSrv.getReport(analyzerId.replaceAll("\\.", "_"), flavor) // FIXME replace "." by "_" should not be usefull after migration
49-
.map { reportTemplate => Ok(reportTemplate) }
49+
.map { reportTemplate ⇒ Ok(reportTemplate) }
5050
}
5151
}

‎thehive-backend/app/controllers/Artifact.scala

+25-23
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ArtifactCtrl @Inject() (
3030
implicit val ec: ExecutionContext) extends Controller with Status {
3131

3232
@Timed
33-
def create(caseId: String) = authenticated(Role.write).async(fieldsBodyParser) { implicit request =>
33+
def create(caseId: String) = authenticated(Role.write).async(fieldsBodyParser) { implicit request ⇒
3434
val fields = request.body
3535
val data = fields.getStrings("data")
3636
.getOrElse(fields.getString("data").toSeq)
@@ -39,46 +39,48 @@ class ArtifactCtrl @Inject() (
3939
// if data is not multivalued, use simple API (not bulk API)
4040
if (data.isEmpty) {
4141
artifactSrv.create(caseId, fields)
42-
.map(artifact => renderer.toOutput(CREATED, artifact))
43-
} else if (data.length == 1) {
42+
.map(artifact ⇒ renderer.toOutput(CREATED, artifact))
43+
}
44+
else if (data.length == 1) {
4445
artifactSrv.create(caseId, fields.set("data", data.head))
45-
.map(artifact => renderer.toOutput(CREATED, artifact))
46-
} else {
46+
.map(artifact ⇒ renderer.toOutput(CREATED, artifact))
47+
}
48+
else {
4749
val multiFields = data.map(fields.set("data", _))
4850
artifactSrv.create(caseId, multiFields)
49-
.map(multiResult => renderer.toMultiOutput(CREATED, multiResult))
51+
.map(multiResult ⇒ renderer.toMultiOutput(CREATED, multiResult))
5052
}
5153
}
5254

5355
@Timed
54-
def get(id: String) = authenticated(Role.read).async(fieldsBodyParser) { implicit request =>
56+
def get(id: String) = authenticated(Role.read).async(fieldsBodyParser) { implicit request ⇒
5557
for {
56-
artifact <- artifactSrv.get(id, request.body.getStrings("fields").map("dataType" +: _))
57-
analyzers <- analyzerSrv.availableFor(artifact.dataType()).map(multiResult => Json.toJson(multiResult))
58-
} yield renderer.toOutput(OK, Json.obj("artifact" -> artifact, "analyzers" -> analyzers))
58+
artifact ← artifactSrv.get(id, request.body.getStrings("fields").map("dataType" +: _))
59+
analyzers ← analyzerSrv.availableFor(artifact.dataType()).map(multiResult ⇒ Json.toJson(multiResult))
60+
} yield renderer.toOutput(OK, Json.obj("artifact" → artifact, "analyzers" → analyzers))
5961
}
6062

6163
@Timed
62-
def update(id: String) = authenticated(Role.write).async(fieldsBodyParser) { implicit request =>
64+
def update(id: String) = authenticated(Role.write).async(fieldsBodyParser) { implicit request ⇒
6365
artifactSrv.update(id, request.body)
64-
.map(artifact => renderer.toOutput(OK, artifact))
66+
.map(artifact ⇒ renderer.toOutput(OK, artifact))
6567
}
6668

6769
@Timed
68-
def bulkUpdate() = authenticated(Role.write).async(fieldsBodyParser) { implicit request =>
69-
request.body.getStrings("ids").fold(Future.successful(Ok(JsArray()))) { ids =>
70-
artifactSrv.bulkUpdate(ids, request.body.unset("ids")).map(multiResult => renderer.toMultiOutput(OK, multiResult))
70+
def bulkUpdate() = authenticated(Role.write).async(fieldsBodyParser) { implicit request ⇒
71+
request.body.getStrings("ids").fold(Future.successful(Ok(JsArray()))) { ids ⇒
72+
artifactSrv.bulkUpdate(ids, request.body.unset("ids")).map(multiResult ⇒ renderer.toMultiOutput(OK, multiResult))
7173
}
7274
}
7375

7476
@Timed
75-
def delete(id: String) = authenticated(Role.write).async { implicit request =>
77+
def delete(id: String) = authenticated(Role.write).async { implicit request ⇒
7678
artifactSrv.delete(id)
77-
.map(_ => NoContent)
79+
.map(_ ⇒ NoContent)
7880
}
7981

8082
@Timed
81-
def findInCase(caseId: String) = authenticated(Role.read).async(fieldsBodyParser) { implicit request =>
83+
def findInCase(caseId: String) = authenticated(Role.read).async(fieldsBodyParser) { implicit request ⇒
8284
import org.elastic4play.services.QueryDSL._
8385
val childQuery = request.body.getValue("query").fold[QueryDef](QueryDSL.any)(_.as[QueryDef])
8486
val query = and(childQuery, "_parent" ~= caseId)
@@ -90,7 +92,7 @@ class ArtifactCtrl @Inject() (
9092
}
9193

9294
@Timed
93-
def find() = authenticated(Role.read).async(fieldsBodyParser) { implicit request =>
95+
def find() = authenticated(Role.read).async(fieldsBodyParser) { implicit request ⇒
9496
val query = request.body.getValue("query").fold[QueryDef](QueryDSL.any)(_.as[QueryDef])
9597
val range = request.body.getString("range")
9698
val sort = request.body.getStrings("sort").getOrElse(Nil)
@@ -103,8 +105,8 @@ class ArtifactCtrl @Inject() (
103105
}
104106

105107
@Timed
106-
def findSimilar(artifactId: String) = authenticated(Role.read).async(fieldsBodyParser) { implicit request =>
107-
artifactSrv.get(artifactId).flatMap { artifact =>
108+
def findSimilar(artifactId: String) = authenticated(Role.read).async(fieldsBodyParser) { implicit request ⇒
109+
artifactSrv.get(artifactId).flatMap { artifact ⇒
108110
val range = request.body.getString("range")
109111
val sort = request.body.getStrings("sort").getOrElse(Nil)
110112

@@ -115,9 +117,9 @@ class ArtifactCtrl @Inject() (
115117
}
116118

117119
@Timed
118-
def stats() = authenticated(Role.read).async(fieldsBodyParser) { implicit request =>
120+
def stats() = authenticated(Role.read).async(fieldsBodyParser) { implicit request ⇒
119121
val query = request.body.getValue("query").fold[QueryDef](QueryDSL.any)(_.as[QueryDef])
120122
val aggs = request.body.getValue("stats").getOrElse(throw BadRequestError("Parameter \"stats\" is missing")).as[Seq[Agg]]
121-
artifactSrv.stats(query, aggs).map(s => Ok(s))
123+
artifactSrv.stats(query, aggs).map(s ⇒ Ok(s))
122124
}
123125
}

‎thehive-backend/app/controllers/Asset.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ class AssetCtrlDev @Inject() (environment: Environment) extends ExternalAssets(e
2020
def get(file: String) = {
2121
if (file.startsWith("bower_components/")) {
2222
at("ui", file)
23-
} else {
23+
}
24+
else {
2425
at("ui/app", file)
2526
}
2627
}

‎thehive-backend/app/controllers/Attachment.scala

+22-19
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,19 @@ import org.elastic4play.controllers.Renderer
2020
* Controller used to access stored attachments (plain or zipped)
2121
*/
2222
@Singleton
23-
class AttachmentCtrl(password: String,
24-
attachmentSrv: AttachmentSrv,
25-
authenticated: Authenticated,
26-
renderer: Renderer) extends Controller {
23+
class AttachmentCtrl(
24+
password: String,
25+
attachmentSrv: AttachmentSrv,
26+
authenticated: Authenticated,
27+
renderer: Renderer) extends Controller {
2728

28-
@Inject() def this(configuration: Configuration,
29-
attachmentSrv: AttachmentSrv,
30-
authenticated: Authenticated,
31-
renderer: Renderer) =
32-
this(configuration.getString("datastore.attachment.password").get,
29+
@Inject() def this(
30+
configuration: Configuration,
31+
attachmentSrv: AttachmentSrv,
32+
authenticated: Authenticated,
33+
renderer: Renderer) =
34+
this(
35+
configuration.getString("datastore.attachment.password").get,
3336
attachmentSrv,
3437
authenticated,
3538
renderer)
@@ -40,7 +43,7 @@ class AttachmentCtrl(password: String,
4043
* open the document directly. It must be used only for safe file
4144
*/
4245
@Timed("controllers.AttachmentCtrl.download")
43-
def download(hash: String, name: Option[String]) = authenticated(Role.read) { implicit request =>
46+
def download(hash: String, name: Option[String]) = authenticated(Role.read) { implicit request ⇒
4447
if (hash.startsWith("{{")) // angularjs hack
4548
NoContent
4649
else if (!name.getOrElse("").intersect(AttachmentAttributeFormat.forbiddenChar).isEmpty())
@@ -50,9 +53,9 @@ class AttachmentCtrl(password: String,
5053
header = ResponseHeader(
5154
200,
5255
Map(
53-
"Content-Disposition" -> s"""attachment; filename="${name.getOrElse(hash)}"""",
54-
"Content-Transfer-Encoding" -> "binary")),
55-
body = HttpEntity.Streamed(attachmentSrv.source(hash), None, None))
56+
"Content-Disposition" → s"""attachment; filename="${name.getOrElse(hash)}"""",
57+
"Content-Transfer-Encoding" → "binary")),
58+
body = HttpEntity.Streamed(attachmentSrv.source(hash), None, None))
5659
}
5760

5861
/**
@@ -61,7 +64,7 @@ class AttachmentCtrl(password: String,
6164
* File name can be specified (zip extension is append)
6265
*/
6366
@Timed("controllers.AttachmentCtrl.downloadZip")
64-
def downloadZip(hash: String, name: Option[String]) = authenticated(Role.read) { implicit request =>
67+
def downloadZip(hash: String, name: Option[String]) = authenticated(Role.read) { implicit request ⇒
6568
if (!name.getOrElse("").intersect(AttachmentAttributeFormat.forbiddenChar).isEmpty())
6669
BadRequest("File name is invalid")
6770
else {
@@ -81,11 +84,11 @@ class AttachmentCtrl(password: String,
8184
header = ResponseHeader(
8285
200,
8386
Map(
84-
"Content-Disposition" -> s"""attachment; filename="${name.getOrElse(hash)}.zip"""",
85-
"Content-Type" -> "application/zip",
86-
"Content-Transfer-Encoding" -> "binary",
87-
"Content-Length" -> f.length.toString)),
88-
body = HttpEntity.Streamed(FileIO.fromPath(f.toPath), Some(f.length), Some("application/zip")))
87+
"Content-Disposition" → s"""attachment; filename="${name.getOrElse(hash)}.zip"""",
88+
"Content-Type" → "application/zip",
89+
"Content-Transfer-Encoding" → "binary",
90+
"Content-Length" → f.length.toString)),
91+
body = HttpEntity.Streamed(FileIO.fromPath(f.toPath), Some(f.length), Some("application/zip")))
8992
}
9093
}
9194
}

‎thehive-backend/app/controllers/Authentication.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ class AuthenticationCtrl @Inject() (
2020
implicit val ec: ExecutionContext) extends Controller {
2121

2222
@Timed
23-
def login = Action.async(fieldsBodyParser) { implicit request =>
23+
def login = Action.async(fieldsBodyParser) { implicit request ⇒
2424
authSrv.authenticate(request.body.getString("user").getOrElse("TODO"), request.body.getString("password").getOrElse("TODO"))
25-
.map { authContext => authenticated.setSessingUser(Ok, authContext) }
25+
.map { authContext ⇒ authenticated.setSessingUser(Ok, authContext) }
2626
}
2727

2828
@Timed

‎thehive-backend/app/controllers/Case.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ class CaseCtrl @Inject() (
5050
@Timed
5151
def get(id: String) = authenticated(Role.read).async { implicit request ⇒
5252
val withStats = for {
53-
statsValues <- request.queryString.get("nstats")
54-
firstValue <- statsValues.headOption
53+
statsValues ← request.queryString.get("nstats")
54+
firstValue ← statsValues.headOption
5555
} yield Try(firstValue.toBoolean).getOrElse(firstValue == "1")
5656

5757
for {
@@ -117,8 +117,8 @@ class CaseCtrl @Inject() (
117117
}.map {
118118
case (caze, artifacts) ⇒
119119
Json.toJson(caze).as[JsObject] - "description" +
120-
("linkedWith" -> Json.toJson(artifacts)) +
121-
("linksCount" -> Json.toJson(artifacts.size))
120+
("linkedWith" → Json.toJson(artifacts)) +
121+
("linksCount" → Json.toJson(artifacts.size))
122122
}
123123
renderer.toOutput(OK, casesList)
124124
}

‎thehive-backend/app/controllers/CaseTemplate.scala

+9-9
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@ class CaseTemplateCtrl @Inject() (
2727
implicit val ec: ExecutionContext) extends Controller with Status {
2828

2929
@Timed
30-
def create = authenticated(Role.admin).async(fieldsBodyParser) { implicit request =>
30+
def create = authenticated(Role.admin).async(fieldsBodyParser) { implicit request ⇒
3131
caseTemplateSrv.create(request.body)
32-
.map(caze => renderer.toOutput(CREATED, caze))
32+
.map(caze ⇒ renderer.toOutput(CREATED, caze))
3333
}
3434

3535
@Timed
36-
def get(id: String) = authenticated(Role.read).async { implicit request =>
36+
def get(id: String) = authenticated(Role.read).async { implicit request ⇒
3737
caseTemplateSrv.get(id)
38-
.map(caze => renderer.toOutput(OK, caze))
38+
.map(caze ⇒ renderer.toOutput(OK, caze))
3939
}
4040

4141
@Timed
42-
def update(id: String) = authenticated(Role.admin).async(fieldsBodyParser) { implicit request =>
42+
def update(id: String) = authenticated(Role.admin).async(fieldsBodyParser) { implicit request ⇒
4343
caseTemplateSrv.update(id, request.body)
44-
.map(caze => renderer.toOutput(OK, caze))
44+
.map(caze ⇒ renderer.toOutput(OK, caze))
4545
}
4646

4747
@Timed
48-
def delete(id: String) = authenticated(Role.admin).async { implicit request =>
48+
def delete(id: String) = authenticated(Role.admin).async { implicit request ⇒
4949
caseTemplateSrv.delete(id)
50-
.map(_ => NoContent)
50+
.map(_ ⇒ NoContent)
5151
}
5252

5353
@Timed
54-
def find = authenticated(Role.read).async(fieldsBodyParser) { implicit request =>
54+
def find = authenticated(Role.read).async(fieldsBodyParser) { implicit request ⇒
5555
val query = request.body.getValue("query").fold[QueryDef](QueryDSL.any)(_.as[QueryDef])
5656
val range = request.body.getString("range")
5757
val sort = request.body.getStrings("sort").getOrElse(Nil)

‎thehive-backend/app/controllers/Flow.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class FlowCtrl @Inject() (
2626
* Return audit logs. For each item, include ancestor entities
2727
*/
2828
@Timed
29-
def flow(rootId: Option[String], count: Option[Int]) = authenticated(Role.read).async { implicit request =>
29+
def flow(rootId: Option[String], count: Option[Int]) = authenticated(Role.read).async { implicit request ⇒
3030
val (audits, total) = flowSrv(rootId.filterNot(_ == "any"), count.getOrElse(10))
3131
renderer.toOutput(OK, audits, total)
3232
}

‎thehive-backend/app/controllers/Job.scala

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ class JobCtrl @Inject() (
2626
implicit val ec: ExecutionContext) extends Controller with Status {
2727

2828
@Timed
29-
def create(artifactId: String) = authenticated(Role.write).async(fieldsBodyParser) { implicit request =>
29+
def create(artifactId: String) = authenticated(Role.write).async(fieldsBodyParser) { implicit request ⇒
3030
jobSrv.create(artifactId, request.body)
31-
.map(job => renderer.toOutput(CREATED, job))
31+
.map(job ⇒ renderer.toOutput(CREATED, job))
3232
}
3333

3434
@Timed
35-
def get(id: String) = authenticated(Role.read).async { implicit request =>
35+
def get(id: String) = authenticated(Role.read).async { implicit request ⇒
3636
jobSrv.get(id)
37-
.map(artifact => renderer.toOutput(OK, artifact))
37+
.map(artifact ⇒ renderer.toOutput(OK, artifact))
3838
}
3939

4040
@Timed
41-
def findInArtifact(artifactId: String) = authenticated(Role.read).async(fieldsBodyParser) { implicit request =>
41+
def findInArtifact(artifactId: String) = authenticated(Role.read).async(fieldsBodyParser) { implicit request ⇒
4242
import org.elastic4play.services.QueryDSL._
4343
val childQuery = request.body.getValue("query").fold[QueryDef](QueryDSL.any)(_.as[QueryDef])
4444
val query = and(childQuery, "_parent" ~= artifactId)
@@ -50,7 +50,7 @@ class JobCtrl @Inject() (
5050
}
5151

5252
@Timed
53-
def find = authenticated(Role.read).async(fieldsBodyParser) { implicit request =>
53+
def find = authenticated(Role.read).async(fieldsBodyParser) { implicit request ⇒
5454
val query = request.body.getValue("query").fold[QueryDef](QueryDSL.any)(_.as[QueryDef])
5555
val range = request.body.getString("range")
5656
val sort = request.body.getStrings("sort").getOrElse(Nil)
@@ -60,9 +60,9 @@ class JobCtrl @Inject() (
6060
}
6161

6262
@Timed
63-
def stats() = authenticated(Role.read).async(fieldsBodyParser) { implicit request =>
63+
def stats() = authenticated(Role.read).async(fieldsBodyParser) { implicit request ⇒
6464
val query = request.body.getValue("query").fold[QueryDef](QueryDSL.any)(_.as[QueryDef])
6565
val agg = request.body.getValue("stats").getOrElse(throw BadRequestError("Parameter \"stats\" is missing")).as[Agg]
66-
jobSrv.stats(query, agg).map(s => Ok(s))
66+
jobSrv.stats(query, agg).map(s ⇒ Ok(s))
6767
}
6868
}

0 commit comments

Comments
 (0)