Reorganise imports and reformat code

HankW507 · Jun 25, 2020 · 825eb58 · 825eb58
1 parent 67b0344
commit 825eb58
Show file tree

Hide file tree

Showing 100 changed files with 348 additions and 420 deletions.
diff --git a/app/org/thp/thehive/CustomServer.scala b/app/org/thp/thehive/CustomServer.scala
@@ -1,9 +1,8 @@
 package org.thp.thehive
 
-import play.core.server.{AkkaHttpServer, ServerProvider}
-
 import akka.http.scaladsl.model.HttpMethod
 import akka.http.scaladsl.settings.ParserSettings
+import play.core.server.{AkkaHttpServer, ServerProvider}
 
 /** A custom Akka HTTP server with advanced configuration. */
 class CustomAkkaHttpServer(context: AkkaHttpServer.Context) extends AkkaHttpServer(context) {

diff --git a/client-common/src/main/scala/org/thp/client/BaseClient.scala b/client-common/src/main/scala/org/thp/client/BaseClient.scala
@@ -1,13 +1,13 @@
 package org.thp.client
 
-import scala.concurrent.{ExecutionContext, Future}
-import scala.util.{Failure, Success, Try}
-
 import play.api.Logger
 import play.api.http.Status
 import play.api.libs.json._
 import play.api.libs.ws.{WSClient, WSResponse}
 
+import scala.concurrent.{ExecutionContext, Future}
+import scala.util.{Failure, Success, Try}
+
 case class ApplicationError(status: Int, body: JsValue) extends Exception(s"ApplicationError($status):\n${Json.prettyPrint(body)}")
 
 object ApplicationError {

diff --git a/client/src/main/scala/org/thp/thehive/client/TheHiveClient.scala b/client/src/main/scala/org/thp/thehive/client/TheHiveClient.scala
@@ -1,15 +1,14 @@
 package org.thp.thehive.client
 
-import scala.concurrent.{ExecutionContext, Future}
-import scala.util.{Failure, Success}
-
+import org.thp.client.{ApplicationError, Authentication, BaseClient}
+import org.thp.thehive.dto.v1._
 import play.api.Logger
 import play.api.http.Status
 import play.api.libs.json.{JsObject, JsValue, Json}
 import play.api.libs.ws.WSClient
 
-import org.thp.client.{ApplicationError, Authentication, BaseClient}
-import org.thp.thehive.dto.v1._
+import scala.concurrent.{ExecutionContext, Future}
+import scala.util.{Failure, Success}
 
 class TheHiveClient(baseUrl: String)(implicit ws: WSClient) {
   lazy val logger: Logger = Logger(getClass)

diff --git a/cortex/client/src/main/scala/org/thp/cortex/client/CortexClient.scala b/cortex/client/src/main/scala/org/thp/cortex/client/CortexClient.scala
@@ -1,21 +1,20 @@
 package org.thp.cortex.client
 
-import scala.concurrent.duration.Duration
-import scala.concurrent.{ExecutionContext, Future}
-import scala.util.{Failure, Success, Try}
-
+import akka.stream.Materializer
+import akka.stream.scaladsl.Source
+import akka.util.ByteString
+import org.thp.client._
+import org.thp.cortex.dto.v0.{Attachment, _}
 import play.api.Logger
 import play.api.http.Status
 import play.api.libs.json.{Format, JsObject, JsString, Json}
 import play.api.libs.ws.WSClient
 import play.api.libs.ws.ahc.AhcWSClientConfig
 import play.api.mvc.MultipartFormData.{DataPart, FilePart}
 
-import akka.stream.Materializer
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
-import org.thp.client._
-import org.thp.cortex.dto.v0.{Attachment, _}
+import scala.concurrent.duration.Duration
+import scala.concurrent.{ExecutionContext, Future}
+import scala.util.{Failure, Success, Try}
 
 case class CortexClientConfig(
     name: String,

diff --git a/cortex/client/src/test/scala/org/thp/cortex/client/TestCortexClientProvider.scala b/cortex/client/src/test/scala/org/thp/cortex/client/TestCortexClientProvider.scala
@@ -3,20 +3,19 @@ package org.thp.cortex.client
 import java.net.URLEncoder
 import java.nio.file.{Path, Paths}
 
-import scala.concurrent.ExecutionContext
-import scala.io.Source
-import scala.util.matching.Regex
-
-import play.api.http.{FileMimeTypes, HttpEntity}
-import play.api.libs.json.{JsValue, Json}
-import play.api.mvc._
-import play.api.test.Helpers._
-
 import akka.stream.scaladsl._
 import javax.inject.{Inject, Provider}
 import mockws.MockWS
 import org.thp.client.NoAuthentication
 import org.thp.cortex.dto.v0.{OutputJob, OutputWorker}
+import play.api.http.{FileMimeTypes, HttpEntity}
+import play.api.libs.json.{JsValue, Json}
+import play.api.mvc._
+import play.api.test.Helpers._
+
+import scala.concurrent.ExecutionContext
+import scala.io.Source
+import scala.util.matching.Regex
 
 class TestCortexClientProvider @Inject() (Action: DefaultActionBuilder, implicit val fileMimeTypes: FileMimeTypes, implicit val ec: ExecutionContext)
     extends Provider[CortexClient] {

diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/CortexRouter.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/CortexRouter.scala
@@ -1,10 +1,9 @@
 package org.thp.thehive.connector.cortex
 
-import play.api.Logger
-import play.api.routing.Router
-
 import javax.inject.{Inject, Provider, Singleton}
 import org.thp.thehive.connector.cortex.controllers.v0
+import play.api.Logger
+import play.api.routing.Router
 
 @Singleton
 class CortexRouter @Inject() (routerV0: v0.Router) extends Provider[Router] {

diff --git a/...nnector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerCtrl.scala b/...nnector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/AnalyzerCtrl.scala
@@ -1,15 +1,14 @@
 package org.thp.thehive.connector.cortex.controllers.v0
 
-import scala.concurrent.ExecutionContext
-
-import play.api.mvc.{Action, AnyContent, Results}
-
 import akka.actor.ActorSystem
 import javax.inject.{Inject, Singleton}
 import org.thp.scalligraph.controllers.{Entrypoint, FieldsParser}
 import org.thp.thehive.connector.cortex.controllers.v0.Conversion._
 import org.thp.thehive.connector.cortex.services.AnalyzerSrv
 import org.thp.thehive.controllers.v0.Conversion._
+import play.api.mvc.{Action, AnyContent, Results}
+
+import scala.concurrent.ExecutionContext
 
 @Singleton
 class AnalyzerCtrl @Inject() (

diff --git a/...connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Conversion.scala b/...connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Conversion.scala
@@ -4,7 +4,7 @@ import io.scalaland.chimney.dsl._
 import org.thp.cortex.dto.v0.{OutputWorker => CortexWorker}
 import org.thp.scalligraph.controllers.Renderer
 import org.thp.scalligraph.models.Entity
-import org.thp.thehive.connector.cortex.dto.v0.{InputAnalyzerTemplate, OutputAction, OutputAnalyzerTemplate, OutputJob, OutputWorker}
+import org.thp.thehive.connector.cortex.dto.v0._
 import org.thp.thehive.connector.cortex.models._
 import play.api.libs.json.{JsArray, JsFalse, Json}
 

diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Router.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/controllers/v0/Router.scala
@@ -1,11 +1,10 @@
 package org.thp.thehive.connector.cortex.controllers.v0
 
+import javax.inject.{Inject, Singleton}
 import play.api.routing.Router.Routes
 import play.api.routing.SimpleRouter
 import play.api.routing.sird._
 
-import javax.inject.{Inject, Singleton}
-
 @Singleton
 class Router @Inject() (
     jobCtrl: JobCtrl,

diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Action.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/models/Action.scala
@@ -2,11 +2,10 @@ package org.thp.thehive.connector.cortex.models
 
 import java.util.Date
 
-import play.api.libs.json.JsObject
-
 import gremlin.scala.{Edge, Graph, Vertex}
 import org.thp.scalligraph.VertexEntity
 import org.thp.scalligraph.models._
+import play.api.libs.json.JsObject
 
 @VertexEntity
 case class Action(
@@ -67,6 +66,7 @@ object ActionContext extends HasEdgeModel[ActionContext, Action, Product] {
       override def _createdAt: Date           = entity._createdAt
       override def _updatedAt: Option[Date]   = entity._updatedAt
     }
-    override def create(e: ActionContext, from: Vertex, to: Vertex)(implicit db: Database, graph: Graph): Edge = from.addEdge(label, to)
+    override def create(e: ActionContext, from: Vertex, to: Vertex)(implicit db: Database, graph: Graph): Edge =
+      from.addEdge(label, to)
   }
 }
diff --git a/...nnector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionOperationSrv.scala b/...nnector/src/main/scala/org/thp/thehive/connector/cortex/services/ActionOperationSrv.scala
@@ -2,10 +2,6 @@ package org.thp.thehive.connector.cortex.services
 
 import java.util.Date
 
-import scala.util.{Failure, Success, Try}
-
-import play.api.Logger
-
 import gremlin.scala.Graph
 import javax.inject.Inject
 import org.thp.scalligraph.InternalError
@@ -17,6 +13,9 @@ import org.thp.thehive.controllers.v0.Conversion._
 import org.thp.thehive.dto.v0.InputTask
 import org.thp.thehive.models._
 import org.thp.thehive.services._
+import play.api.Logger
+
+import scala.util.{Failure, Success, Try}
 
 class ActionOperationSrv @Inject() (
     caseSrv: CaseSrv,

diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/AnalyzerSrv.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/AnalyzerSrv.scala
@@ -1,14 +1,13 @@
 package org.thp.thehive.connector.cortex.services
 
-import scala.concurrent.{ExecutionContext, Future}
-import scala.util.{Failure, Success}
-
-import play.api.Logger
-
 import javax.inject.{Inject, Singleton}
 import org.thp.cortex.dto.v0.{OutputWorker => CortexWorker}
 import org.thp.scalligraph.NotFoundError
 import org.thp.scalligraph.auth.AuthContext
+import play.api.Logger
+
+import scala.concurrent.{ExecutionContext, Future}
+import scala.util.{Failure, Success}
 
 @Singleton
 class AnalyzerSrv @Inject() (connector: Connector, serviceHelper: ServiceHelper, implicit val ec: ExecutionContext) {

diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/Connector.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/Connector.scala
@@ -1,11 +1,5 @@
 package org.thp.thehive.connector.cortex.services
 
-import scala.concurrent.duration.FiniteDuration
-import scala.concurrent.{ExecutionContext, Future}
-import scala.util.{Failure, Success}
-
-import play.api.libs.json.{JsObject, Json}
-
 import akka.actor.ActorSystem
 import akka.stream.Materializer
 import javax.inject.{Inject, Singleton}
@@ -14,6 +8,11 @@ import org.thp.scalligraph.services.config.ApplicationConfig.finiteDurationForma
 import org.thp.scalligraph.services.config.{ApplicationConfig, ConfigItem}
 import org.thp.thehive.models.HealthStatus
 import org.thp.thehive.services.{Connector => TheHiveConnector}
+import play.api.libs.json.{JsObject, Json}
+
+import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.{ExecutionContext, Future}
+import scala.util.{Failure, Success}
 
 @Singleton
 class Connector @Inject() (

diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/Conversion.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/Conversion.scala
@@ -1,7 +1,7 @@
 package org.thp.thehive.connector.cortex.services
 
 import io.scalaland.chimney.dsl._
-import org.thp.cortex.dto.v0.{OutputMinireport, OutputArtifact, JobStatus => CortexJobStatus}
+import org.thp.cortex.dto.v0.{OutputArtifact, OutputMinireport, JobStatus => CortexJobStatus}
 import org.thp.thehive.connector.cortex.models.JobStatus
 import org.thp.thehive.models.{Observable, ReportTag, ReportTagLevel}
 

diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/EntityHelper.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/EntityHelper.scala
@@ -1,9 +1,5 @@
 package org.thp.thehive.connector.cortex.services
 
-import scala.util.{Failure, Try}
-
-import play.api.Logger
-
 import gremlin.scala.Graph
 import javax.inject.{Inject, Singleton}
 import org.thp.scalligraph.BadRequestError
@@ -12,6 +8,9 @@ import org.thp.scalligraph.models.Entity
 import org.thp.scalligraph.steps.StepsOps._
 import org.thp.thehive.models._
 import org.thp.thehive.services._
+import play.api.Logger
+
+import scala.util.{Failure, Try}
 
 @Singleton
 class EntityHelper @Inject() (

diff --git a/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/package.scala b/cortex/connector/src/main/scala/org/thp/thehive/connector/cortex/services/package.scala
@@ -1,11 +1,13 @@
 package org.thp.thehive.connector.cortex
 
+import org.thp.scalligraph.models.Database
 import org.thp.scalligraph.steps.StepsOps._
 import org.thp.thehive.connector.cortex.models.ObservableJob
 import org.thp.thehive.services.ObservableSteps
 
 package object services {
   implicit class RichObservableSteps(observableSteps: ObservableSteps) {
-    def jobs: JobSteps = new JobSteps(observableSteps.outTo[ObservableJob].raw)(observableSteps.db, observableSteps.graph)
+    def jobs: JobSteps =
+      new JobSteps(observableSteps.outTo[ObservableJob].raw)(observableSteps.db.asInstanceOf[Database], observableSteps.graph)
   }
 }
diff --git a/...connector/src/test/scala/org/thp/thehive/connector/cortex/services/EntityHelperTest.scala b/...connector/src/test/scala/org/thp/thehive/connector/cortex/services/EntityHelperTest.scala
@@ -1,13 +1,12 @@
 package org.thp.thehive.connector.cortex.services
 
-import play.api.test.PlaySpecification
-
 import org.thp.scalligraph.auth.AuthContext
 import org.thp.scalligraph.models.{Database, DummyUserSrv}
 import org.thp.scalligraph.steps.StepsOps._
 import org.thp.thehive.TestAppBuilder
 import org.thp.thehive.models.Permissions
 import org.thp.thehive.services.{AlertSrv, ObservableSrv, TaskSrv}
+import play.api.test.PlaySpecification
 
 class EntityHelperTest extends PlaySpecification with TestAppBuilder {
   implicit val authContext: AuthContext =

diff --git a/...ex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/TestConnector.scala b/...ex/connector/src/test/scala/org/thp/thehive/connector/cortex/services/TestConnector.scala
@@ -1,15 +1,15 @@
 package org.thp.thehive.connector.cortex.services
 
-import scala.concurrent.ExecutionContext
-
 import akka.actor.ActorSystem
 import akka.stream.Materializer
 import javax.inject.{Inject, Singleton}
 import org.thp.cortex.client.CortexClient
 import org.thp.scalligraph.services.config.ApplicationConfig
 
+import scala.concurrent.ExecutionContext
+
 @Singleton
-class TestConnector @Inject()(client: CortexClient, appConfig: ApplicationConfig, mat: Materializer, system: ActorSystem, ec: ExecutionContext)
+class TestConnector @Inject() (client: CortexClient, appConfig: ApplicationConfig, mat: Materializer, system: ActorSystem, ec: ExecutionContext)
     extends Connector(appConfig, mat, system, ec) {
   override def clients: Seq[CortexClient] = Seq(client)
 

diff --git a/dto/src/main/scala/org/thp/thehive/dto/v0/Alert.scala b/dto/src/main/scala/org/thp/thehive/dto/v0/Alert.scala
@@ -2,9 +2,8 @@ package org.thp.thehive.dto.v0
 
 import java.util.Date
 
-import play.api.libs.json._
-
 import org.thp.scalligraph.controllers.WithParser
+import play.api.libs.json._
 
 case class InputAlert(
     `type`: String,

diff --git a/dto/src/main/scala/org/thp/thehive/dto/v0/Audit.scala b/dto/src/main/scala/org/thp/thehive/dto/v0/Audit.scala
@@ -2,9 +2,8 @@ package org.thp.thehive.dto.v0
 
 import java.util.Date
 
-import play.api.libs.json._
-
 import org.thp.scalligraph.models.Entity
+import play.api.libs.json._
 
 case class OutputEntity(_type: String, _id: String, _createdAt: Date, _createdBy: String, _updatedAt: Option[Date], _updatedBy: Option[String])
 

diff --git a/dto/src/main/scala/org/thp/thehive/dto/v0/Case.scala b/dto/src/main/scala/org/thp/thehive/dto/v0/Case.scala
@@ -2,9 +2,8 @@ package org.thp.thehive.dto.v0
 
 import java.util.Date
 
-import play.api.libs.json._
-
 import org.thp.scalligraph.controllers.WithParser
+import play.api.libs.json._
 
 case class InputCase(
     title: String,

diff --git a/dto/src/main/scala/org/thp/thehive/dto/v0/CaseTemplate.scala b/dto/src/main/scala/org/thp/thehive/dto/v0/CaseTemplate.scala
@@ -2,9 +2,8 @@ package org.thp.thehive.dto.v0
 
 import java.util.Date
 
-import play.api.libs.json.{JsObject, Json, OFormat, OWrites}
-
 import org.thp.scalligraph.controllers.WithParser
+import play.api.libs.json.{JsObject, Json, OFormat, OWrites}
 
 case class InputCaseTemplate(
     name: String,

diff --git a/dto/src/main/scala/org/thp/thehive/dto/v0/CustomFieldValue.scala b/dto/src/main/scala/org/thp/thehive/dto/v0/CustomFieldValue.scala
@@ -2,12 +2,11 @@ package org.thp.thehive.dto.v0
 
 import java.util.Date
 
-import play.api.libs.json._
-
 import org.scalactic.Accumulation._
-import org.scalactic.{Bad, Every, Good, One, Or}
-import org.thp.scalligraph.{AttributeError, InvalidFormatAttributeError}
+import org.scalactic._
 import org.thp.scalligraph.controllers.{FNull, _}
+import org.thp.scalligraph.{AttributeError, InvalidFormatAttributeError}
+import play.api.libs.json._
 
 case class OutputCustomField(
     id: String,

diff --git a/dto/src/main/scala/org/thp/thehive/dto/v0/Log.scala b/dto/src/main/scala/org/thp/thehive/dto/v0/Log.scala
@@ -2,9 +2,8 @@ package org.thp.thehive.dto.v0
 
 import java.util.Date
 
-import play.api.libs.json.{Json, OFormat}
-
 import org.thp.scalligraph.controllers.FFile
+import play.api.libs.json.{Json, OFormat}
 
 case class InputLog(message: String, startDate: Option[Date] = None, attachment: Option[FFile] = None)