From 5daecf9d2b66c34a1649619614a25e0e8449ff42 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 25 Sep 2024 13:40:49 +0200 Subject: [PATCH] Update dependencies for 1.11.0-M2 (#5154) * Update dependencies for 1.11.0-M2 --------- Co-authored-by: Simon Dumas --- build.sbt | 10 +++++----- .../PostgresServiceDependency.scala | 2 +- .../BlazegraphSlowQueryStore.scala | 2 +- .../BlazegraphSlowQueryStoreFixture.scala | 2 +- .../store/CompositeProgressStore.scala | 2 +- .../store/CompositeRestartStore.scala | 2 +- .../ElasticSearchDefaultViewsResetter.scala | 2 +- .../query/DefaultViewsStore.scala | 2 +- ...asticSearchDefaultViewsResetterSuite.scala | 2 +- .../indexing/GraphAnalyticsStream.scala | 2 +- .../indexing/GraphAnalyticsStreamSuite.scala | 2 +- .../nexus/delta/plugins/jira/TokenStore.scala | 2 +- .../sdk/deletion/ProjectDeletionStore.scala | 2 +- .../FetchActiveOrganization.scala | 2 +- .../organizations/OrganizationDeleter.scala | 2 +- .../delta/sdk/projects/FetchContext.scala | 2 +- .../sdk/projects/ProjectsStatistics.scala | 2 +- .../ScopeInitializationErrorStore.scala | 3 ++- .../nexus/delta/sdk/realms/OpenIdExists.scala | 2 +- .../sdk/resolvers/ValidatePriority.scala | 2 +- .../ProjectDeletionCoordinatorSuite.scala | 2 +- .../OrganizationDeleterSuite.scala | 2 +- .../projects/ProjectsStatisticsSuite.scala | 2 +- .../ScopeInitializationErrorStoreSuite.scala | 2 +- .../typehierarchy/TypeHierarchySuite.scala | 2 +- .../nexus/delta/sourcing/DeleteExpired.scala | 2 +- .../nexus/delta/sourcing/EntityCheck.scala | 2 +- .../sourcing/EntityDependencyStore.scala | 2 +- .../nexus/delta/sourcing/EphemeralLog.scala | 2 +- .../nexus/delta/sourcing/GlobalEventLog.scala | 2 +- .../delta/sourcing/PurgeElemFailures.scala | 2 +- .../delta/sourcing/QueryLogHandler.scala | 20 +++++++++---------- .../nexus/delta/sourcing/Scope.scala | 2 +- .../nexus/delta/sourcing/ScopedEventLog.scala | 2 +- .../nexus/delta/sourcing/Transactors.scala | 2 +- .../delta/sourcing/event/EventStreaming.scala | 2 +- .../sourcing/event/GlobalEventStore.scala | 2 +- .../sourcing/event/ScopedEventStore.scala | 2 +- .../delta/sourcing/exporter/Exporter.scala | 2 +- .../implicits/TimeRangeInstances.scala | 2 +- .../nexus/delta/sourcing/model/Tag.scala | 2 +- .../nexus/delta/sourcing/offset/Offset.scala | 2 +- .../projections/FailedElemLogStore.scala | 2 +- .../projections/ProjectionRestartStore.scala | 2 +- .../delta/sourcing/query/StreamingQuery.scala | 2 +- .../sourcing/state/EphemeralStateStore.scala | 2 +- .../delta/sourcing/state/GlobalStateGet.scala | 2 +- .../sourcing/state/GlobalStateStore.scala | 2 +- .../delta/sourcing/state/ScopedStateGet.scala | 2 +- .../sourcing/state/ScopedStateStore.scala | 2 +- .../sourcing/stream/ProjectionStore.scala | 2 +- .../sourcing/tombstone/TombstoneStore.scala | 2 +- .../sourcing/EntityDependencyStoreSuite.scala | 2 +- .../nexus/delta/sourcing/PullRequest.scala | 2 +- .../delta/sourcing/ScopedEventLogSuite.scala | 2 +- .../delta/sourcing/SerializerSuite.scala | 2 +- .../sourcing/event/EventStreamingSuite.scala | 2 +- .../event/GlobalEventStoreSuite.scala | 2 +- .../event/ScopedEventStoreSuite.scala | 2 +- .../delta/sourcing/postgres/Doobie.scala | 2 +- .../sourcing/query/StreamingQuerySuite.scala | 2 +- .../state/EphemeralStateStoreSuite.scala | 2 +- .../state/GlobalStateStoreSuite.scala | 2 +- .../state/ScopedStateStoreFixture.scala | 2 +- .../state/ScopedStateStoreSuite.scala | 2 +- .../tombstone/TombstoneStoreSuite.scala | 2 +- .../nexus/ship/DroppedEventStore.scala | 4 ++-- .../nexus/ship/ShipSummaryStore.scala | 2 +- .../projects/OriginalProjectContext.scala | 2 +- .../bluebrain/nexus/ship/RunShipSuite.scala | 2 +- .../nexus/ship/ShipSummaryStoreSuite.scala | 2 +- 71 files changed, 86 insertions(+), 85 deletions(-) diff --git a/build.sbt b/build.sbt index 539de2b3da..7a4899b587 100755 --- a/build.sbt +++ b/build.sbt @@ -20,7 +20,7 @@ val akkaHttpCirceVersion = "1.39.2" val akkaCorsVersion = "1.2.0" val akkaVersion = "2.6.21" val alpakkaVersion = "3.0.4" -val awsSdkVersion = "2.28.1" +val awsSdkVersion = "2.28.8" val betterMonadicForVersion = "0.3.1" val caffeineVersion = "3.1.8" val catsEffectVersion = "3.5.4" @@ -29,15 +29,15 @@ val catsVersion = "2.12.0" val circeVersion = "0.14.10" val circeOpticsVersion = "0.15.0" val circeExtrasVersions = "0.14.4" -val classgraphVersion = "4.8.175" +val classgraphVersion = "4.8.176" val declineVersion = "2.4.1" -val distageVersion = "1.2.12" -val doobieVersion = "1.0.0-RC5" +val distageVersion = "1.2.15" +val doobieVersion = "1.0.0-RC6" val fs2Version = "3.11.0" val fs2AwsVersion = "6.1.3" val googleAuthClientVersion = "1.36.0" val handleBarsVersion = "4.4.0" -val hikariVersion = "5.1.0" +val hikariVersion = "6.0.0" val jenaVersion = "4.10.0" val jsonldjavaVersion = "0.13.6" val kamonVersion = "2.7.3" diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/dependency/PostgresServiceDependency.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/dependency/PostgresServiceDependency.scala index 1b26bc6a59..6fa3edb347 100644 --- a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/dependency/PostgresServiceDependency.scala +++ b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/dependency/PostgresServiceDependency.scala @@ -5,7 +5,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.ServiceDependency import ch.epfl.bluebrain.nexus.delta.sdk.model.ComponentDescription.ServiceDescription import ch.epfl.bluebrain.nexus.delta.sdk.model.Name import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors -import doobie.implicits._ +import doobie.syntax.all._ /** * Describes the postgres [[ServiceDependency]] providing a way to extract the [[ServiceDescription]] from a ''select diff --git a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/slowqueries/BlazegraphSlowQueryStore.scala b/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/slowqueries/BlazegraphSlowQueryStore.scala index 0e3901d656..07154b6553 100644 --- a/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/slowqueries/BlazegraphSlowQueryStore.scala +++ b/delta/plugins/blazegraph/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/slowqueries/BlazegraphSlowQueryStore.scala @@ -4,7 +4,7 @@ import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.slowqueries.model.BlazegraphSlowQuery import ch.epfl.bluebrain.nexus.delta.sdk.views.ViewRef import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import io.circe.syntax.EncoderOps diff --git a/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/slowqueries/BlazegraphSlowQueryStoreFixture.scala b/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/slowqueries/BlazegraphSlowQueryStoreFixture.scala index 7c4519be9b..d705c7b695 100644 --- a/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/slowqueries/BlazegraphSlowQueryStoreFixture.scala +++ b/delta/plugins/blazegraph/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/blazegraph/slowqueries/BlazegraphSlowQueryStoreFixture.scala @@ -2,7 +2,7 @@ package ch.epfl.bluebrain.nexus.delta.plugins.blazegraph.slowqueries import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie -import doobie.implicits._ +import doobie.syntax.all._ import munit.AfterEach import munit.catseffect.IOFixture diff --git a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/store/CompositeProgressStore.scala b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/store/CompositeProgressStore.scala index a854486479..9db445249d 100644 --- a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/store/CompositeProgressStore.scala +++ b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/store/CompositeProgressStore.scala @@ -16,7 +16,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset import ch.epfl.bluebrain.nexus.delta.sourcing.stream.ProjectionProgress import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import java.time.Instant diff --git a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/store/CompositeRestartStore.scala b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/store/CompositeRestartStore.scala index 862711790b..1048ab99aa 100644 --- a/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/store/CompositeRestartStore.scala +++ b/delta/plugins/composite-views/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/compositeviews/store/CompositeRestartStore.scala @@ -13,7 +13,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset import ch.epfl.bluebrain.nexus.delta.sourcing.stream._ -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import ch.epfl.bluebrain.nexus.delta.sourcing.stream.PurgeProjectionCoordinator.PurgeProjection import io.circe.Json diff --git a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchDefaultViewsResetter.scala b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchDefaultViewsResetter.scala index f1c8f9648f..e5b36ae8b1 100644 --- a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchDefaultViewsResetter.scala +++ b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchDefaultViewsResetter.scala @@ -15,7 +15,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef -import doobie.implicits._ +import doobie.syntax.all._ import fs2.Stream /** diff --git a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/query/DefaultViewsStore.scala b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/query/DefaultViewsStore.scala index db336ffa06..f6ee57b526 100644 --- a/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/query/DefaultViewsStore.scala +++ b/delta/plugins/elasticsearch/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/query/DefaultViewsStore.scala @@ -9,7 +9,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.views.ViewRef import ch.epfl.bluebrain.nexus.delta.sourcing.model.Tag import ch.epfl.bluebrain.nexus.delta.sourcing.{Scope, Transactors} import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import io.circe.{Decoder, Json} /** diff --git a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchDefaultViewsResetterSuite.scala b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchDefaultViewsResetterSuite.scala index e9e6292d68..cece6e0c5b 100644 --- a/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchDefaultViewsResetterSuite.scala +++ b/delta/plugins/elasticsearch/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/elasticsearch/indexing/ElasticSearchDefaultViewsResetterSuite.scala @@ -15,7 +15,7 @@ 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.SelectFilter import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import fs2.Stream import munit.AnyFixture diff --git a/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/indexing/GraphAnalyticsStream.scala b/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/indexing/GraphAnalyticsStream.scala index 965750a894..f627eaf2f5 100644 --- a/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/indexing/GraphAnalyticsStream.scala +++ b/delta/plugins/graph-analytics/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/indexing/GraphAnalyticsStream.scala @@ -17,7 +17,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.{ElemStream, EntityType, Pro import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset import ch.epfl.bluebrain.nexus.delta.sourcing.query.{SelectFilter, StreamingQuery} import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import io.circe.Json trait GraphAnalyticsStream { diff --git a/delta/plugins/graph-analytics/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/indexing/GraphAnalyticsStreamSuite.scala b/delta/plugins/graph-analytics/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/indexing/GraphAnalyticsStreamSuite.scala index b9e0f9ca67..d2389c543b 100644 --- a/delta/plugins/graph-analytics/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/indexing/GraphAnalyticsStreamSuite.scala +++ b/delta/plugins/graph-analytics/src/test/scala/ch/epfl/bluebrain/nexus/delta/plugins/graph/analytics/indexing/GraphAnalyticsStreamSuite.scala @@ -13,7 +13,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.delta.sourcing.state.ScopedStateStore import ch.epfl.bluebrain.nexus.delta.sourcing.state.State.ScopedState import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import io.circe.Codec import io.circe.generic.extras.Configuration import io.circe.generic.extras.semiauto.deriveConfiguredCodec diff --git a/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/TokenStore.scala b/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/TokenStore.scala index 748d4b5f1e..5f70fbc3c5 100644 --- a/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/TokenStore.scala +++ b/delta/plugins/jira/src/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/jira/TokenStore.scala @@ -5,7 +5,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.User -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import io.circe.Json import io.circe.syntax._ diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/deletion/ProjectDeletionStore.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/deletion/ProjectDeletionStore.scala index 5f416ddf4d..21514c6cc8 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/deletion/ProjectDeletionStore.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/deletion/ProjectDeletionStore.scala @@ -8,7 +8,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import doobie.util.fragment.Fragment import doobie.ConnectionIO -import doobie.implicits._ +import doobie.syntax.all._ import io.circe.syntax.EncoderOps final private[deletion] class ProjectDeletionStore(xas: Transactors) { diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/FetchActiveOrganization.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/FetchActiveOrganization.scala index 67fadd5ec3..fe9411b9d8 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/FetchActiveOrganization.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/FetchActiveOrganization.scala @@ -6,7 +6,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.organizations.model.{Organization, Orga import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label import ch.epfl.bluebrain.nexus.delta.sourcing.state.GlobalStateGet -import doobie.implicits._ +import doobie.syntax.all._ import doobie.{Get, Put} trait FetchActiveOrganization { diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationDeleter.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationDeleter.scala index ac95fb6f05..248a9a0b5c 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationDeleter.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationDeleter.scala @@ -9,7 +9,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.acls.model.AclAddress import ch.epfl.bluebrain.nexus.delta.sdk.organizations.model.OrganizationRejection.OrganizationNonEmpty import ch.epfl.bluebrain.nexus.delta.sourcing.model.{EntityType, Label} import ch.epfl.bluebrain.nexus.delta.sourcing.{PartitionInit, Transactors} -import doobie.implicits._ +import doobie.syntax.all._ import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import doobie.util.update.Update0 import doobie.{ConnectionIO, Update} diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/FetchContext.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/FetchContext.scala index 7aac74fbc5..8f955dea91 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/FetchContext.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/FetchContext.scala @@ -10,7 +10,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Label, ProjectRef} import ch.epfl.bluebrain.nexus.delta.sourcing.state.ScopedStateGet -import doobie.implicits._ +import doobie.syntax.all._ import doobie.{Get, Put} /** diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsStatistics.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsStatistics.scala index 1cf88dab69..eed50ec7ae 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsStatistics.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsStatistics.scala @@ -5,7 +5,7 @@ import ch.epfl.bluebrain.nexus.delta.kernel.cache.LocalCache import ch.epfl.bluebrain.nexus.delta.sdk.projects.model.ProjectStatistics import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.delta.sourcing.model.{ProjectRef, Tag} -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import java.time.Instant diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ScopeInitializationErrorStore.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ScopeInitializationErrorStore.scala index 6666a42f62..a8b94958bf 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ScopeInitializationErrorStore.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ScopeInitializationErrorStore.scala @@ -7,7 +7,8 @@ import ch.epfl.bluebrain.nexus.delta.sdk.error.ServiceError.ScopeInitializationF import ch.epfl.bluebrain.nexus.delta.sdk.projects.ScopeInitializationErrorStore.ScopeInitErrorRow import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.delta.sourcing.model.{EntityType, Label, ProjectRef} -import doobie.implicits._ +import doobie.syntax.all._ +import doobie.generic.auto._ import doobie.postgres.implicits._ import java.time.Instant diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/realms/OpenIdExists.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/realms/OpenIdExists.scala index c63da45cee..786ec45d3e 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/realms/OpenIdExists.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/realms/OpenIdExists.scala @@ -6,7 +6,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.realms.model.RealmRejection.RealmOpenId import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label -import doobie.implicits._ +import doobie.syntax.all._ object OpenIdExists { diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ValidatePriority.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ValidatePriority.scala index 74ad7444b7..fef43e1c13 100644 --- a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ValidatePriority.scala +++ b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/resolvers/ValidatePriority.scala @@ -7,7 +7,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.resolvers.model.Priority import ch.epfl.bluebrain.nexus.delta.sdk.resolvers.model.ResolverRejection.PriorityAlreadyExists import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef -import doobie.implicits._ +import doobie.syntax.all._ trait ValidatePriority { diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/deletion/ProjectDeletionCoordinatorSuite.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/deletion/ProjectDeletionCoordinatorSuite.scala index 97f5ea079e..cf384d06ff 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/deletion/ProjectDeletionCoordinatorSuite.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/deletion/ProjectDeletionCoordinatorSuite.scala @@ -23,7 +23,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Identity, Label, ProjectRef} import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import munit.AnyFixture import java.time.Instant diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationDeleterSuite.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationDeleterSuite.scala index c702bb4016..dea48db877 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationDeleterSuite.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/organizations/OrganizationDeleterSuite.scala @@ -16,7 +16,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.PartitionInit import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.Subject import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Identity, Label, ProjectRef} import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import munit.AnyFixture import java.util.UUID diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsStatisticsSuite.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsStatisticsSuite.scala index 71143b6578..fd2da5b138 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsStatisticsSuite.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ProjectsStatisticsSuite.scala @@ -16,7 +16,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.delta.sourcing.state.ScopedStateStore import ch.epfl.bluebrain.nexus.delta.sourcing.state.State.ScopedState import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import io.circe.Codec import io.circe.generic.extras.Configuration import io.circe.generic.extras.semiauto.deriveConfiguredCodec diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ScopeInitializationErrorStoreSuite.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ScopeInitializationErrorStoreSuite.scala index e0af0790f8..dbde445fc0 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ScopeInitializationErrorStoreSuite.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/projects/ScopeInitializationErrorStoreSuite.scala @@ -7,7 +7,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.{EntityType, Label, ProjectR import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.testkit.clock.MutableClock import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import munit.AnyFixture import java.time.Instant diff --git a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/typehierarchy/TypeHierarchySuite.scala b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/typehierarchy/TypeHierarchySuite.scala index 48ce3b7617..154c48f5f6 100644 --- a/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/typehierarchy/TypeHierarchySuite.scala +++ b/delta/sdk/src/test/scala/ch/epfl/bluebrain/nexus/delta/sdk/typehierarchy/TypeHierarchySuite.scala @@ -11,7 +11,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Identity, Label} import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.testkit.clock.FixedClock import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import munit.AnyFixture import java.time.Instant diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/DeleteExpired.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/DeleteExpired.scala index c43e611720..b721c802c9 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/DeleteExpired.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/DeleteExpired.scala @@ -6,7 +6,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.DeleteExpired.logger import ch.epfl.bluebrain.nexus.delta.sourcing.config.PurgeConfig import ch.epfl.bluebrain.nexus.delta.sourcing.stream.PurgeProjectionCoordinator.PurgeProjection import ch.epfl.bluebrain.nexus.delta.sourcing.stream.ProjectionMetadata -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import java.time.Instant diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityCheck.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityCheck.scala index 1f188a3523..aa032722bf 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityCheck.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityCheck.scala @@ -5,7 +5,7 @@ import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.sourcing.model.Tag.Latest import ch.epfl.bluebrain.nexus.delta.sourcing.model.{EntityType, Label, ProjectRef, Tag} import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import cats.implicits._ diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityDependencyStore.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityDependencyStore.scala index c0c27b1df5..d91a9120eb 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityDependencyStore.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityDependencyStore.scala @@ -7,7 +7,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import ch.epfl.bluebrain.nexus.delta.sourcing.model.EntityDependency.{DependsOn, ReferencedBy} import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Label, ProjectRef, Tag} import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import doobie.util.Put import io.circe.{Decoder, Json} diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EphemeralLog.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EphemeralLog.scala index 6fd3b046a3..f7b89c2126 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EphemeralLog.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EphemeralLog.scala @@ -6,7 +6,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.config.EphemeralLogConfig import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef import ch.epfl.bluebrain.nexus.delta.sourcing.state.EphemeralStateStore import ch.epfl.bluebrain.nexus.delta.sourcing.state.State.EphemeralState -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.sqlstate /** diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/GlobalEventLog.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/GlobalEventLog.scala index cd8e92a31f..d92dd4fbd2 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/GlobalEventLog.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/GlobalEventLog.scala @@ -8,7 +8,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.event.GlobalEventStore import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset import ch.epfl.bluebrain.nexus.delta.sourcing.state.GlobalStateStore import ch.epfl.bluebrain.nexus.delta.sourcing.state.State.GlobalState -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.sqlstate import fs2.Stream diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/PurgeElemFailures.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/PurgeElemFailures.scala index 9c8c4b2ba4..45d900a2a7 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/PurgeElemFailures.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/PurgeElemFailures.scala @@ -6,7 +6,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.PurgeElemFailures.logger import ch.epfl.bluebrain.nexus.delta.sourcing.config.PurgeConfig import ch.epfl.bluebrain.nexus.delta.sourcing.stream.PurgeProjectionCoordinator.PurgeProjection import ch.epfl.bluebrain.nexus.delta.sourcing.stream.ProjectionMetadata -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import java.time.Instant diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/QueryLogHandler.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/QueryLogHandler.scala index c56406d5ae..4db7755ef3 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/QueryLogHandler.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/QueryLogHandler.scala @@ -5,7 +5,7 @@ import ch.epfl.bluebrain.nexus.delta.kernel.Logger import ch.epfl.bluebrain.nexus.delta.sourcing.event.Event import ch.epfl.bluebrain.nexus.delta.sourcing.state.State import doobie.util.log -import doobie.util.log.{LogEvent, LogHandler} +import doobie.util.log.{LogEvent, LogHandler, Parameters} import io.circe.Json import scala.concurrent.duration.FiniteDuration @@ -16,39 +16,39 @@ object QueryLogHandler { def apply(poolName: String, slowQueryThreshold: FiniteDuration): LogHandler[IO] = new LogHandler[IO] { override def run(logEvent: LogEvent): IO[Unit] = logEvent match { - case log.Success(sql, args, label, exec, processing) if exec > slowQueryThreshold => + case log.Success(sql, params, label, exec, processing) if exec > slowQueryThreshold => logger.warn(s"""[$poolName] Slow Statement Execution: | | ${formatQuery(sql)} | - | arguments = ${formatArguments(args)} + | arguments = ${formatArguments(params)} | label = $label | elapsed = ${exec.toMillis} ms exec + ${processing.toMillis} ms processing (${(exec + processing).toMillis} ms total) """.stripMargin) - case log.Success(sql, args, label, exec, processing) => + case log.Success(sql, params, label, exec, processing) => logger.debug(s"""[$poolName] Successful Statement Execution: | | ${formatQuery(sql)} | - | arguments = ${formatArguments(args)} + | arguments = ${formatArguments(params)} | label = $label | elapsed = ${exec.toMillis} ms exec + ${processing.toMillis} ms processing (${(exec + processing).toMillis} ms total) """.stripMargin) - case log.ProcessingFailure(sql, args, label, exec, processing, failure) => + case log.ProcessingFailure(sql, params, label, exec, processing, failure) => logger.error(failure)(s"""[$poolName] Failed Resultset Processing: | | ${formatQuery(sql)} | - | arguments = ${formatArguments(args)} + | arguments = ${formatArguments(params)} | label = $label | elapsed = ${exec.toMillis} ms exec + ${processing.toMillis} ms processing (failed) (${(exec + processing).toMillis.toString} ms total) """.stripMargin) - case log.ExecFailure(sql, args, label, exec, failure) => + case log.ExecFailure(sql, params, label, exec, failure) => logger.error(failure)(s"""[$poolName] Failed Statement Execution: | | ${formatQuery(sql)} | - | arguments = ${formatArguments(args)} + | arguments = ${formatArguments(params)} | label = $label | elapsed = ${exec.toMillis} ms exec (failed) """.stripMargin) @@ -56,7 +56,7 @@ object QueryLogHandler { private def formatQuery(sql: String) = sql.linesIterator.dropWhile(_.trim.isEmpty).mkString("\n ") - private def formatArguments(args: List[Any]) = args + private def formatArguments(params: Parameters) = params.allParams.flatten .map { case _: Json => "{json blob}" case e: Event => s"{event ${e.getClass.getSimpleName}}" diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/Scope.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/Scope.scala index e16e7618dd..ec9860f670 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/Scope.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/Scope.scala @@ -1,7 +1,7 @@ package ch.epfl.bluebrain.nexus.delta.sourcing import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Label, ProjectRef} -import doobie.implicits._ +import doobie.syntax.all._ /** * Allows to filter results when querying the database for scoped entities diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/ScopedEventLog.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/ScopedEventLog.scala index b838f649e0..b14440dd61 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/ScopedEventLog.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/ScopedEventLog.scala @@ -17,7 +17,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.state.ScopedStateStore.StateNotFou import ch.epfl.bluebrain.nexus.delta.sourcing.state.State.ScopedState import ch.epfl.bluebrain.nexus.delta.sourcing.tombstone.TombstoneStore import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.sqlstate import fs2.Stream diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/Transactors.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/Transactors.scala index fd8ce790be..504b21106c 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/Transactors.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/Transactors.scala @@ -11,7 +11,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.config.DatabaseConfig.DatabaseAcce import com.zaxxer.hikari.HikariDataSource import doobie.Fragment import doobie.hikari.HikariTransactor -import doobie.implicits._ +import doobie.syntax.all._ import doobie.util.ExecutionContexts import doobie.util.transactor.Transactor import io.github.classgraph.ClassGraph diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/EventStreaming.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/EventStreaming.scala index dc05dac706..c749da75a0 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/EventStreaming.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/EventStreaming.scala @@ -9,7 +9,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset import ch.epfl.bluebrain.nexus.delta.sourcing.query.StreamingQuery import ch.epfl.bluebrain.nexus.delta.sourcing.stream.Elem import ch.epfl.bluebrain.nexus.delta.sourcing.{MultiDecoder, Scope, Transactors} -import doobie.implicits._ +import doobie.syntax.all._ import doobie.util.query.Query0 import doobie.{Fragment, Fragments} import io.circe.Json diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/GlobalEventStore.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/GlobalEventStore.scala index 84fda20b7b..56005724f9 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/GlobalEventStore.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/GlobalEventStore.scala @@ -11,7 +11,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import doobie._ import doobie.postgres.implicits._ -import doobie.implicits._ +import doobie.syntax.all._ import fs2.Stream /** diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/ScopedEventStore.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/ScopedEventStore.scala index 789a79178e..bafe018be7 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/ScopedEventStore.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/ScopedEventStore.scala @@ -8,7 +8,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.{Execute, PartitionInit, Serialize import doobie._ import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import fs2.Stream diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/exporter/Exporter.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/exporter/Exporter.scala index 6effff5236..682cecefcf 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/exporter/Exporter.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/exporter/Exporter.scala @@ -11,7 +11,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset import ch.epfl.bluebrain.nexus.delta.sourcing.query.{RefreshStrategy, StreamingQuery} import ch.epfl.bluebrain.nexus.delta.sourcing.stream.utils.StreamingUtils import doobie.Fragments -import doobie.implicits._ +import doobie.syntax.all._ import doobie.util.query.Query0 import fs2.Stream import fs2.io.file._ diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/implicits/TimeRangeInstances.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/implicits/TimeRangeInstances.scala index 0a48413007..c6de1c1741 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/implicits/TimeRangeInstances.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/implicits/TimeRangeInstances.scala @@ -3,7 +3,7 @@ package ch.epfl.bluebrain.nexus.delta.sourcing.implicits import ch.epfl.bluebrain.nexus.delta.kernel.search.TimeRange import ch.epfl.bluebrain.nexus.delta.kernel.search.TimeRange._ import ch.epfl.bluebrain.nexus.delta.sourcing.FragmentEncoder -import doobie.implicits._ +import doobie.syntax.all._ import doobie.util.fragment.Fragment import doobie.postgres.implicits._ diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/model/Tag.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/model/Tag.scala index e7c1f82d58..3e036fb673 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/model/Tag.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/model/Tag.scala @@ -6,7 +6,7 @@ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.decoder.JsonLdDecoderError.Parsi import ch.epfl.bluebrain.nexus.delta.sourcing.FragmentEncoder import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label.IllegalLabelFormat import doobie.Put -import doobie.implicits._ +import doobie.syntax.all._ import doobie.util.Get import io.circe.{Decoder, Encoder, KeyDecoder, KeyEncoder} import cats.implicits._ diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/offset/Offset.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/offset/Offset.scala index 33064d3784..e28fdfef8b 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/offset/Offset.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/offset/Offset.scala @@ -7,7 +7,7 @@ import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.context.JsonLdContext.keywords import ch.epfl.bluebrain.nexus.delta.rdf.jsonld.encoder.JsonLdEncoder import ch.epfl.bluebrain.nexus.delta.sourcing.FragmentEncoder import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import io.circe.Codec import io.circe.generic.extras.Configuration import io.circe.generic.extras.semiauto.deriveConfiguredCodec diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/projections/FailedElemLogStore.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/projections/FailedElemLogStore.scala index fba62b315c..00908d59a3 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/projections/FailedElemLogStore.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/projections/FailedElemLogStore.scala @@ -16,7 +16,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.stream.Elem.FailedElem import ch.epfl.bluebrain.nexus.delta.sourcing.stream.{ProjectionMetadata, ProjectionStore} import ch.epfl.bluebrain.nexus.delta.sourcing.{FragmentEncoder, Transactors} import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import fs2.Stream diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/projections/ProjectionRestartStore.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/projections/ProjectionRestartStore.scala index f505977935..6119e15a88 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/projections/ProjectionRestartStore.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/projections/ProjectionRestartStore.scala @@ -12,7 +12,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.projections.model.ProjectionRestar import ch.epfl.bluebrain.nexus.delta.sourcing.projections.model.ProjectionRestart.{entityType, restartId} import ch.epfl.bluebrain.nexus.delta.sourcing.query.StreamingQuery import ch.epfl.bluebrain.nexus.delta.sourcing.stream.Elem -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import io.circe.Json import io.circe.syntax.EncoderOps diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/query/StreamingQuery.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/query/StreamingQuery.scala index fa111c198f..c66c482a69 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/query/StreamingQuery.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/query/StreamingQuery.scala @@ -11,7 +11,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset import ch.epfl.bluebrain.nexus.delta.sourcing.stream.Elem.{DroppedElem, SuccessElem} import ch.epfl.bluebrain.nexus.delta.sourcing.stream.{Elem, RemainingElems} import doobie.Fragments -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import doobie.util.fragment.Fragment import doobie.util.query.Query0 diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/EphemeralStateStore.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/EphemeralStateStore.scala index 3c3843798f..bac8ee4b2e 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/EphemeralStateStore.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/EphemeralStateStore.scala @@ -6,7 +6,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.{Serializer, Transactors} import ch.epfl.bluebrain.nexus.delta.sourcing.model._ import ch.epfl.bluebrain.nexus.delta.sourcing.state.State.EphemeralState import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import ch.epfl.bluebrain.nexus.delta.sourcing.implicits.IriInstances diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateGet.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateGet.scala index 85c2002fc1..b60ecbc783 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateGet.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateGet.scala @@ -1,7 +1,7 @@ package ch.epfl.bluebrain.nexus.delta.sourcing.state import ch.epfl.bluebrain.nexus.delta.sourcing.model.EntityType -import doobie.implicits._ +import doobie.syntax.all._ import doobie.{ConnectionIO, Get, Put} object GlobalStateGet { diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateStore.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateStore.scala index 7a167ea3ad..438785d9c3 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateStore.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateStore.scala @@ -11,7 +11,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset import ch.epfl.bluebrain.nexus.delta.sourcing.query.{RefreshStrategy, StreamingQuery} import ch.epfl.bluebrain.nexus.delta.sourcing.state.State.GlobalState import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import doobie.util.transactor.Transactor import fs2.Stream diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateGet.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateGet.scala index 1c6d18e6a2..983a754ece 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateGet.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateGet.scala @@ -2,7 +2,7 @@ package ch.epfl.bluebrain.nexus.delta.sourcing.state import ch.epfl.bluebrain.nexus.delta.sourcing.model.Tag.Latest import ch.epfl.bluebrain.nexus.delta.sourcing.model.{EntityType, ProjectRef, Tag} -import doobie.implicits._ +import doobie.syntax.all._ import doobie.{ConnectionIO, Get, Put} object ScopedStateGet { diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStore.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStore.scala index bf1fd1237b..fd5e388bc3 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStore.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStore.scala @@ -16,7 +16,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.state.State.ScopedState import ch.epfl.bluebrain.nexus.delta.sourcing.stream.Elem import ch.epfl.bluebrain.nexus.delta.sourcing.{Execute, PartitionInit, Scope, Serializer, Transactors} import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import io.circe.Decoder diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/stream/ProjectionStore.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/stream/ProjectionStore.scala index e600a45d6d..3449f2bebc 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/stream/ProjectionStore.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/stream/ProjectionStore.scala @@ -9,7 +9,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.ProjectRef import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset import ch.epfl.bluebrain.nexus.delta.sourcing.stream.ProjectionStore.ProjectionProgressRow import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import fs2.Stream diff --git a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/tombstone/TombstoneStore.scala b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/tombstone/TombstoneStore.scala index 832bd25ed3..0d1b21c488 100644 --- a/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/tombstone/TombstoneStore.scala +++ b/delta/sourcing-psql/src/main/scala/ch/epfl/bluebrain/nexus/delta/sourcing/tombstone/TombstoneStore.scala @@ -13,7 +13,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.state.State.ScopedState import ch.epfl.bluebrain.nexus.delta.sourcing.stream.ProjectionMetadata import ch.epfl.bluebrain.nexus.delta.sourcing.stream.PurgeProjectionCoordinator.PurgeProjection import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import io.circe.Codec import io.circe.generic.extras.Configuration diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityDependencyStoreSuite.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityDependencyStoreSuite.scala index 968897ee30..43f05dc4aa 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityDependencyStoreSuite.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/EntityDependencyStoreSuite.scala @@ -14,7 +14,7 @@ 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.ScopedStateStore import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import io.circe.Decoder import munit.AnyFixture diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/PullRequest.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/PullRequest.scala index 35e9dd90d7..40817fb0af 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/PullRequest.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/PullRequest.scala @@ -24,7 +24,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.state.State.ScopedState import io.circe.generic.extras.Configuration import io.circe.generic.extras.semiauto.deriveConfiguredCodec import io.circe.{Codec, Json} -import doobie.implicits._ +import doobie.syntax.all._ import java.time.Instant diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/ScopedEventLogSuite.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/ScopedEventLogSuite.scala index e6b68ee292..04ab1385fe 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/ScopedEventLogSuite.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/ScopedEventLogSuite.scala @@ -21,7 +21,7 @@ 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.ScopedStateStore import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import io.circe.Decoder import munit.AnyFixture diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/SerializerSuite.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/SerializerSuite.scala index c4df563819..ea3e2c371f 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/SerializerSuite.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/SerializerSuite.scala @@ -5,7 +5,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.SerializerSuite.{Bar, Foo} import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite import doobie._ -import doobie.implicits._ +import doobie.syntax.all._ import io.circe.Codec import io.circe.generic.extras.Configuration import io.circe.generic.extras.semiauto.deriveConfiguredCodec diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/EventStreamingSuite.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/EventStreamingSuite.scala index 82e3244e05..cfbc0f2ae5 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/EventStreamingSuite.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/EventStreamingSuite.scala @@ -14,7 +14,7 @@ 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.{MultiDecoder, PullRequest, Scope} import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import io.circe.Decoder import munit.AnyFixture diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/GlobalEventStoreSuite.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/GlobalEventStoreSuite.scala index 236a499c3e..84d2cbdec8 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/GlobalEventStoreSuite.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/event/GlobalEventStoreSuite.scala @@ -12,7 +12,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Label import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.delta.sourcing.query.RefreshStrategy import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import munit.AnyFixture import java.time.Instant 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 525caf63f0..2e292b1dbc 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 @@ -7,7 +7,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.model.Identity.{Anonymous, User} import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Label, ProjectRef} import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import munit.AnyFixture import java.time.Instant 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 9b37a16f7e..7c7c8f48f0 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 @@ -7,7 +7,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.{Execute, Transactors} import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite import ch.epfl.bluebrain.nexus.testkit.postgres.PostgresContainer import doobie.Fragment -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.sqlstate import munit.Location import munit.catseffect.IOFixture diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/query/StreamingQuerySuite.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/query/StreamingQuerySuite.scala index d0acd37a02..5f5ace1b37 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/query/StreamingQuerySuite.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/query/StreamingQuerySuite.scala @@ -21,7 +21,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.stream.RemainingElems import ch.epfl.bluebrain.nexus.delta.sourcing.tombstone.TombstoneStore import ch.epfl.bluebrain.nexus.delta.sourcing.{PullRequest, Serializer} import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import fs2.Chunk import io.circe.generic.extras.Configuration import io.circe.generic.extras.semiauto.deriveConfiguredCodec diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/EphemeralStateStoreSuite.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/EphemeralStateStoreSuite.scala index 8f1ed0d140..766d3da61c 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/EphemeralStateStoreSuite.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/EphemeralStateStoreSuite.scala @@ -8,7 +8,7 @@ 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.{DeleteExpired, Message} import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import munit.AnyFixture import java.time.Instant diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateStoreSuite.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateStoreSuite.scala index 2c1486a570..31595c2e50 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateStoreSuite.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/GlobalStateStoreSuite.scala @@ -12,7 +12,7 @@ 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.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import munit.AnyFixture import java.time.Instant diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStoreFixture.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStoreFixture.scala index 7b7271e6ca..8cf0cc5131 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStoreFixture.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStoreFixture.scala @@ -9,7 +9,7 @@ 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.State.ScopedState import ch.epfl.bluebrain.nexus.delta.sourcing.{Serializer, Transactors} -import doobie.implicits._ +import doobie.syntax.all._ object ScopedStateStoreFixture { diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStoreSuite.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStoreSuite.scala index c0c467248b..d0b20c31ea 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStoreSuite.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/state/ScopedStateStoreSuite.scala @@ -19,7 +19,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.state.ScopedStateStore.StateNotFou import ch.epfl.bluebrain.nexus.delta.sourcing.stream.Elem import ch.epfl.bluebrain.nexus.delta.sourcing.{EntityCheck, PullRequest, Scope} import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import munit.AnyFixture import java.time.Instant diff --git a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/tombstone/TombstoneStoreSuite.scala b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/tombstone/TombstoneStoreSuite.scala index e0068d2cc0..4a532c7e53 100644 --- a/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/tombstone/TombstoneStoreSuite.scala +++ b/delta/sourcing-psql/src/test/scala/ch/epfl/bluebrain/nexus/delta/sourcing/tombstone/TombstoneStoreSuite.scala @@ -12,7 +12,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.tombstone.TombstoneStore.Cause import ch.epfl.bluebrain.nexus.delta.sourcing.tombstone.TombstoneStoreSuite.{entityType, SimpleResource} import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import munit.AnyFixture import java.time.Instant diff --git a/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/DroppedEventStore.scala b/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/DroppedEventStore.scala index 0ffc6045c4..de6a3d924e 100644 --- a/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/DroppedEventStore.scala +++ b/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/DroppedEventStore.scala @@ -5,7 +5,7 @@ import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.delta.sourcing.exporter.RowEvent import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import doobie.postgres.implicits._ -import doobie.implicits._ +import doobie.syntax.all._ final class DroppedEventStore(xas: Transactors) { @@ -28,7 +28,7 @@ final class DroppedEventStore(xas: Transactors) { | instant | ) | VALUES ( - | ${rowEvent.ordering}, + | ${rowEvent.ordering.value}, | ${rowEvent.`type`}, | ${rowEvent.org}, | ${rowEvent.project}, diff --git a/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/ShipSummaryStore.scala b/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/ShipSummaryStore.scala index 97cbb02a1f..c3a8564ccd 100644 --- a/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/ShipSummaryStore.scala +++ b/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/ShipSummaryStore.scala @@ -4,7 +4,7 @@ import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.kernel.utils.ThrowableUtils import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.ship.ShipCommand.RunCommand -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import io.circe.syntax.EncoderOps diff --git a/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/projects/OriginalProjectContext.scala b/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/projects/OriginalProjectContext.scala index 936d365c4e..54db7f461a 100644 --- a/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/projects/OriginalProjectContext.scala +++ b/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/projects/OriginalProjectContext.scala @@ -6,7 +6,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.projects.model.{ApiMappings, ProjectCon import ch.epfl.bluebrain.nexus.delta.sourcing.Transactors import ch.epfl.bluebrain.nexus.delta.sourcing.implicits._ import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Identity, ProjectRef} -import doobie.implicits._ +import doobie.syntax.all._ import io.circe.generic.semiauto.deriveCodec import io.circe.syntax.EncoderOps import io.circe.{Codec, Json} diff --git a/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/RunShipSuite.scala b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/RunShipSuite.scala index 00db3d2033..1e343ee517 100644 --- a/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/RunShipSuite.scala +++ b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/RunShipSuite.scala @@ -28,7 +28,7 @@ import ch.epfl.bluebrain.nexus.ship.RunShipSuite.{checkFor, expectedImportReport import ch.epfl.bluebrain.nexus.ship.config.ShipConfigFixtures import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite import doobie.Get -import doobie.implicits._ +import doobie.syntax.all._ import fs2.Stream import fs2.io.file.Path import io.circe.Json diff --git a/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/ShipSummaryStoreSuite.scala b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/ShipSummaryStoreSuite.scala index 41ce406425..7298e11a8a 100644 --- a/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/ShipSummaryStoreSuite.scala +++ b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/ShipSummaryStoreSuite.scala @@ -4,7 +4,7 @@ import cats.effect.IO import ch.epfl.bluebrain.nexus.delta.sourcing.postgres.Doobie import ch.epfl.bluebrain.nexus.ship.ShipCommand.RunCommand import ch.epfl.bluebrain.nexus.testkit.mu.NexusSuite -import doobie.implicits._ +import doobie.syntax.all._ import doobie.postgres.implicits._ import munit.AnyFixture import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset