#52 Fix circular dependency error

TheHive-Project · Aug 28, 2017 · 2ad04fb · 2ad04fb
1 parent 6c4489d
commit 2ad04fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/thehive-misp/app/connectors/misp/MispConfig.scala b/thehive-misp/app/connectors/misp/MispConfig.scala
@@ -1,6 +1,6 @@
 package connectors.misp
 
-import javax.inject.Inject
+import javax.inject.{ Inject, Singleton }
 
 import scala.concurrent.duration.{ DurationInt, FiniteDuration }
 import scala.util.Try
@@ -9,6 +9,7 @@ import play.api.Configuration
 
 import services.CustomWSAPI
 
+@Singleton
 class MispConfig(val interval: FiniteDuration, val connections: Seq[MispConnection]) {
 
   def this(configuration: Configuration, defaultCaseTemplate: Option[String], globalWS: CustomWSAPI) = this(

diff --git a/thehive-misp/app/connectors/misp/MispExport.scala b/thehive-misp/app/connectors/misp/MispExport.scala
@@ -2,7 +2,7 @@ package connectors.misp
 
 import java.text.SimpleDateFormat
 import java.util.Date
-import javax.inject.Inject
+import javax.inject.{ Inject, Provider, Singleton }
 
 import scala.concurrent.{ ExecutionContext, Future }
 import scala.util.Try
@@ -21,16 +21,18 @@ import org.elastic4play.models.JsonFormat.baseModelEntityWrites
 import org.elastic4play.services.{ AttachmentSrv, AuthContext }
 import org.elastic4play.utils.RichFuture
 
+@Singleton
 class MispExport @Inject() (
     mispConfig: MispConfig,
     mispSrv: MispSrv,
     artifactSrv: ArtifactSrv,
-    alertSrv: AlertSrv,
+    alertSrvProvider: Provider[AlertSrv],
     attachmentSrv: AttachmentSrv,
     implicit val ec: ExecutionContext,
     implicit val mat: Materializer) extends MispConverter {
 
   lazy val dateFormat = new SimpleDateFormat("yy-MM-dd")
+  private[misp] lazy val alertSrv = alertSrvProvider.get
 
   def relatedMispEvent(mispName: String, caseId: String): Future[(Option[String], Option[String])] = {
     import org.elastic4play.services.QueryDSL._

diff --git a/thehive-misp/app/connectors/misp/MispSynchro.scala b/thehive-misp/app/connectors/misp/MispSynchro.scala
@@ -1,7 +1,7 @@
 package connectors.misp
 
 import java.util.Date
-import javax.inject.Inject
+import javax.inject.{ Inject, Provider, Singleton }
 
 import scala.collection.immutable
 import scala.concurrent.{ ExecutionContext, Future }
@@ -23,13 +23,14 @@ import JsonFormat.mispAlertWrites
 import org.elastic4play.controllers.Fields
 import org.elastic4play.services.{ AuthContext, MigrationSrv, TempSrv }
 
+@Singleton
 class MispSynchro @Inject() (
     mispConfig: MispConfig,
     migrationSrv: MigrationSrv,
     mispSrv: MispSrv,
     caseSrv: CaseSrv,
     artifactSrv: ArtifactSrv,
-    alertSrv: AlertSrv,
+    alertSrvProvider: Provider[AlertSrv],
     userSrv: UserSrv,
     tempSrv: TempSrv,
     lifecycle: ApplicationLifecycle,
@@ -38,6 +39,7 @@ class MispSynchro @Inject() (
     implicit val mat: Materializer) {
 
   private[misp] lazy val logger = Logger(getClass)
+  private[misp] lazy val alertSrv = alertSrvProvider.get
 
   private[misp] def initScheduler(): Unit = {
     val task = system.scheduler.schedule(0.seconds, mispConfig.interval) {