sort tokens

dasch-swiss · Dec 28, 2023 · 52b2d6a · 52b2d6a
1 parent e9c7b47
commit 52b2d6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala b/integration/src/test/scala/org/knora/webapi/core/LayersTest.scala
@@ -73,11 +73,12 @@ object LayersTest {
   type DefaultTestEnvironmentWithoutSipi = LayersLive.DspEnvironmentLive with FusekiTestContainer with TestClientService
   type DefaultTestEnvironmentWithSipi    = DefaultTestEnvironmentWithoutSipi with SipiTestContainer
 
-  type CommonR0 = ActorSystem with AppConfigurations with SipiService with JwtService with StringFormatter
+  type CommonR0 = ActorSystem with AppConfigurations with JwtService with SipiService with StringFormatter
   type CommonR =
     ApiRoutes
       with AppRouter
       with Authenticator
+      with AuthorizationRestService
       with CacheService
       with CacheServiceRequestMessageHandler
       with CardinalityHandler
@@ -98,6 +99,7 @@ object LayersTest {
       with MessageRelay
       with OntologyCache
       with OntologyHelpers
+      with OntologyInferencer
       with OntologyRepo
       with OntologyResponderV2
       with PermissionUtilADM
@@ -114,12 +116,10 @@ object LayersTest {
       with ResourceUtilV2
       with ResourcesResponderV2
       with RestCardinalityService
-      with AuthorizationRestService
       with RestResourceInfoService
       with SearchApiRoutes
       with SearchResponderV2
       with SipiResponderADM
-      with OntologyInferencer
       with StandoffResponderV2
       with StandoffTagUtilV2
       with State
@@ -135,6 +135,7 @@ object LayersTest {
       ApiRoutes.layer,
       AppRouter.layer,
       AuthenticatorLive.layer,
+      AuthorizationRestServiceLive.layer,
       BaseEndpoints.layer,
       CacheServiceInMemImpl.layer,
       CacheServiceRequestMessageHandlerLive.layer,
@@ -186,7 +187,6 @@ object LayersTest {
       ResourceUtilV2Live.layer,
       ResourcesResponderV2Live.layer,
       RestCardinalityServiceLive.layer,
-      AuthorizationRestServiceLive.layer,
       SearchApiRoutes.layer,
       SearchResponderV2Live.layer,
       SipiResponderADMLive.layer,

diff --git a/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala b/webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala
@@ -71,13 +71,13 @@ object LayersLive {
     ActorSystem & ApiRoutes & AppConfigurations & AppRouter & Authenticator & CacheService &
       CacheServiceRequestMessageHandler & CardinalityHandler & CardinalityService & ConstructResponseUtilV2 &
       ConstructTransformer & GravsearchTypeInspectionRunner & GroupsResponderADM & HttpServer &
-      IIIFRequestMessageHandler & SipiService & InferenceOptimizationService & IriService & IriConverter & JwtService &
+      IIIFRequestMessageHandler & InferenceOptimizationService & IriConverter & IriService & JwtService & SipiService &
       KnoraProjectRepo & ListsResponderADM & ListsResponderV2 & MessageRelay & OntologyCache & OntologyHelpers &
-      OntologyRepo & OntologyResponderV2 & PermissionUtilADM & PermissionsResponderADM & PredicateObjectMapper &
+      OntologyRepo & OntologyResponderV2 & PermissionsResponderADM & PermissionUtilADM & PredicateObjectMapper &
       ProjectADMRestService & ProjectADMService & ProjectExportService & ProjectExportStorageService &
       ProjectImportService & ProjectsResponderADM & QueryTraverser & RepositoryUpdater & ResourceUtilV2 &
-      ResourceUtilV2 & ResourcesResponderV2 & RestCardinalityService & AuthorizationRestService & RestResourceInfoService &
-      SearchApiRoutes & SearchResponderV2 & SipiResponderADM & OntologyInferencer & StandoffResponderV2 & StandoffTagUtilV2 & State &
+      AuthorizationRestService & ResourcesResponderV2 & ResourceUtilV2 & RestCardinalityService & RestResourceInfoService &
+      OntologyInferencer & SearchApiRoutes & SearchResponderV2 & SipiResponderADM & StandoffResponderV2 & StandoffTagUtilV2 & State &
       StoresResponderADM & StringFormatter & TriplestoreService & UsersResponderADM & ValuesResponderV2
 
   /**
@@ -91,6 +91,7 @@ object LayersLive {
       AppConfig.layer,
       AppRouter.layer,
       AuthenticatorLive.layer,
+      AuthorizationRestServiceLive.layer,
       BaseEndpoints.layer,
       CacheServiceInMemImpl.layer,
       CacheServiceRequestMessageHandlerLive.layer,
@@ -143,7 +144,6 @@ object LayersLive {
       ResourceUtilV2Live.layer,
       ResourcesResponderV2Live.layer,
       RestCardinalityServiceLive.layer,
-      AuthorizationRestServiceLive.layer,
       RestResourceInfoServiceLive.layer,
       SearchApiRoutes.layer,
       SearchResponderV2Live.layer,