From d9cd63f76a580b331e9145f4e59d69837e1c8fa4 Mon Sep 17 00:00:00 2001 From: To-om Date: Wed, 27 Jan 2021 11:41:52 +0100 Subject: [PATCH] #1731 Fix dependence injection (bis) --- ScalliGraph | 2 +- thehive/app/org/thp/thehive/services/OrganisationSrv.scala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ScalliGraph b/ScalliGraph index 9916fd49b9..6450d6fefe 160000 --- a/ScalliGraph +++ b/ScalliGraph @@ -1 +1 @@ -Subproject commit 9916fd49b96a0da2643250eb7228998d64a67f7c +Subproject commit 6450d6fefe9d9981f27e754366d77bcdf3e1c4e1 diff --git a/thehive/app/org/thp/thehive/services/OrganisationSrv.scala b/thehive/app/org/thp/thehive/services/OrganisationSrv.scala index ceb6837de3..a3a45e34a2 100644 --- a/thehive/app/org/thp/thehive/services/OrganisationSrv.scala +++ b/thehive/app/org/thp/thehive/services/OrganisationSrv.scala @@ -17,12 +17,12 @@ import play.api.cache.SyncCacheApi import play.api.libs.json.JsObject import java.util.{Map => JMap} -import javax.inject.{Inject, Named, Singleton} +import javax.inject.{Inject, Named, Provider, Singleton} import scala.util.{Failure, Success, Try} @Singleton class OrganisationSrv @Inject() ( -// taxonomySrvProvider: Provider[TaxonomySrv], + taxonomySrvProvider: Provider[TaxonomySrv], roleSrv: RoleSrv, profileSrv: ProfileSrv, auditSrv: AuditSrv, @@ -30,7 +30,7 @@ class OrganisationSrv @Inject() ( @Named("integrity-check-actor") integrityCheckActor: ActorRef, cache: SyncCacheApi ) extends VertexSrv[Organisation] { - lazy val taxonomySrv: TaxonomySrv = ??? //taxonomySrvProvider.get + lazy val taxonomySrv: TaxonomySrv = taxonomySrvProvider.get val organisationOrganisationSrv = new EdgeSrv[OrganisationOrganisation, Organisation, Organisation] val organisationShareSrv = new EdgeSrv[OrganisationShare, Organisation, Share] val organisationTaxonomySrv = new EdgeSrv[OrganisationTaxonomy, Organisation, Taxonomy]