From a3e9f4c74575b184be801e6105f71bdb2b5efce9 Mon Sep 17 00:00:00 2001 From: Oliver <20188437+olivergrabinski@users.noreply.github.com> Date: Wed, 1 Nov 2023 10:11:19 +0100 Subject: [PATCH] Migrate SearchParams to CE (#4452) --- .../model/BlazegraphViewSearchParams.scala | 44 ------------------ .../compositeviews/CompositeViews.scala | 2 +- .../model/CompositeViewSearchParams.scala | 11 +++-- .../model/ElasticSearchViewSearchParams.scala | 44 ------------------ .../storages/model/StorageSearchParams.scala | 45 ------------------- .../delta/sdk/model/search/SearchParams.scala | 28 ++++++------ .../sdk/organizations/OrganizationsImpl.scala | 2 +- .../delta/sdk/projects/ProjectsImpl.scala | 2 +- .../nexus/delta/sdk/realms/RealmsImpl.scala | 2 +- .../sdk/resolvers/ResolverResolution.scala | 3 +- .../delta/sdk/resolvers/ResolversImpl.scala | 2 +- .../sdk/model/search/SearchParamsSpec.scala | 24 +++++----- .../organizations/OrganizationsImplSpec.scala | 11 ++--- .../delta/sdk/projects/ProjectsImplSpec.scala | 11 +++-- .../sdk/resolvers/ResolversImplSpec.scala | 6 +-- 15 files changed, 49 insertions(+), 188 deletions(-) delete mode 100644 delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/model/BlazegraphViewSearchParams.scala delete mode 100644 delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/model/ElasticSearchViewSearchParams.scala delete mode 100644 delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/storages/model/StorageSearchParams.scala diff --git a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/model/BlazegraphViewSearchParams.scala b/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/model/BlazegraphViewSearchParams.scala deleted file mode 100644 index 7eee8539ae..0000000000 --- a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/model/BlazegraphViewSearchParams.scala +++ /dev/null @@ -1,44 +0,0 @@ -package ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.model - -import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.model.{schema => blazegraphSchema} -import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri -import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject -import ch.epfl.bluebrain.nexus.delta.sdk.model.search.SearchParams -import ch.epfl.bluebrain.nexus.delta.sourcing.model.ResourceRef -import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef -import monix.bio.UIO - -/** - * Search parameters for Blazegraph views. - * - * @param project - * the optional parent project of the views - * @param deprecated - * the optional deprecation status of the views - * @param rev - * the optional revision of the views - * @param createdBy - * the optional subject who created the views - * @param updatedBy - * the optional subject who last updated the views - * @param types - * the collection of types to consider, where empty implies all views - * @param filter - * an additional resource filter - */ -final case class BlazegraphViewSearchParams( - project: Option[ProjectRef] = None, - deprecated: Option[Boolean] = None, - rev: Option[Int] = None, - createdBy: Option[Subject] = None, - updatedBy: Option[Subject] = None, - types: Set[Iri] = Set.empty[Iri], - filter: BlazegraphView => UIO[Boolean] -) extends SearchParams[BlazegraphView] { - - override val schema: Option[ResourceRef] = Some(blazegraphSchema) - - override def matches(resource: ViewResource): UIO[Boolean] = - super.matches(resource).map(_ && project.forall(_ == resource.value.project)) - -} diff --git a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/CompositeViews.scala b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/CompositeViews.scala index ac29154c8f..237d6f7c23 100644 --- a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/CompositeViews.scala +++ b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/CompositeViews.scala @@ -298,7 +298,7 @@ final class CompositeViews private ( ): IO[UnscoredSearchResults[ViewResource]] = { val scope = params.project.fold[Scope](Scope.Root)(ref => Scope.Project(ref)) SearchResults( - log.currentStates(scope, _.toResource).evalFilter(params.matches), + log.currentStates(scope, _.toResource).evalFilter(params.matches(_).toTask), pagination, ordering ).span("listCompositeViews") diff --git a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/model/CompositeViewSearchParams.scala b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/model/CompositeViewSearchParams.scala index 1f79c6ed6e..458c5e3edd 100644 --- a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/model/CompositeViewSearchParams.scala +++ b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/model/CompositeViewSearchParams.scala @@ -1,12 +1,11 @@ package ch.epfl.bluebrain.nexus.delta.plugins.compositeviews.model +import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.plugins.compositeviews.model import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri -import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject import ch.epfl.bluebrain.nexus.delta.sdk.model.search.SearchParams -import ch.epfl.bluebrain.nexus.delta.sourcing.model.ResourceRef -import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef -import monix.bio.UIO +import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject +import ch.epfl.bluebrain.nexus.delta.sourcing.model.{ProjectRef, ResourceRef} /** * Search parameters for Composite views. @@ -33,12 +32,12 @@ final case class CompositeViewSearchParams( createdBy: Option[Subject] = None, updatedBy: Option[Subject] = None, types: Set[Iri] = Set.empty, - filter: CompositeView => UIO[Boolean] + filter: CompositeView => IO[Boolean] ) extends SearchParams[CompositeView] { override val schema: Option[ResourceRef] = Some(model.schema) - override def matches(resource: ViewResource): UIO[Boolean] = + override def matches(resource: ViewResource): IO[Boolean] = super.matches(resource).map(_ && project.forall(_ == resource.value.project)) } diff --git a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/model/ElasticSearchViewSearchParams.scala b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/model/ElasticSearchViewSearchParams.scala deleted file mode 100644 index 563276778f..0000000000 --- a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/model/ElasticSearchViewSearchParams.scala +++ /dev/null @@ -1,44 +0,0 @@ -package ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.model - -import ch.epfl.bluebrain.nexus.delta.plugins.elasticsearch.model -import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri -import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject -import ch.epfl.bluebrain.nexus.delta.sdk.model.search.SearchParams -import ch.epfl.bluebrain.nexus.delta.sourcing.model.ResourceRef -import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef -import monix.bio.UIO - -/** - * Search parameters for ElasticSearch views. - * - * @param project - * the optional parent project of the views - * @param deprecated - * the optional deprecation status of the views - * @param rev - * the optional revision of the views - * @param createdBy - * the optional subject who created the views - * @param updatedBy - * the optional subject who last updated the views - * @param types - * the collection of types to consider, where empty implies all views - * @param filter - * an additional resource filter - */ -final case class ElasticSearchViewSearchParams( - project: Option[ProjectRef] = None, - deprecated: Option[Boolean] = None, - rev: Option[Int] = None, - createdBy: Option[Subject] = None, - updatedBy: Option[Subject] = None, - types: Set[Iri] = Set.empty, - filter: ElasticSearchView => UIO[Boolean] -) extends SearchParams[ElasticSearchView] { - - override val schema: Option[ResourceRef] = Some(model.schema) - - override def matches(resource: ViewResource): UIO[Boolean] = - super.matches(resource).map(_ && project.forall(_ == resource.value.project)) - -} diff --git a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/storages/model/StorageSearchParams.scala b/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/storages/model/StorageSearchParams.scala deleted file mode 100644 index a9cefb8abe..0000000000 --- a/delta/plugins/storage/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/storages/model/StorageSearchParams.scala +++ /dev/null @@ -1,45 +0,0 @@ -package ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.model - -import ch.epfl.bluebrain.nexus.delta.plugins.storage.storages.{nxvStorage, schemas, StorageResource} -import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri -import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject -import ch.epfl.bluebrain.nexus.delta.sdk.model.search.SearchParams -import ch.epfl.bluebrain.nexus.delta.sourcing.model.ResourceRef -import ch.epfl.bluebrain.nexus.delta.sourcing.model.ResourceRef.Latest -import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef -import monix.bio.UIO - -/** - * Search parameters for storage. - * - * @param project - * the optional parent project of the storages - * @param deprecated - * the optional deprecation status of the storages - * @param rev - * the optional revision of the storages - * @param createdBy - * the optional subject who created the storages - * @param updatedBy - * the optional subject who last updated the storages - * @param types - * the types the storage should contain - * @param filter - * an additional resource filter - */ -final case class StorageSearchParams( - project: Option[ProjectRef] = None, - deprecated: Option[Boolean] = None, - rev: Option[Int] = None, - createdBy: Option[Subject] = None, - updatedBy: Option[Subject] = None, - types: Set[Iri] = Set(nxvStorage), - filter: Storage => UIO[Boolean] -) extends SearchParams[Storage] { - - override val schema: Option[ResourceRef] = Some(Latest(schemas.storage)) - - override def matches(resource: StorageResource): UIO[Boolean] = - super.matches(resource).map(_ && project.forall(_ == resource.value.project)) - -} diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/model/search/SearchParams.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/model/search/SearchParams.scala index 59ddd2d590..3292109020 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/model/search/SearchParams.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/model/search/SearchParams.scala @@ -1,5 +1,6 @@ package ch.epfl.bluebrain.nexus.delta.sdk.model.search +import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.rdf.IriOrBNode.Iri import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.{nxv, schemas => nxvschemas} import ch.epfl.bluebrain.nexus.delta.sdk.model.ResourceF @@ -10,7 +11,6 @@ import ch.epfl.bluebrain.nexus.delta.sdk.resolvers.model.Resolver import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject import ch.epfl.bluebrain.nexus.delta.sourcing.model.ResourceRef.Latest import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Label, ProjectRef, ResourceRef} -import monix.bio.UIO /** * Enumeration of the possible Search Parameters @@ -22,7 +22,7 @@ trait SearchParams[A] { def updatedBy: Option[Subject] def types: Set[Iri] def schema: Option[ResourceRef] - def filter: A => UIO[Boolean] + def filter: A => IO[Boolean] /** * Checks whether a ''resource'' matches the current [[SearchParams]]. @@ -30,8 +30,8 @@ trait SearchParams[A] { * @param resource * a resource */ - def matches(resource: ResourceF[A]): UIO[Boolean] = - UIO + def matches(resource: ResourceF[A]): IO[Boolean] = + IO .pure( rev.forall(_ == resource.rev) && deprecated.forall(_ == resource.deprecated) && @@ -67,12 +67,12 @@ object SearchParams { rev: Option[Int] = None, createdBy: Option[Subject] = None, updatedBy: Option[Subject] = None, - filter: Realm => UIO[Boolean] = _ => UIO.pure(true) + filter: Realm => IO[Boolean] = _ => IO.pure(true) ) extends SearchParams[Realm] { override val types: Set[Iri] = Set(nxv.Realm) override val schema: Option[ResourceRef] = Some(Latest(nxvschemas.realms)) - override def matches(resource: ResourceF[Realm]): UIO[Boolean] = + override def matches(resource: ResourceF[Realm]): IO[Boolean] = super.matches(resource).map(_ && issuer.forall(_ == resource.value.issuer)) } @@ -106,11 +106,11 @@ object SearchParams { createdBy: Option[Subject] = None, updatedBy: Option[Subject] = None, label: Option[String] = None, - filter: Organization => UIO[Boolean] + filter: Organization => IO[Boolean] ) extends SearchParams[Organization] { - override val types: Set[Iri] = Set(nxv.Organization) - override val schema: Option[ResourceRef] = Some(Latest(nxvschemas.organizations)) - override def matches(resource: ResourceF[Organization]): UIO[Boolean] = + override val types: Set[Iri] = Set(nxv.Organization) + override val schema: Option[ResourceRef] = Some(Latest(nxvschemas.organizations)) + override def matches(resource: ResourceF[Organization]): IO[Boolean] = super .matches(resource) .map(_ && label.forall(lb => resource.value.label.value.toLowerCase.contains(lb.toLowerCase.trim))) @@ -141,12 +141,12 @@ object SearchParams { createdBy: Option[Subject] = None, updatedBy: Option[Subject] = None, label: Option[String] = None, - filter: Project => UIO[Boolean] + filter: Project => IO[Boolean] ) extends SearchParams[Project] { override val types: Set[Iri] = Set(nxv.Project) override val schema: Option[ResourceRef] = Some(Latest(nxvschemas.projects)) - override def matches(resource: ResourceF[Project]): UIO[Boolean] = + override def matches(resource: ResourceF[Project]): IO[Boolean] = super .matches(resource) .map( @@ -181,11 +181,11 @@ object SearchParams { createdBy: Option[Subject] = None, updatedBy: Option[Subject] = None, types: Set[Iri] = Set(nxv.Resolver), - filter: Resolver => UIO[Boolean] + filter: Resolver => IO[Boolean] ) extends SearchParams[Resolver] { override val schema: Option[ResourceRef] = Some(Latest(nxvschemas.resolvers)) - override def matches(resource: ResourceF[Resolver]): UIO[Boolean] = + override def matches(resource: ResourceF[Resolver]): IO[Boolean] = super.matches(resource).map(_ && project.forall(_ == resource.value.project)) } diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationsImpl.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationsImpl.scala index 8a7f350fd1..3da19ef949 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationsImpl.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationsImpl.scala @@ -78,7 +78,7 @@ final class OrganizationsImpl private ( log .currentStates(_.toResource) .translate(ioToTaskK) - .evalFilter(params.matches), + .evalFilter(params.matches(_).toUIO), pagination, ordering ).span("listOrganizations") diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsImpl.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsImpl.scala index b7e47cd27e..6ba8225423 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsImpl.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsImpl.scala @@ -98,7 +98,7 @@ final class ProjectsImpl private ( SearchResults( log .currentStates(params.organization.fold(Scope.root)(Scope.Org), _.toResource(defaultApiMappings)) - .evalFilter(params.matches), + .evalFilter(params.matches(_).toUIO), pagination, ordering ).span("listProjects") diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/realms/RealmsImpl.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/realms/RealmsImpl.scala index 85435238e1..20524986d4 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/realms/RealmsImpl.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/realms/RealmsImpl.scala @@ -70,7 +70,7 @@ final class RealmsImpl private (log: RealmsLog) extends Realms { ordering: Ordering[RealmResource] ): IO[SearchResults.UnscoredSearchResults[RealmResource]] = SearchResults( - log.currentStates(_.toResource).translate(ioToTaskK).evalFilter(params.matches), + log.currentStates(_.toResource).translate(ioToTaskK).evalFilter(params.matches(_).toUIO), pagination, ordering ).span("listRealms") diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolverResolution.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolverResolution.scala index c580346a25..cb575ae55d 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolverResolution.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolverResolution.scala @@ -20,7 +20,6 @@ import ch.epfl.bluebrain.nexus.delta.sdk.resolvers.model.ResourceResolutionRepor import ch.epfl.bluebrain.nexus.delta.sdk.resolvers.model.{Resolver, ResolverRejection, ResolverResolutionRejection, ResourceResolutionReport} import ch.epfl.bluebrain.nexus.delta.sdk.{ResolverResource, ResourceShifts} import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Identity, ProjectRef, ResourceRef} -import monix.bio.{IO => BIO} import java.time.Instant import scala.collection.immutable.VectorMap @@ -233,7 +232,7 @@ object ResolverResolution { type ResolverResolutionResult[R] = (ResolverReport, Option[R]) - private val resolverSearchParams = ResolverSearchParams(deprecated = Some(false), filter = _ => BIO.pure(true)) + private val resolverSearchParams = ResolverSearchParams(deprecated = Some(false), filter = _ => IO.pure(true)) private val resolverOrdering: Ordering[ResolverResource] = Ordering[Instant] on (r => r.createdAt) diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolversImpl.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolversImpl.scala index a34ce39e56..9bdc0be6ed 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolversImpl.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolversImpl.scala @@ -154,7 +154,7 @@ final class ResolversImpl private ( ): IO[UnscoredSearchResults[ResolverResource]] = { val scope = params.project.fold[Scope](Scope.Root)(ref => Scope.Project(ref)) SearchResults( - log.currentStates(scope, _.toResource).evalFilter(params.matches), + log.currentStates(scope, _.toResource).evalFilter(params.matches(_).toUIO), pagination, ordering ).span("listResolvers") diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/model/search/SearchParamsSpec.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/model/search/SearchParamsSpec.scala index cd25518a89..0d7a80902b 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/model/search/SearchParamsSpec.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/model/search/SearchParamsSpec.scala @@ -1,14 +1,14 @@ package ch.epfl.bluebrain.nexus.delta.sdk.model.search +import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.sdk.generators.{OrganizationGen, ProjectGen, RealmGen, WellKnownGen} import ch.epfl.bluebrain.nexus.delta.sdk.model.Name import ch.epfl.bluebrain.nexus.delta.sdk.model.search.SearchParams.{OrganizationSearchParams, ProjectSearchParams, RealmSearchParams} import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.{Anonymous, User} import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label -import ch.epfl.bluebrain.nexus.testkit.scalatest.bio.BioSpec -import monix.bio.UIO +import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.CatsEffectSpec -class SearchParamsSpec extends BioSpec { +class SearchParamsSpec extends CatsEffectSpec { private val subject = User("myuser", Label.unsafe("myrealm")) @@ -22,7 +22,7 @@ class SearchParamsSpec extends BioSpec { rev = Some(1), createdBy = Some(subject), updatedBy = Some(subject), - r => UIO.pure(r.name == resource.value.name) + r => IO.pure(r.name == resource.value.name) ) "match a realm resource" in { @@ -52,7 +52,7 @@ class SearchParamsSpec extends BioSpec { createdBy = Some(subject), updatedBy = Some(subject), label = Some("myorg"), - _ => UIO.pure(true) + _ => IO.pure(true) ) val resource = OrganizationGen.resourceFor(OrganizationGen.organization("myorg"), 1, subject) @@ -60,9 +60,9 @@ class SearchParamsSpec extends BioSpec { forAll( List( searchWithAllParams, - OrganizationSearchParams(label = Some("my"), filter = _ => UIO.pure(true)), - OrganizationSearchParams(filter = _ => UIO.pure(true)), - OrganizationSearchParams(rev = Some(1), filter = _ => UIO.pure(true)) + OrganizationSearchParams(label = Some("my"), filter = _ => IO.pure(true)), + OrganizationSearchParams(filter = _ => IO.pure(true)), + OrganizationSearchParams(rev = Some(1), filter = _ => IO.pure(true)) ) ) { search => search.matches(resource).accepted shouldEqual true @@ -91,7 +91,7 @@ class SearchParamsSpec extends BioSpec { createdBy = Some(subject), updatedBy = Some(subject), label = Some("myproj"), - _ => UIO.pure(true) + _ => IO.pure(true) ) val resource = ProjectGen.resourceFor(ProjectGen.project("myorg", "myproj"), 1, subject) @@ -99,9 +99,9 @@ class SearchParamsSpec extends BioSpec { forAll( List( searchWithAllParams, - ProjectSearchParams(label = Some("my"), filter = _ => UIO.pure(true)), - ProjectSearchParams(filter = _ => UIO.pure(true)), - ProjectSearchParams(rev = Some(1), filter = _ => UIO.pure(true)) + ProjectSearchParams(label = Some("my"), filter = _ => IO.pure(true)), + ProjectSearchParams(filter = _ => IO.pure(true)), + ProjectSearchParams(rev = Some(1), filter = _ => IO.pure(true)) ) ) { search => search.matches(resource).accepted shouldEqual true diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationsImplSpec.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationsImplSpec.scala index d9f64198d5..3b546169e9 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationsImplSpec.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationsImplSpec.scala @@ -1,5 +1,6 @@ package ch.epfl.bluebrain.nexus.delta.sdk.organizations +import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.kernel.search.Pagination.FromPagination import ch.epfl.bluebrain.nexus.delta.kernel.utils.UUIDF import ch.epfl.bluebrain.nexus.delta.sdk.generators.OrganizationGen.{organization, resourceFor} @@ -14,8 +15,6 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Identity, Label} import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.DoobieScalaTestFixture import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.CatsEffectSpec -import monix.bio.UIO -import monix.execution.Scheduler import org.scalatest.CancelAfterFailure import java.time.Instant @@ -35,8 +34,6 @@ class OrganizationsImplSpec val epoch: Instant = Instant.EPOCH implicit val subject: Subject = Identity.User("user", Label.unsafe("realm")) - implicit val scheduler: Scheduler = Scheduler.global - val description = Some("my description") val description2 = Some("my other description") val label = Label.unsafe("myorg") @@ -91,15 +88,15 @@ class OrganizationsImplSpec "list organizations" in { val result1 = orgs.fetch(label).accepted val result2 = orgs.fetch(label2).accepted - val filter = OrganizationSearchParams(deprecated = Some(true), rev = Some(3), filter = _ => UIO.pure(true)) + val filter = OrganizationSearchParams(deprecated = Some(true), rev = Some(3), filter = _ => IO.pure(true)) val order = ResourceF.defaultSort[Organization] orgs - .list(FromPagination(0, 1), OrganizationSearchParams(filter = _ => UIO.pure(true)), order) + .list(FromPagination(0, 1), OrganizationSearchParams(filter = _ => IO.pure(true)), order) .accepted shouldEqual UnscoredSearchResults(2L, Vector(UnscoredResultEntry(result1))) orgs - .list(FromPagination(0, 10), OrganizationSearchParams(filter = _ => UIO.pure(true)), order) + .list(FromPagination(0, 10), OrganizationSearchParams(filter = _ => IO.pure(true)), order) .accepted shouldEqual UnscoredSearchResults(2L, Vector(UnscoredResultEntry(result1), UnscoredResultEntry(result2))) orgs.list(FromPagination(0, 10), filter, order).accepted shouldEqual diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsImplSpec.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsImplSpec.scala index 39a0693f2a..3f79dd2396 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsImplSpec.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsImplSpec.scala @@ -20,7 +20,6 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Identity, Label, ProjectRef import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.DoobieScalaTestFixture import ch.epfl.bluebrain.nexus.testkit.ce.CatsRunContext import ch.epfl.bluebrain.nexus.testkit.scalatest.ce.CatsEffectSpec -import monix.bio.UIO import org.scalatest.CancelAfterFailure import java.util.UUID @@ -222,14 +221,14 @@ class ProjectsImplSpec "list projects without filters nor pagination" in { val results = - projects.list(FromPagination(0, 10), ProjectSearchParams(filter = _ => UIO.pure(true)), order).accepted + projects.list(FromPagination(0, 10), ProjectSearchParams(filter = _ => IO.pure(true)), order).accepted results shouldEqual SearchResults(2L, Vector(resource, anotherProjResource)) } "list projects without filers but paginated" in { val results = - projects.list(FromPagination(0, 1), ProjectSearchParams(filter = _ => UIO.pure(true)), order).accepted + projects.list(FromPagination(0, 1), ProjectSearchParams(filter = _ => IO.pure(true)), order).accepted results shouldEqual SearchResults(2L, Vector(resource)) } @@ -239,7 +238,7 @@ class ProjectsImplSpec projects .list( FromPagination(0, 10), - ProjectSearchParams(deprecated = Some(true), filter = _ => UIO.pure(true)), + ProjectSearchParams(deprecated = Some(true), filter = _ => IO.pure(true)), order ) .accepted @@ -252,7 +251,7 @@ class ProjectsImplSpec projects .list( FromPagination(0, 10), - ProjectSearchParams(organization = Some(anotherRef.organization), filter = _ => UIO.pure(true)), + ProjectSearchParams(organization = Some(anotherRef.organization), filter = _ => IO.pure(true)), order ) .accepted @@ -265,7 +264,7 @@ class ProjectsImplSpec projects .list( FromPagination(0, 10), - ProjectSearchParams(createdBy = Some(Identity.Anonymous), filter = _ => UIO.pure(true)), + ProjectSearchParams(createdBy = Some(Identity.Anonymous), filter = _ => IO.pure(true)), order ) .accepted diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolversImplSpec.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolversImplSpec.scala index 2591b6d013..e2ddb1e99b 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolversImplSpec.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ResolversImplSpec.scala @@ -1,6 +1,7 @@ package ch.epfl.bluebrain.nexus.delta.sdk.resolvers import cats.data.NonEmptyList +import cats.effect.IO import cats.syntax.all._ import ch.epfl.bluebrain.nexus.delta.kernel.search.Pagination.FromPagination import ch.epfl.bluebrain.nexus.delta.kernel.utils.UUIDF @@ -28,7 +29,6 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Tag.UserTag 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.scalatest.ce.CatsEffectSpec -import monix.bio.UIO import org.scalatest.CancelAfterFailure import java.util.UUID @@ -726,7 +726,7 @@ class ResolversImplSpec extends CatsEffectSpec with DoobieScalaTestFixture with val results = resolvers .list( FromPagination(0, 10), - ResolverSearchParams(deprecated = Some(true), filter = _ => UIO.pure(true)), + ResolverSearchParams(deprecated = Some(true), filter = _ => IO.pure(true)), order ) .accepted @@ -739,7 +739,7 @@ class ResolversImplSpec extends CatsEffectSpec with DoobieScalaTestFixture with val results = resolvers .list( FromPagination(0, 10), - ResolverSearchParams(createdBy = Some(alice.subject), filter = _ => UIO.pure(true)), + ResolverSearchParams(createdBy = Some(alice.subject), filter = _ => IO.pure(true)), order ) .accepted