From 3178c42ea826197260024b4f398e1896904148c2 Mon Sep 17 00:00:00 2001 From: Oliver <20188437+olivergrabinski@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:26:22 +0100 Subject: [PATCH] Remove explicit `IORuntime`s --- .../ch/epfl/bluebrain/nexus/delta/Main.scala | 2 +- .../delta/plugin/WiringInitializer.scala | 8 ++--- .../nexus/delta/routes/AclsRoutes.scala | 7 ++-- .../nexus/delta/routes/ElemRoutes.scala | 4 +-- .../nexus/delta/routes/EventsRoutes.scala | 7 ++-- .../nexus/delta/routes/IdentitiesRoutes.scala | 6 ++-- .../nexus/delta/routes/MultiFetchRoutes.scala | 4 +-- .../delta/routes/OrganizationsRoutes.scala | 8 ++--- .../delta/routes/PermissionsRoutes.scala | 7 ++-- .../nexus/delta/routes/ProjectsRoutes.scala | 6 ++-- .../nexus/delta/routes/QuotasRoutes.scala | 3 +- .../nexus/delta/routes/RealmsRoutes.scala | 7 ++-- .../nexus/delta/routes/ResolversRoutes.scala | 3 -- .../nexus/delta/routes/ResourcesRoutes.scala | 3 -- .../delta/routes/ResourcesTrialRoutes.scala | 3 -- .../nexus/delta/routes/SchemasRoutes.scala | 3 -- .../delta/routes/SupervisionRoutes.scala | 7 ++-- .../delta/routes/UserPermissionsRoutes.scala | 8 ++--- .../nexus/delta/routes/VersionRoutes.scala | 7 ++-- .../nexus/delta/wiring/AclsModule.scala | 11 +++--- .../nexus/delta/wiring/DeltaModule.scala | 10 +++--- .../nexus/delta/wiring/EventsModule.scala | 9 ++--- .../nexus/delta/wiring/IdentitiesModule.scala | 6 ++-- .../nexus/delta/wiring/MultiFetchModule.scala | 6 ++-- .../delta/wiring/OrganizationsModule.scala | 7 ++-- .../delta/wiring/PermissionsModule.scala | 6 ++-- .../nexus/delta/wiring/ProjectsModule.scala | 10 ++---- .../nexus/delta/wiring/QuotasModule.scala | 6 ++-- .../nexus/delta/wiring/RealmsModule.scala | 6 ++-- .../nexus/delta/wiring/ResolversModule.scala | 3 -- .../nexus/delta/wiring/ResourcesModule.scala | 3 -- .../delta/wiring/ResourcesTrialModule.scala | 3 -- .../nexus/delta/wiring/SchemasModule.scala | 3 -- .../delta/wiring/SupervisionModule.scala | 6 ++-- .../nexus/delta/wiring/VersionModule.scala | 7 ++-- .../bluebrain/nexus/delta/MainSuite.scala | 6 +--- .../nexus/delta/plugin/PluginLoaderSpec.scala | 3 +- .../utils/ClasspathResourceUtilsSpec.scala | 4 +-- .../plugins/archive/ArchiveDownload.scala | 8 ++--- .../plugins/archive/ArchivePluginModule.scala | 11 +++--- .../archive/routes/ArchiveRoutes.scala | 3 +- .../blazegraph/BlazegraphPluginModule.scala | 7 +--- .../routes/BlazegraphViewsDirectives.scala | 7 ++-- .../BlazegraphViewsIndexingRoutes.scala | 3 -- .../routes/BlazegraphViewsRoutes.scala | 3 -- .../blazegraph/BlazegraphClientSetup.scala | 3 +- .../indexing/BlazegraphCoordinatorSuite.scala | 1 + .../BlazegraphViewsIndexingRoutesSpec.scala | 3 +- .../CompositeViewsPluginModule.scala | 13 +++---- .../compositeviews/client/DeltaClient.scala | 7 ++-- .../routes/CompositeViewsIndexingRoutes.scala | 7 ++-- .../routes/CompositeViewsRoutes.scala | 3 -- .../routes/CompositeViewsRoutesFixtures.scala | 2 -- .../ElasticSearchPluginModule.scala | 13 ++----- .../routes/ElasticSearchIndexingRoutes.scala | 7 ++-- .../routes/ElasticSearchQueryRoutes.scala | 2 -- .../routes/ElasticSearchViewsRoutes.scala | 5 +-- .../routes/IdResolutionRoutes.scala | 2 -- .../ElasticSearchClientSetup.scala | 3 +- .../ElasticSearchViewDecodingSpec.scala | 1 + .../ElasticSearchViewsQuerySuite.scala | 6 ++-- .../plugins/elasticsearch/Fixtures.scala | 4 +-- .../elasticsearch/IdResolutionSuite.scala | 4 +-- .../ScalaTestElasticSearchClientSetup.scala | 4 +-- .../ElasticSearchCoordinatorSuite.scala | 1 + .../query/DefaultViewSearchSuite.scala | 6 ++-- .../ElasticSearchViewsRoutesFixtures.scala | 2 -- .../GraphAnalyticsPluginModule.scala | 5 +-- .../routes/GraphAnalyticsRoutes.scala | 3 +- .../GraphAnalyticsCoordinatorSuite.scala | 1 + .../delta/plugins/jira/JiraPluginModule.scala | 7 ++-- .../plugins/jira/routes/JiraRoutes.scala | 3 +- .../ProjectDeletionModule.scala | 6 ++-- .../ProjectDeletionRoutes.scala | 4 +-- .../ShouldDeleteProjectSuite.scala | 8 +---- .../plugins/search/SearchPluginModule.scala | 6 ++-- .../delta/plugins/search/SearchRoutes.scala | 3 +- .../plugins/storage/StoragePluginModule.scala | 9 +---- .../delta/plugins/storage/files/Files.scala | 4 +-- .../storage/files/FormDataExtractor.scala | 4 +-- .../storage/files/routes/FilesRoutes.scala | 3 -- .../storages/routes/StoragesRoutes.scala | 3 -- .../plugins/storage/files/FileFixtures.scala | 3 +- .../files/routes/FilesRoutesSpec.scala | 2 +- .../delta/sdk/directives/AuthDirectives.scala | 5 ++- .../sdk/directives/DeltaDirectives.scala | 9 ++--- .../directives/DeltaSchemeDirectives.scala | 17 +++++----- .../nexus/delta/sdk/directives/Response.scala | 3 +- .../sdk/directives/ResponseToJsonLd.scala | 34 +++++++++---------- .../ResponseToJsonLdDiscardingEntity.scala | 10 +++--- .../sdk/directives/ResponseToRedirect.scala | 6 ++-- .../delta/sdk/directives/ResponseToSse.scala | 8 ++--- .../sdk/marshalling/RdfExceptionHandler.scala | 5 ++- .../sdk/marshalling/RdfRejectionHandler.scala | 4 +-- .../delta/sdk/stream/StreamConverter.scala | 4 +-- .../nexus/delta/sdk/SerializationSuite.scala | 1 + .../nexus/delta/sdk/acls/AclSimpleCheck.scala | 4 +-- .../sdk/directives/DeltaDirectivesSpec.scala | 6 ++-- .../delta/sdk/generators/ResourceGen.scala | 11 +++--- .../delta/sdk/generators/SchemaGen.scala | 6 ++-- .../sdk/identities/IdentitiesImplSuite.scala | 1 + .../delta/sdk/projects/UUIDCacheSuite.scala | 4 +-- .../sdk/resources/ResourcesImplSpec.scala | 6 ++-- .../nexus/delta/sdk/utils/BaseRouteSpec.scala | 3 +- .../nexus/delta/sdk/utils/RouteFixtures.scala | 3 +- .../event/ScopedEventStoreSuite.scala | 3 +- .../delta/sourcing/postgres/Doobie.scala | 3 +- .../postgres/DoobieScalaTestFixture.scala | 3 +- .../sourcing/stream/SupervisorSetup.scala | 3 +- .../nexus/testkit/ce/CatsRunContext.scala | 9 ----- .../testkit/mu/ce/CatsEffectAssertions.scala | 3 +- .../nexus/testkit/mu/ce/CatsEffectSuite.scala | 3 +- .../nexus/testkit/mu/ce/CatsIOValues.scala | 4 +-- .../testkit/mu/ce/CatsStreamAssertions.scala | 3 +- .../scalatest/ClasspathResources.scala | 5 ++- .../ce/CatsEffectAsyncScalaTestAdapter.scala | 5 ++- .../testkit/scalatest/ce/CatsEffectSpec.scala | 2 -- .../testkit/scalatest/ce/CatsIOValues.scala | 4 +-- .../epfl/bluebrain/nexus/storage/Main.scala | 1 - .../storage/attributes/AttributesCache.scala | 2 -- .../attributes/AttributesCacheActor.scala | 5 ++- .../nexus/storage/routes/AuthDirectives.scala | 4 +-- .../nexus/storage/routes/Routes.scala | 8 ++--- .../nexus/storage/routes/StorageRoutes.scala | 6 ++-- .../nexus/storage/routes/instances.scala | 4 +-- .../attributes/AttributesCacheSpec.scala | 1 + .../auth/AuthorizationMethodSuite.scala | 4 +-- .../nexus/storage/utils/Randomness.scala | 2 -- .../nexus/storage/utils/Resources.scala | 4 +-- .../nexus/tests/BaseIntegrationSpec.scala | 3 +- .../bluebrain/nexus/tests/BlazegraphDsl.scala | 2 -- .../nexus/tests/ElasticsearchDsl.scala | 4 +-- .../bluebrain/nexus/tests/HttpClient.scala | 4 +-- .../bluebrain/nexus/tests/KeycloakDsl.scala | 4 +-- .../epfl/bluebrain/nexus/tests/Optics.scala | 3 +- .../nexus/tests/admin/AdminDsl.scala | 4 +-- .../bluebrain/nexus/tests/iam/AclDsl.scala | 4 +-- .../nexus/tests/iam/PermissionDsl.scala | 4 +-- .../nexus/tests/iam/RealmsSpec.scala | 1 + .../tests/kg/AutoProjectDeletionSpec.scala | 1 + .../nexus/tests/kg/CompositeViewsSpec.scala | 1 + .../tests/kg/ElasticSearchViewsSpec.scala | 1 + .../nexus/tests/kg/VersionSpec.scala | 1 + 143 files changed, 237 insertions(+), 474 deletions(-) delete mode 100644 delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/ce/CatsRunContext.scala diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/Main.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/Main.scala index f3a2718439..7f333859b1 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/Main.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/Main.scala @@ -53,7 +53,7 @@ object Main extends IOApp { (cfg, config, cl, pluginDefs) <- Resource.eval(loadPluginsAndConfig(loaderConfig)) _ <- Resource.eval(KamonMonitoring.initialize(config)) modules = DeltaModule(cfg, config, cl) - (plugins, locator) <- WiringInitializer(modules, pluginDefs)(runtime) + (plugins, locator) <- WiringInitializer(modules, pluginDefs) _ <- bootstrap(locator, plugins) } yield locator diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugin/WiringInitializer.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugin/WiringInitializer.scala index a34ea12d66..6575ea5281 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugin/WiringInitializer.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugin/WiringInitializer.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.plugin -import cats.effect.unsafe.IORuntime import cats.effect.{IO, Resource} import cats.syntax.monadError._ import cats.syntax.traverse._ @@ -23,12 +22,9 @@ object WiringInitializer { def apply( serviceModule: ModuleDef, pluginsDef: List[PluginDef] - )(implicit runtime: IORuntime): Resource[IO, (List[Plugin], Locator)] = { - val catsEffectModule = new ModuleDef { - make[IORuntime].fromValue(runtime) - } + ): Resource[IO, (List[Plugin], Locator)] = { val pluginsInfoModule = new ModuleDef { make[List[PluginDef]].from(pluginsDef) } - val appModules = (catsEffectModule :: serviceModule :: pluginsInfoModule :: pluginsDef.map(_.module)).merge + val appModules = (serviceModule :: pluginsInfoModule :: pluginsDef.map(_.module)).merge // workaround for: java.lang.NoClassDefFoundError: zio/blocking/package$Blocking$Service implicit val defaultModule: DefaultModule[IO] = DefaultModule.empty diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/AclsRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/AclsRoutes.scala index fa61dae49c..031fcd218e 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/AclsRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/AclsRoutes.scala @@ -7,7 +7,6 @@ import akka.http.scaladsl.model.Uri.Path._ import akka.http.scaladsl.model.{StatusCode, StatusCodes} import akka.http.scaladsl.server.{Directive1, MalformedQueryParamRejection, Route} import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.JsonLdContext.keywords import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution @@ -43,8 +42,7 @@ import scala.annotation.nowarn class AclsRoutes(identities: Identities, acls: Acls, aclCheck: AclCheck)(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling with QueryParamsUnmarshalling { @@ -247,8 +245,7 @@ object AclsRoutes { def apply(identities: Identities, acls: Acls, aclCheck: AclCheck)(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): AclsRoutes = new AclsRoutes(identities, acls, aclCheck) } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ElemRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ElemRoutes.scala index c15fb65d2a..5edb2b7ea8 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ElemRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ElemRoutes.scala @@ -3,7 +3,6 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.model.StatusCodes.OK import akka.http.scaladsl.server.Route -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.{ContextValue, RemoteContextResolution} import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder @@ -40,8 +39,7 @@ class ElemRoutes( )(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck: AclCheck) { import baseUri.prefixSegment import schemeDirectives._ diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/EventsRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/EventsRoutes.scala index 010b3528de..2b9c92e1a8 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/EventsRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/EventsRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.model.StatusCodes.OK import akka.http.scaladsl.server.{Directive1, Route} -import cats.effect.unsafe.IORuntime import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering @@ -40,8 +39,7 @@ class EventsRoutes( )(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck: AclCheck) { import baseUri.prefixSegment @@ -147,8 +145,7 @@ object EventsRoutes { )(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): Route = new EventsRoutes(identities, aclCheck, sseEventLog, schemeDirectives).routes } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/IdentitiesRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/IdentitiesRoutes.scala index c6a7606d8f..755725974f 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/IdentitiesRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/IdentitiesRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclCheck @@ -19,8 +18,7 @@ import kamon.instrumentation.akka.http.TracingDirectives.operationName class IdentitiesRoutes(identities: Identities, aclCheck: AclCheck)(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck) { import baseUri.prefixSegment @@ -47,6 +45,6 @@ object IdentitiesRoutes { def apply( identities: Identities, aclCheck: AclCheck - )(implicit baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, runtime: IORuntime): Route = + )(implicit baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering): Route = new IdentitiesRoutes(identities, aclCheck).routes } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/MultiFetchRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/MultiFetchRoutes.scala index a58f0098b5..68de1533ae 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/MultiFetchRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/MultiFetchRoutes.scala @@ -1,7 +1,6 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.server.Route -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclCheck @@ -26,8 +25,7 @@ class MultiFetchRoutes( )(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling with RdfMarshalling { diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutes.scala index 0d1bc3588c..1ac939bad2 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/OrganizationsRoutes.scala @@ -3,7 +3,7 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.server.{Directive1, Route} import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder @@ -55,8 +55,7 @@ final class OrganizationsRoutes( baseUri: BaseUri, paginationConfig: PaginationConfig, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling { @@ -196,8 +195,7 @@ object OrganizationsRoutes { baseUri: BaseUri, paginationConfig: PaginationConfig, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): Route = new OrganizationsRoutes(identities, organizations, orgDeleter, aclCheck, schemeDirectives).routes diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/PermissionsRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/PermissionsRoutes.scala index affa0f9bf8..39a523fc75 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/PermissionsRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/PermissionsRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.server.{MalformedRequestContentRejection, Route} import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.JsonLdContext.keywords @@ -44,8 +43,7 @@ import scala.annotation.nowarn final class PermissionsRoutes(identities: Identities, permissions: Permissions, aclCheck: AclCheck)(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling { @@ -135,8 +133,7 @@ object PermissionsRoutes { def apply(identities: Identities, permissions: Permissions, aclCheck: AclCheck)(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): Route = new PermissionsRoutes(identities, permissions, aclCheck: AclCheck).routes diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ProjectsRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ProjectsRoutes.scala index 81349d700b..b7dfa7fcfe 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ProjectsRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ProjectsRoutes.scala @@ -3,7 +3,7 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.model._ import akka.http.scaladsl.server._ import cats.data.OptionT -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder @@ -53,8 +53,7 @@ final class ProjectsRoutes( config: ProjectsConfig, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - fusionConfig: FusionConfig, - runtime: IORuntime + fusionConfig: FusionConfig ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling { @@ -201,7 +200,6 @@ object ProjectsRoutes { config: ProjectsConfig, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ): Route = new ProjectsRoutes(identities, aclCheck, projects, projectsStatistics, projectProvisioning, schemeDirectives).routes diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/QuotasRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/QuotasRoutes.scala index c4b9360e6b..704b129327 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/QuotasRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/QuotasRoutes.scala @@ -1,7 +1,6 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.server._ -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclCheck @@ -27,7 +26,7 @@ final class QuotasRoutes( identities: Identities, aclCheck: AclCheck, quotas: Quotas -)(implicit baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, runtime: IORuntime) +)(implicit baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering) extends AuthDirectives(identities, aclCheck) with RdfMarshalling { diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/RealmsRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/RealmsRoutes.scala index 7e24b3684c..0d31a049ce 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/RealmsRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/RealmsRoutes.scala @@ -4,7 +4,6 @@ import akka.http.scaladsl.model.{StatusCode, StatusCodes, Uri} import akka.http.scaladsl.server.{Directive1, Route} import cats.data.NonEmptySet import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder @@ -36,8 +35,7 @@ class RealmsRoutes(identities: Identities, realms: Realms, aclCheck: AclCheck)(i baseUri: BaseUri, paginationConfig: PaginationConfig, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling { @@ -142,8 +140,7 @@ object RealmsRoutes { baseUri: BaseUri, paginationConfig: PaginationConfig, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): Route = new RealmsRoutes(identities, realms, aclCheck).routes diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResolversRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResolversRoutes.scala index c5f35fb237..930aa5076a 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResolversRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResolversRoutes.scala @@ -4,7 +4,6 @@ import akka.http.scaladsl.model.StatusCodes.Created import akka.http.scaladsl.model.{StatusCode, StatusCodes} import akka.http.scaladsl.server._ import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.{contexts, schemas} import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.{ContextValue, RemoteContextResolution} @@ -56,7 +55,6 @@ final class ResolversRoutes( baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling @@ -248,7 +246,6 @@ object ResolversRoutes { baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ): Route = new ResolversRoutes(identities, aclCheck, resolvers, multiResolution, schemeDirectives, index).routes diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesRoutes.scala index 859a17e994..717a6f69af 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesRoutes.scala @@ -3,7 +3,6 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.model.StatusCodes.{Created, OK} import akka.http.scaladsl.server._ import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.rdf.RdfError import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.schemas @@ -53,7 +52,6 @@ final class ResourcesRoutes( baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig, decodingOption: DecodingOption ) extends AuthDirectives(identities, aclCheck) @@ -325,7 +323,6 @@ object ResourcesRoutes { baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig, decodingOption: DecodingOption ): Route = new ResourcesRoutes(identities, aclCheck, resources, projectsDirectives, index).routes diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesTrialRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesTrialRoutes.scala index dcf9748800..c60686616c 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesTrialRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesTrialRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.schemas import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution @@ -45,7 +44,6 @@ final class ResourcesTrialRoutes( baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, decodingOption: DecodingOption ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling @@ -156,7 +154,6 @@ object ResourcesTrialRoutes { baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, decodingOption: DecodingOption ): ResourcesTrialRoutes = new ResourcesTrialRoutes( diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/SchemasRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/SchemasRoutes.scala index 2cfccc951d..49005bb030 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/SchemasRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/SchemasRoutes.scala @@ -5,7 +5,6 @@ import akka.http.scaladsl.model.{StatusCode, StatusCodes} import akka.http.scaladsl.server._ import cats.effect.IO import cats.implicits._ -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.schemas.shacl import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.{ContextValue, RemoteContextResolution} @@ -52,7 +51,6 @@ final class SchemasRoutes( baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling @@ -192,7 +190,6 @@ object SchemasRoutes { baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ): Route = new SchemasRoutes(identities, aclCheck, schemas, schemeDirectives, index).routes diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/SupervisionRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/SupervisionRoutes.scala index 91abc161de..0fb4e31623 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/SupervisionRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/SupervisionRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.server._ import cats.effect.IO -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.{ContextValue, RemoteContextResolution} import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder @@ -28,8 +27,7 @@ class SupervisionRoutes( )(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck) { import baseUri.prefixSegment @@ -67,8 +65,7 @@ object SupervisionRoutes { )(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): SupervisionRoutes = new SupervisionRoutes(identities, aclCheck, supervisor.getRunningProjections()) diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/UserPermissionsRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/UserPermissionsRoutes.scala index aa83ebc315..dc031ace76 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/UserPermissionsRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/UserPermissionsRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.server.Route -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclCheck import ch.epfl.bluebrain.nexus.delta.sdk.acls.model.AclAddress import ch.epfl.bluebrain.nexus.delta.sdk.circe.CirceUnmarshalling @@ -23,9 +22,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.permissions.model.Permission * verify the acls for users */ final class UserPermissionsRoutes(identities: Identities, aclCheck: AclCheck, storages: StoragePermissionProvider)( - implicit - baseUri: BaseUri, - runtime: IORuntime + implicit baseUri: BaseUri ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling { @@ -61,8 +58,7 @@ final class UserPermissionsRoutes(identities: Identities, aclCheck: AclCheck, st object UserPermissionsRoutes { def apply(identities: Identities, aclCheck: AclCheck, storagePermissionProvider: StoragePermissionProvider)(implicit - baseUri: BaseUri, - runtime: IORuntime + baseUri: BaseUri ): Route = new UserPermissionsRoutes(identities, aclCheck: AclCheck, storagePermissionProvider).routes } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/VersionRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/VersionRoutes.scala index b4a57aa2a5..34700332f5 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/VersionRoutes.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/VersionRoutes.scala @@ -1,7 +1,6 @@ package ch.epfl.bluebrain.nexus.delta.routes import akka.http.scaladsl.server.Route -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.config.DescriptionConfig import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary @@ -33,8 +32,7 @@ class VersionRoutes( )(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck) { def routes: Route = @@ -91,8 +89,7 @@ object VersionRoutes { )(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): VersionRoutes = { new VersionRoutes(identities, aclCheck, ServiceDescription(cfg.name, cfg.version), plugins, dependencies, cfg.env) } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/AclsModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/AclsModule.scala index 87ddfac1d4..55caf49141 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/AclsModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/AclsModule.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.wiring import akka.http.scaladsl.server.RouteConcatenation import cats.effect.{Clock, IO} -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority import ch.epfl.bluebrain.nexus.delta.config.AppConfig import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader @@ -55,10 +54,9 @@ object AclsModule extends ModuleDef { aclCheck: AclCheck, baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) => - new AclsRoutes(identities, acls, aclCheck)(baseUri, cr, ordering, runtime) + new AclsRoutes(identities, acls, aclCheck)(baseUri, cr, ordering) } many[ProjectDeletionTask].add { (acls: Acls) => Acls.projectDeletionTask(acls) } @@ -79,10 +77,9 @@ object AclsModule extends ModuleDef { identities: Identities, aclCheck: AclCheck, baseUri: BaseUri, - storagePermissionProvider: StoragePermissionProvider, - runtime: IORuntime + storagePermissionProvider: StoragePermissionProvider ) => - new UserPermissionsRoutes(identities, aclCheck, storagePermissionProvider)(baseUri, runtime) + new UserPermissionsRoutes(identities, aclCheck, storagePermissionProvider)(baseUri) } many[PriorityRoute].add { (alcs: AclsRoutes, userPermissions: UserPermissionsRoutes) => diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/DeltaModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/DeltaModule.scala index a6e2a40e07..933ffbd5af 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/DeltaModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/DeltaModule.scala @@ -8,7 +8,6 @@ import akka.http.scaladsl.model.headers.Location import akka.http.scaladsl.server.{ExceptionHandler, RejectionHandler, Route} import akka.stream.{Materializer, SystemMaterializer} import cats.data.NonEmptyList -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO, Resource, Sync} import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority import ch.epfl.bluebrain.nexus.delta.config.AppConfig @@ -129,13 +128,12 @@ class DeltaModule(appCfg: AppConfig, config: Config)(implicit classLoader: Class } make[Materializer].from((as: ActorSystem[Nothing]) => SystemMaterializer(as).materializer) make[Logger].from { LoggerFactory.getLogger("delta") } - make[RejectionHandler].from { - (cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, runtime: IORuntime) => - RdfRejectionHandler(cr, ordering, runtime) + make[RejectionHandler].from { (cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering) => + RdfRejectionHandler(cr, ordering) } make[ExceptionHandler].from { - (cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, base: BaseUri, runtime: IORuntime) => - RdfExceptionHandler(cr, ordering, base, runtime) + (cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, base: BaseUri) => + RdfExceptionHandler(cr, ordering, base) } make[CorsSettings].from( CorsSettings.defaultSettings diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/EventsModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/EventsModule.scala index b89af4ca43..3b00ff7cfa 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/EventsModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/EventsModule.scala @@ -16,7 +16,6 @@ import ch.epfl.bluebrain.nexus.delta.sdk.sse.{SseElemStream, SseEncoder, SseEven import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.delta.sourcing.config.QueryConfig import izumi.distage.model.definition.{Id, ModuleDef} -import cats.effect.unsafe.IORuntime /** * Events wiring @@ -53,10 +52,9 @@ object EventsModule extends ModuleDef { schemeDirectives: DeltaSchemeDirectives, baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) => - new EventsRoutes(identities, aclCheck, sseEventLog, schemeDirectives)(baseUri, cr, ordering, runtime) + new EventsRoutes(identities, aclCheck, sseEventLog, schemeDirectives)(baseUri, cr, ordering) } many[PriorityRoute].add { (route: EventsRoutes) => @@ -70,11 +68,10 @@ object EventsModule extends ModuleDef { sseElemStream: SseElemStream, schemeDirectives: DeltaSchemeDirectives, baseUri: BaseUri, - runtime: IORuntime, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering ) => - new ElemRoutes(identities, aclCheck, sseElemStream, schemeDirectives)(baseUri, cr, ordering, runtime) + new ElemRoutes(identities, aclCheck, sseElemStream, schemeDirectives)(baseUri, cr, ordering) } many[PriorityRoute].add { (route: ElemRoutes) => diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/IdentitiesModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/IdentitiesModule.scala index 39c8afeec6..607d47e916 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/IdentitiesModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/IdentitiesModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.wiring -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority import ch.epfl.bluebrain.nexus.delta.config.AppConfig @@ -51,9 +50,8 @@ object IdentitiesModule extends ModuleDef { aclCheck: AclCheck, baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime - ) => new IdentitiesRoutes(identities, aclCheck)(baseUri, cr, ordering, runtime) + ordering: JsonKeyOrdering + ) => new IdentitiesRoutes(identities, aclCheck)(baseUri, cr, ordering) } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/MultiFetchModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/MultiFetchModule.scala index f7e7b8667c..18ed6340a7 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/MultiFetchModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/MultiFetchModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.wiring -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering @@ -34,10 +33,9 @@ object MultiFetchModule extends ModuleDef { multiFetch: MultiFetch, baseUri: BaseUri, rcr: RemoteContextResolution @Id("aggregate"), - jko: JsonKeyOrdering, - runtime: IORuntime + jko: JsonKeyOrdering ) => - new MultiFetchRoutes(identities, aclCheck, multiFetch)(baseUri, rcr, jko, runtime) + new MultiFetchRoutes(identities, aclCheck, multiFetch)(baseUri, rcr, jko) } many[PriorityRoute].add { (route: MultiFetchRoutes) => diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/OrganizationsModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/OrganizationsModule.scala index 22857bfbbc..acc6eb14f0 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/OrganizationsModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/OrganizationsModule.scala @@ -18,7 +18,6 @@ import ch.epfl.bluebrain.nexus.delta.sdk.organizations.{OrganizationDeleter, Org import ch.epfl.bluebrain.nexus.delta.sdk.sse.SseEncoder import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import izumi.distage.model.definition.{Id, ModuleDef} -import cats.effect.unsafe.IORuntime /** * Organizations module wiring config. @@ -57,15 +56,13 @@ object OrganizationsModule extends ModuleDef { aclCheck: AclCheck, schemeDirectives: DeltaSchemeDirectives, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) => new OrganizationsRoutes(identities, organizations, orgDeleter, aclCheck, schemeDirectives)( cfg.http.baseUri, cfg.organizations.pagination, cr, - ordering, - runtime + ordering ) } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/PermissionsModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/PermissionsModule.scala index 6adc6470dc..e6085a5a9c 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/PermissionsModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/PermissionsModule.scala @@ -16,7 +16,6 @@ import ch.epfl.bluebrain.nexus.delta.sdk.permissions.{Permissions, PermissionsIm import ch.epfl.bluebrain.nexus.delta.sdk.sse.SseEncoder import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import izumi.distage.model.definition.{Id, ModuleDef} -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader /** @@ -42,9 +41,8 @@ object PermissionsModule extends ModuleDef { aclCheck: AclCheck, baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime - ) => new PermissionsRoutes(identities, permissions, aclCheck)(baseUri, cr, ordering, runtime) + ordering: JsonKeyOrdering + ) => new PermissionsRoutes(identities, permissions, aclCheck)(baseUri, cr, ordering) } many[SseEncoder[_]].add { base: BaseUri => PermissionsEvent.sseEncoder(base) } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ProjectsModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ProjectsModule.scala index 4a4d06a0e8..18de9649ea 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ProjectsModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ProjectsModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.wiring -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority @@ -120,9 +119,8 @@ object ProjectsModule extends ModuleDef { UUIDCache(config.projects.cache, config.organizations.cache, xas) } - make[DeltaSchemeDirectives].from { - (fetchContext: FetchContext[ContextRejection], uuidCache: UUIDCache, runtime: IORuntime) => - DeltaSchemeDirectives(fetchContext, uuidCache)(runtime) + make[DeltaSchemeDirectives].from { (fetchContext: FetchContext[ContextRejection], uuidCache: UUIDCache) => + DeltaSchemeDirectives(fetchContext, uuidCache) } make[ProjectsRoutes].from { @@ -137,7 +135,6 @@ object ProjectsModule extends ModuleDef { baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) => new ProjectsRoutes(identities, aclCheck, projects, projectsStatistics, projectProvisioning, schemeDirectives)( @@ -145,8 +142,7 @@ object ProjectsModule extends ModuleDef { config.projects, cr, ordering, - fusionConfig, - runtime + fusionConfig ) } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/QuotasModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/QuotasModule.scala index cd0df4ec37..7f661614bd 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/QuotasModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/QuotasModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.wiring -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority import ch.epfl.bluebrain.nexus.delta.config.AppConfig import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader @@ -39,9 +38,8 @@ object QuotasModule extends ModuleDef { quotas: Quotas, baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime - ) => new QuotasRoutes(identities, aclCheck, quotas)(baseUri, cr, ordering, runtime) + ordering: JsonKeyOrdering + ) => new QuotasRoutes(identities, aclCheck, quotas)(baseUri, cr, ordering) } many[PriorityRoute].add { (route: QuotasRoutes) => diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/RealmsModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/RealmsModule.scala index f6b2b851d8..144f53a905 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/RealmsModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/RealmsModule.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.wiring import akka.actor.typed.ActorSystem import akka.http.scaladsl.model.{HttpRequest, Uri} -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority import ch.epfl.bluebrain.nexus.delta.config.AppConfig @@ -48,10 +47,9 @@ object RealmsModule extends ModuleDef { cfg: AppConfig, aclCheck: AclCheck, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) => - new RealmsRoutes(identities, realms, aclCheck)(cfg.http.baseUri, cfg.realms.pagination, cr, ordering, runtime) + new RealmsRoutes(identities, realms, aclCheck)(cfg.http.baseUri, cfg.realms.pagination, cr, ordering) } make[HttpClient].named("realm").from { (as: ActorSystem[Nothing]) => diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResolversModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResolversModule.scala index 2e3f2fd9d7..9f9f911e4e 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResolversModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResolversModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.wiring -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority import ch.epfl.bluebrain.nexus.delta.config.AppConfig @@ -80,7 +79,6 @@ object ResolversModule extends ModuleDef { baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) => new ResolversRoutes( @@ -94,7 +92,6 @@ object ResolversModule extends ModuleDef { baseUri, cr, ordering, - runtime, fusionConfig ) } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResourcesModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResourcesModule.scala index f9f051769a..3f1b7b82ab 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResourcesModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResourcesModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.wiring -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import ch.epfl.bluebrain.nexus.delta.Main.pluginsMinPriority import ch.epfl.bluebrain.nexus.delta.config.AppConfig @@ -87,7 +86,6 @@ object ResourcesModule extends ModuleDef { baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig, config: ResourcesConfig ) => @@ -101,7 +99,6 @@ object ResourcesModule extends ModuleDef { baseUri, cr, ordering, - runtime, fusionConfig, config.decodingOption ) diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResourcesTrialModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResourcesTrialModule.scala index d4c3250fbd..d3a96011be 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResourcesTrialModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/ResourcesTrialModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.wiring -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import ch.epfl.bluebrain.nexus.delta.Main.pluginsMinPriority import ch.epfl.bluebrain.nexus.delta.kernel.utils.UUIDF @@ -56,7 +55,6 @@ object ResourcesTrialModule extends ModuleDef { baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, config: ResourcesConfig ) => ResourcesTrialRoutes( @@ -69,7 +67,6 @@ object ResourcesTrialModule extends ModuleDef { baseUri, cr, ordering, - runtime, config.decodingOption ) } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/SchemasModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/SchemasModule.scala index 6ecb2edbec..fc116ccbfb 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/SchemasModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/SchemasModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.wiring -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority import ch.epfl.bluebrain.nexus.delta.config.AppConfig @@ -87,14 +86,12 @@ object SchemasModule extends ModuleDef { baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) => new SchemasRoutes(identities, aclCheck, schemas, schemeDirectives, indexingAction(_, _, _)(shift))( baseUri, cr, ordering, - runtime, fusionConfig ) } diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/SupervisionModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/SupervisionModule.scala index c5f1a89338..fbfdeefc7f 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/SupervisionModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/SupervisionModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.wiring -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts @@ -29,9 +28,8 @@ object SupervisionModule extends ModuleDef { supervisor: Supervisor, baseUri: BaseUri, rc: RemoteContextResolution @Id("aggregate"), - jo: JsonKeyOrdering, - runtime: IORuntime - ) => new SupervisionRoutes(identities, aclCheck, supervisor.getRunningProjections())(baseUri, rc, jo, runtime) + jo: JsonKeyOrdering + ) => new SupervisionRoutes(identities, aclCheck, supervisor.getRunningProjections())(baseUri, rc, jo) } many[RemoteContextResolution].addEffect( diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/VersionModule.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/VersionModule.scala index dabdc43ad2..5ec366dd22 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/VersionModule.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/wiring/VersionModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.wiring -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.Main.pluginsMaxPriority import ch.epfl.bluebrain.nexus.delta.config.AppConfig import ch.epfl.bluebrain.nexus.delta.dependency.PostgresServiceDependency @@ -30,14 +29,12 @@ object VersionModule extends ModuleDef { plugins: List[PluginDescription], dependencies: Set[ServiceDependency], cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) => VersionRoutes(identities, aclCheck, plugins, dependencies.toList, cfg.description)( cfg.http.baseUri, cr, - ordering, - runtime + ordering ) } diff --git a/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/MainSuite.scala b/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/MainSuite.scala index 860caafbdf..3c193c910c 100644 --- a/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/MainSuite.scala +++ b/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/MainSuite.scala @@ -18,7 +18,6 @@ import izumi.distage.planning.solver.PlanVerifier import munit.AnyFixture import java.nio.file.{Files, Paths} -import cats.effect.unsafe.IORuntime /** * Test class that allows to check that across core and plugins: @@ -39,13 +38,10 @@ class MainSuite extends CatsEffectSuite with MainSuite.Fixture { } test("yield a correct plan") { - val catsEffectModule = new ModuleDef { - make[IORuntime].fromValue(runtime) - } val (cfg, config, cl, pDefs) = Main.loadPluginsAndConfig(pluginLoaderConfig).accepted val pluginsInfoModule = new ModuleDef { make[List[PluginDef]].from(pDefs) } val modules: Module = - (catsEffectModule :: DeltaModule(cfg, config, cl) :: pluginsInfoModule :: pDefs.map(_.module)).merge + (DeltaModule(cfg, config, cl) :: pluginsInfoModule :: pDefs.map(_.module)).merge PlanVerifier() .verify[IO]( diff --git a/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugin/PluginLoaderSpec.scala b/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugin/PluginLoaderSpec.scala index bc90834b61..1f14273d3f 100644 --- a/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugin/PluginLoaderSpec.scala +++ b/delta/app/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugin/PluginLoaderSpec.scala @@ -5,12 +5,11 @@ import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.plugin.PluginsLoader.PluginLoaderConfig import ch.epfl.bluebrain.nexus.delta.sdk.PriorityRoute import ch.epfl.bluebrain.nexus.delta.sdk.model.BaseUri -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.CatsEffectSpec import com.typesafe.config.impl.ConfigImpl import izumi.distage.model.definition.ModuleDef -class PluginLoaderSpec extends CatsEffectSpec with ScalatestRouteTest with CatsRunContext { +class PluginLoaderSpec extends CatsEffectSpec with ScalatestRouteTest { private val baseUri = BaseUri.withoutPrefix("http://localhost") private val serviceModule = new ModuleDef { diff --git a/delta/kernel/src/test/scala/ch/epfl/bluebrain/nexus/delta/kernel/utils/ClasspathResourceUtilsSpec.scala b/delta/kernel/src/test/scala/ch/epfl/bluebrain/nexus/delta/kernel/utils/ClasspathResourceUtilsSpec.scala index 715cdb3e67..45a5670bb3 100644 --- a/delta/kernel/src/test/scala/ch/epfl/bluebrain/nexus/delta/kernel/utils/ClasspathResourceUtilsSpec.scala +++ b/delta/kernel/src/test/scala/ch/epfl/bluebrain/nexus/delta/kernel/utils/ClasspathResourceUtilsSpec.scala @@ -1,7 +1,7 @@ package ch.epfl.bluebrain.nexus.delta.kernel.utils import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceError.{InvalidJson, InvalidJsonObject, ResourcePathNotFound} import io.circe.syntax._ import io.circe.{Json, JsonObject} @@ -10,8 +10,6 @@ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike class ClasspathResourceUtilsSpec extends AnyWordSpecLike with Matchers with ScalaFutures { - implicit val runtime: IORuntime = IORuntime.global - private val loader: ClasspathResourceLoader = ClasspathResourceLoader() private def accept[A](io: IO[A]): A = diff --git a/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/ArchiveDownload.scala b/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/ArchiveDownload.scala index cfc32a9661..819cf29f1d 100644 --- a/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/ArchiveDownload.scala +++ b/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/ArchiveDownload.scala @@ -4,8 +4,8 @@ import akka.stream.alpakka.file.ArchiveMetadata import akka.stream.scaladsl.Source import akka.util.ByteString import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.implicits._ +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.delta.plugins.archive.FileSelf.ParsingError import ch.epfl.bluebrain.nexus.delta.plugins.archive.model.ArchiveReference.{FileReference, FileSelfReference, ResourceReference} @@ -90,8 +90,7 @@ object ArchiveDownload { )(implicit sort: JsonKeyOrdering, baseUri: BaseUri, - rcr: RemoteContextResolution, - runtime: IORuntime + rcr: RemoteContextResolution ): ArchiveDownload = new ArchiveDownload { @@ -270,8 +269,7 @@ object ArchiveDownload { def apply(aclCheck: AclCheck, shifts: ResourceShifts, files: Files, fileSelf: FileSelf)(implicit sort: JsonKeyOrdering, baseUri: BaseUri, - rcr: RemoteContextResolution, - runtime: IORuntime + rcr: RemoteContextResolution ): ArchiveDownload = ArchiveDownload( aclCheck, diff --git a/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/ArchivePluginModule.scala b/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/ArchivePluginModule.scala index 5ecf66933a..9987f7bcc6 100644 --- a/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/ArchivePluginModule.scala +++ b/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/ArchivePluginModule.scala @@ -20,7 +20,6 @@ import ch.epfl.bluebrain.nexus.delta.sdk.projects.model.ApiMappings import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import com.typesafe.config.Config import izumi.distage.model.definition.{Id, ModuleDef} -import cats.effect.unsafe.IORuntime /** * Archive plugin wiring. @@ -39,10 +38,9 @@ object ArchivePluginModule extends ModuleDef { fileSelf: FileSelf, sort: JsonKeyOrdering, baseUri: BaseUri, - rcr: RemoteContextResolution @Id("aggregate"), - runtime: IORuntime + rcr: RemoteContextResolution @Id("aggregate") ) => - ArchiveDownload(aclCheck, shifts, files, fileSelf)(sort, baseUri, rcr, runtime) + ArchiveDownload(aclCheck, shifts, files, fileSelf)(sort, baseUri, rcr) } make[FileSelf].from { (fetchContext: FetchContext[ContextRejection], baseUri: BaseUri) => @@ -75,10 +73,9 @@ object ArchivePluginModule extends ModuleDef { schemeDirectives: DeltaSchemeDirectives, baseUri: BaseUri, rcr: RemoteContextResolution @Id("aggregate"), - jko: JsonKeyOrdering, - runtime: IORuntime + jko: JsonKeyOrdering ) => - new ArchiveRoutes(archives, identities, aclCheck, schemeDirectives)(baseUri, rcr, jko, runtime) + new ArchiveRoutes(archives, identities, aclCheck, schemeDirectives)(baseUri, rcr, jko) } many[PriorityRoute].add { (cfg: ArchivePluginConfig, routes: ArchiveRoutes) => diff --git a/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/routes/ArchiveRoutes.scala b/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/routes/ArchiveRoutes.scala index 4c0bb4e779..4b5e4918aa 100644 --- a/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/routes/ArchiveRoutes.scala +++ b/delta/plugins/archive/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/archive/routes/ArchiveRoutes.scala @@ -4,7 +4,6 @@ import akka.http.scaladsl.model.StatusCode import akka.http.scaladsl.model.StatusCodes.{Created, SeeOther} import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.plugins.archive.Archives import ch.epfl.bluebrain.nexus.delta.plugins.archive.model.{permissions, ArchiveRejection, ArchiveResource, Zip} @@ -39,7 +38,7 @@ class ArchiveRoutes( identities: Identities, aclCheck: AclCheck, schemeDirectives: DeltaSchemeDirectives -)(implicit baseUri: BaseUri, rcr: RemoteContextResolution, jko: JsonKeyOrdering, runtime: IORuntime) +)(implicit baseUri: BaseUri, rcr: RemoteContextResolution, jko: JsonKeyOrdering) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling { diff --git a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/BlazegraphPluginModule.scala b/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/BlazegraphPluginModule.scala index 29613c4325..af359f3b86 100644 --- a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/BlazegraphPluginModule.scala +++ b/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/BlazegraphPluginModule.scala @@ -1,7 +1,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.blazegraph import akka.actor.typed.ActorSystem -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import ch.epfl.bluebrain.nexus.delta.kernel.utils.{ClasspathResourceLoader, UUIDF} import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.client.BlazegraphClient @@ -205,7 +204,6 @@ class BlazegraphPluginModule(priority: Int) extends ModuleDef { cfg: BlazegraphViewsConfig, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) => new BlazegraphViewsRoutes( @@ -219,7 +217,6 @@ class BlazegraphPluginModule(priority: Int) extends ModuleDef { baseUri, cr, ordering, - runtime, cfg.pagination, fusionConfig ) @@ -236,8 +233,7 @@ class BlazegraphPluginModule(priority: Int) extends ModuleDef { baseUri: BaseUri, cfg: BlazegraphViewsConfig, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) => new BlazegraphViewsIndexingRoutes( views.fetchIndexingView(_, _), @@ -250,7 +246,6 @@ class BlazegraphPluginModule(priority: Int) extends ModuleDef { baseUri, cr, ordering, - runtime, cfg.pagination ) } diff --git a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsDirectives.scala b/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsDirectives.scala index 2d6b780f6a..270084cc5a 100644 --- a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsDirectives.scala +++ b/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsDirectives.scala @@ -4,7 +4,6 @@ import akka.http.scaladsl.model.MediaType import akka.http.scaladsl.model.MediaTypes.`text/plain` import akka.http.scaladsl.server.Directives.{extractRequest, provide} import akka.http.scaladsl.server.{Directive, Directive1, Route} -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.client.{SparqlQueryResponse, SparqlQueryResponseType} import ch.epfl.bluebrain.nexus.delta.rdf.RdfMediaTypes._ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution @@ -30,15 +29,13 @@ trait BlazegraphViewsDirectives { */ private def emitUnacceptedMediaType(implicit cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): Route = discardEntityAndForceEmit(unacceptedMediaTypeRejection(queryMediaTypes)) def queryResponseType(implicit cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): Directive1[SparqlQueryResponseType.Aux[SparqlQueryResponse]] = extractRequest.flatMap { req => HeadersUtils.findFirst(req.headers, queryMediaTypes).flatMap(SparqlQueryResponseType.fromMediaType) match { diff --git a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsIndexingRoutes.scala b/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsIndexingRoutes.scala index a18592e7db..61a6a2b680 100644 --- a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsIndexingRoutes.scala +++ b/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsIndexingRoutes.scala @@ -3,7 +3,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.routes import cats.implicits._ import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.indexing.IndexingViewDef.ActiveViewDef import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.model.BlazegraphViewRejection._ import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.model._ @@ -43,7 +42,6 @@ class BlazegraphViewsIndexingRoutes( baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, pc: PaginationConfig ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling @@ -155,7 +153,6 @@ object BlazegraphViewsIndexingRoutes { baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, pc: PaginationConfig ): Route = { new BlazegraphViewsIndexingRoutes( diff --git a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsRoutes.scala b/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsRoutes.scala index a97a3ae34c..cb04f6a3cf 100644 --- a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsRoutes.scala +++ b/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.routes import akka.http.scaladsl.model.StatusCodes.Created import akka.http.scaladsl.server.{Directive0, Route} -import cats.effect.unsafe.IORuntime import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.model.BlazegraphView._ import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.model.BlazegraphViewRejection._ @@ -55,7 +54,6 @@ class BlazegraphViewsRoutes( baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, pc: PaginationConfig, fusionConfig: FusionConfig ) extends AuthDirectives(identities, aclCheck) @@ -274,7 +272,6 @@ object BlazegraphViewsRoutes { baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, pc: PaginationConfig, fusionConfig: FusionConfig ): Route = { diff --git a/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/BlazegraphClientSetup.scala b/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/BlazegraphClientSetup.scala index a26d40677a..123554a0a0 100644 --- a/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/BlazegraphClientSetup.scala +++ b/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/BlazegraphClientSetup.scala @@ -5,7 +5,6 @@ import cats.effect.{IO, Resource} import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.client.BlazegraphClient import ch.epfl.bluebrain.nexus.delta.sdk.http.HttpClientSetup import ch.epfl.bluebrain.nexus.testkit.blazegraph.BlazegraphContainer -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.mu.ce.ResourceFixture import ch.epfl.bluebrain.nexus.testkit.mu.ce.ResourceFixture.IOFixture @@ -36,7 +35,7 @@ object BlazegraphClientSetup extends Fixtures { ): IOFixture[BlazegraphClient] = ResourceFixture.suiteLocal(name, resource()) - trait Fixture { self: CatsRunContext => + trait Fixture { val blazegraphClient: ResourceFixture.IOFixture[BlazegraphClient] = BlazegraphClientSetup.suiteLocalFixture("blazegraphClient") } diff --git a/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/indexing/BlazegraphCoordinatorSuite.scala b/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/indexing/BlazegraphCoordinatorSuite.scala index a571cacb24..624d002db8 100644 --- a/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/indexing/BlazegraphCoordinatorSuite.scala +++ b/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/indexing/BlazegraphCoordinatorSuite.scala @@ -1,6 +1,7 @@ package ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.indexing import cats.effect.IO +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.BlazegraphViews import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.indexing.IndexingViewDef.{ActiveViewDef, DeprecatedViewDef} import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.nxv diff --git a/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsIndexingRoutesSpec.scala b/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsIndexingRoutesSpec.scala index 6a0ae10737..6af0c6e44c 100644 --- a/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsIndexingRoutesSpec.scala +++ b/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/routes/BlazegraphViewsIndexingRoutesSpec.scala @@ -24,12 +24,11 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.query.SelectFilter import ch.epfl.bluebrain.nexus.delta.sourcing.stream.Elem.FailedElem import ch.epfl.bluebrain.nexus.delta.sourcing.stream.ProjectionProgress import ch.epfl.bluebrain.nexus.testkit.ce.IOFromMap -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import java.time.Instant import scala.concurrent.duration._ -class BlazegraphViewsIndexingRoutesSpec extends BlazegraphViewRoutesFixtures with IOFromMap with CatsRunContext { +class BlazegraphViewsIndexingRoutesSpec extends BlazegraphViewRoutesFixtures with IOFromMap { private lazy val projections = Projections(xas, queryConfig, 1.hour, clock) private lazy val projectionErrors = ProjectionErrors(xas, queryConfig, clock) diff --git a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/CompositeViewsPluginModule.scala b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/CompositeViewsPluginModule.scala index 2920c9232a..f60efd882d 100644 --- a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/CompositeViewsPluginModule.scala +++ b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/CompositeViewsPluginModule.scala @@ -1,7 +1,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.compositeviews import akka.actor.typed.ActorSystem -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import ch.epfl.bluebrain.nexus.delta.kernel.utils.{ClasspathResourceLoader, UUIDF} import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.client.BlazegraphClient @@ -55,13 +54,11 @@ class CompositeViewsPluginModule(priority: Int) extends ModuleDef { ( cfg: CompositeViewsConfig, as: ActorSystem[Nothing], - runtime: IORuntime, authTokenProvider: AuthTokenProvider ) => val httpClient = HttpClient()(cfg.remoteSourceClient.http, as.classicSystem) DeltaClient(httpClient, authTokenProvider, cfg.remoteSourceCredentials, cfg.remoteSourceClient.retryDelay)( - as, - runtime + as ) } @@ -293,7 +290,6 @@ class CompositeViewsPluginModule(priority: Int) extends ModuleDef { baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) => new CompositeViewsRoutes( @@ -303,7 +299,7 @@ class CompositeViewsPluginModule(priority: Int) extends ModuleDef { blazegraphQuery, elasticSearchQuery, schemeDirectives - )(baseUri, cr, ordering, runtime, fusionConfig) + )(baseUri, cr, ordering, fusionConfig) } make[CompositeViewsIndexingRoutes].from { @@ -318,8 +314,7 @@ class CompositeViewsPluginModule(priority: Int) extends ModuleDef { baseUri: BaseUri, config: CompositeViewsConfig, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) => new CompositeViewsIndexingRoutes( identities, @@ -330,7 +325,7 @@ class CompositeViewsPluginModule(priority: Int) extends ModuleDef { projections, projectionErrors, schemeDirectives - )(baseUri, config.pagination, cr, ordering, runtime) + )(baseUri, config.pagination, cr, ordering) } make[CompositeView.Shift].from { (views: CompositeViews, base: BaseUri) => diff --git a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/client/DeltaClient.scala b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/client/DeltaClient.scala index 0c4e9cf649..06f94df19b 100644 --- a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/client/DeltaClient.scala +++ b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/client/DeltaClient.scala @@ -8,7 +8,7 @@ import akka.http.scaladsl.model.headers.{`Last-Event-ID`, Accept} import akka.http.scaladsl.model.{HttpRequest, HttpResponse, StatusCodes} import akka.stream.alpakka.sse.scaladsl.EventSource import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.delta.plugins.compositeviews.model.CompositeViewSource.RemoteProjectSource import ch.epfl.bluebrain.nexus.delta.plugins.compositeviews.stream.CompositeBranch @@ -84,8 +84,7 @@ object DeltaClient { credentials: Credentials, retryDelay: FiniteDuration )(implicit - as: ActorSystem[Nothing], - runtime: IORuntime + as: ActorSystem[Nothing] ) extends DeltaClient { override def projectStatistics(source: RemoteProjectSource): IO[ProjectStatistics] = { @@ -182,6 +181,6 @@ object DeltaClient { authTokenProvider: AuthTokenProvider, credentials: Credentials, retryDelay: FiniteDuration - )(implicit as: ActorSystem[Nothing], runtime: IORuntime): DeltaClient = + )(implicit as: ActorSystem[Nothing]): DeltaClient = new DeltaClientImpl(client, authTokenProvider, credentials, retryDelay) } diff --git a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsIndexingRoutes.scala b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsIndexingRoutes.scala index 0349b70b6d..c5a97440c2 100644 --- a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsIndexingRoutes.scala +++ b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsIndexingRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.compositeviews.routes import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.routes.BlazegraphViewsDirectives import ch.epfl.bluebrain.nexus.delta.plugins.compositeviews.indexing.CompositeViewDef.ActiveViewDef @@ -44,8 +43,7 @@ class CompositeViewsIndexingRoutes( baseUri: BaseUri, paginationConfig: PaginationConfig, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck) with DeltaDirectives with CirceUnmarshalling @@ -282,8 +280,7 @@ object CompositeViewsIndexingRoutes { baseUri: BaseUri, paginationConfig: PaginationConfig, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): Route = new CompositeViewsIndexingRoutes( identities, diff --git a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsRoutes.scala b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsRoutes.scala index 570ca23164..14fd55f749 100644 --- a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsRoutes.scala +++ b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsRoutes.scala @@ -4,7 +4,6 @@ import akka.http.scaladsl.model.StatusCode import akka.http.scaladsl.model.StatusCodes.{Created, OK} import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.client.SparqlQueryResponse import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.routes.BlazegraphViewsDirectives @@ -41,7 +40,6 @@ class CompositeViewsRoutes( baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) extends AuthDirectives(identities, aclCheck) with DeltaDirectives @@ -209,7 +207,6 @@ object CompositeViewsRoutes { baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ): Route = new CompositeViewsRoutes( diff --git a/delta/plugins/composite-views/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsRoutesFixtures.scala b/delta/plugins/composite-views/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsRoutesFixtures.scala index 3dd76adfb7..081308237a 100644 --- a/delta/plugins/composite-views/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsRoutesFixtures.scala +++ b/delta/plugins/composite-views/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/routes/CompositeViewsRoutesFixtures.scala @@ -14,7 +14,6 @@ import ch.epfl.bluebrain.nexus.delta.sdk.utils.RouteHelpers import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.{Authenticated, Group, User} import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.DoobieScalaTestFixture -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.clock.FixedClock import ch.epfl.bluebrain.nexus.testkit.scalatest.TestMatchers import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.CatsIOValues @@ -30,7 +29,6 @@ trait CompositeViewsRoutesFixtures with CirceLiteral with CirceEq with FixedClock - with CatsRunContext with OptionValues with TestMatchers with Inspectors diff --git a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchPluginModule.scala b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchPluginModule.scala index de34e5a33a..3adc6f2fb9 100644 --- a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchPluginModule.scala +++ b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchPluginModule.scala @@ -39,7 +39,6 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label import ch.epfl.bluebrain.nexus.delta.sourcing.projections.{ProjectionErrors, Projections} import ch.epfl.bluebrain.nexus.delta.sourcing.stream.{PipeChain, ReferenceRegistry, Supervisor} import izumi.distage.model.definition.{Id, ModuleDef} -import cats.effect.unsafe.IORuntime /** * ElasticSearch plugin wiring. @@ -197,7 +196,6 @@ class ElasticSearchPluginModule(priority: Int) extends ModuleDef { baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) => new ElasticSearchViewsRoutes( @@ -211,8 +209,7 @@ class ElasticSearchPluginModule(priority: Int) extends ModuleDef { baseUri, cr, ordering, - fusionConfig, - runtime + fusionConfig ) } @@ -225,7 +222,6 @@ class ElasticSearchPluginModule(priority: Int) extends ModuleDef { baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, resourcesToSchemaSet: Set[ResourceToSchemaMappings], esConfig: ElasticSearchViewsConfig, fetchContext: FetchContext[ContextRejection] @@ -242,7 +238,6 @@ class ElasticSearchPluginModule(priority: Int) extends ModuleDef { esConfig.pagination, cr, ordering, - runtime, fetchContext.mapRejection(ElasticSearchQueryError.ProjectContextRejection) ) } @@ -256,7 +251,6 @@ class ElasticSearchPluginModule(priority: Int) extends ModuleDef { projectionErrors: ProjectionErrors, schemeDirectives: DeltaSchemeDirectives, baseUri: BaseUri, - runtime: IORuntime, cr: RemoteContextResolution @Id("aggregate"), esConfig: ElasticSearchViewsConfig, ordering: JsonKeyOrdering, @@ -274,8 +268,7 @@ class ElasticSearchPluginModule(priority: Int) extends ModuleDef { baseUri, esConfig.pagination, cr, - ordering, - runtime + ordering ) } @@ -289,7 +282,6 @@ class ElasticSearchPluginModule(priority: Int) extends ModuleDef { aclCheck: AclCheck, idResolution: IdResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, rcr: RemoteContextResolution @Id("aggregate"), fusionConfig: FusionConfig, baseUri: BaseUri @@ -298,7 +290,6 @@ class ElasticSearchPluginModule(priority: Int) extends ModuleDef { baseUri, ordering, rcr, - runtime, fusionConfig ) } diff --git a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchIndexingRoutes.scala b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchIndexingRoutes.scala index 77bcb9c5a4..c82017df99 100644 --- a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchIndexingRoutes.scala +++ b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchIndexingRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.routes import akka.http.scaladsl.server._ import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.ElasticSearchViewsQuery import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.indexing.IndexingViewDef.ActiveViewDef @@ -62,8 +61,7 @@ final class ElasticSearchIndexingRoutes( baseUri: BaseUri, paginationConfig: PaginationConfig, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling with RdfMarshalling { @@ -179,8 +177,7 @@ object ElasticSearchIndexingRoutes { baseUri: BaseUri, paginationConfig: PaginationConfig, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): Route = new ElasticSearchIndexingRoutes( identities, diff --git a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchQueryRoutes.scala b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchQueryRoutes.scala index 8a46aa35d1..075833fe54 100644 --- a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchQueryRoutes.scala +++ b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchQueryRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.routes import akka.http.scaladsl.server._ import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.model._ import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.query.DefaultSearchRequest.{OrgSearch, ProjectSearch, RootSearch} @@ -34,7 +33,6 @@ class ElasticSearchQueryRoutes( paginationConfig: PaginationConfig, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fetchContext: FetchContext[ElasticSearchQueryError] ) extends AuthDirectives(identities, aclCheck) with ElasticSearchViewsDirectives { diff --git a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchViewsRoutes.scala b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchViewsRoutes.scala index a87b9175fa..8a00684b6a 100644 --- a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchViewsRoutes.scala +++ b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchViewsRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.routes import akka.http.scaladsl.model.StatusCodes.Created import akka.http.scaladsl.server._ -import cats.effect.unsafe.IORuntime import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.model.ElasticSearchViewRejection._ import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.model._ @@ -50,8 +49,7 @@ final class ElasticSearchViewsRoutes( baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - fusionConfig: FusionConfig, - runtime: IORuntime + fusionConfig: FusionConfig ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling with ElasticSearchViewsDirectives @@ -210,7 +208,6 @@ object ElasticSearchViewsRoutes { baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ): Route = new ElasticSearchViewsRoutes( diff --git a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/IdResolutionRoutes.scala b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/IdResolutionRoutes.scala index f3085fafeb..99f27ad82e 100644 --- a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/IdResolutionRoutes.scala +++ b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/IdResolutionRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.routes import akka.http.scaladsl.model.{StatusCodes, Uri} import akka.http.scaladsl.server.Route -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.IdResolution import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.query.ElasticSearchQueryError @@ -24,7 +23,6 @@ class IdResolutionRoutes( baseUri: BaseUri, jko: JsonKeyOrdering, rcr: RemoteContextResolution, - runtime: IORuntime, fusionConfig: FusionConfig ) extends AuthDirectives(identities, aclCheck) { diff --git a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchClientSetup.scala b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchClientSetup.scala index 327574ef73..3e52978baf 100644 --- a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchClientSetup.scala +++ b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchClientSetup.scala @@ -6,13 +6,12 @@ import cats.effect.{IO, Resource} import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.client.ElasticSearchClient import ch.epfl.bluebrain.nexus.delta.sdk.http.HttpClientSetup import ch.epfl.bluebrain.nexus.testkit.CirceLiteral -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.elasticsearch.ElasticSearchContainer import ch.epfl.bluebrain.nexus.testkit.mu.ce.ResourceFixture import ch.epfl.bluebrain.nexus.testkit.mu.ce.ResourceFixture.IOFixture import munit.Suite -object ElasticSearchClientSetup extends CirceLiteral with CatsRunContext with Fixtures { +object ElasticSearchClientSetup extends CirceLiteral with Fixtures { private val template = jobj"""{ "index_patterns" : ["*"], diff --git a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchViewDecodingSpec.scala b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchViewDecodingSpec.scala index e11e09b58a..2b6deb27f8 100644 --- a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchViewDecodingSpec.scala +++ b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchViewDecodingSpec.scala @@ -1,6 +1,7 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch import cats.data.NonEmptySet +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.utils.UUIDF import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.model.ElasticSearchViewRejection.{DecodingFailed, InvalidJsonLdFormat, UnexpectedElasticSearchViewId} import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.model.ElasticSearchViewValue.{AggregateElasticSearchViewValue, IndexingElasticSearchViewValue} diff --git a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchViewsQuerySuite.scala b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchViewsQuerySuite.scala index 3180336108..c04501639d 100644 --- a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchViewsQuerySuite.scala +++ b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ElasticSearchViewsQuerySuite.scala @@ -3,7 +3,7 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch import akka.http.scaladsl.model.Uri.Query import cats.data.NonEmptySet import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.kernel.utils.UUIDF import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.ElasticSearchViewsQuerySuite.Sample @@ -399,7 +399,7 @@ object ElasticSearchViewsQuerySuite { updatedBy: Subject = Anonymous ) { - def asResourceF(view: ViewRef)(implicit rcr: RemoteContextResolution, runtime: IORuntime): DataResource = { + def asResourceF(view: ViewRef)(implicit rcr: RemoteContextResolution): DataResource = { val resource = ResourceGen.resource(view.viewId / suffix, view.project, Json.obj()) ResourceGen .resourceFor(resource, types = types, rev = rev, deprecated = deprecated) @@ -414,7 +414,7 @@ object ElasticSearchViewsQuerySuite { def asDocument( view: ViewRef - )(implicit baseUri: BaseUri, rcr: RemoteContextResolution, jsonldApi: JsonLdApi, runtime: IORuntime): IO[Json] = + )(implicit baseUri: BaseUri, rcr: RemoteContextResolution, jsonldApi: JsonLdApi): IO[Json] = asResourceF(view).toCompactedJsonLd.map(_.json) } diff --git a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/Fixtures.scala b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/Fixtures.scala index 5d5c4d8361..53132ac061 100644 --- a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/Fixtures.scala +++ b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/Fixtures.scala @@ -1,6 +1,7 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch import cats.syntax.all._ +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.model.contexts.{elasticsearch, elasticsearchMetadata} import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.model.{contexts, ElasticSearchFiles} @@ -10,13 +11,12 @@ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.ContextValue.ContextObje import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.{ContextValue, RemoteContextResolution} import ch.epfl.bluebrain.nexus.delta.sourcing.stream.ReferenceRegistry import ch.epfl.bluebrain.nexus.delta.sourcing.stream.pipes._ -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext object Fixtures { implicit private val loader: ClasspathResourceLoader = ClasspathResourceLoader() } -trait Fixtures extends CatsRunContext { +trait Fixtures { import Fixtures._ diff --git a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/IdResolutionSuite.scala b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/IdResolutionSuite.scala index e780890fdf..6f948e6373 100644 --- a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/IdResolutionSuite.scala +++ b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/IdResolutionSuite.scala @@ -1,7 +1,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.IdResolutionResponse.{MultipleResults, SingleResult} import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.IdResolutionSuite.searchResults @@ -95,8 +94,7 @@ class IdResolutionSuite extends CatsEffectSuite with Fixtures { object IdResolutionSuite { def asResourceF(resourceRef: ResourceRef, projectRef: ProjectRef)(implicit - rcr: RemoteContextResolution, - runtime: IORuntime + rcr: RemoteContextResolution ): DataResource = { val resource = ResourceGen.resource(resourceRef.iri, projectRef, Json.obj()) ResourceGen.resourceFor(resource) diff --git a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ScalaTestElasticSearchClientSetup.scala b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ScalaTestElasticSearchClientSetup.scala index d78ae060fc..962fc42fe6 100644 --- a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ScalaTestElasticSearchClientSetup.scala +++ b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/ScalaTestElasticSearchClientSetup.scala @@ -2,16 +2,16 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch import akka.actor.ActorSystem import akka.http.scaladsl.model.headers.BasicHttpCredentials +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.RetryStrategyConfig import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.client.ElasticSearchClient import ch.epfl.bluebrain.nexus.delta.sdk.http.{HttpClient, HttpClientConfig, HttpClientWorthRetry} import ch.epfl.bluebrain.nexus.testkit.CirceLiteral -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.elasticsearch.{ElasticSearchContainer, ElasticSearchDocker} import scala.concurrent.ExecutionContext -trait ScalaTestElasticSearchClientSetup extends CirceLiteral with Fixtures { self: CatsRunContext => +trait ScalaTestElasticSearchClientSetup extends CirceLiteral with Fixtures { private val template = jobj"""{ "index_patterns" : ["*"], diff --git a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchCoordinatorSuite.scala b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchCoordinatorSuite.scala index b490f38036..067571af69 100644 --- a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchCoordinatorSuite.scala +++ b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchCoordinatorSuite.scala @@ -1,6 +1,7 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.indexing import cats.effect.IO +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.client.IndexLabel import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.indexing.IndexingViewDef.{ActiveViewDef, DeprecatedViewDef} import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.{ElasticSearchViews, Fixtures} diff --git a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/query/DefaultViewSearchSuite.scala b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/query/DefaultViewSearchSuite.scala index 48a30bc979..51c8bb5862 100644 --- a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/query/DefaultViewSearchSuite.scala +++ b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/query/DefaultViewSearchSuite.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.query import akka.http.scaladsl.model.Uri import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.kernel.search.Pagination.FromPagination import ch.epfl.bluebrain.nexus.delta.kernel.search.{Pagination, TimeRange} @@ -272,7 +271,7 @@ object DefaultViewSearchSuite { def id: Iri = nxv + suffix - def asResourceF(implicit rcr: RemoteContextResolution, runtime: IORuntime): DataResource = { + def asResourceF(implicit rcr: RemoteContextResolution): DataResource = { val resource = ResourceGen.resource(id, project, Json.obj()) ResourceGen .resourceFor(resource, types = types, rev = rev, deprecated = deprecated) @@ -288,8 +287,7 @@ object DefaultViewSearchSuite { def asDocument(implicit baseUri: BaseUri, rcr: RemoteContextResolution, - jsonldApi: JsonLdApi, - runtime: IORuntime + jsonldApi: JsonLdApi ): IO[Json] = { val metadata = Resource.fileMetadataEncoder(Resource.Metadata(tag.toList)) asResourceF.toCompactedJsonLd.map(_.json.deepMerge(metadata)) diff --git a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchViewsRoutesFixtures.scala b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchViewsRoutesFixtures.scala index e33ba47c3d..294e87175a 100644 --- a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchViewsRoutesFixtures.scala +++ b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/routes/ElasticSearchViewsRoutesFixtures.scala @@ -21,7 +21,6 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.{Anonymous, Authent import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Label, ProjectRef} import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.DoobieScalaTestFixture import ch.epfl.bluebrain.nexus.testkit._ -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.CatsIOValues import org.scalatest.CancelAfterFailure @@ -33,7 +32,6 @@ class ElasticSearchViewsRoutesFixtures with DoobieScalaTestFixture with CirceLiteral with CirceEq - with CatsRunContext with CancelAfterFailure with ConfigFixtures with CirceMarshalling diff --git a/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/GraphAnalyticsPluginModule.scala b/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/GraphAnalyticsPluginModule.scala index 0ad035a58f..554640b1fd 100644 --- a/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/GraphAnalyticsPluginModule.scala +++ b/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/GraphAnalyticsPluginModule.scala @@ -20,7 +20,6 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.projections.Projections import ch.epfl.bluebrain.nexus.delta.sourcing.query.SelectFilter import ch.epfl.bluebrain.nexus.delta.sourcing.stream.Supervisor import izumi.distage.model.definition.{Id, ModuleDef} -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader /** @@ -66,7 +65,6 @@ class GraphAnalyticsPluginModule(priority: Int) extends ModuleDef { baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, viewsQuery: GraphAnalyticsViewsQuery ) => new GraphAnalyticsRoutes( @@ -79,8 +77,7 @@ class GraphAnalyticsPluginModule(priority: Int) extends ModuleDef { )( baseUri, cr, - ordering, - runtime + ordering ) } diff --git a/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/routes/GraphAnalyticsRoutes.scala b/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/routes/GraphAnalyticsRoutes.scala index e2789c967b..cfde8739e4 100644 --- a/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/routes/GraphAnalyticsRoutes.scala +++ b/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/routes/GraphAnalyticsRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.graph.analytics.routes import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.routes.ElasticSearchViewsDirectives.extractQueryParams import ch.epfl.bluebrain.nexus.delta.plugins.graph.analytics.permissions.query import ch.epfl.bluebrain.nexus.delta.plugins.graph.analytics.{GraphAnalytics, GraphAnalyticsViewsQuery} @@ -41,7 +40,7 @@ class GraphAnalyticsRoutes( fetchStatistics: ProjectRef => IO[ProgressStatistics], schemeDirectives: DeltaSchemeDirectives, viewsQuery: GraphAnalyticsViewsQuery -)(implicit baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, runtime: IORuntime) +)(implicit baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling with RdfMarshalling { diff --git a/delta/plugins/graph-analytics/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/GraphAnalyticsCoordinatorSuite.scala b/delta/plugins/graph-analytics/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/GraphAnalyticsCoordinatorSuite.scala index ded6f17c26..d150b8a40a 100644 --- a/delta/plugins/graph-analytics/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/GraphAnalyticsCoordinatorSuite.scala +++ b/delta/plugins/graph-analytics/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/GraphAnalyticsCoordinatorSuite.scala @@ -1,6 +1,7 @@ package ch.epfl.bluebrain.nexus.delta.plugins.graph.analytics import cats.effect.IO +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.plugins.graph.analytics.GraphAnalyticsCoordinator.ProjectDef import ch.epfl.bluebrain.nexus.delta.plugins.graph.analytics.indexing.GraphAnalyticsResult.Noop import ch.epfl.bluebrain.nexus.delta.plugins.graph.analytics.indexing.{GraphAnalyticsResult, GraphAnalyticsStream} diff --git a/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/JiraPluginModule.scala b/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/JiraPluginModule.scala index fd09e4dc02..5705db2404 100644 --- a/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/JiraPluginModule.scala +++ b/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/JiraPluginModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.plugins.jira -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import ch.epfl.bluebrain.nexus.delta.plugins.jira.config.JiraConfig import ch.epfl.bluebrain.nexus.delta.plugins.jira.routes.JiraRoutes @@ -31,8 +30,7 @@ class JiraPluginModule(priority: Int) extends ModuleDef { jiraClient: JiraClient, baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) => new JiraRoutes( identities, @@ -41,8 +39,7 @@ class JiraPluginModule(priority: Int) extends ModuleDef { )( baseUri, cr, - ordering, - runtime + ordering ) } diff --git a/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/routes/JiraRoutes.scala b/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/routes/JiraRoutes.scala index 59a55f258d..7b284eeb27 100644 --- a/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/routes/JiraRoutes.scala +++ b/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/routes/JiraRoutes.scala @@ -3,7 +3,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.jira.routes import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.server.{Directive1, Route} import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.plugins.jira.model.{JiraResponse, Verifier} import ch.epfl.bluebrain.nexus.delta.plugins.jira.{JiraClient, JiraError} @@ -36,7 +35,7 @@ class JiraRoutes( identities: Identities, aclCheck: AclCheck, jiraClient: JiraClient -)(implicit baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, runtime: IORuntime) +)(implicit baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling with RdfMarshalling { diff --git a/delta/plugins/project-deletion/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ProjectDeletionModule.scala b/delta/plugins/project-deletion/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ProjectDeletionModule.scala index eeede6b672..bcff652037 100644 --- a/delta/plugins/project-deletion/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ProjectDeletionModule.scala +++ b/delta/plugins/project-deletion/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ProjectDeletionModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.plugins.projectdeletion -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader import ch.epfl.bluebrain.nexus.delta.plugins.projectdeletion.model.{contexts, ProjectDeletionConfig} @@ -27,9 +26,8 @@ class ProjectDeletionModule(priority: Int) extends ModuleDef { config: ProjectDeletionConfig, baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime - ) => new ProjectDeletionRoutes(config)(baseUri, cr, ordering, runtime) + ordering: JsonKeyOrdering + ) => new ProjectDeletionRoutes(config)(baseUri, cr, ordering) } many[PriorityRoute].add { (route: ProjectDeletionRoutes) => diff --git a/delta/plugins/project-deletion/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ProjectDeletionRoutes.scala b/delta/plugins/project-deletion/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ProjectDeletionRoutes.scala index b53d3306ff..2cdd070c36 100644 --- a/delta/plugins/project-deletion/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ProjectDeletionRoutes.scala +++ b/delta/plugins/project-deletion/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ProjectDeletionRoutes.scala @@ -3,7 +3,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.projectdeletion import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.plugins.projectdeletion.model.ProjectDeletionConfig import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering @@ -22,8 +21,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.model.BaseUri class ProjectDeletionRoutes(config: ProjectDeletionConfig)(implicit baseUri: BaseUri, cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ) extends RdfMarshalling { def routes: Route = diff --git a/delta/plugins/project-deletion/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ShouldDeleteProjectSuite.scala b/delta/plugins/project-deletion/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ShouldDeleteProjectSuite.scala index 7b27d1c974..d278bd9706 100644 --- a/delta/plugins/project-deletion/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ShouldDeleteProjectSuite.scala +++ b/delta/plugins/project-deletion/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/projectdeletion/ShouldDeleteProjectSuite.scala @@ -12,7 +12,6 @@ import ch.epfl.bluebrain.nexus.delta.sdk.projects.model.Project import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Anonymous import ch.epfl.bluebrain.nexus.delta.sourcing.model.ResourceRef import ch.epfl.bluebrain.nexus.testkit.Generators -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.clock.FixedClock import ch.epfl.bluebrain.nexus.testkit.mu.ce.{CatsEffectAssertions, CatsEffectSuite} import munit.{Assertions, Location} @@ -106,12 +105,7 @@ class ShouldDeleteProjectSuite extends CatsEffectSuite { } } -object ShouldDeleteProjectSuite - extends Assertions - with CatsRunContext - with CatsEffectAssertions - with Generators - with FixedClock { +object ShouldDeleteProjectSuite extends Assertions with CatsEffectAssertions with Generators with FixedClock { case class ProjectFixture( deprecated: Boolean, updatedAt: Instant, diff --git a/delta/plugins/search/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/search/SearchPluginModule.scala b/delta/plugins/search/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/search/SearchPluginModule.scala index 2a652615b0..69768723c4 100644 --- a/delta/plugins/search/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/search/SearchPluginModule.scala +++ b/delta/plugins/search/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/search/SearchPluginModule.scala @@ -1,6 +1,5 @@ package ch.epfl.bluebrain.nexus.delta.plugins.search -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.plugins.compositeviews.CompositeViews import ch.epfl.bluebrain.nexus.delta.plugins.compositeviews.config.CompositeViewsConfig import ch.epfl.bluebrain.nexus.delta.plugins.compositeviews.indexing.CompositeProjectionLifeCycle @@ -47,9 +46,8 @@ class SearchPluginModule(priority: Int) extends ModuleDef { config: SearchConfig, baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), - ordering: JsonKeyOrdering, - runtime: IORuntime - ) => new SearchRoutes(identities, aclCheck, search, config.fields.asJson)(baseUri, cr, ordering, runtime) + ordering: JsonKeyOrdering + ) => new SearchRoutes(identities, aclCheck, search, config.fields.asJson)(baseUri, cr, ordering) } many[PriorityRoute].add { (route: SearchRoutes) => diff --git a/delta/plugins/search/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/search/SearchRoutes.scala b/delta/plugins/search/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/search/SearchRoutes.scala index dc6c282c48..a137d962fa 100644 --- a/delta/plugins/search/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/search/SearchRoutes.scala +++ b/delta/plugins/search/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/search/SearchRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.search import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.routes.ElasticSearchViewsDirectives.extractQueryParams import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering @@ -20,7 +19,7 @@ class SearchRoutes( aclCheck: AclCheck, search: Search, configFields: Json -)(implicit baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, runtime: IORuntime) +)(implicit baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling with RdfMarshalling diff --git a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/StoragePluginModule.scala b/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/StoragePluginModule.scala index c0f104986c..19efc3c516 100644 --- a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/StoragePluginModule.scala +++ b/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/StoragePluginModule.scala @@ -45,7 +45,6 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label import ch.epfl.bluebrain.nexus.delta.sourcing.stream.Supervisor import com.typesafe.config.Config import izumi.distage.model.definition.{Id, ModuleDef} -import cats.effect.unsafe.IORuntime /** * Storages and Files wiring @@ -123,7 +122,6 @@ class StoragePluginModule(priority: Int) extends ModuleDef { baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) => { @@ -138,7 +136,6 @@ class StoragePluginModule(priority: Int) extends ModuleDef { baseUri, cr, ordering, - runtime, fusionConfig ) } @@ -164,7 +161,6 @@ class StoragePluginModule(priority: Int) extends ModuleDef { clock: Clock[IO], uuidF: UUIDF, as: ActorSystem[Nothing], - runtime: IORuntime, remoteDiskStorageClient: RemoteDiskStorageClient ) => IO @@ -181,8 +177,7 @@ class StoragePluginModule(priority: Int) extends ModuleDef { clock )( uuidF, - as, - runtime + as ) ) .flatTap { files => @@ -202,7 +197,6 @@ class StoragePluginModule(priority: Int) extends ModuleDef { baseUri: BaseUri, cr: RemoteContextResolution @Id("aggregate"), ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) => val storageConfig = cfg.storages.storageTypeConfig @@ -211,7 +205,6 @@ class StoragePluginModule(priority: Int) extends ModuleDef { storageConfig, cr, ordering, - runtime, fusionConfig ) } diff --git a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/Files.scala b/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/Files.scala index 852f5a0974..fb575da2b3 100644 --- a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/Files.scala +++ b/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/Files.scala @@ -4,7 +4,6 @@ import akka.actor.typed.ActorSystem import akka.actor.{ActorSystem => ClassicActorSystem} import akka.http.scaladsl.model.ContentTypes.`application/octet-stream` import akka.http.scaladsl.model.{ContentType, HttpEntity, Uri} -import cats.effect.unsafe.IORuntime import cats.effect.{Clock, IO} import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.kernel.cache.LocalCache @@ -767,8 +766,7 @@ object Files { clock: Clock[IO] )(implicit uuidF: UUIDF, - as: ActorSystem[Nothing], - runtime: IORuntime + as: ActorSystem[Nothing] ): Files = { implicit val classicAs: ClassicActorSystem = as.classicSystem new Files( diff --git a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/FormDataExtractor.scala b/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/FormDataExtractor.scala index 7de15f1b85..aa88e7b049 100644 --- a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/FormDataExtractor.scala +++ b/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/FormDataExtractor.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.unmarshalling.Unmarshaller.UnsupportedContentTypeExcep import akka.http.scaladsl.unmarshalling.{FromEntityUnmarshaller, MultipartUnmarshallers, Unmarshaller} import akka.stream.scaladsl.{Keep, Sink} import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.kernel.http.MediaTypeDetectorConfig import ch.epfl.bluebrain.nexus.delta.kernel.utils.{FileUtils, UUIDF} @@ -65,7 +65,7 @@ object FormDataExtractor { def apply( mediaTypeDetector: MediaTypeDetectorConfig - )(implicit uuidF: UUIDF, as: ActorSystem, runtime: IORuntime): FormDataExtractor = + )(implicit uuidF: UUIDF, as: ActorSystem): FormDataExtractor = new FormDataExtractor { implicit val ec: ExecutionContext = as.getDispatcher diff --git a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/routes/FilesRoutes.scala b/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/routes/FilesRoutes.scala index 3ba38337c7..7686829d3a 100644 --- a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/routes/FilesRoutes.scala +++ b/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/routes/FilesRoutes.scala @@ -6,7 +6,6 @@ import akka.http.scaladsl.model.headers.Accept import akka.http.scaladsl.model.{ContentType, MediaRange} import akka.http.scaladsl.server._ import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.FileRejection._ import ch.epfl.bluebrain.nexus.delta.plugins.storage.files.model.{File, FileId, FileRejection} @@ -61,7 +60,6 @@ final class FilesRoutes( storageConfig: StorageTypeConfig, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling { self => @@ -266,7 +264,6 @@ object FilesRoutes { baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ): Route = { implicit val storageTypeConfig: StorageTypeConfig = config diff --git a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/storages/routes/StoragesRoutes.scala b/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/storages/routes/StoragesRoutes.scala index 6d504f6e86..5cb04cd343 100644 --- a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/storages/routes/StoragesRoutes.scala +++ b/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/storages/routes/StoragesRoutes.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.routes import akka.http.scaladsl.model.StatusCodes.Created import akka.http.scaladsl.server._ -import cats.effect.unsafe.IORuntime import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.plugins.storage.storages._ import ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.model.StorageRejection._ @@ -49,7 +48,6 @@ final class StoragesRoutes( baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ) extends AuthDirectives(identities, aclCheck) with CirceUnmarshalling @@ -214,7 +212,6 @@ object StoragesRoutes { baseUri: BaseUri, cr: RemoteContextResolution, ordering: JsonKeyOrdering, - runtime: IORuntime, fusionConfig: FusionConfig ): Route = new StoragesRoutes(identities, aclCheck, storages, storagesStatistics, schemeDirectives, index).routes diff --git a/delta/plugins/storage/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/FileFixtures.scala b/delta/plugins/storage/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/FileFixtures.scala index 8b3bcd2093..729dd5e4f8 100644 --- a/delta/plugins/storage/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/FileFixtures.scala +++ b/delta/plugins/storage/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/FileFixtures.scala @@ -12,7 +12,6 @@ import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.nxv import ch.epfl.bluebrain.nexus.delta.sdk.generators.ProjectGen import ch.epfl.bluebrain.nexus.delta.sdk.projects.model.ApiMappings import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.scalatest.EitherValues import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.CatsIOValues import org.scalatest.Suite @@ -22,7 +21,7 @@ import java.util.{Base64, UUID} trait FileFixtures extends EitherValues with CatsIOValues { - self: Suite with CatsRunContext => + self: Suite => val uuid = UUID.fromString("8249ba90-7cc6-4de5-93a1-802c04200dcc") val uuid2 = UUID.fromString("12345678-7cc6-4de5-93a1-802c04200dcc") diff --git a/delta/plugins/storage/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/routes/FilesRoutesSpec.scala b/delta/plugins/storage/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/routes/FilesRoutesSpec.scala index fe0e3538f7..97760ad223 100644 --- a/delta/plugins/storage/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/routes/FilesRoutesSpec.scala +++ b/delta/plugins/storage/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/routes/FilesRoutesSpec.scala @@ -135,7 +135,7 @@ class FilesRoutesSpec FilesConfig(eventLogConfig, MediaTypeDetectorConfig.Empty), remoteDiskStorageClient, clock - )(uuidF, typedSystem, runtime) + )(uuidF, typedSystem) private val groupDirectives = DeltaSchemeDirectives(fetchContext, ioFromMap(uuid -> projectRef.organization), ioFromMap(uuid -> projectRef)) diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/AuthDirectives.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/AuthDirectives.scala index 915d33f2ac..14ef4af605 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/AuthDirectives.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/AuthDirectives.scala @@ -4,7 +4,7 @@ import akka.http.scaladsl.model.headers.OAuth2BearerToken import akka.http.scaladsl.server._ import akka.http.scaladsl.server.directives.Credentials import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.kernel.jwt.{AuthToken, TokenRejection} import ch.epfl.bluebrain.nexus.delta.sdk.acls.AclCheck @@ -20,8 +20,7 @@ import scala.concurrent.Future /** * Akka HTTP directives for authentication */ -abstract class AuthDirectives(identities: Identities, aclCheck: AclCheck)(implicit runtime: IORuntime) - extends Directives { +abstract class AuthDirectives(identities: Identities, aclCheck: AclCheck) extends Directives { private def authenticator: AsyncAuthenticator[Caller] = { case Credentials.Missing => Future.successful(None) diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaDirectives.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaDirectives.scala index fbb6bd49dd..11bf717f3b 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaDirectives.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaDirectives.scala @@ -8,7 +8,6 @@ import akka.http.scaladsl.server.ContentNegotiator.Alternative import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server._ import cats.effect.IO -import cats.effect.unsafe.IORuntime import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.rdf.RdfMediaTypes._ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder @@ -120,8 +119,7 @@ trait DeltaDirectives extends UriDirectives { * enabled */ def emitOrFusionRedirect(projectRef: ProjectRef, id: IdSegmentRef, emitDelta: Route)(implicit - config: FusionConfig, - runtime: IORuntime + config: FusionConfig ): Route = { val resourceBase = config.base / projectRef.organization.value / projectRef.project.value / "resources" / id.value.asString @@ -140,15 +138,14 @@ trait DeltaDirectives extends UriDirectives { * enabled */ def emitOrFusionRedirect(projectRef: ProjectRef, emitDelta: Route)(implicit - config: FusionConfig, - runtime: IORuntime + config: FusionConfig ): Route = emitOrFusionRedirect( config.base / "admin" / projectRef.organization.value / projectRef.project.value, emitDelta ) - def emitOrFusionRedirect(fusionUri: Uri, emitDelta: Route)(implicit config: FusionConfig, runtime: IORuntime): Route = + def emitOrFusionRedirect(fusionUri: Uri, emitDelta: Route)(implicit config: FusionConfig): Route = extractRequest { req => if (config.enableRedirects && req.header[Accept].exists(_.mediaRanges.contains(fusionRange))) { emitRedirect(SeeOther, IO.pure(fusionUri)) diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaSchemeDirectives.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaSchemeDirectives.scala index 7eb134ef6b..466c268ccf 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaSchemeDirectives.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaSchemeDirectives.scala @@ -4,7 +4,7 @@ import akka.http.scaladsl.model.Uri.Path./ import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.{Directive0, Directive1} import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri import ch.epfl.bluebrain.nexus.delta.sdk.directives.UriDirectives._ import ch.epfl.bluebrain.nexus.delta.sdk.marshalling.QueryParamsUnmarshalling @@ -30,8 +30,7 @@ final class DeltaSchemeDirectives( fetchContext: ProjectRef => IO[ProjectContext], fetchOrgByUuid: UUID => IO[Option[Label]], fetchProjByUuid: UUID => IO[Option[ProjectRef]] -)(implicit runtime: IORuntime) - extends QueryParamsUnmarshalling { +) extends QueryParamsUnmarshalling { /** * Extracts the organization segment and converts it to UUID. If the conversion is possible, it attempts to fetch the @@ -137,32 +136,32 @@ final class DeltaSchemeDirectives( object DeltaSchemeDirectives extends QueryParamsUnmarshalling { - def empty(implicit runtime: IORuntime): DeltaSchemeDirectives = onlyResolveOrgUuid(_ => IO.none) + def empty: DeltaSchemeDirectives = onlyResolveOrgUuid(_ => IO.none) - def onlyResolveOrgUuid(fetchOrgByUuid: UUID => IO[Option[Label]])(implicit runtime: IORuntime) = + def onlyResolveOrgUuid(fetchOrgByUuid: UUID => IO[Option[Label]]) = new DeltaSchemeDirectives( (ref: ProjectRef) => IO.raiseError(ProjectNotFound(ref)), fetchOrgByUuid, _ => IO.none ) - def onlyResolveProjUuid(fetchProjByUuid: UUID => IO[Option[ProjectRef]])(implicit runtime: IORuntime) = + def onlyResolveProjUuid(fetchProjByUuid: UUID => IO[Option[ProjectRef]]) = new DeltaSchemeDirectives( (ref: ProjectRef) => IO.raiseError(ProjectNotFound(ref)), _ => IO.none, fetchProjByUuid ) - def apply(fetchContext: FetchContext[_], uuidCache: UUIDCache)(implicit runtime: IORuntime): DeltaSchemeDirectives = + def apply(fetchContext: FetchContext[_], uuidCache: UUIDCache): DeltaSchemeDirectives = apply(fetchContext, uuidCache.orgLabel, uuidCache.projectRef) - def apply(fetchContext: FetchContext[_])(implicit runtime: IORuntime): DeltaSchemeDirectives = + def apply(fetchContext: FetchContext[_]): DeltaSchemeDirectives = new DeltaSchemeDirectives((ref: ProjectRef) => fetchContext.onRead(ref), _ => IO.none, _ => IO.none) def apply( fetchContext: FetchContext[_], fetchOrgByUuid: UUID => IO[Option[Label]], fetchProjByUuid: UUID => IO[Option[ProjectRef]] - )(implicit runtime: IORuntime): DeltaSchemeDirectives = + ): DeltaSchemeDirectives = new DeltaSchemeDirectives((ref: ProjectRef) => fetchContext.onRead(ref), fetchOrgByUuid, fetchProjByUuid) } diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/Response.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/Response.scala index c9c779387f..3cddec510b 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/Response.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/Response.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.delta.sdk.directives import akka.http.scaladsl.model.{HttpHeader, StatusCode} import akka.http.scaladsl.server.{Rejection, Route} -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.JsonLdContext.keywords import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.{ContextValue, RemoteContextResolution} @@ -43,7 +42,7 @@ object Response { /** * Generates a route that completes from the current rejection */ - def forceComplete(implicit cr: RemoteContextResolution, ordering: JsonKeyOrdering, runtime: IORuntime): Route = + def forceComplete(implicit cr: RemoteContextResolution, ordering: JsonKeyOrdering): Route = DeltaDirectives.discardEntityAndForceEmit(value) /** diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToJsonLd.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToJsonLd.scala index c0920a8e58..40c467354d 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToJsonLd.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToJsonLd.scala @@ -8,7 +8,7 @@ import akka.http.scaladsl.model.headers.{Accept, RawHeader} import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.rdf.RdfMediaTypes._ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.api.{JsonLdApi, JsonLdJavaApi} @@ -39,7 +39,7 @@ object ResponseToJsonLd extends FileBytesInstances { def apply[E]( io: IO[RejOrFailOrComplete[E]] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = new ResponseToJsonLd { // Some resources may not have been created in the system with a strict configuration @@ -85,7 +85,7 @@ object ResponseToJsonLd extends FileBytesInstances { def apply[E: JsonLdEncoder, A: JsonLdEncoder]( io: IO[Either[Response[E], Complete[A]]] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = apply(io.map[RejOrFailOrComplete[E]] { case Right(c: Complete[A]) => Right(c.map(JsonLdValue(_))) case Left(c: Complete[E]) => Left(Right(c.map(JsonLdValue(_)))) @@ -94,7 +94,7 @@ object ResponseToJsonLd extends FileBytesInstances { def fromFile[E: JsonLdEncoder]( io: IO[Either[Response[E], FileResponse]] - )(implicit jo: JsonKeyOrdering, cr: RemoteContextResolution, runtime: IORuntime): ResponseToJsonLd = + )(implicit jo: JsonKeyOrdering, cr: RemoteContextResolution): ResponseToJsonLd = new ResponseToJsonLd { // From the RFC 2047: "=?" charset "?" encoding "?" encoded-text "?=" @@ -136,17 +136,17 @@ object ResponseToJsonLd extends FileBytesInstances { sealed trait FileBytesInstances extends ValueInstances { implicit def ioFileBytesWithReject[E: JsonLdEncoder]( io: IO[Either[Response[E], FileResponse]] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd.fromFile(io) implicit def ioFileBytes[E: JsonLdEncoder: HttpResponseFields]( io: IO[Either[E, FileResponse]] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd.fromFile(io.map(_.leftMap(Complete(_)))) implicit def fileBytesValue( value: FileResponse - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd.fromFile(IO.pure(Right(value))) } @@ -155,33 +155,33 @@ sealed trait ValueInstances extends LowPriorityValueInstances { implicit def ioCompleteWithReject[E: JsonLdEncoder: HttpResponseFields, A: JsonLdEncoder]( io: IO[Either[E, Complete[A]]] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd(io.map(_.leftMap(Complete(_)))) implicit def ioValueWithReject[E: JsonLdEncoder]( io: IO[Reject[E]] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd(io.map[UseLeft[E]](Left(_))) implicit def ioValue[A: JsonLdEncoder]( io: IO[A] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd(io.map[UseRight[A]](v => Right(Complete(OK, Seq.empty, v)))) implicit def ioEitherValueOrReject[E: JsonLdEncoder, A: JsonLdEncoder]( io: IO[Either[Response[E], A]] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = { + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = { ResponseToJsonLd(io.map(_.map(Complete(OK, Seq.empty, _)))) } implicit def ioValueOrError[E: JsonLdEncoder: HttpResponseFields, A: JsonLdEncoder]( io: IO[Either[E, A]] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd(io.map(_.leftMap(Complete(_)).map(Complete(OK, Seq.empty, _)))) implicit def ioJsonLdValue[E: JsonLdEncoder: HttpResponseFields]( io: IO[Either[E, JsonLdValue]] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd(io.map[RejOrFailOrComplete[E]] { case Left(e) => Left(Right(Complete(e).map[JsonLdValue](JsonLdValue(_)))) case Right(value) => Right(Complete(OK, Seq.empty, value)) @@ -189,23 +189,23 @@ sealed trait ValueInstances extends LowPriorityValueInstances { implicit def rejectValue[E: JsonLdEncoder]( value: Reject[E] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd(IO.pure[UseLeft[E]](Left(value))) implicit def completeValue[A: JsonLdEncoder]( value: Complete[A] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd(IO.pure[UseRight[A]](Right(value))) implicit def valueWithHttpResponseFields[A: JsonLdEncoder: HttpResponseFields]( value: A - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd(IO.pure[UseRight[A]](Right(Complete(value)))) } sealed trait LowPriorityValueInstances { implicit def valueWithoutHttpResponseFields[A: JsonLdEncoder]( value: A - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLd = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLd = ResponseToJsonLd(IO.pure[UseRight[A]](Right(Complete(OK, Seq.empty, value)))) } diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToJsonLdDiscardingEntity.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToJsonLdDiscardingEntity.scala index c1091b5490..c7b9c49f36 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToJsonLdDiscardingEntity.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToJsonLdDiscardingEntity.scala @@ -5,7 +5,7 @@ import akka.http.scaladsl.model.StatusCodes.OK import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering @@ -24,7 +24,7 @@ object ResponseToJsonLdDiscardingEntity extends DiscardValueInstances { private[directives] def apply[A: JsonLdEncoder: Encoder]( io: IO[Complete[A]] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLdDiscardingEntity = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLdDiscardingEntity = new ResponseToJsonLdDiscardingEntity { private def fallbackAsPlainJson = @@ -46,12 +46,12 @@ sealed trait DiscardValueInstances extends DiscardLowPriorityValueInstances { implicit def ioValue[A: JsonLdEncoder: Encoder]( io: IO[A] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLdDiscardingEntity = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLdDiscardingEntity = ResponseToJsonLdDiscardingEntity(io.map(Complete(OK, Seq.empty, _))) implicit def valueWithHttpResponseFields[A: JsonLdEncoder: HttpResponseFields: Encoder]( value: A - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLdDiscardingEntity = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLdDiscardingEntity = ResponseToJsonLdDiscardingEntity(IO.pure(Complete(value))) } @@ -59,7 +59,7 @@ sealed trait DiscardValueInstances extends DiscardLowPriorityValueInstances { sealed trait DiscardLowPriorityValueInstances { implicit def valueWithoutHttpResponseFields[A: JsonLdEncoder: Encoder]( value: A - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToJsonLdDiscardingEntity = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToJsonLdDiscardingEntity = ResponseToJsonLdDiscardingEntity(IO.pure(Complete(OK, Seq.empty, value))) } diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToRedirect.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToRedirect.scala index 5bf2eb0a5b..fcbaacdf99 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToRedirect.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToRedirect.scala @@ -5,7 +5,7 @@ import akka.http.scaladsl.model.Uri import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering @@ -20,7 +20,7 @@ sealed trait ResponseToRedirect { object ResponseToRedirect { - implicit def ioRedirect(io: IO[Uri])(implicit runtime: IORuntime): ResponseToRedirect = + implicit def ioRedirect(io: IO[Uri]): ResponseToRedirect = new ResponseToRedirect { override def apply(redirection: Redirection): Route = onSuccess(io.unsafeToFuture()) { uri => @@ -30,7 +30,7 @@ object ResponseToRedirect { implicit def ioRedirectWithError[E <: Throwable: JsonLdEncoder: HttpResponseFields]( io: IO[Either[E, Uri]] - )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering, runtime: IORuntime): ResponseToRedirect = + )(implicit cr: RemoteContextResolution, jo: JsonKeyOrdering): ResponseToRedirect = new ResponseToRedirect { override def apply(redirection: Redirection): Route = onSuccess(io.unsafeToFuture()) { diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToSse.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToSse.scala index cf9326877d..a9005fd1dd 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToSse.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/ResponseToSse.scala @@ -11,7 +11,7 @@ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.RemoteContextResolution import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder import ch.epfl.bluebrain.nexus.delta.rdf.utils.JsonKeyOrdering import DeltaDirectives.emit -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.sdk.directives.Response.{Complete, Reject} import ch.epfl.bluebrain.nexus.delta.sdk.marshalling.HttpResponseFields import ch.epfl.bluebrain.nexus.delta.sdk.sse.ServerSentEventStream @@ -27,7 +27,7 @@ object ResponseToSse { private def apply[E: JsonLdEncoder, A]( io: IO[Either[Response[E], ServerSentEventStream]] - )(implicit jo: JsonKeyOrdering, cr: RemoteContextResolution, runtime: IORuntime): ResponseToSse = + )(implicit jo: JsonKeyOrdering, cr: RemoteContextResolution): ResponseToSse = new ResponseToSse { override def apply(): Route = @@ -46,11 +46,11 @@ object ResponseToSse { implicit def ioStream[E: JsonLdEncoder: HttpResponseFields]( io: IO[Either[E, ServerSentEventStream]] - )(implicit jo: JsonKeyOrdering, cr: RemoteContextResolution, runtime: IORuntime): ResponseToSse = + )(implicit jo: JsonKeyOrdering, cr: RemoteContextResolution): ResponseToSse = ResponseToSse(io.map(_.left.map(Complete(_)))) implicit def streamValue( value: ServerSentEventStream - )(implicit jo: JsonKeyOrdering, cr: RemoteContextResolution, runtime: IORuntime): ResponseToSse = + )(implicit jo: JsonKeyOrdering, cr: RemoteContextResolution): ResponseToSse = ResponseToSse(IO.pure(Right(value))) } diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/marshalling/RdfExceptionHandler.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/marshalling/RdfExceptionHandler.scala index 768093fa5f..c7fffc0209 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/marshalling/RdfExceptionHandler.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/marshalling/RdfExceptionHandler.scala @@ -4,7 +4,7 @@ import akka.http.scaladsl.model.{EntityStreamSizeException, StatusCodes} import akka.http.scaladsl.server.ExceptionHandler import ch.epfl.bluebrain.nexus.delta.kernel.Logger import akka.http.scaladsl.server.Directives._ -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClassUtils import ch.epfl.bluebrain.nexus.delta.rdf.RdfError import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts @@ -30,8 +30,7 @@ object RdfExceptionHandler { def apply(implicit cr: RemoteContextResolution, ordering: JsonKeyOrdering, - base: BaseUri, - runtime: IORuntime + base: BaseUri ): ExceptionHandler = ExceptionHandler { case err: IdentityError => discardEntityAndForceEmit(err) diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/marshalling/RdfRejectionHandler.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/marshalling/RdfRejectionHandler.scala index 7767cdf0a6..1e84b38ea9 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/marshalling/RdfRejectionHandler.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/marshalling/RdfRejectionHandler.scala @@ -4,7 +4,6 @@ import akka.http.scaladsl.model.headers._ import akka.http.scaladsl.model.{ContentRange, EntityStreamSizeException, StatusCodes} import akka.http.scaladsl.server.AuthenticationFailedRejection.{CredentialsMissing, CredentialsRejected} import akka.http.scaladsl.server._ -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClassUtils import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.BNode import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts @@ -29,8 +28,7 @@ object RdfRejectionHandler { */ def apply(implicit cr: RemoteContextResolution, - ordering: JsonKeyOrdering, - runtime: IORuntime + ordering: JsonKeyOrdering ): RejectionHandler = RejectionHandler .newBuilder() diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/stream/StreamConverter.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/stream/StreamConverter.scala index aec5b0cd99..3f119128a2 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/stream/StreamConverter.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/stream/StreamConverter.scala @@ -5,7 +5,7 @@ import akka.stream._ import akka.stream.scaladsl.{Sink => AkkaSink, Source => AkkaSource, _} import cats.effect._ import cats.effect.kernel.Resource.ExitCase -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import fs2._ /** @@ -49,7 +49,7 @@ object StreamConverter { } } - def apply[A](stream: Stream[IO, A])(implicit runtime: IORuntime): Graph[SourceShape[A], NotUsed] = { + def apply[A](stream: Stream[IO, A]): Graph[SourceShape[A], NotUsed] = { val source = AkkaSource.queue[A](0, OverflowStrategy.backpressure) // A sink that runs an FS2 publisherStream when consuming the publisher actor (= materialized value) of source val sink = AkkaSink.foreach[SourceQueueWithComplete[A]] { p => diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/SerializationSuite.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/SerializationSuite.scala index 5e0ce80b9e..20ba164392 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/SerializationSuite.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/SerializationSuite.scala @@ -1,5 +1,6 @@ package ch.epfl.bluebrain.nexus.delta.sdk +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.contexts import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.{ContextValue, RemoteContextResolution} import ch.epfl.bluebrain.nexus.delta.sdk.model.BaseUri diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/acls/AclSimpleCheck.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/acls/AclSimpleCheck.scala index 52b61d8e38..effd09fd58 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/acls/AclSimpleCheck.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/acls/AclSimpleCheck.scala @@ -7,7 +7,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.acls.model.{Acl, AclAddress} import ch.epfl.bluebrain.nexus.delta.sdk.permissions.model.Permission import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity import cats.effect.Ref -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ /** * In-memory implementation of an [[AclCheck]] @@ -57,7 +57,7 @@ object AclSimpleCheck { } } - def unsafe(input: (Identity, AclAddress, Set[Permission])*)(implicit runtime: IORuntime) = + def unsafe(input: (Identity, AclAddress, Set[Permission])*) = apply(input: _*).unsafeRunSync() } diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaDirectivesSpec.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaDirectivesSpec.scala index 09da3d464c..6e8fde378c 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaDirectivesSpec.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/directives/DeltaDirectivesSpec.scala @@ -125,7 +125,7 @@ class DeltaDirectivesSpec pathPrefix("resources") { concat( path("redirectFusionDisabled") { - emitOrFusionRedirect(ref, Latest(nxv + "id"), emit(resource))(f.copy(enableRedirects = false), runtime) + emitOrFusionRedirect(ref, Latest(nxv + "id"), emit(resource))(f.copy(enableRedirects = false)) }, path("redirectFusionLatest") { emitOrFusionRedirect(ref, Latest(nxv + "id"), emit(resource)) @@ -137,14 +137,14 @@ class DeltaDirectivesSpec emitOrFusionRedirect(ref, Tag(nxv + "id", UserTag.unsafe("my-tag")), emit(resource)) }, path("redirectFusionDisabled") { - emitOrFusionRedirect(ref, Latest(nxv + "id"), emit(resource))(f.copy(enableRedirects = false), runtime) + emitOrFusionRedirect(ref, Latest(nxv + "id"), emit(resource))(f.copy(enableRedirects = false)) } ) }, pathPrefix("projects") { concat( path("redirectFusionDisabled") { - emitOrFusionRedirect(ref, emit(ioProject))(f.copy(enableRedirects = false), runtime) + emitOrFusionRedirect(ref, emit(ioProject))(f.copy(enableRedirects = false)) }, path("redirectFusion") { emitOrFusionRedirect(ref, emit(ioProject)) diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/generators/ResourceGen.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/generators/ResourceGen.scala index 5b35a3575a..653d90d9aa 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/generators/ResourceGen.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/generators/ResourceGen.scala @@ -1,7 +1,7 @@ package ch.epfl.bluebrain.nexus.delta.sdk.generators import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.schemas import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.ExpandedJsonLd @@ -63,7 +63,7 @@ object ResourceGen { source: Json, schema: ResourceRef = Latest(schemas.resources), tags: Tags = Tags.empty - )(implicit resolution: RemoteContextResolution, runtime: IORuntime): Resource = { + )(implicit resolution: RemoteContextResolution): Resource = { val expanded = ExpandedJsonLd(source).accepted.replaceId(id) val compacted = expanded.toCompacted(source.topContextValueOrEmpty).accepted Resource(id, project, tags, schema, source, compacted, expanded) @@ -93,7 +93,7 @@ object ResourceGen { rev: Int = 1, subject: Subject = Anonymous, deprecated: Boolean = false - )(implicit resolution: RemoteContextResolution, runtime: IORuntime): DataResource = { + )(implicit resolution: RemoteContextResolution): DataResource = { val result = ExpandedJsonLd.explain(source).accepted val expanded = result.value.replaceId(id) val compacted = expanded.toCompacted(source.topContextValueOrEmpty).accepted @@ -146,15 +146,14 @@ object ResourceGen { ).toResource def jsonLdContent(id: Iri, project: ProjectRef, source: Json)(implicit - resolution: RemoteContextResolution, - runtime: IORuntime + resolution: RemoteContextResolution ) = { val resourceF = sourceToResourceF(id, project, source) JsonLdContent(resourceF, resourceF.value.source, None) } implicit final private class CatsIOValuesOps[A](private val io: IO[A]) { - def accepted(implicit runtime: IORuntime): A = + def accepted: A = io.unsafeRunTimed(45.seconds).getOrElse(throw new RuntimeException("IO timed out during .accepted call")) } diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/generators/SchemaGen.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/generators/SchemaGen.scala index 67c28d474c..49453d6829 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/generators/SchemaGen.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/generators/SchemaGen.scala @@ -2,7 +2,7 @@ package ch.epfl.bluebrain.nexus.delta.sdk.generators import cats.data.NonEmptyList import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.ExpandedJsonLd import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.api.{JsonLdApi, JsonLdJavaApi} @@ -49,7 +49,7 @@ object SchemaGen { project: ProjectRef, source: Json, tags: Tags = Tags.empty - )(implicit resolution: RemoteContextResolution, runtime: IORuntime): Schema = { + )(implicit resolution: RemoteContextResolution): Schema = { schemaAsync(id, project, source, tags).accepted } @@ -89,7 +89,7 @@ object SchemaGen { ).toResource implicit final private class CatsIOValuesOps[A](private val io: IO[A]) { - def accepted(implicit runtime: IORuntime): A = + def accepted: A = io.unsafeRunTimed(45.seconds).getOrElse(throw new RuntimeException("IO timed out during .accepted call")) } } diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/identities/IdentitiesImplSuite.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/identities/IdentitiesImplSuite.scala index 025cbff119..4ff364a724 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/identities/IdentitiesImplSuite.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/identities/IdentitiesImplSuite.scala @@ -4,6 +4,7 @@ import akka.http.scaladsl.model.headers.OAuth2BearerToken import akka.http.scaladsl.model.{HttpRequest, Uri} import cats.data.NonEmptySet import cats.effect.{IO, Ref} +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.cache.LocalCache import ch.epfl.bluebrain.nexus.delta.kernel.jwt.TokenRejection._ import ch.epfl.bluebrain.nexus.delta.kernel.jwt.{AuthToken, ParsedToken} diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/UUIDCacheSuite.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/UUIDCacheSuite.scala index 6c16bfda5a..c9ec27daee 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/UUIDCacheSuite.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/UUIDCacheSuite.scala @@ -1,6 +1,7 @@ package ch.epfl.bluebrain.nexus.delta.sdk.projects import cats.syntax.all._ +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.cache.CacheConfig import ch.epfl.bluebrain.nexus.delta.sdk.generators.{OrganizationGen, ProjectGen} import ch.epfl.bluebrain.nexus.delta.sdk.organizations.Organizations @@ -11,7 +12,6 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Label, ProjectRef} import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.delta.sourcing.query.RefreshStrategy import ch.epfl.bluebrain.nexus.delta.sourcing.state.{GlobalStateStore, ScopedStateStore} -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.mu.ce.CatsEffectSuite import doobie.implicits._ import munit.AnyFixture @@ -19,7 +19,7 @@ import munit.AnyFixture import java.util.UUID import scala.concurrent.duration._ -class UUIDCacheSuite extends CatsEffectSuite with CatsRunContext with Doobie.Fixture { +class UUIDCacheSuite extends CatsEffectSuite with Doobie.Fixture { override def munitFixtures: Seq[AnyFixture[_]] = List(doobie) diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/resources/ResourcesImplSpec.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/resources/ResourcesImplSpec.scala index c12ce90ac6..f07876a6ea 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/resources/ResourcesImplSpec.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/resources/ResourcesImplSpec.scala @@ -223,8 +223,7 @@ class ResourcesImplSpec val schemaRev = Revision(resourceSchema.iri, 1) val expectedData = ResourceGen.resource(myId8, projectRef, sourceMyId8, schemaRev)( - resolverContextResolution(projectRef), - runtime + resolverContextResolution(projectRef) ) val resource = resources.create(projectRef, resourceSchema, sourceMyId8, None).accepted resource shouldEqual mkResource(expectedData) @@ -235,8 +234,7 @@ class ResourcesImplSpec val schemaRev = Revision(resourceSchema.iri, 1) val expectedData = ResourceGen.resource(myId9, projectRef, sourceMyId9, schemaRev)( - resolverContextResolution(projectRef), - runtime + resolverContextResolution(projectRef) ) val resource = resources.create(projectRef, resourceSchema, sourceMyId9, None).accepted resource shouldEqual mkResource(expectedData) diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/utils/BaseRouteSpec.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/utils/BaseRouteSpec.scala index 12f76dd3d6..5371a7cf3a 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/utils/BaseRouteSpec.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/utils/BaseRouteSpec.scala @@ -3,7 +3,7 @@ package ch.epfl.bluebrain.nexus.delta.sdk.utils import ch.epfl.bluebrain.nexus.delta.sdk.ConfigFixtures import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.DoobieScalaTestFixture import ch.epfl.bluebrain.nexus.testkit._ -import ch.epfl.bluebrain.nexus.testkit.ce.{CatsRunContext, IOFromMap} +import ch.epfl.bluebrain.nexus.testkit.ce.IOFromMap import ch.epfl.bluebrain.nexus.testkit.scalatest.TestMatchers import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.CatsIOValues import org.scalatest.matchers.should.Matchers @@ -12,7 +12,6 @@ import org.scalatest.{Inspectors, OptionValues} trait BaseRouteSpec extends RouteHelpers with DoobieScalaTestFixture - with CatsRunContext with Matchers with CatsIOValues with IOFromMap diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/utils/RouteFixtures.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/utils/RouteFixtures.scala index 67bfce568a..dad3264173 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/utils/RouteFixtures.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/utils/RouteFixtures.scala @@ -12,11 +12,10 @@ import ch.epfl.bluebrain.nexus.delta.sdk.model.BaseUri import ch.epfl.bluebrain.nexus.delta.sdk.model.search.PaginationConfig import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.User import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.scalatest.ClasspathResources trait RouteFixtures { - self: CatsRunContext with ClasspathResources => + self: ClasspathResources => implicit val api: JsonLdApi = JsonLdJavaApi.strict diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/ScopedEventStoreSuite.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/ScopedEventStoreSuite.scala index 44281f9a47..7a7a632f37 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/ScopedEventStoreSuite.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/ScopedEventStoreSuite.scala @@ -12,7 +12,6 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.delta.sourcing.query.RefreshStrategy import ch.epfl.bluebrain.nexus.delta.sourcing.{PullRequest, Scope} -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.mu.ce.CatsEffectSuite import doobie.implicits._ import munit.AnyFixture @@ -20,7 +19,7 @@ import munit.AnyFixture import java.time.Instant import scala.concurrent.duration._ -class ScopedEventStoreSuite extends CatsEffectSuite with CatsRunContext with Doobie.Fixture with Doobie.Assertions { +class ScopedEventStoreSuite extends CatsEffectSuite with Doobie.Fixture with Doobie.Assertions { override def munitFixtures: Seq[AnyFixture[_]] = List(doobie) diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/postgres/Doobie.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/postgres/Doobie.scala index b0cef805fa..c715d27894 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/postgres/Doobie.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/postgres/Doobie.scala @@ -4,7 +4,6 @@ import cats.effect.{IO, Resource} import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef import ch.epfl.bluebrain.nexus.delta.sourcing.{Execute, Transactors} -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite import ch.epfl.bluebrain.nexus.testkit.mu.ce.ResourceFixture import ch.epfl.bluebrain.nexus.testkit.mu.ce.ResourceFixture.IOFixture @@ -42,7 +41,7 @@ object Doobie { ): IOFixture[Transactors] = ResourceFixture.suiteLocal(name, resource(user, pass)) - trait Fixture { self: NexusSuite with CatsRunContext => + trait Fixture { self: NexusSuite => val doobie: ResourceFixture.IOFixture[Transactors] = Doobie.suiteLocalFixture("doobie") /** diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/postgres/DoobieScalaTestFixture.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/postgres/DoobieScalaTestFixture.scala index 37065f4506..25112e766b 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/postgres/DoobieScalaTestFixture.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/postgres/DoobieScalaTestFixture.scala @@ -3,7 +3,6 @@ package ch.epfl.bluebrain.nexus.delta.sourcing.postgres import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.testkit.Generators -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.clock.FixedClock import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.CatsIOValues import org.scalatest.{BeforeAndAfterAll, Suite} @@ -15,7 +14,7 @@ trait DoobieScalaTestFixture with CatsIOValues with FixedClock { - self: Suite with CatsRunContext => + self: Suite => var xas: Transactors = _ private var xasTeardown: IO[Unit] = _ diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/stream/SupervisorSetup.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/stream/SupervisorSetup.scala index c96cc8c0dc..b14317b794 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/stream/SupervisorSetup.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/stream/SupervisorSetup.scala @@ -7,7 +7,6 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.config.{BatchConfig, ProjectionCon import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.delta.sourcing.projections.{ProjectionErrors, Projections} import ch.epfl.bluebrain.nexus.delta.sourcing.query.RefreshStrategy -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.clock.FixedClock import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite import ch.epfl.bluebrain.nexus.testkit.mu.ce.ResourceFixture @@ -54,7 +53,7 @@ object SupervisorSetup { def suiteLocalFixture(name: String, cluster: ClusterConfig, clock: Clock[IO]): IOFixture[SupervisorSetup] = ResourceFixture.suiteLocal(name, resource(cluster, clock)) - trait Fixture { self: NexusSuite with CatsRunContext with FixedClock => + trait Fixture { self: NexusSuite with FixedClock => val supervisor: IOFixture[SupervisorSetup] = SupervisorSetup.suiteLocalFixture("supervisor", ClusterConfig(1, 0), clock) val supervisor3_1: IOFixture[SupervisorSetup] = diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/ce/CatsRunContext.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/ce/CatsRunContext.scala deleted file mode 100644 index 7bc89b2f46..0000000000 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/ce/CatsRunContext.scala +++ /dev/null @@ -1,9 +0,0 @@ -package ch.epfl.bluebrain.nexus.testkit.ce - -import cats.effect.unsafe.IORuntime - -trait CatsRunContext { - - implicit val runtime: IORuntime = IORuntime.global - -} diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsEffectAssertions.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsEffectAssertions.scala index 744ea1da29..5553411953 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsEffectAssertions.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsEffectAssertions.scala @@ -5,7 +5,6 @@ import ch.epfl.bluebrain.nexus.delta.kernel.syntax._ import cats.syntax.eq._ import ch.epfl.bluebrain.nexus.delta.kernel.RetryStrategy import ch.epfl.bluebrain.nexus.delta.kernel.RetryStrategyConfig.MaximumCumulativeDelayConfig -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import munit.{Assertions, Compare, FailException, Location} import scala.reflect.ClassTag @@ -15,7 +14,7 @@ import scala.util.control.NonFatal * Adapted from: from * https://github.com/typelevel/munit-cats-effect/blob/main/core/src/main/scala/munit/CatsEffectAssertions.scala */ -trait CatsEffectAssertions { self: Assertions with CatsRunContext => +trait CatsEffectAssertions { self: Assertions => def assertIO[A, B]( obtained: IO[A], diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsEffectSuite.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsEffectSuite.scala index 6dcd0280b1..f4878007f9 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsEffectSuite.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsEffectSuite.scala @@ -1,7 +1,7 @@ package ch.epfl.bluebrain.nexus.testkit.mu.ce import cats.effect.IO -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.testkit.clock.FixedClock import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite import ch.epfl.bluebrain.nexus.testkit.scalatest.{ClasspathResources, MUnitExtractValue} @@ -14,7 +14,6 @@ import scala.concurrent.duration.{DurationInt, FiniteDuration} */ abstract class CatsEffectSuite extends NexusSuite - with CatsRunContext with MUnitExtractValue with ClasspathResources with CatsIOValues diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsIOValues.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsIOValues.scala index da00938a42..dcae637e71 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsIOValues.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsIOValues.scala @@ -1,14 +1,14 @@ package ch.epfl.bluebrain.nexus.testkit.mu.ce import cats.effect.IO -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext +import cats.effect.unsafe.implicits._ import munit.{Assertions, Location} import scala.concurrent.duration.DurationInt trait CatsIOValues { - self: Assertions with CatsRunContext => + self: Assertions => implicit final class CatsIOValuesOps[A](private val io: IO[A]) { def accepted(implicit loc: Location): A = diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsStreamAssertions.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsStreamAssertions.scala index f044119c04..9614601613 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsStreamAssertions.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/mu/ce/CatsStreamAssertions.scala @@ -1,13 +1,12 @@ package ch.epfl.bluebrain.nexus.testkit.mu.ce import cats.effect.IO -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import fs2.Stream import munit.{Assertions, Location} import scala.concurrent.duration.DurationInt -trait CatsStreamAssertions { self: CatsRunContext with Assertions => +trait CatsStreamAssertions extends Assertions { implicit class CEStreamAssertionsOps[A](stream: Stream[IO, A])(implicit loc: Location diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ClasspathResources.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ClasspathResources.scala index febfd5278f..035f4c70a9 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ClasspathResources.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ClasspathResources.scala @@ -2,7 +2,6 @@ package ch.epfl.bluebrain.nexus.testkit.scalatest import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.mu.ce.{CatsIOValues => MUnitCatsIOValues} import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.{CatsIOValues => ScalaTestCatsIOValues} import io.circe.{Json, JsonObject} @@ -19,13 +18,13 @@ trait ExtractValue { } trait ScalaTestExtractValue extends ExtractValue with ScalaTestCatsIOValues { - self: ScalaTestAssertions with CatsRunContext => + self: ScalaTestAssertions => override def extractValue[A](io: IO[A]): A = io.accepted } trait MUnitExtractValue extends ExtractValue with MUnitCatsIOValues { - self: MUnitAssertions with CatsRunContext => + self: MUnitAssertions => override def extractValue[A](io: IO[A]): A = io.accepted } diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsEffectAsyncScalaTestAdapter.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsEffectAsyncScalaTestAdapter.scala index a71e474f5d..7ad39c2311 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsEffectAsyncScalaTestAdapter.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsEffectAsyncScalaTestAdapter.scala @@ -1,7 +1,7 @@ package ch.epfl.bluebrain.nexus.testkit.scalatest.ce import cats.effect.IO -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext +import cats.effect.unsafe.implicits._ import org.scalatest.Assertions._ import org.scalatest.{Assertion, AsyncTestSuite} @@ -9,7 +9,7 @@ import scala.concurrent.{ExecutionContext, Future} trait CatsEffectAsyncScalaTestAdapter extends CatsEffectAsyncScalaTestAdapterLowPrio { - self: AsyncTestSuite with CatsRunContext => + self: AsyncTestSuite => implicit def ioToFutureAssertion(io: IO[Assertion]): Future[Assertion] = io.unsafeToFuture() implicit def futureListToFutureAssertion(future: Future[List[Assertion]]): Future[Assertion] = @@ -17,7 +17,6 @@ trait CatsEffectAsyncScalaTestAdapter extends CatsEffectAsyncScalaTestAdapterLow } trait CatsEffectAsyncScalaTestAdapterLowPrio { - self: CatsRunContext => implicit def ioListToFutureAssertion(io: IO[List[Assertion]])(implicit ec: ExecutionContext): Future[Assertion] = io.unsafeToFuture().map(_ => succeed) } diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsEffectSpec.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsEffectSpec.scala index 6a9a435010..15c556eb4f 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsEffectSpec.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsEffectSpec.scala @@ -1,12 +1,10 @@ package ch.epfl.bluebrain.nexus.testkit.scalatest.ce -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.clock.FixedClock import ch.epfl.bluebrain.nexus.testkit.scalatest.{BaseSpec, ClasspathResources, ScalaTestExtractValue} trait CatsEffectSpec extends BaseSpec - with CatsRunContext with CatsIOValues with ClasspathResources with ScalaTestExtractValue diff --git a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsIOValues.scala b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsIOValues.scala index 76fae23930..e3e3052a1f 100644 --- a/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsIOValues.scala +++ b/delta/testkit/src/main/scala/ch/epfl/bluebrain/nexus/testkit/scalatest/ce/CatsIOValues.scala @@ -1,7 +1,7 @@ package ch.epfl.bluebrain.nexus.testkit.scalatest.ce import cats.effect.IO -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext +import cats.effect.unsafe.implicits._ import org.scalactic.source import org.scalatest.{Assertion, Assertions} @@ -10,7 +10,7 @@ import scala.reflect.ClassTag trait CatsIOValues { - self: Assertions with CatsRunContext => + self: Assertions => implicit final class CatsIOValuesOps[A](private val io: IO[A]) { def accepted(implicit pos: source.Position): A = { diff --git a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/Main.scala b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/Main.scala index f769540244..138c76c5b4 100644 --- a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/Main.scala +++ b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/Main.scala @@ -58,7 +58,6 @@ object Main extends IOApp { implicit val timeout = Timeout(1.minute) implicit val clock = Clock.systemUTC implicit val contentTypeDetector = new ContentTypeDetector(appConfig.mediaTypeDetector) - implicit val runtimeImpl = runtime val storages: Storages[AkkaSource] = new DiskStorage(appConfig.storage, contentTypeDetector, appConfig.digest, AttributesCache[AkkaSource]) diff --git a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCache.scala b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCache.scala index 68440104b0..1856e83cd8 100644 --- a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCache.scala +++ b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCache.scala @@ -4,7 +4,6 @@ import akka.actor.{ActorRef, ActorSystem} import akka.pattern.{ask, AskTimeoutException} import akka.util.Timeout import cats.effect.IO -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.storage.File.FileAttributes import ch.epfl.bluebrain.nexus.storage.StorageError.{InternalError, OperationTimedOut} @@ -45,7 +44,6 @@ object AttributesCache { def apply[Source](implicit system: ActorSystem, - runtime: IORuntime, clock: Clock, tm: Timeout, computation: AttributesComputation[Source], diff --git a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCacheActor.scala b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCacheActor.scala index 98577d651d..771a55d8cf 100644 --- a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCacheActor.scala +++ b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCacheActor.scala @@ -6,7 +6,7 @@ import akka.http.scaladsl.model.MediaTypes.`application/octet-stream` import akka.stream.javadsl.Sink import akka.stream.scaladsl.{Flow, Keep, Source} import akka.stream.{OverflowStrategy, QueueOfferResult} -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.storage.File.{Digest, FileAttributes} import ch.epfl.bluebrain.nexus.storage._ import ch.epfl.bluebrain.nexus.storage.attributes.AttributesCacheActor.Protocol._ @@ -32,7 +32,6 @@ import scala.concurrent.duration._ */ class AttributesCacheActor[S](computation: AttributesComputation[S])(implicit config: DigestConfig, - runtime: IORuntime, clock: Clock ) extends Actor with ActorLogging { @@ -146,7 +145,7 @@ object AttributesCacheActor { def props[S]( computation: AttributesComputation[S] - )(implicit config: DigestConfig, runtime: IORuntime, clock: Clock): Props = + )(implicit config: DigestConfig, clock: Clock): Props = Props(new AttributesCacheActor(computation)) sealed private[attributes] trait Protocol extends Product with Serializable diff --git a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/AuthDirectives.scala b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/AuthDirectives.scala index 7769d1cd4a..57d05082e3 100644 --- a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/AuthDirectives.scala +++ b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/AuthDirectives.scala @@ -3,7 +3,7 @@ package ch.epfl.bluebrain.nexus.storage.routes import akka.http.scaladsl.model.headers.OAuth2BearerToken import akka.http.scaladsl.server.Directive0 import akka.http.scaladsl.server.Directives._ -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.delta.kernel.jwt.AuthToken import ch.epfl.bluebrain.nexus.storage.StorageError._ @@ -16,7 +16,7 @@ object AuthDirectives { /** * Extracts the credentials from the HTTP Authorization Header and builds the [[AccessToken]] */ - def validUser(implicit authorizationMethod: AuthorizationMethod, runtime: IORuntime): Directive0 = { + def validUser(implicit authorizationMethod: AuthorizationMethod): Directive0 = { def validate(token: Option[AuthToken]): Directive0 = authorizationMethod.validate(token) match { case Left(error) => diff --git a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/Routes.scala b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/Routes.scala index a540a03e0e..6668d4291b 100644 --- a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/Routes.scala +++ b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/Routes.scala @@ -3,7 +3,7 @@ package ch.epfl.bluebrain.nexus.storage.routes import akka.http.scaladsl.model.headers.{`WWW-Authenticate`, HttpChallenges} import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.{ExceptionHandler, RejectionHandler, Route} -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.storage.StorageError._ import ch.epfl.bluebrain.nexus.storage.auth.AuthorizationMethod @@ -24,7 +24,7 @@ object Routes { * @return * an ExceptionHandler that ensures a descriptive message is returned to the caller */ - final def exceptionHandler(implicit runtime: IORuntime): ExceptionHandler = { + final def exceptionHandler: ExceptionHandler = { def completeGeneric(): Route = complete(InternalError("The system experienced an unexpected error, please try again later."): StorageError) @@ -68,7 +68,7 @@ object Routes { * @param route * the route to wrap */ - final def wrap(route: Route)(implicit hc: HttpConfig, runtime: IORuntime): Route = + final def wrap(route: Route)(implicit hc: HttpConfig): Route = handleExceptions(exceptionHandler) { handleRejections(rejectionHandler) { uriPrefix(hc.publicUri) { @@ -85,7 +85,7 @@ object Routes { */ def apply( storages: Storages[AkkaSource] - )(implicit config: AppConfig, authorizationMethod: AuthorizationMethod, runtime: IORuntime): Route = + )(implicit config: AppConfig, authorizationMethod: AuthorizationMethod): Route = //TODO: Fetch Bearer token and verify identity wrap { concat( diff --git a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/StorageRoutes.scala b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/StorageRoutes.scala index eddfdbb981..5d334e7727 100644 --- a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/StorageRoutes.scala +++ b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/StorageRoutes.scala @@ -5,7 +5,7 @@ import akka.http.scaladsl.model.StatusCodes._ import akka.http.scaladsl.model.{HttpEntity, StatusCode, Uri} import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.storage.File.{Digest, FileAttributes} import ch.epfl.bluebrain.nexus.storage.config.AppConfig import ch.epfl.bluebrain.nexus.storage.config.AppConfig.HttpConfig @@ -18,7 +18,7 @@ import io.circe.generic.semiauto._ import io.circe.{Decoder, Encoder} import kamon.instrumentation.akka.http.TracingDirectives.operationName -class StorageRoutes()(implicit storages: Storages[AkkaSource], hc: HttpConfig, runtime: IORuntime) { +class StorageRoutes()(implicit storages: Storages[AkkaSource], hc: HttpConfig) { def routes: Route = // Consume buckets/{name}/ @@ -104,7 +104,7 @@ object StorageRoutes { implicit val linkFileEnc: Encoder[LinkFile] = deriveEncoder[LinkFile] } - final def apply(storages: Storages[AkkaSource])(implicit cfg: AppConfig, runtime: IORuntime): StorageRoutes = { + final def apply(storages: Storages[AkkaSource])(implicit cfg: AppConfig): StorageRoutes = { implicit val s = storages new StorageRoutes() } diff --git a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/instances.scala b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/instances.scala index 14ab2e3c8f..1ac2ee6313 100644 --- a/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/instances.scala +++ b/storage/src/main/scala/ch/epfl/bluebrain/nexus/storage/routes/instances.scala @@ -5,7 +5,7 @@ import akka.http.scaladsl.marshalling._ import akka.http.scaladsl.model.MediaTypes._ import akka.http.scaladsl.model._ import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.storage.JsonLdCirceSupport.sortKeys import ch.epfl.bluebrain.nexus.storage.JsonLdCirceSupport.OrderedKeys import ch.epfl.bluebrain.nexus.storage.Rejection @@ -49,7 +49,7 @@ object instances extends LowPriority { } implicit final class EitherFSyntax[A](f: IO[Either[Rejection, A]]) { - def runWithStatus(code: StatusCode)(implicit runtime: IORuntime): Future[Either[Rejection, (StatusCode, A)]] = + def runWithStatus(code: StatusCode): Future[Either[Rejection, (StatusCode, A)]] = f.map(_.map(code -> _)).unsafeToFuture() } diff --git a/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCacheSpec.scala b/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCacheSpec.scala index 379f036ab2..57c14cd943 100644 --- a/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCacheSpec.scala +++ b/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCacheSpec.scala @@ -5,6 +5,7 @@ import akka.http.scaladsl.model.MediaTypes.{`application/octet-stream`, `image/j import akka.testkit.TestKit import akka.util.Timeout import cats.effect.IO +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.storage.File.{Digest, FileAttributes} import ch.epfl.bluebrain.nexus.storage._ import ch.epfl.bluebrain.nexus.storage.config.AppConfig.DigestConfig diff --git a/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/auth/AuthorizationMethodSuite.scala b/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/auth/AuthorizationMethodSuite.scala index 9c8aedf539..a2021ba0d7 100644 --- a/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/auth/AuthorizationMethodSuite.scala +++ b/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/auth/AuthorizationMethodSuite.scala @@ -1,8 +1,8 @@ package ch.epfl.bluebrain.nexus.storage.auth -import ch.epfl.bluebrain.nexus.storage.utils.Randomness.randomString import cats.data.NonEmptySet import ch.epfl.bluebrain.nexus.storage.auth.AuthorizationMethod._ +import ch.epfl.bluebrain.nexus.storage.utils.Randomness import com.nimbusds.jose.jwk.gen.RSAKeyGenerator import com.nimbusds.jose.jwk.{JWK, JWKSet, RSAKey} import munit.FunSuite @@ -10,7 +10,7 @@ import pureconfig.ConfigSource import scala.jdk.CollectionConverters._ -class AuthorizationMethodSuite extends FunSuite { +class AuthorizationMethodSuite extends FunSuite with Randomness { private def generateKey: RSAKey = new RSAKeyGenerator(2048).keyID(randomString()).generate() diff --git a/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/utils/Randomness.scala b/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/utils/Randomness.scala index b3310d2283..9789cc66f3 100644 --- a/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/utils/Randomness.scala +++ b/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/utils/Randomness.scala @@ -9,5 +9,3 @@ trait Randomness { final def genInt(max: Int = 100): Int = Random.nextInt(max) } - -object Randomness extends Randomness diff --git a/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/utils/Resources.scala b/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/utils/Resources.scala index c9de761533..14809b194c 100644 --- a/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/utils/Resources.scala +++ b/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/utils/Resources.scala @@ -65,6 +65,4 @@ trait Resources { @SuppressWarnings(Array("TryGet")) final def jsonContentOf(resourcePath: String, replacements: Map[String, String]): Json = parse(contentOf(resourcePath, replacements)).toTry.get -} - -object Resources extends Resources +} \ No newline at end of file diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/BaseIntegrationSpec.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/BaseIntegrationSpec.scala index d75443d0d3..7156ce46e4 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/BaseIntegrationSpec.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/BaseIntegrationSpec.scala @@ -7,10 +7,10 @@ import akka.http.scaladsl.model.headers._ import akka.http.scaladsl.testkit.ScalatestRouteTest import akka.util.ByteString import cats.effect.{IO, Ref} +import cats.effect.unsafe.implicits._ import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.testkit._ -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.clock.FixedClock import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.{CatsEffectAsyncScalaTestAdapter, CatsIOValues} import ch.epfl.bluebrain.nexus.testkit.scalatest.{ClasspathResources, EitherValues, ScalaTestExtractValue} @@ -44,7 +44,6 @@ trait BaseIntegrationSpec with EitherValues with OptionValues with Inspectors - with CatsRunContext with CatsIOValues with FixedClock with CirceUnmarshalling diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/BlazegraphDsl.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/BlazegraphDsl.scala index 29e402f76f..6d3c138d0a 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/BlazegraphDsl.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/BlazegraphDsl.scala @@ -7,7 +7,6 @@ import akka.http.scaladsl.model.headers.Accept import akka.http.scaladsl.model.{HttpRequest, MediaRange, MediaType} import akka.stream.Materializer import cats.effect.IO -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.testkit.CirceLiteral import io.circe.optics.JsonPath.root import org.scalatest.matchers.should.Matchers @@ -17,7 +16,6 @@ import scala.concurrent.ExecutionContext class BlazegraphDsl(implicit as: ActorSystem, materializer: Materializer, - runtime: IORuntime, ec: ExecutionContext ) extends CirceLiteral with CirceUnmarshalling diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/ElasticsearchDsl.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/ElasticsearchDsl.scala index fef80bb332..bd94d55cb1 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/ElasticsearchDsl.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/ElasticsearchDsl.scala @@ -6,7 +6,6 @@ import akka.http.scaladsl.model.headers.BasicHttpCredentials import akka.http.scaladsl.model.{ContentTypes, HttpEntity, HttpRequest, StatusCode} import akka.stream.Materializer import cats.effect.IO -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader import ch.epfl.bluebrain.nexus.testkit.CirceLiteral @@ -18,8 +17,7 @@ import scala.concurrent.ExecutionContext class ElasticsearchDsl(implicit as: ActorSystem, materializer: Materializer, - ec: ExecutionContext, - runtime: IORuntime + ec: ExecutionContext ) extends CirceLiteral with CirceUnmarshalling with Matchers { diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/HttpClient.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/HttpClient.scala index b1a1088463..fd8b1e05c5 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/HttpClient.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/HttpClient.scala @@ -13,7 +13,7 @@ import akka.stream.Materializer import akka.stream.alpakka.sse.scaladsl.EventSource import akka.stream.scaladsl.Sink import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.tests.HttpClient.{jsonHeaders, rdfApplicationSqlQuery, tokensMap} import ch.epfl.bluebrain.nexus.tests.Identity.Anonymous import io.circe.Json @@ -31,7 +31,6 @@ import scala.concurrent.{ExecutionContext, Future} class HttpClient private (baseUrl: Uri, httpExt: HttpExt)(implicit as: ActorSystem, materializer: Materializer, - runtime: IORuntime, ec: ExecutionContext ) extends Matchers with AppendedClues { @@ -314,7 +313,6 @@ object HttpClient { def apply(baseUrl: Uri)(implicit as: ActorSystem, materializer: Materializer, - runtime: IORuntime, ec: ExecutionContext ) = new HttpClient(baseUrl, Http()) } diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/KeycloakDsl.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/KeycloakDsl.scala index 471328427e..fab6f65135 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/KeycloakDsl.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/KeycloakDsl.scala @@ -8,7 +8,6 @@ import akka.http.scaladsl.model.headers.Authorization import akka.http.scaladsl.unmarshalling.FromEntityUnmarshaller import akka.stream.Materializer import cats.effect.IO -import cats.effect.unsafe.IORuntime import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader import ch.epfl.bluebrain.nexus.tests.Identity.{ClientCredentials, UserCredentials} @@ -22,8 +21,7 @@ class KeycloakDsl(implicit as: ActorSystem, materializer: Materializer, um: FromEntityUnmarshaller[Json], - executionContext: ExecutionContext, - runtime: IORuntime + executionContext: ExecutionContext ) { private val loader = ClasspathResourceLoader() diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/Optics.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/Optics.scala index 1959db2265..6d5c42393d 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/Optics.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/Optics.scala @@ -7,7 +7,6 @@ import io.circe.{Json, JsonObject} import org.scalatest.matchers.should.Matchers import org.scalatest.{Assertion, Assertions, OptionValues} import Optics._ -import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.scalatest.{ClasspathResources, ScalaTestExtractValue} import ch.epfl.bluebrain.nexus.tests.Optics.admin.{apiMappings, effectiveApiMappings} @@ -17,7 +16,7 @@ trait OpticsValidators with CirceEq with ClasspathResources with ScalaTestExtractValue { - self: Assertions with CatsRunContext => + self: Assertions => private val defaultMappings = jsonContentOf("admin/projects/default-mappings.json").asArray.get diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/admin/AdminDsl.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/admin/AdminDsl.scala index e1f4b0d436..3a255b6245 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/admin/AdminDsl.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/admin/AdminDsl.scala @@ -2,7 +2,7 @@ package ch.epfl.bluebrain.nexus.tests.admin import akka.http.scaladsl.model.{StatusCode, StatusCodes} import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader import ch.epfl.bluebrain.nexus.testkit.Generators @@ -15,7 +15,7 @@ import io.circe.Json import org.scalatest.matchers.should.Matchers import org.scalatest.{Assertion, OptionValues} -class AdminDsl(cl: HttpClient, config: TestsConfig)(implicit runtime: IORuntime) +class AdminDsl(cl: HttpClient, config: TestsConfig) extends Generators with CirceUnmarshalling with Matchers diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/AclDsl.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/AclDsl.scala index 6ca6112556..4c9e44e1ee 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/AclDsl.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/AclDsl.scala @@ -2,7 +2,7 @@ package ch.epfl.bluebrain.nexus.tests.iam import akka.http.scaladsl.model.{HttpResponse, StatusCodes} import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import cats.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader @@ -16,7 +16,7 @@ import org.scalatest.{Assertion, OptionValues} import scala.jdk.CollectionConverters._ -class AclDsl(cl: HttpClient)(implicit runtime: IORuntime) extends CirceUnmarshalling with OptionValues with Matchers { +class AclDsl(cl: HttpClient) extends CirceUnmarshalling with OptionValues with Matchers { private val logger = Logger[this.type] private val loader = ClasspathResourceLoader() diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/PermissionDsl.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/PermissionDsl.scala index f2ea46f1e7..333489eb46 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/PermissionDsl.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/PermissionDsl.scala @@ -2,7 +2,7 @@ package ch.epfl.bluebrain.nexus.tests.iam import akka.http.scaladsl.model.StatusCodes import cats.effect.IO -import cats.effect.unsafe.IORuntime +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.utils.ClasspathResourceLoader import ch.epfl.bluebrain.nexus.tests.iam.types.{Permission, Permissions} import ch.epfl.bluebrain.nexus.tests.{CirceUnmarshalling, HttpClient, Identity} @@ -10,7 +10,7 @@ import io.circe.Json import org.scalatest.Assertion import org.scalatest.matchers.should.Matchers -class PermissionDsl(cl: HttpClient)(implicit runtime: IORuntime) extends CirceUnmarshalling with Matchers { +class PermissionDsl(cl: HttpClient) extends CirceUnmarshalling with Matchers { private val loader = ClasspathResourceLoader() diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/RealmsSpec.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/RealmsSpec.scala index 2fb332044c..eeb15e1b5a 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/RealmsSpec.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/iam/RealmsSpec.scala @@ -1,6 +1,7 @@ package ch.epfl.bluebrain.nexus.tests.iam import akka.http.scaladsl.model.StatusCodes +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.tests.Optics._ import ch.epfl.bluebrain.nexus.tests.{BaseIntegrationSpec, Identity, Realm} import io.circe.Json diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/AutoProjectDeletionSpec.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/AutoProjectDeletionSpec.scala index 28644f32ba..9bc1d40f0f 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/AutoProjectDeletionSpec.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/AutoProjectDeletionSpec.scala @@ -1,6 +1,7 @@ package ch.epfl.bluebrain.nexus.tests.kg import akka.http.scaladsl.model.StatusCodes +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.tests.BaseIntegrationSpec import ch.epfl.bluebrain.nexus.tests.Identity.projects.Bojack import ch.epfl.bluebrain.nexus.tests.iam.types.Permission.{Events, Organizations, Projects, Resources} diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/CompositeViewsSpec.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/CompositeViewsSpec.scala index 37051f4c55..1fb86be5e8 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/CompositeViewsSpec.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/CompositeViewsSpec.scala @@ -2,6 +2,7 @@ package ch.epfl.bluebrain.nexus.tests.kg import akka.http.scaladsl.model.StatusCodes +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.tests.BaseIntegrationSpec import ch.epfl.bluebrain.nexus.tests.HttpClient._ diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/ElasticSearchViewsSpec.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/ElasticSearchViewsSpec.scala index 4c405aa25b..d5f7a1807b 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/ElasticSearchViewsSpec.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/ElasticSearchViewsSpec.scala @@ -2,6 +2,7 @@ package ch.epfl.bluebrain.nexus.tests.kg import akka.http.scaladsl.model.StatusCodes +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.tests.BaseIntegrationSpec import ch.epfl.bluebrain.nexus.tests.Identity.Anonymous import ch.epfl.bluebrain.nexus.tests.Identity.views.ScoobyDoo diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/VersionSpec.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/VersionSpec.scala index 4ef005822d..54ad611dc4 100644 --- a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/VersionSpec.scala +++ b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/VersionSpec.scala @@ -1,6 +1,7 @@ package ch.epfl.bluebrain.nexus.tests.kg import akka.http.scaladsl.model.StatusCodes +import cats.effect.unsafe.implicits._ import ch.epfl.bluebrain.nexus.tests.iam.types.Permission import ch.epfl.bluebrain.nexus.tests.kg.VersionSpec.VersionBundle import ch.epfl.bluebrain.nexus.tests.{BaseIntegrationSpec, Identity}