bump: update to akka with timestamp offset by slice (#72)

akka · Aug 21, 2024 · 03e312d · 03e312d
1 parent 88d2993
commit 03e312d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 36 deletions.
diff --git a/core/src/main/scala/akka/persistence/dynamodb/internal/TimestampOffsetBySlice.scala b/core/src/main/scala/akka/persistence/dynamodb/internal/TimestampOffsetBySlice.scala
diff --git a/core/src/main/scala/akka/persistence/dynamodb/query/scaladsl/DynamoDBReadJournal.scala b/core/src/main/scala/akka/persistence/dynamodb/query/scaladsl/DynamoDBReadJournal.scala
@@ -27,11 +27,11 @@ import akka.persistence.dynamodb.internal.SerializedJournalItem
 import akka.persistence.dynamodb.internal.SerializedSnapshotItem
 import akka.persistence.dynamodb.internal.SnapshotDao
 import akka.persistence.dynamodb.internal.StartingFromSnapshotStage
-import akka.persistence.dynamodb.internal.TimestampOffsetBySlice
 import akka.persistence.dynamodb.util.ClientProvider
 import akka.persistence.query.NoOffset
 import akka.persistence.query.Offset
 import akka.persistence.query.TimestampOffset
+import akka.persistence.query.TimestampOffsetBySlice
 import akka.persistence.query.scaladsl._
 import akka.persistence.query.typed.EventEnvelope
 import akka.persistence.query.typed.scaladsl.CurrentEventsBySliceQuery
@@ -227,8 +227,8 @@ final class DynamoDBReadJournal(system: ExtendedActorSystem, config: Config, cfg
 
   private def sliceStartOffset(slice: Int, offset: Offset): Offset = {
     offset match {
-      case offsetBySlice: TimestampOffsetBySlice => offsetBySlice.offsets.getOrElse(slice, NoOffset)
-      case _                                     => offset
+      case TimestampOffsetBySlice(offsets) => offsets.getOrElse(slice, NoOffset)
+      case _                               => offset
     }
   }
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,7 +9,7 @@ object Dependencies {
   val Scala3 = "3.3.3"
   val Scala2Versions = Seq(Scala213)
   val ScalaVersions = Dependencies.Scala2Versions :+ Dependencies.Scala3
-  val AkkaVersion = System.getProperty("override.akka.version", "2.9.4")
+  val AkkaVersion = System.getProperty("override.akka.version", "2.9.5")
   val AkkaVersionInDocs = VersionNumber(AkkaVersion).numbers match { case Seq(major, minor, _*) => s"$major.$minor" }
   val AkkaProjectionVersion = "1.5.4"
   val AkkaProjectionVersionInDocs = "current"

diff --git a/projection/src/main/scala/akka/projection/dynamodb/internal/DynamoDBOffsetStore.scala b/projection/src/main/scala/akka/projection/dynamodb/internal/DynamoDBOffsetStore.scala
@@ -19,10 +19,10 @@ import akka.annotation.InternalApi
 import akka.dispatch.ExecutionContexts
 import akka.persistence.Persistence
 import akka.persistence.dynamodb.internal.EnvelopeOrigin
-import akka.persistence.dynamodb.internal.TimestampOffsetBySlice
 import akka.persistence.query.DeletedDurableState
 import akka.persistence.query.DurableStateChange
 import akka.persistence.query.TimestampOffset
+import akka.persistence.query.TimestampOffsetBySlice
 import akka.persistence.query.UpdatedDurableState
 import akka.persistence.query.typed.EventEnvelope
 import akka.persistence.query.typed.scaladsl.EventTimestampQuery

diff --git a/...ction/src/test/scala/akka/projection/dynamodb/DynamoDBTimestampOffsetProjectionSpec.scala b/...ction/src/test/scala/akka/projection/dynamodb/DynamoDBTimestampOffsetProjectionSpec.scala
@@ -33,9 +33,9 @@ import akka.actor.typed.ActorRef
 import akka.actor.typed.ActorSystem
 import akka.dispatch.ExecutionContexts
 import akka.persistence.dynamodb.internal.EnvelopeOrigin
-import akka.persistence.dynamodb.internal.TimestampOffsetBySlice
 import akka.persistence.query.Offset
 import akka.persistence.query.TimestampOffset
+import akka.persistence.query.TimestampOffsetBySlice
 import akka.persistence.query.typed.EventEnvelope
 import akka.persistence.query.typed.scaladsl.EventTimestampQuery
 import akka.persistence.query.typed.scaladsl.LoadEventQuery

diff --git a/projection/src/test/scala/akka/projection/dynamodb/DynamoDBTimestampOffsetStoreSpec.scala b/projection/src/test/scala/akka/projection/dynamodb/DynamoDBTimestampOffsetStoreSpec.scala
@@ -16,8 +16,8 @@ import akka.actor.testkit.typed.scaladsl.LogCapturing
 import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import akka.actor.typed.ActorSystem
 import akka.persistence.dynamodb.internal.EnvelopeOrigin
-import akka.persistence.dynamodb.internal.TimestampOffsetBySlice
 import akka.persistence.query.TimestampOffset
+import akka.persistence.query.TimestampOffsetBySlice
 import akka.persistence.query.UpdatedDurableState
 import akka.persistence.query.typed.EventEnvelope
 import akka.persistence.query.typed.scaladsl.EventTimestampQuery