Skip to content

Commit

Permalink
Update dependencies for 1.11.0-M2 (#5154)
Browse files Browse the repository at this point in the history
* Update dependencies for 1.11.0-M2

---------

Co-authored-by: Simon Dumas <simon.dumas@epfl.ch>
  • Loading branch information
imsdu and Simon Dumas authored Sep 25, 2024
1 parent 933df3a commit 5daecf9
Show file tree
Hide file tree
Showing 71 changed files with 86 additions and 85 deletions.
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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._

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,47 +16,47 @@ 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)
}

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}}"
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 5daecf9

Please sign in to comment.