From a2293c4d17627238ea0985d6e266da1d45f2f936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Mon, 20 Dec 2021 11:17:11 +0100 Subject: [PATCH] Fix for build failure on Scala 2.12 (#31007) * Fix for build failure on Scala 2.12 * formatting... --- .../query/scaladsl/PersistenceTestKitReadJournal.scala | 5 +++-- .../scaladsl/PersistenceTestKitDurableStateStore.scala | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala index 34e6438c25..4a1587819b 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/query/scaladsl/PersistenceTestKitReadJournal.scala @@ -23,12 +23,13 @@ import akka.stream.scaladsl.Source import akka.util.unused import com.typesafe.config.Config import org.slf4j.LoggerFactory - import akka.persistence.Persistence import akka.persistence.query.typed import akka.persistence.query.typed.scaladsl.CurrentEventsBySliceQuery import akka.persistence.typed.PersistenceId +import scala.collection.immutable + object PersistenceTestKitReadJournal { val Identifier = "akka.persistence.testkit.query" } @@ -128,7 +129,7 @@ final class PersistenceTestKitReadJournal(system: ExtendedActorSystem, @unused c override def sliceForPersistenceId(persistenceId: String): Int = persistence.sliceForPersistenceId(persistenceId) - override def sliceRanges(numberOfRanges: Int): Seq[Range] = + override def sliceRanges(numberOfRanges: Int): immutable.Seq[Range] = persistence.sliceRanges(numberOfRanges) /** diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala index 9321a2a676..a2854ba2c9 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/state/scaladsl/PersistenceTestKitDurableStateStore.scala @@ -5,9 +5,7 @@ package akka.persistence.testkit.state.scaladsl import java.util.concurrent.atomic.AtomicLong - import scala.concurrent.Future - import akka.{ Done, NotUsed } import akka.actor.ExtendedActorSystem import akka.persistence.Persistence @@ -26,6 +24,8 @@ import akka.stream.scaladsl.Source import akka.stream.typed.scaladsl.ActorSource import akka.stream.OverflowStrategy +import scala.collection.immutable + object PersistenceTestKitDurableStateStore { val Identifier = "akka.persistence.testkit.state" } @@ -164,7 +164,7 @@ class PersistenceTestKitDurableStateStore[A](val system: ExtendedActorSystem) override def sliceForPersistenceId(persistenceId: String): Int = persistence.sliceForPersistenceId(persistenceId) - override def sliceRanges(numberOfRanges: Int): Seq[Range] = + override def sliceRanges(numberOfRanges: Int): immutable.Seq[Range] = persistence.sliceRanges(numberOfRanges) override def currentPersistenceIds(afterId: Option[String], limit: Long): Source[String, NotUsed] =