#1731 Fix dependence injection (bis)

TheHive-Project · Jan 27, 2021 · d9cd63f · d9cd63f
1 parent 62050db
commit d9cd63f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git a/thehive/app/org/thp/thehive/services/OrganisationSrv.scala b/thehive/app/org/thp/thehive/services/OrganisationSrv.scala
@@ -17,20 +17,20 @@ 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,
     userSrv: UserSrv,
     @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]
+0 −1		core-test/src/test/scala/org/thp/scalligraph/models/ModernQuery.scala
+5 −5		core/src/main/scala/org/thp/scalligraph/models/Operation.scala
+0 −23		core/src/main/scala/org/thp/scalligraph/query/InputSort.scala
+3 −1		core/src/main/scala/org/thp/scalligraph/query/Query.scala