This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-pekko-persistence-jdbc.git
The following commit(s) were added to refs/heads/main by this push:
new db5733e Remove FQCN boilerplate
db5733e is described below
commit db5733e60fffb99d3d822d3d60199ec2f0890278
Author: Matthew de Detrich <[email protected]>
AuthorDate: Fri Mar 24 18:34:30 2023 +0100
Remove FQCN boilerplate
---
.../jdbc/integration/JdbcJournalPerfSpec.scala | 11 ++--
.../jdbc/integration/JdbcJournalSpec.scala | 5 +-
.../jdbc/integration/JdbcSnapshotStoreSpec.scala | 11 ++--
...gresScalaJdbcDurableStateChangesByTagTest.scala | 7 ++-
.../StoreOnlySerializableMessagesTest.scala | 11 ++--
.../persistence/jdbc/PekkoSerialization.scala | 11 ++--
.../pekko/persistence/jdbc/db/SlickDatabase.scala | 5 +-
.../pekko/persistence/jdbc/db/SlickExtension.scala | 9 +--
.../jdbc/journal/JdbcAsyncWriteJournal.scala | 27 ++++-----
.../persistence/jdbc/journal/dao/BaseDao.scala | 7 ++-
.../dao/BaseJournalDaoWithReadMessages.scala | 15 ++---
.../jdbc/journal/dao/DefaultJournalDao.scala | 21 +++----
.../persistence/jdbc/journal/dao/JournalDao.scala | 2 +-
.../journal/dao/JournalDaoWithReadMessages.scala | 9 +--
.../jdbc/journal/dao/JournalQueries.scala | 5 +-
.../jdbc/journal/dao/JournalTables.scala | 7 ++-
.../journal/dao/legacy/ByteArrayJournalDao.scala | 26 ++++-----
.../dao/legacy/ByteArrayJournalSerializer.scala | 7 ++-
.../jdbc/query/JdbcReadJournalProvider.scala | 5 +-
.../jdbc/query/JournalSequenceActor.scala | 13 +++--
.../jdbc/query/dao/DefaultReadJournalDao.scala | 18 +++---
.../jdbc/query/dao/ReadJournalDao.scala | 9 +--
.../jdbc/query/dao/ReadJournalQueries.scala | 9 +--
.../query/dao/legacy/ByteArrayReadJournalDao.scala | 23 ++++----
.../jdbc/query/dao/legacy/ReadJournalQueries.scala | 5 +-
.../jdbc/query/javadsl/JdbcReadJournal.scala | 11 ++--
.../jdbc/query/scaladsl/JdbcReadJournal.scala | 37 ++++++------
.../serialization/PersistentReprSerializer.scala | 11 ++--
.../jdbc/snapshot/JdbcSnapshotStore.scala | 17 +++---
.../jdbc/snapshot/dao/DefaultSnapshotDao.scala | 13 +++--
.../jdbc/snapshot/dao/SnapshotQueries.scala | 5 +-
.../jdbc/snapshot/dao/SnapshotTables.scala | 9 +--
.../snapshot/dao/legacy/ByteArraySnapshotDao.scala | 13 +++--
.../dao/legacy/ByteArraySnapshotSerializer.scala | 11 ++--
.../jdbc/snapshot/dao/legacy/SnapshotQueries.scala | 5 +-
.../jdbc/snapshot/dao/legacy/SnapshotTables.scala | 7 ++-
.../jdbc/state/DurableStateQueries.scala | 5 +-
.../jdbc/state/DurableStateTables.scala | 5 +-
.../jdbc/state/JdbcDurableStateStoreProvider.scala | 17 +++---
.../jdbc/state/SequenceNextValUpdater.scala | 5 +-
.../jdbc/state/javadsl/JdbcDurableStateStore.scala | 19 ++++---
.../state/scaladsl/DurableStateSequenceActor.scala | 13 +++--
.../state/scaladsl/JdbcDurableStateStore.scala | 37 ++++++------
.../jdbc/testkit/internal/SchemaUtilsImpl.scala | 13 +++--
.../jdbc/testkit/javadsl/SchemaUtils.scala | 9 +--
.../jdbc/testkit/scaladsl/SchemaUtils.scala | 9 +--
.../pekko/persistence/jdbc/ScaladslSnippets.scala | 24 ++++----
.../jdbc/SharedActorSystemTestSpec.scala | 15 ++---
.../apache/pekko/persistence/jdbc/SimpleSpec.scala | 7 ++-
.../jdbc/SingleActorSystemPerTestSpec.scala | 13 +++--
.../jdbc/configuration/ConfigOpsTest.scala | 5 +-
.../jdbc/configuration/JNDIConfigTest.scala | 7 ++-
.../jdbc/journal/JdbcJournalPerfSpec.scala | 19 ++++---
.../persistence/jdbc/journal/JdbcJournalSpec.scala | 13 +++--
.../persistence/jdbc/journal/dao/TrySeqTest.scala | 5 +-
.../query/CurrentEventsByPersistenceIdTest.scala | 13 +++--
.../jdbc/query/CurrentEventsByTagTest.scala | 9 +--
.../persistence/jdbc/query/EventAdapterTest.scala | 7 ++-
.../jdbc/query/EventsByPersistenceIdTest.scala | 13 +++--
.../persistence/jdbc/query/EventsByTagTest.scala | 9 +--
.../jdbc/query/HardDeleteQueryTest.scala | 5 +-
.../query/JournalDaoStreamMessagesMemoryTest.scala | 13 +++--
.../jdbc/query/JournalSequenceActorTest.scala | 23 ++++----
.../jdbc/query/MultipleReadJournalTest.scala | 9 +--
.../persistence/jdbc/query/QueryTestSpec.scala | 65 +++++++++++-----------
.../jdbc/query/TaggingEventAdapter.scala | 5 +-
.../jdbc/query/dao/ReadJournalTablesTest.scala | 5 +-
.../jdbc/query/dao/TestProbeReadJournalDao.scala | 17 +++---
.../StoreOnlySerializableMessagesTest.scala | 25 +++++----
.../jdbc/snapshot/JdbcSnapshotStoreSpec.scala | 15 ++---
.../persistence/jdbc/state/ScaladslSnippets.scala | 56 +++++++++++--------
.../scaladsl/DurableStateSequenceActorTest.scala | 22 ++++----
.../scaladsl/DurableStateStorePluginSpec.scala | 7 ++-
.../jdbc/state/scaladsl/JdbcDurableStateSpec.scala | 31 ++++++-----
.../jdbc/state/scaladsl/StateSpecBase.scala | 15 ++---
.../scaladsl/TestProbeDurableStateStoreQuery.scala | 23 ++++----
.../pekko/persistence/jdbc/util/DropCreate.scala | 7 ++-
.../migrator/integration/JournalMigratorTest.scala | 5 +-
.../integration/SnapshotMigratorTest.scala | 5 +-
.../jdbc/migrator/JournalMigrator.scala | 27 ++++-----
.../jdbc/migrator/SnapshotMigrator.scala | 27 ++++-----
.../jdbc/migrator/JournalMigratorTest.scala | 9 +--
.../persistence/jdbc/migrator/MigratorSpec.scala | 41 +++++++-------
.../jdbc/migrator/SnapshotMigratorTest.scala | 9 +--
84 files changed, 628 insertions(+), 546 deletions(-)
diff --git
a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalPerfSpec.scala
b/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalPerfSpec.scala
index efddf94..9358b3b 100644
---
a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalPerfSpec.scala
+++
b/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalPerfSpec.scala
@@ -9,11 +9,12 @@
package org.apache.pekko.persistence.jdbc.integration
-import org.apache.pekko.persistence.jdbc.journal.JdbcJournalPerfSpec
-import org.apache.pekko.persistence.jdbc.testkit.internal.MySQL
-import org.apache.pekko.persistence.jdbc.testkit.internal.Oracle
-import org.apache.pekko.persistence.jdbc.testkit.internal.Postgres
-import org.apache.pekko.persistence.jdbc.testkit.internal.SqlServer
+import org.apache.pekko
+import pekko.persistence.jdbc.journal.JdbcJournalPerfSpec
+import pekko.persistence.jdbc.testkit.internal.MySQL
+import pekko.persistence.jdbc.testkit.internal.Oracle
+import pekko.persistence.jdbc.testkit.internal.Postgres
+import pekko.persistence.jdbc.testkit.internal.SqlServer
import com.typesafe.config.ConfigFactory
import com.typesafe.config.ConfigValueFactory
diff --git
a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalSpec.scala
b/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalSpec.scala
index 7c198e0..0793469 100644
---
a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalSpec.scala
+++
b/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcJournalSpec.scala
@@ -9,8 +9,9 @@
package org.apache.pekko.persistence.jdbc.integration
-import org.apache.pekko.persistence.jdbc.journal.JdbcJournalSpec
-import org.apache.pekko.persistence.jdbc.testkit.internal.{ MySQL, Oracle,
Postgres, SqlServer }
+import org.apache.pekko
+import pekko.persistence.jdbc.journal.JdbcJournalSpec
+import pekko.persistence.jdbc.testkit.internal.{ MySQL, Oracle, Postgres,
SqlServer }
import com.typesafe.config.ConfigFactory
class PostgresJournalSpec extends
JdbcJournalSpec(ConfigFactory.load("postgres-application.conf"), Postgres)
diff --git
a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcSnapshotStoreSpec.scala
b/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcSnapshotStoreSpec.scala
index 9b0402f..158bb83 100644
---
a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcSnapshotStoreSpec.scala
+++
b/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/JdbcSnapshotStoreSpec.scala
@@ -9,11 +9,12 @@
package org.apache.pekko.persistence.jdbc.integration
-import org.apache.pekko.persistence.jdbc.snapshot.JdbcSnapshotStoreSpec
-import org.apache.pekko.persistence.jdbc.testkit.internal.MySQL
-import org.apache.pekko.persistence.jdbc.testkit.internal.Oracle
-import org.apache.pekko.persistence.jdbc.testkit.internal.Postgres
-import org.apache.pekko.persistence.jdbc.testkit.internal.SqlServer
+import org.apache.pekko
+import pekko.persistence.jdbc.snapshot.JdbcSnapshotStoreSpec
+import pekko.persistence.jdbc.testkit.internal.MySQL
+import pekko.persistence.jdbc.testkit.internal.Oracle
+import pekko.persistence.jdbc.testkit.internal.Postgres
+import pekko.persistence.jdbc.testkit.internal.SqlServer
import com.typesafe.config.ConfigFactory
class PostgresSnapshotStoreSpec extends
JdbcSnapshotStoreSpec(ConfigFactory.load("postgres-application.conf"), Postgres)
diff --git
a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/PostgresScalaJdbcDurableStateChangesByTagTest.scala
b/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/PostgresScalaJdbcDurableStateChangesByTagTest.scala
index 5ab6dac..21a486a 100644
---
a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/PostgresScalaJdbcDurableStateChangesByTagTest.scala
+++
b/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/PostgresScalaJdbcDurableStateChangesByTagTest.scala
@@ -10,9 +10,10 @@
package org.apache.pekko.persistence.jdbc.integration
import com.typesafe.config.ConfigFactory
-import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateSpec
-import org.apache.pekko.persistence.jdbc.testkit.internal.Postgres
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateSpec
+import pekko.persistence.jdbc.testkit.internal.Postgres
class PostgresScalaJdbcDurableStateStoreQueryTest
extends
JdbcDurableStateSpec(ConfigFactory.load("postgres-shared-db-application.conf"),
Postgres) {
diff --git
a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/StoreOnlySerializableMessagesTest.scala
b/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/StoreOnlySerializableMessagesTest.scala
index 6459a19..2ecd23a 100644
---
a/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/StoreOnlySerializableMessagesTest.scala
+++
b/core/src/it/scala/org/apache/pekko/persistence/jdbc/integration/StoreOnlySerializableMessagesTest.scala
@@ -9,11 +9,12 @@
package org.apache.pekko.persistence.jdbc.integration
-import
org.apache.pekko.persistence.jdbc.serialization.StoreOnlySerializableMessagesTest
-import org.apache.pekko.persistence.jdbc.testkit.internal.MySQL
-import org.apache.pekko.persistence.jdbc.testkit.internal.Oracle
-import org.apache.pekko.persistence.jdbc.testkit.internal.Postgres
-import org.apache.pekko.persistence.jdbc.testkit.internal.SqlServer
+import org.apache.pekko
+import pekko.persistence.jdbc.serialization.StoreOnlySerializableMessagesTest
+import pekko.persistence.jdbc.testkit.internal.MySQL
+import pekko.persistence.jdbc.testkit.internal.Oracle
+import pekko.persistence.jdbc.testkit.internal.Postgres
+import pekko.persistence.jdbc.testkit.internal.SqlServer
class PostgresStoreOnlySerializableMessagesTest
extends StoreOnlySerializableMessagesTest("postgres-application.conf",
Postgres)
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/PekkoSerialization.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/PekkoSerialization.scala
index 132164e..85c7a30 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/PekkoSerialization.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/PekkoSerialization.scala
@@ -14,11 +14,12 @@
package org.apache.pekko.persistence.jdbc
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.persistence.PersistentRepr
-import org.apache.pekko.persistence.jdbc.state.DurableStateTables
-import
org.apache.pekko.persistence.jdbc.journal.dao.JournalTables.JournalPekkoSerializationRow
-import org.apache.pekko.serialization.{ Serialization, Serializers }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.PersistentRepr
+import pekko.persistence.jdbc.state.DurableStateTables
+import
pekko.persistence.jdbc.journal.dao.JournalTables.JournalPekkoSerializationRow
+import pekko.serialization.{ Serialization, Serializers }
import scala.util.{ Success, Try }
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/db/SlickDatabase.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/db/SlickDatabase.scala
index 9993897..915ad35 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/db/SlickDatabase.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/db/SlickDatabase.scala
@@ -14,9 +14,10 @@
package org.apache.pekko.persistence.jdbc.db
-import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko
+import pekko.actor.ActorSystem
import javax.naming.InitialContext
-import org.apache.pekko.persistence.jdbc.config.SlickConfiguration
+import pekko.persistence.jdbc.config.SlickConfiguration
import com.typesafe.config.Config
import slick.basic.DatabaseConfig
import slick.jdbc.JdbcProfile
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/db/SlickExtension.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/db/SlickExtension.scala
index 8b42b19..3d07b80 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/db/SlickExtension.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/db/SlickExtension.scala
@@ -14,9 +14,10 @@
package org.apache.pekko.persistence.jdbc.db
-import org.apache.pekko.actor.{ ActorSystem, ExtendedActorSystem, Extension,
ExtensionId, ExtensionIdProvider }
-import org.apache.pekko.persistence.jdbc.config.{ ConfigKeys,
SlickConfiguration }
-import org.apache.pekko.persistence.jdbc.util.ConfigOps._
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId,
ExtensionIdProvider }
+import pekko.persistence.jdbc.config.{ ConfigKeys, SlickConfiguration }
+import pekko.persistence.jdbc.util.ConfigOps._
import com.typesafe.config.{ Config, ConfigObject }
import scala.collection.JavaConverters._
@@ -48,7 +49,7 @@ class SlickExtensionImpl(system: ExtendedActorSystem) extends
Extension {
* A SlickDatabaseProvider is loaded using reflection,
* The instance is created using the following:
* - The fully qualified class name as configured in
`jdbc-journal.database-provider-fqcn`.
- * - The constructor with one argument of type
[[org.apache.pekko.actor.ActorSystem]] is used to create the instance.
+ * - The constructor with one argument of type [[pekko.actor.ActorSystem]] is
used to create the instance.
* Therefore the class must have such a constructor.
*/
trait SlickDatabaseProvider {
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala
index 1ac28cd..618dad9 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala
@@ -16,16 +16,17 @@ package org.apache.pekko.persistence.jdbc.journal
import java.util.{ HashMap => JHMap, Map => JMap }
-import org.apache.pekko.Done
-import org.apache.pekko.actor.{ ActorSystem, ExtendedActorSystem }
-import org.apache.pekko.persistence.jdbc.config.JournalConfig
-import org.apache.pekko.persistence.jdbc.journal.JdbcAsyncWriteJournal.{
InPlaceUpdateEvent, WriteFinished }
-import org.apache.pekko.persistence.jdbc.journal.dao.{ JournalDao,
JournalDaoWithUpdates }
-import org.apache.pekko.persistence.jdbc.db.{ SlickDatabase, SlickExtension }
-import org.apache.pekko.persistence.journal.AsyncWriteJournal
-import org.apache.pekko.persistence.{ AtomicWrite, PersistentRepr }
-import org.apache.pekko.serialization.{ Serialization, SerializationExtension }
-import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.{ ActorSystem, ExtendedActorSystem }
+import pekko.persistence.jdbc.config.JournalConfig
+import pekko.persistence.jdbc.journal.JdbcAsyncWriteJournal.{
InPlaceUpdateEvent, WriteFinished }
+import pekko.persistence.jdbc.journal.dao.{ JournalDao, JournalDaoWithUpdates }
+import pekko.persistence.jdbc.db.{ SlickDatabase, SlickExtension }
+import pekko.persistence.journal.AsyncWriteJournal
+import pekko.persistence.{ AtomicWrite, PersistentRepr }
+import pekko.serialization.{ Serialization, SerializationExtension }
+import pekko.stream.{ Materializer, SystemMaterializer }
import com.typesafe.config.Config
import slick.jdbc.JdbcProfile
import slick.jdbc.JdbcBackend._
@@ -33,8 +34,8 @@ import slick.jdbc.JdbcBackend._
import scala.collection.immutable._
import scala.concurrent.{ ExecutionContext, Future }
import scala.util.{ Failure, Success, Try }
-import org.apache.pekko.pattern.pipe
-import org.apache.pekko.persistence.jdbc.util.PluginVersionChecker
+import pekko.pattern.pipe
+import pekko.persistence.jdbc.util.PluginVersionChecker
object JdbcAsyncWriteJournal {
private case class WriteFinished(pid: String, f: Future[_])
@@ -43,7 +44,7 @@ object JdbcAsyncWriteJournal {
* Extra Plugin API: May be used to issue in-place updates for events.
* To be used only for data migrations such as "encrypt all events" and
similar operations.
*
- * The write payload may be wrapped in a
[[org.apache.pekko.persistence.journal.Tagged]],
+ * The write payload may be wrapped in a
[[pekko.persistence.journal.Tagged]],
* in which case the new tags will overwrite the existing tags of the event.
*/
final case class InPlaceUpdateEvent(persistenceId: String, seqNr: Long,
write: AnyRef)
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/BaseDao.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/BaseDao.scala
index cdacc0d..615776a 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/BaseDao.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/BaseDao.scala
@@ -14,9 +14,10 @@
package org.apache.pekko.persistence.jdbc.journal.dao
-import org.apache.pekko.persistence.jdbc.config.BaseDaoConfig
-import org.apache.pekko.stream.scaladsl.{ Keep, Sink, Source,
SourceQueueWithComplete }
-import org.apache.pekko.stream.{ Materializer, OverflowStrategy,
QueueOfferResult }
+import org.apache.pekko
+import pekko.persistence.jdbc.config.BaseDaoConfig
+import pekko.stream.scaladsl.{ Keep, Sink, Source, SourceQueueWithComplete }
+import pekko.stream.{ Materializer, OverflowStrategy, QueueOfferResult }
import scala.collection.immutable.{ Seq, Vector }
import scala.concurrent.{ ExecutionContext, Future, Promise }
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/BaseJournalDaoWithReadMessages.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/BaseJournalDaoWithReadMessages.scala
index 02b63b6..465783a 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/BaseJournalDaoWithReadMessages.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/BaseJournalDaoWithReadMessages.scala
@@ -14,12 +14,13 @@
package org.apache.pekko.persistence.jdbc.journal.dao
-import org.apache.pekko.NotUsed
-import org.apache.pekko.actor.Scheduler
-import org.apache.pekko.persistence.PersistentRepr
-import org.apache.pekko.persistence.jdbc.journal.dao.FlowControl.{ Continue,
ContinueDelayed, Stop }
-import org.apache.pekko.stream.Materializer
-import org.apache.pekko.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.Scheduler
+import pekko.persistence.PersistentRepr
+import pekko.persistence.jdbc.journal.dao.FlowControl.{ Continue,
ContinueDelayed, Stop }
+import pekko.stream.Materializer
+import pekko.stream.scaladsl.{ Sink, Source }
import scala.collection.immutable.Seq
import scala.concurrent.{ ExecutionContext, Future }
@@ -73,7 +74,7 @@ trait BaseJournalDaoWithReadMessages extends
JournalDaoWithReadMessages {
case Continue => retrieveNextBatch()
case ContinueDelayed =>
val (delay, scheduler) = refreshInterval.get
- org.apache.pekko.pattern.after(delay,
scheduler)(retrieveNextBatch())
+ pekko.pattern.after(delay, scheduler)(retrieveNextBatch())
}
}
.mapConcat(identity(_))
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/DefaultJournalDao.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/DefaultJournalDao.scala
index c9f7770..5f52b85 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/DefaultJournalDao.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/DefaultJournalDao.scala
@@ -14,16 +14,17 @@
package org.apache.pekko.persistence.jdbc.journal.dao
-import org.apache.pekko.NotUsed
-import org.apache.pekko.dispatch.ExecutionContexts
-import org.apache.pekko.persistence.jdbc.PekkoSerialization
-import org.apache.pekko.persistence.jdbc.config.{ BaseDaoConfig, JournalConfig
}
-import
org.apache.pekko.persistence.jdbc.journal.dao.JournalTables.JournalPekkoSerializationRow
-import org.apache.pekko.persistence.journal.Tagged
-import org.apache.pekko.persistence.{ AtomicWrite, PersistentRepr }
-import org.apache.pekko.serialization.Serialization
-import org.apache.pekko.stream.Materializer
-import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.dispatch.ExecutionContexts
+import pekko.persistence.jdbc.PekkoSerialization
+import pekko.persistence.jdbc.config.{ BaseDaoConfig, JournalConfig }
+import
pekko.persistence.jdbc.journal.dao.JournalTables.JournalPekkoSerializationRow
+import pekko.persistence.journal.Tagged
+import pekko.persistence.{ AtomicWrite, PersistentRepr }
+import pekko.serialization.Serialization
+import pekko.stream.Materializer
+import pekko.stream.scaladsl.Source
import slick.jdbc.JdbcBackend.Database
import slick.jdbc.JdbcProfile
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalDao.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalDao.scala
index 1c77c7c..fb0211a 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalDao.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalDao.scala
@@ -33,7 +33,7 @@ trait JournalDao extends JournalDaoWithReadMessages {
def highestSequenceNr(persistenceId: String, fromSequenceNr: Long):
Future[Long]
/**
- * @see
[[org.apache.pekko.persistence.journal.AsyncWriteJournal.asyncWriteMessages(messages)]]
+ * @see
[[pekko.persistence.journal.AsyncWriteJournal.asyncWriteMessages(messages)]]
*/
def asyncWriteMessages(messages: Seq[AtomicWrite]): Future[Seq[Try[Unit]]]
}
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalDaoWithReadMessages.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalDaoWithReadMessages.scala
index 8cf5958..efd0453 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalDaoWithReadMessages.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalDaoWithReadMessages.scala
@@ -17,10 +17,11 @@ package org.apache.pekko.persistence.jdbc.journal.dao
import scala.concurrent.duration.FiniteDuration
import scala.util.Try
-import org.apache.pekko.NotUsed
-import org.apache.pekko.actor.Scheduler
-import org.apache.pekko.persistence.PersistentRepr
-import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.Scheduler
+import pekko.persistence.PersistentRepr
+import pekko.stream.scaladsl.Source
trait JournalDaoWithReadMessages {
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalQueries.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalQueries.scala
index f7c5ca4..9e9c01a 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalQueries.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalQueries.scala
@@ -14,8 +14,9 @@
package org.apache.pekko.persistence.jdbc.journal.dao
-import org.apache.pekko.persistence.jdbc.config.{
EventJournalTableConfiguration, EventTagTableConfiguration }
-import org.apache.pekko.persistence.jdbc.journal.dao.JournalTables.{
JournalPekkoSerializationRow, TagRow }
+import org.apache.pekko
+import pekko.persistence.jdbc.config.{ EventJournalTableConfiguration,
EventTagTableConfiguration }
+import pekko.persistence.jdbc.journal.dao.JournalTables.{
JournalPekkoSerializationRow, TagRow }
import slick.jdbc.JdbcProfile
import scala.concurrent.ExecutionContext
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalTables.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalTables.scala
index 7958f47..80ba1ca 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalTables.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/JournalTables.scala
@@ -14,9 +14,10 @@
package org.apache.pekko.persistence.jdbc.journal.dao
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.persistence.jdbc.config.{
EventJournalTableConfiguration, EventTagTableConfiguration }
-import org.apache.pekko.persistence.jdbc.journal.dao.JournalTables.{
JournalPekkoSerializationRow, TagRow }
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.jdbc.config.{ EventJournalTableConfiguration,
EventTagTableConfiguration }
+import pekko.persistence.jdbc.journal.dao.JournalTables.{
JournalPekkoSerializationRow, TagRow }
/**
* INTERNAL API
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/legacy/ByteArrayJournalDao.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/legacy/ByteArrayJournalDao.scala
index 4b364f3..8d66fda 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/legacy/ByteArrayJournalDao.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/legacy/ByteArrayJournalDao.scala
@@ -14,19 +14,15 @@
package org.apache.pekko.persistence.jdbc.journal.dao.legacy
-import org.apache.pekko.persistence.jdbc.config.{ BaseDaoConfig, JournalConfig
}
-import org.apache.pekko.persistence.jdbc.journal.dao.{
- BaseDao,
- BaseJournalDaoWithReadMessages,
- H2Compat,
- JournalDaoWithUpdates
-}
-import
org.apache.pekko.persistence.jdbc.serialization.FlowPersistentReprSerializer
-import org.apache.pekko.persistence.{ AtomicWrite, PersistentRepr }
-import org.apache.pekko.serialization.Serialization
-import org.apache.pekko.stream.Materializer
-import org.apache.pekko.stream.scaladsl.Source
-import org.apache.pekko.{ Done, NotUsed }
+import org.apache.pekko
+import pekko.persistence.jdbc.config.{ BaseDaoConfig, JournalConfig }
+import pekko.persistence.jdbc.journal.dao.{ BaseDao,
BaseJournalDaoWithReadMessages, H2Compat, JournalDaoWithUpdates }
+import pekko.persistence.jdbc.serialization.FlowPersistentReprSerializer
+import pekko.persistence.{ AtomicWrite, PersistentRepr }
+import pekko.serialization.Serialization
+import pekko.stream.Materializer
+import pekko.stream.scaladsl.Source
+import pekko.{ Done, NotUsed }
import org.slf4j.LoggerFactory
import slick.jdbc.JdbcBackend.Database
import slick.jdbc.JdbcProfile
@@ -71,7 +67,7 @@ trait BaseByteArrayJournalDao
}
/**
- * @see
[[org.apache.pekko.persistence.journal.AsyncWriteJournal.asyncWriteMessages(messages)]]
+ * @see
[[pekko.persistence.journal.AsyncWriteJournal.asyncWriteMessages(messages)]]
*/
def asyncWriteMessages(messages: Seq[AtomicWrite]): Future[Seq[Try[Unit]]] =
{
val serializedTries: Seq[Try[Seq[JournalRow]]] =
serializer.serialize(messages)
@@ -90,7 +86,7 @@ trait BaseByteArrayJournalDao
override def delete(persistenceId: String, maxSequenceNr: Long):
Future[Unit] = {
// We should keep journal record with highest sequence number in order to
be compliant
- // with @see [[org.apache.pekko.persistence.journal.JournalSpec]]
+ // with @see [[pekko.persistence.journal.JournalSpec]]
val actions: DBIOAction[Unit, NoStream, Effect.Write with Effect.Read] =
for {
_ <- queries.markJournalMessagesAsDeleted(persistenceId, maxSequenceNr)
highestMarkedSequenceNr <- highestMarkedSequenceNr(persistenceId)
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/legacy/ByteArrayJournalSerializer.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/legacy/ByteArrayJournalSerializer.scala
index 7ce254c..f787f2b 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/legacy/ByteArrayJournalSerializer.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/dao/legacy/ByteArrayJournalSerializer.scala
@@ -15,9 +15,10 @@
package org.apache.pekko.persistence.jdbc
package journal.dao.legacy
-import org.apache.pekko.persistence.PersistentRepr
-import
org.apache.pekko.persistence.jdbc.serialization.FlowPersistentReprSerializer
-import org.apache.pekko.serialization.Serialization
+import org.apache.pekko
+import pekko.persistence.PersistentRepr
+import pekko.persistence.jdbc.serialization.FlowPersistentReprSerializer
+import pekko.serialization.Serialization
import scala.collection.immutable._
import scala.util.Try
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/JdbcReadJournalProvider.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/JdbcReadJournalProvider.scala
index 7c2ba86..9a7ec4c 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/JdbcReadJournalProvider.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/JdbcReadJournalProvider.scala
@@ -14,8 +14,9 @@
package org.apache.pekko.persistence.jdbc.query
-import org.apache.pekko.actor.ExtendedActorSystem
-import org.apache.pekko.persistence.query.ReadJournalProvider
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.persistence.query.ReadJournalProvider
import com.typesafe.config.Config
class JdbcReadJournalProvider(system: ExtendedActorSystem, config: Config,
configPath: String)
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/JournalSequenceActor.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/JournalSequenceActor.scala
index f23b8d3..01e4aca 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/JournalSequenceActor.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/JournalSequenceActor.scala
@@ -15,12 +15,13 @@
package org.apache.pekko.persistence.jdbc
package query
-import org.apache.pekko.actor.{ Actor, ActorLogging, Props, Status, Timers }
-import org.apache.pekko.pattern.pipe
-import org.apache.pekko.persistence.jdbc.config.JournalSequenceRetrievalConfig
-import org.apache.pekko.persistence.jdbc.query.dao.ReadJournalDao
-import org.apache.pekko.stream.Materializer
-import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, Props, Status, Timers }
+import pekko.pattern.pipe
+import pekko.persistence.jdbc.config.JournalSequenceRetrievalConfig
+import pekko.persistence.jdbc.query.dao.ReadJournalDao
+import pekko.stream.Materializer
+import pekko.stream.scaladsl.Sink
import scala.collection.immutable.NumericRange
import scala.concurrent.duration.FiniteDuration
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/DefaultReadJournalDao.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/DefaultReadJournalDao.scala
index 8b253af..10bc2a0 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/DefaultReadJournalDao.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/DefaultReadJournalDao.scala
@@ -13,14 +13,16 @@
*/
package org.apache.pekko.persistence.jdbc.query.dao
-import org.apache.pekko.NotUsed
-import org.apache.pekko.persistence.PersistentRepr
-import org.apache.pekko.persistence.jdbc.PekkoSerialization
-import org.apache.pekko.persistence.jdbc.config.ReadJournalConfig
-import org.apache.pekko.persistence.jdbc.journal.dao.{
BaseJournalDaoWithReadMessages, H2Compat }
-import org.apache.pekko.serialization.Serialization
-import org.apache.pekko.stream.Materializer
-import org.apache.pekko.stream.scaladsl.Source
+
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.PersistentRepr
+import pekko.persistence.jdbc.PekkoSerialization
+import pekko.persistence.jdbc.config.ReadJournalConfig
+import pekko.persistence.jdbc.journal.dao.{ BaseJournalDaoWithReadMessages,
H2Compat }
+import pekko.serialization.Serialization
+import pekko.stream.Materializer
+import pekko.stream.scaladsl.Source
import slick.jdbc.JdbcBackend.Database
import slick.jdbc.JdbcProfile
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalDao.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalDao.scala
index ff40a83..379056a 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalDao.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalDao.scala
@@ -14,10 +14,11 @@
package org.apache.pekko.persistence.jdbc.query.dao
-import org.apache.pekko.NotUsed
-import org.apache.pekko.persistence.PersistentRepr
-import org.apache.pekko.persistence.jdbc.journal.dao.JournalDaoWithReadMessages
-import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.PersistentRepr
+import pekko.persistence.jdbc.journal.dao.JournalDaoWithReadMessages
+import pekko.stream.scaladsl.Source
import scala.collection.immutable.Set
import scala.concurrent.Future
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalQueries.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalQueries.scala
index f92ce4a..02c7245 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalQueries.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalQueries.scala
@@ -14,12 +14,9 @@
package org.apache.pekko.persistence.jdbc.query.dao
-import org.apache.pekko.persistence.jdbc.config.{
- EventJournalTableConfiguration,
- EventTagTableConfiguration,
- ReadJournalConfig
-}
-import org.apache.pekko.persistence.jdbc.journal.dao.JournalTables
+import org.apache.pekko
+import pekko.persistence.jdbc.config.{ EventJournalTableConfiguration,
EventTagTableConfiguration, ReadJournalConfig }
+import pekko.persistence.jdbc.journal.dao.JournalTables
import slick.jdbc.JdbcProfile
class ReadJournalQueries(val profile: JdbcProfile, val readJournalConfig:
ReadJournalConfig) extends JournalTables {
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/legacy/ByteArrayReadJournalDao.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/legacy/ByteArrayReadJournalDao.scala
index ccfcf04..a551c02 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/legacy/ByteArrayReadJournalDao.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/legacy/ByteArrayReadJournalDao.scala
@@ -14,17 +14,18 @@
package org.apache.pekko.persistence.jdbc.query.dao.legacy
-import org.apache.pekko.NotUsed
-import org.apache.pekko.persistence.PersistentRepr
-import org.apache.pekko.persistence.jdbc.config.ReadJournalConfig
-import org.apache.pekko.persistence.jdbc.journal.dao.{
BaseJournalDaoWithReadMessages, H2Compat }
-import org.apache.pekko.persistence.jdbc.journal.dao.legacy.{
ByteArrayJournalSerializer, JournalRow }
-import org.apache.pekko.persistence.jdbc.query.dao.ReadJournalDao
-import
org.apache.pekko.persistence.jdbc.query.dao.legacy.TagFilterFlow.perfectlyMatchTag
-import
org.apache.pekko.persistence.jdbc.serialization.FlowPersistentReprSerializer
-import org.apache.pekko.serialization.Serialization
-import org.apache.pekko.stream.Materializer
-import org.apache.pekko.stream.scaladsl.{ Flow, Source }
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.PersistentRepr
+import pekko.persistence.jdbc.config.ReadJournalConfig
+import pekko.persistence.jdbc.journal.dao.{ BaseJournalDaoWithReadMessages,
H2Compat }
+import pekko.persistence.jdbc.journal.dao.legacy.{ ByteArrayJournalSerializer,
JournalRow }
+import pekko.persistence.jdbc.query.dao.ReadJournalDao
+import pekko.persistence.jdbc.query.dao.legacy.TagFilterFlow.perfectlyMatchTag
+import pekko.persistence.jdbc.serialization.FlowPersistentReprSerializer
+import pekko.serialization.Serialization
+import pekko.stream.Materializer
+import pekko.stream.scaladsl.{ Flow, Source }
import slick.jdbc.JdbcBackend._
import slick.jdbc.{ GetResult, JdbcProfile }
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/legacy/ReadJournalQueries.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/legacy/ReadJournalQueries.scala
index ce0777d..32a6a4a 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/legacy/ReadJournalQueries.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/dao/legacy/ReadJournalQueries.scala
@@ -14,8 +14,9 @@
package org.apache.pekko.persistence.jdbc.query.dao.legacy
-import org.apache.pekko.persistence.jdbc.config.{
LegacyJournalTableConfiguration, ReadJournalConfig }
-import org.apache.pekko.persistence.jdbc.journal.dao.legacy.JournalTables
+import org.apache.pekko
+import pekko.persistence.jdbc.config.{ LegacyJournalTableConfiguration,
ReadJournalConfig }
+import pekko.persistence.jdbc.journal.dao.legacy.JournalTables
import slick.jdbc.JdbcProfile
class ReadJournalQueries(val profile: JdbcProfile, val readJournalConfig:
ReadJournalConfig) extends JournalTables {
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/javadsl/JdbcReadJournal.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/javadsl/JdbcReadJournal.scala
index a8ccb72..ec204fe 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/javadsl/JdbcReadJournal.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/javadsl/JdbcReadJournal.scala
@@ -14,11 +14,12 @@
package org.apache.pekko.persistence.jdbc.query.javadsl
-import org.apache.pekko.NotUsed
-import org.apache.pekko.persistence.jdbc.query.scaladsl.{ JdbcReadJournal =>
ScalaJdbcReadJournal }
-import org.apache.pekko.persistence.query.{ EventEnvelope, Offset }
-import org.apache.pekko.persistence.query.javadsl._
-import org.apache.pekko.stream.javadsl.Source
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.jdbc.query.scaladsl.{ JdbcReadJournal =>
ScalaJdbcReadJournal }
+import pekko.persistence.query.{ EventEnvelope, Offset }
+import pekko.persistence.query.javadsl._
+import pekko.stream.javadsl.Source
object JdbcReadJournal {
final val Identifier = ScalaJdbcReadJournal.Identifier
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/scaladsl/JdbcReadJournal.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/scaladsl/JdbcReadJournal.scala
index 693c485..32b7df4 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/scaladsl/JdbcReadJournal.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/scaladsl/JdbcReadJournal.scala
@@ -15,19 +15,20 @@
package org.apache.pekko.persistence.jdbc.query
package scaladsl
-import org.apache.pekko.NotUsed
-import org.apache.pekko.actor.ExtendedActorSystem
-import org.apache.pekko.persistence.jdbc.config.ReadJournalConfig
-import org.apache.pekko.persistence.jdbc.query.JournalSequenceActor.{
GetMaxOrderingId, MaxOrderingId }
-import org.apache.pekko.persistence.jdbc.db.SlickExtension
-import org.apache.pekko.persistence.jdbc.journal.dao.FlowControl
-import org.apache.pekko.persistence.query.scaladsl._
-import org.apache.pekko.persistence.query.{ EventEnvelope, Offset, Sequence }
-import org.apache.pekko.persistence.{ Persistence, PersistentRepr }
-import org.apache.pekko.serialization.{ Serialization, SerializationExtension }
-import org.apache.pekko.stream.scaladsl.{ Sink, Source }
-import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
-import org.apache.pekko.util.Timeout
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ExtendedActorSystem
+import pekko.persistence.jdbc.config.ReadJournalConfig
+import pekko.persistence.jdbc.query.JournalSequenceActor.{ GetMaxOrderingId,
MaxOrderingId }
+import pekko.persistence.jdbc.db.SlickExtension
+import pekko.persistence.jdbc.journal.dao.FlowControl
+import pekko.persistence.query.scaladsl._
+import pekko.persistence.query.{ EventEnvelope, Offset, Sequence }
+import pekko.persistence.{ Persistence, PersistentRepr }
+import pekko.serialization.{ Serialization, SerializationExtension }
+import pekko.stream.scaladsl.{ Sink, Source }
+import pekko.stream.{ Materializer, SystemMaterializer }
+import pekko.util.Timeout
import com.typesafe.config.Config
import slick.jdbc.JdbcBackend._
import slick.jdbc.JdbcProfile
@@ -36,9 +37,9 @@ import scala.collection.immutable._
import scala.concurrent.duration._
import scala.concurrent.{ ExecutionContext, Future }
import scala.util.{ Failure, Success }
-import org.apache.pekko.actor.Scheduler
-import org.apache.pekko.persistence.jdbc.query.dao.ReadJournalDao
-import org.apache.pekko.persistence.jdbc.util.PluginVersionChecker
+import pekko.actor.Scheduler
+import pekko.persistence.jdbc.query.dao.ReadJournalDao
+import pekko.persistence.jdbc.util.PluginVersionChecker
object JdbcReadJournal {
final val Identifier = "jdbc-read-journal"
@@ -233,7 +234,7 @@ class JdbcReadJournal(config: Config, configPath:
String)(implicit val system: E
tag: String,
offset: Long,
terminateAfterOffset: Option[Long]): Source[EventEnvelope, NotUsed] = {
- import org.apache.pekko.pattern.ask
+ import pekko.pattern.ask
import FlowControl._
implicit val askTimeout: Timeout =
Timeout(readJournalConfig.journalSequenceRetrievalConfiguration.askTimeout)
val batchSize = readJournalConfig.maxBufferSize
@@ -275,7 +276,7 @@ class JdbcReadJournal(config: Config, configPath:
String)(implicit val system: E
case Stop => Future.successful(None)
case Continue => retrieveNextBatch()
case ContinueDelayed =>
- org.apache.pekko.pattern.after(readJournalConfig.refreshInterval,
system.scheduler)(retrieveNextBatch())
+ pekko.pattern.after(readJournalConfig.refreshInterval,
system.scheduler)(retrieveNextBatch())
}
}
.mapConcat(identity)
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/serialization/PersistentReprSerializer.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/serialization/PersistentReprSerializer.scala
index c5a65df..48c28b0 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/serialization/PersistentReprSerializer.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/serialization/PersistentReprSerializer.scala
@@ -14,11 +14,12 @@
package org.apache.pekko.persistence.jdbc.serialization
-import org.apache.pekko.NotUsed
-import org.apache.pekko.persistence.jdbc.util.TrySeq
-import org.apache.pekko.persistence.journal.Tagged
-import org.apache.pekko.persistence.{ AtomicWrite, PersistentRepr }
-import org.apache.pekko.stream.scaladsl.Flow
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.jdbc.util.TrySeq
+import pekko.persistence.journal.Tagged
+import pekko.persistence.{ AtomicWrite, PersistentRepr }
+import pekko.stream.scaladsl.Flow
import scala.collection.immutable._
import scala.util.Try
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStore.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStore.scala
index fce47e3..19bb452 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStore.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStore.scala
@@ -14,14 +14,15 @@
package org.apache.pekko.persistence.jdbc.snapshot
-import org.apache.pekko.actor.{ ActorSystem, ExtendedActorSystem }
-import org.apache.pekko.persistence.jdbc.config.SnapshotConfig
-import org.apache.pekko.persistence.jdbc.snapshot.dao.SnapshotDao
-import org.apache.pekko.persistence.jdbc.db.{ SlickDatabase, SlickExtension }
-import org.apache.pekko.persistence.snapshot.SnapshotStore
-import org.apache.pekko.persistence.{ SelectedSnapshot, SnapshotMetadata,
SnapshotSelectionCriteria }
-import org.apache.pekko.serialization.{ Serialization, SerializationExtension }
-import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
+import org.apache.pekko
+import pekko.actor.{ ActorSystem, ExtendedActorSystem }
+import pekko.persistence.jdbc.config.SnapshotConfig
+import pekko.persistence.jdbc.snapshot.dao.SnapshotDao
+import pekko.persistence.jdbc.db.{ SlickDatabase, SlickExtension }
+import pekko.persistence.snapshot.SnapshotStore
+import pekko.persistence.{ SelectedSnapshot, SnapshotMetadata,
SnapshotSelectionCriteria }
+import pekko.serialization.{ Serialization, SerializationExtension }
+import pekko.stream.{ Materializer, SystemMaterializer }
import com.typesafe.config.Config
import slick.jdbc.JdbcProfile
import slick.jdbc.JdbcBackend._
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/DefaultSnapshotDao.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/DefaultSnapshotDao.scala
index 258c5cb..b0580cf 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/DefaultSnapshotDao.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/DefaultSnapshotDao.scala
@@ -15,13 +15,14 @@
package org.apache.pekko.persistence.jdbc.snapshot.dao
import slick.jdbc.{ JdbcBackend, JdbcProfile }
-import org.apache.pekko.persistence.SnapshotMetadata
-import org.apache.pekko.persistence.jdbc.config.SnapshotConfig
-import org.apache.pekko.serialization.Serialization
-import org.apache.pekko.stream.Materializer
+import org.apache.pekko
+import pekko.persistence.SnapshotMetadata
+import pekko.persistence.jdbc.config.SnapshotConfig
+import pekko.serialization.Serialization
+import pekko.stream.Materializer
import SnapshotTables._
-import org.apache.pekko.dispatch.ExecutionContexts
-import org.apache.pekko.persistence.jdbc.PekkoSerialization
+import pekko.dispatch.ExecutionContexts
+import pekko.persistence.jdbc.PekkoSerialization
import scala.concurrent.{ ExecutionContext, Future }
import scala.util.{ Success, Try }
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/SnapshotQueries.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/SnapshotQueries.scala
index ddb0858..7786ddf 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/SnapshotQueries.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/SnapshotQueries.scala
@@ -14,8 +14,9 @@
package org.apache.pekko.persistence.jdbc.snapshot.dao
-import org.apache.pekko.persistence.jdbc.config.SnapshotTableConfiguration
-import
org.apache.pekko.persistence.jdbc.snapshot.dao.SnapshotTables.SnapshotRow
+import org.apache.pekko
+import pekko.persistence.jdbc.config.SnapshotTableConfiguration
+import pekko.persistence.jdbc.snapshot.dao.SnapshotTables.SnapshotRow
import slick.jdbc.JdbcProfile
class SnapshotQueries(val profile: JdbcProfile, override val snapshotTableCfg:
SnapshotTableConfiguration)
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/SnapshotTables.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/SnapshotTables.scala
index 50a3b1a..75bbd79 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/SnapshotTables.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/SnapshotTables.scala
@@ -14,10 +14,11 @@
package org.apache.pekko.persistence.jdbc.snapshot.dao
-import org.apache.pekko.persistence.jdbc.config.SnapshotTableConfiguration
-import
org.apache.pekko.persistence.jdbc.snapshot.dao.SnapshotTables.SnapshotRow
-import
org.apache.pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.isOracleDriver
-import
org.apache.pekko.persistence.jdbc.util.InputStreamOps.InputStreamImplicits
+import org.apache.pekko
+import pekko.persistence.jdbc.config.SnapshotTableConfiguration
+import pekko.persistence.jdbc.snapshot.dao.SnapshotTables.SnapshotRow
+import pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.isOracleDriver
+import pekko.persistence.jdbc.util.InputStreamOps.InputStreamImplicits
object SnapshotTables {
case class SnapshotRow(
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/ByteArraySnapshotDao.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/ByteArraySnapshotDao.scala
index e16fc43..8fa26b1 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/ByteArraySnapshotDao.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/ByteArraySnapshotDao.scala
@@ -14,12 +14,13 @@
package org.apache.pekko.persistence.jdbc.snapshot.dao.legacy
-import org.apache.pekko.persistence.SnapshotMetadata
-import org.apache.pekko.persistence.jdbc.config.SnapshotConfig
-import
org.apache.pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.SnapshotRow
-import org.apache.pekko.persistence.jdbc.snapshot.dao.SnapshotDao
-import org.apache.pekko.serialization.Serialization
-import org.apache.pekko.stream.Materializer
+import org.apache.pekko
+import pekko.persistence.SnapshotMetadata
+import pekko.persistence.jdbc.config.SnapshotConfig
+import pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.SnapshotRow
+import pekko.persistence.jdbc.snapshot.dao.SnapshotDao
+import pekko.serialization.Serialization
+import pekko.stream.Materializer
import slick.jdbc.{ JdbcBackend, JdbcProfile }
import scala.concurrent.{ ExecutionContext, Future }
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/ByteArraySnapshotSerializer.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/ByteArraySnapshotSerializer.scala
index f7d12f0..bd20280 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/ByteArraySnapshotSerializer.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/ByteArraySnapshotSerializer.scala
@@ -14,11 +14,12 @@
package org.apache.pekko.persistence.jdbc.snapshot.dao.legacy
-import org.apache.pekko.persistence.SnapshotMetadata
-import org.apache.pekko.persistence.jdbc.serialization.SnapshotSerializer
-import
org.apache.pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.SnapshotRow
-import org.apache.pekko.persistence.serialization.Snapshot
-import org.apache.pekko.serialization.Serialization
+import org.apache.pekko
+import pekko.persistence.SnapshotMetadata
+import pekko.persistence.jdbc.serialization.SnapshotSerializer
+import pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.SnapshotRow
+import pekko.persistence.serialization.Snapshot
+import pekko.serialization.Serialization
import scala.util.Try
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/SnapshotQueries.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/SnapshotQueries.scala
index 2c865af..89c701b 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/SnapshotQueries.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/SnapshotQueries.scala
@@ -14,8 +14,9 @@
package org.apache.pekko.persistence.jdbc.snapshot.dao.legacy
-import
org.apache.pekko.persistence.jdbc.config.LegacySnapshotTableConfiguration
-import
org.apache.pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.SnapshotRow
+import org.apache.pekko
+import pekko.persistence.jdbc.config.LegacySnapshotTableConfiguration
+import pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.SnapshotRow
import slick.jdbc.JdbcProfile
class SnapshotQueries(val profile: JdbcProfile, override val snapshotTableCfg:
LegacySnapshotTableConfiguration)
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/SnapshotTables.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/SnapshotTables.scala
index bece091..e959c76 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/SnapshotTables.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/dao/legacy/SnapshotTables.scala
@@ -14,9 +14,10 @@
package org.apache.pekko.persistence.jdbc.snapshot.dao.legacy
-import
org.apache.pekko.persistence.jdbc.config.LegacySnapshotTableConfiguration
-import org.apache.pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.{
isOracleDriver, SnapshotRow }
-import org.apache.pekko.persistence.jdbc.util.InputStreamOps._
+import org.apache.pekko
+import pekko.persistence.jdbc.config.LegacySnapshotTableConfiguration
+import pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.{
isOracleDriver, SnapshotRow }
+import pekko.persistence.jdbc.util.InputStreamOps._
import slick.jdbc.JdbcProfile
object SnapshotTables {
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/DurableStateQueries.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/DurableStateQueries.scala
index ef464e1..c8128a9 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/DurableStateQueries.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/DurableStateQueries.scala
@@ -14,14 +14,15 @@
package org.apache.pekko.persistence.jdbc.state
-import org.apache.pekko.annotation.InternalApi
+import org.apache.pekko
+import pekko.annotation.InternalApi
import slick.jdbc.{ JdbcProfile, SetParameter }
import slick.jdbc.H2Profile
import slick.jdbc.MySQLProfile
import slick.jdbc.OracleProfile
import slick.jdbc.PostgresProfile
import slick.jdbc.SQLServerProfile
-import org.apache.pekko.persistence.jdbc.config.DurableStateTableConfiguration
+import pekko.persistence.jdbc.config.DurableStateTableConfiguration
/**
* INTERNAL API
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/DurableStateTables.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/DurableStateTables.scala
index a16595e..67a9608 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/DurableStateTables.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/DurableStateTables.scala
@@ -14,8 +14,9 @@
package org.apache.pekko.persistence.jdbc.state
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.persistence.jdbc.config.DurableStateTableConfiguration
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.jdbc.config.DurableStateTableConfiguration
/**
* INTERNAL API
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/JdbcDurableStateStoreProvider.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/JdbcDurableStateStoreProvider.scala
index be9652a..d469b9f 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/JdbcDurableStateStoreProvider.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/JdbcDurableStateStoreProvider.scala
@@ -17,14 +17,15 @@ package org.apache.pekko.persistence.jdbc.state
import scala.concurrent.ExecutionContext
import slick.jdbc.JdbcProfile
import slick.jdbc.JdbcBackend._
-import org.apache.pekko.actor.ExtendedActorSystem
-import org.apache.pekko.persistence.jdbc.config.DurableStateTableConfiguration
-import org.apache.pekko.persistence.state.scaladsl.DurableStateStore
-import org.apache.pekko.persistence.state.javadsl.{ DurableStateStore =>
JDurableStateStore }
-import org.apache.pekko.persistence.state.DurableStateStoreProvider
-import org.apache.pekko.persistence.jdbc.db.{ SlickDatabase, SlickExtension }
-import org.apache.pekko.serialization.SerializationExtension
-import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
+import org.apache.pekko
+import pekko.actor.ExtendedActorSystem
+import pekko.persistence.jdbc.config.DurableStateTableConfiguration
+import pekko.persistence.state.scaladsl.DurableStateStore
+import pekko.persistence.state.javadsl.{ DurableStateStore =>
JDurableStateStore }
+import pekko.persistence.state.DurableStateStoreProvider
+import pekko.persistence.jdbc.db.{ SlickDatabase, SlickExtension }
+import pekko.serialization.SerializationExtension
+import pekko.stream.{ Materializer, SystemMaterializer }
class JdbcDurableStateStoreProvider[A](system: ExtendedActorSystem) extends
DurableStateStoreProvider {
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/SequenceNextValUpdater.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/SequenceNextValUpdater.scala
index 19b92ae..0d633ac 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/SequenceNextValUpdater.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/SequenceNextValUpdater.scala
@@ -14,8 +14,9 @@
package org.apache.pekko.persistence.jdbc.state
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.persistence.jdbc.config.DurableStateTableConfiguration
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.jdbc.config.DurableStateTableConfiguration
import slick.jdbc.JdbcProfile
import slick.dbio.Effect
import slick.sql.SqlStreamingAction
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/javadsl/JdbcDurableStateStore.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/javadsl/JdbcDurableStateStore.scala
index c4254fb..85da113 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/javadsl/JdbcDurableStateStore.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/javadsl/JdbcDurableStateStore.scala
@@ -18,15 +18,16 @@ import java.util.Optional
import java.util.concurrent.CompletionStage
import scala.compat.java8.FutureConverters._
import scala.concurrent.ExecutionContext
-import org.apache.pekko.annotation.ApiMayChange
-import org.apache.pekko.{ Done, NotUsed }
-import org.apache.pekko.persistence.jdbc.state.DurableStateQueries
-import org.apache.pekko.persistence.jdbc.config.DurableStateTableConfiguration
-import org.apache.pekko.persistence.jdbc.state.scaladsl.{
JdbcDurableStateStore => ScalaJdbcDurableStateStore }
-import org.apache.pekko.persistence.query.{ DurableStateChange, Offset }
-import org.apache.pekko.persistence.query.javadsl.DurableStateStoreQuery
-import org.apache.pekko.persistence.state.javadsl.{ DurableStateUpdateStore,
GetObjectResult }
-import org.apache.pekko.stream.javadsl.Source
+import org.apache.pekko
+import pekko.annotation.ApiMayChange
+import pekko.{ Done, NotUsed }
+import pekko.persistence.jdbc.state.DurableStateQueries
+import pekko.persistence.jdbc.config.DurableStateTableConfiguration
+import pekko.persistence.jdbc.state.scaladsl.{ JdbcDurableStateStore =>
ScalaJdbcDurableStateStore }
+import pekko.persistence.query.{ DurableStateChange, Offset }
+import pekko.persistence.query.javadsl.DurableStateStoreQuery
+import pekko.persistence.state.javadsl.{ DurableStateUpdateStore,
GetObjectResult }
+import pekko.stream.javadsl.Source
import slick.jdbc.JdbcProfile
object JdbcDurableStateStore {
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateSequenceActor.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateSequenceActor.scala
index 7521eee..70c7202 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateSequenceActor.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateSequenceActor.scala
@@ -16,14 +16,15 @@ package org.apache.pekko.persistence.jdbc.state.scaladsl
import scala.collection.immutable.NumericRange
-import org.apache.pekko.actor.{ Actor, ActorLogging, Props, Status, Timers }
-import org.apache.pekko.pattern.pipe
-import
org.apache.pekko.persistence.jdbc.config.DurableStateSequenceRetrievalConfig
-import org.apache.pekko.stream.Materializer
-import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko
+import pekko.actor.{ Actor, ActorLogging, Props, Status, Timers }
+import pekko.pattern.pipe
+import pekko.persistence.jdbc.config.DurableStateSequenceRetrievalConfig
+import pekko.stream.Materializer
+import pekko.stream.scaladsl.Sink
import scala.concurrent.duration.FiniteDuration
-import org.apache.pekko.annotation.InternalApi
+import pekko.annotation.InternalApi
/**
* INTERNAL API
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/JdbcDurableStateStore.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/JdbcDurableStateStore.scala
index 913e1a1..509661a 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/JdbcDurableStateStore.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/JdbcDurableStateStore.scala
@@ -19,25 +19,26 @@ import scala.concurrent.duration._
import scala.util.Try
import slick.jdbc.{ JdbcBackend, JdbcProfile }
-import org.apache.pekko.{ Done, NotUsed }
-import org.apache.pekko.actor.ExtendedActorSystem
-import org.apache.pekko.pattern.ask
-import org.apache.pekko.persistence.state.scaladsl.{ DurableStateUpdateStore,
GetObjectResult }
-import org.apache.pekko.persistence.jdbc.PekkoSerialization
-import org.apache.pekko.persistence.jdbc.state.DurableStateQueries
-import org.apache.pekko.persistence.jdbc.config.DurableStateTableConfiguration
-import org.apache.pekko.persistence.jdbc.state.{ DurableStateTables,
OffsetSyntax }
-import org.apache.pekko.persistence.query.{ DurableStateChange, Offset }
-import org.apache.pekko.persistence.query.scaladsl.DurableStateStoreQuery
-import org.apache.pekko.persistence.jdbc.journal.dao.FlowControl
-import org.apache.pekko.serialization.Serialization
-import org.apache.pekko.stream.scaladsl.{ Sink, Source }
-import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
-import org.apache.pekko.util.Timeout
+import org.apache.pekko
+import pekko.{ Done, NotUsed }
+import pekko.actor.ExtendedActorSystem
+import pekko.pattern.ask
+import pekko.persistence.state.scaladsl.{ DurableStateUpdateStore,
GetObjectResult }
+import pekko.persistence.jdbc.PekkoSerialization
+import pekko.persistence.jdbc.state.DurableStateQueries
+import pekko.persistence.jdbc.config.DurableStateTableConfiguration
+import pekko.persistence.jdbc.state.{ DurableStateTables, OffsetSyntax }
+import pekko.persistence.query.{ DurableStateChange, Offset }
+import pekko.persistence.query.scaladsl.DurableStateStoreQuery
+import pekko.persistence.jdbc.journal.dao.FlowControl
+import pekko.serialization.Serialization
+import pekko.stream.scaladsl.{ Sink, Source }
+import pekko.stream.{ Materializer, SystemMaterializer }
+import pekko.util.Timeout
import DurableStateSequenceActor._
import OffsetSyntax._
-import org.apache.pekko.annotation.ApiMayChange
-import org.apache.pekko.persistence.query.UpdatedDurableState
+import pekko.annotation.ApiMayChange
+import pekko.persistence.query.UpdatedDurableState
object JdbcDurableStateStore {
val Identifier = "jdbc-durable-state-store"
@@ -192,7 +193,7 @@ class JdbcDurableStateStore[A](
case Stop => Future.successful(None)
case Continue => retrieveNextBatch()
case ContinueDelayed =>
-
org.apache.pekko.pattern.after(durableStateConfig.refreshInterval,
system.scheduler)(retrieveNextBatch())
+ pekko.pattern.after(durableStateConfig.refreshInterval,
system.scheduler)(retrieveNextBatch())
}
}
.mapConcat(identity)
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/internal/SchemaUtilsImpl.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/internal/SchemaUtilsImpl.scala
index 5645c71..f0bee0e 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/internal/SchemaUtilsImpl.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/internal/SchemaUtilsImpl.scala
@@ -17,12 +17,13 @@ package org.apache.pekko.persistence.jdbc.testkit.internal
import java.sql.Statement
import scala.concurrent.Future
-import org.apache.pekko.Done
-import org.apache.pekko.actor.ClassicActorSystemProvider
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.dispatch.Dispatchers
-import org.apache.pekko.persistence.jdbc.db.SlickDatabase
-import org.apache.pekko.persistence.jdbc.db.SlickExtension
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.ClassicActorSystemProvider
+import pekko.annotation.InternalApi
+import pekko.dispatch.Dispatchers
+import pekko.persistence.jdbc.db.SlickDatabase
+import pekko.persistence.jdbc.db.SlickExtension
import com.typesafe.config.Config
import org.slf4j.Logger
import slick.jdbc.H2Profile
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/javadsl/SchemaUtils.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/javadsl/SchemaUtils.scala
index 8ccdb20..164f9ef 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/javadsl/SchemaUtils.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/javadsl/SchemaUtils.scala
@@ -18,10 +18,11 @@ import java.util.concurrent.CompletionStage
import scala.compat.java8.FutureConverters._
-import org.apache.pekko.Done
-import org.apache.pekko.actor.ClassicActorSystemProvider
-import org.apache.pekko.annotation.ApiMayChange
-import org.apache.pekko.persistence.jdbc.testkit.internal.SchemaUtilsImpl
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.ClassicActorSystemProvider
+import pekko.annotation.ApiMayChange
+import pekko.persistence.jdbc.testkit.internal.SchemaUtilsImpl
import org.slf4j.LoggerFactory
object SchemaUtils {
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/scaladsl/SchemaUtils.scala
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/scaladsl/SchemaUtils.scala
index dd00d5c..a7fb49d 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/scaladsl/SchemaUtils.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/scaladsl/SchemaUtils.scala
@@ -16,10 +16,11 @@ package org.apache.pekko.persistence.jdbc.testkit.scaladsl
import scala.concurrent.Future
-import org.apache.pekko.Done
-import org.apache.pekko.actor.ClassicActorSystemProvider
-import org.apache.pekko.annotation.ApiMayChange
-import org.apache.pekko.persistence.jdbc.testkit.internal.SchemaUtilsImpl
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.ClassicActorSystemProvider
+import pekko.annotation.ApiMayChange
+import pekko.persistence.jdbc.testkit.internal.SchemaUtilsImpl
import org.slf4j.LoggerFactory
object SchemaUtils {
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/ScaladslSnippets.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/ScaladslSnippets.scala
index ff77f4d..27c8e34 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/ScaladslSnippets.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/ScaladslSnippets.scala
@@ -14,10 +14,11 @@
package org.apache.pekko.persistence.jdbc
-import org.apache.pekko.{ Done, NotUsed }
-import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
-import org.apache.pekko.persistence.jdbc.testkit.scaladsl.SchemaUtils
+import org.apache.pekko
+import pekko.{ Done, NotUsed }
+import pekko.actor.ActorSystem
+import pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
+import pekko.persistence.jdbc.testkit.scaladsl.SchemaUtils
import scala.concurrent.Future
@@ -46,8 +47,9 @@ object ScaladslSnippets {
implicit val system: ActorSystem = ActorSystem()
// #persistence-ids
- import org.apache.pekko.stream.scaladsl.Source
- import org.apache.pekko.persistence.query.PersistenceQuery
+ import org.apache
+ import pekko.stream.scaladsl.Source
+ import pekko.persistence.query.PersistenceQuery
val readJournal: JdbcReadJournal =
PersistenceQuery(system).readJournalFor[JdbcReadJournal](JdbcReadJournal.Identifier)
@@ -62,8 +64,9 @@ object ScaladslSnippets {
implicit val system: ActorSystem = ActorSystem()
// #events-by-persistence-id
- import org.apache.pekko.stream.scaladsl.Source
- import org.apache.pekko.persistence.query.{ EventEnvelope,
PersistenceQuery }
+ import org.apache.pekko
+ import pekko.stream.scaladsl.Source
+ import pekko.persistence.query.{ EventEnvelope, PersistenceQuery }
val readJournal: JdbcReadJournal =
PersistenceQuery(system).readJournalFor[JdbcReadJournal](JdbcReadJournal.Identifier)
@@ -79,8 +82,9 @@ object ScaladslSnippets {
def eventsByTag(): Unit = {
implicit val system: ActorSystem = ActorSystem()
// #events-by-tag
- import org.apache.pekko.stream.scaladsl.Source
- import org.apache.pekko.persistence.query.{ EventEnvelope,
PersistenceQuery }
+ import org.apache.pekko
+ import pekko.stream.scaladsl.Source
+ import pekko.persistence.query.{ EventEnvelope, PersistenceQuery }
val readJournal: JdbcReadJournal =
PersistenceQuery(system).readJournalFor[JdbcReadJournal](JdbcReadJournal.Identifier)
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/SharedActorSystemTestSpec.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/SharedActorSystemTestSpec.scala
index d202ce4..560d727 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/SharedActorSystemTestSpec.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/SharedActorSystemTestSpec.scala
@@ -14,14 +14,15 @@
package org.apache.pekko.persistence.jdbc
-import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.serialization.SerializationExtension
-import org.apache.pekko.util.Timeout
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.serialization.SerializationExtension
+import pekko.util.Timeout
import com.typesafe.config.{ Config, ConfigFactory, ConfigValue }
-import org.apache.pekko.persistence.jdbc.config.{ JournalConfig,
ReadJournalConfig }
-import org.apache.pekko.persistence.jdbc.db.SlickExtension
-import org.apache.pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
-import org.apache.pekko.persistence.jdbc.util.DropCreate
+import pekko.persistence.jdbc.config.{ JournalConfig, ReadJournalConfig }
+import pekko.persistence.jdbc.db.SlickExtension
+import pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
+import pekko.persistence.jdbc.util.DropCreate
import org.scalatest.BeforeAndAfterAll
import scala.concurrent.ExecutionContext
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/SimpleSpec.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/SimpleSpec.scala
index a656cc8..4a5ff81 100644
--- a/core/src/test/scala/org/apache/pekko/persistence/jdbc/SimpleSpec.scala
+++ b/core/src/test/scala/org/apache/pekko/persistence/jdbc/SimpleSpec.scala
@@ -14,9 +14,10 @@
package org.apache.pekko.persistence.jdbc
-import org.apache.pekko.actor.{ ActorRef, ActorSystem }
-import org.apache.pekko.persistence.jdbc.util.ClasspathResources
-import org.apache.pekko.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.{ ActorRef, ActorSystem }
+import pekko.persistence.jdbc.util.ClasspathResources
+import pekko.testkit.TestProbe
import org.scalatest._
import org.scalatest.concurrent.{ Eventually, ScalaFutures }
import org.scalatest.flatspec.AnyFlatSpec
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/SingleActorSystemPerTestSpec.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/SingleActorSystemPerTestSpec.scala
index 55a86ed..e669f89 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/SingleActorSystemPerTestSpec.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/SingleActorSystemPerTestSpec.scala
@@ -14,13 +14,14 @@
package org.apache.pekko.persistence.jdbc
-import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.util.Timeout
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.util.Timeout
import com.typesafe.config.{ Config, ConfigFactory, ConfigValue }
-import org.apache.pekko.persistence.jdbc.config.{ JournalConfig,
ReadJournalConfig, SlickConfiguration }
-import org.apache.pekko.persistence.jdbc.db.SlickDatabase
-import org.apache.pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
-import org.apache.pekko.persistence.jdbc.util.DropCreate
+import pekko.persistence.jdbc.config.{ JournalConfig, ReadJournalConfig,
SlickConfiguration }
+import pekko.persistence.jdbc.db.SlickDatabase
+import pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
+import pekko.persistence.jdbc.util.DropCreate
import org.scalatest.BeforeAndAfterEach
import slick.jdbc.JdbcBackend.Database
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/configuration/ConfigOpsTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/configuration/ConfigOpsTest.scala
index 48d4dbc..e34ba4e 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/configuration/ConfigOpsTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/configuration/ConfigOpsTest.scala
@@ -15,8 +15,9 @@
package org.apache.pekko.persistence.jdbc.configuration
import com.typesafe.config.ConfigFactory
-import org.apache.pekko.persistence.jdbc.SimpleSpec
-import org.apache.pekko.persistence.jdbc.util.ConfigOps.ConfigOperations
+import org.apache.pekko
+import pekko.persistence.jdbc.SimpleSpec
+import pekko.persistence.jdbc.util.ConfigOps.ConfigOperations
class ConfigOpsTest extends SimpleSpec {
it should "parse field values to Options" in {
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/configuration/JNDIConfigTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/configuration/JNDIConfigTest.scala
index 634ce49..14916c0 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/configuration/JNDIConfigTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/configuration/JNDIConfigTest.scala
@@ -15,9 +15,10 @@
package org.apache.pekko.persistence.jdbc.configuration
import com.typesafe.config.ConfigFactory
-import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.persistence.jdbc.SimpleSpec
-import org.apache.pekko.persistence.jdbc.db.SlickExtension
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.persistence.jdbc.SimpleSpec
+import pekko.persistence.jdbc.db.SlickExtension
class JNDIConfigTest extends SimpleSpec {
"JNDI config" should "read the config and throw NoInitialContextException in
case the JNDI resource is not available" in {
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/JdbcJournalPerfSpec.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/JdbcJournalPerfSpec.scala
index d5f2288..0217da8 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/JdbcJournalPerfSpec.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/JdbcJournalPerfSpec.scala
@@ -14,15 +14,16 @@
package org.apache.pekko.persistence.jdbc.journal
-import org.apache.pekko.actor.Props
-import org.apache.pekko.persistence.CapabilityFlag
-import org.apache.pekko.persistence.journal.JournalPerfSpec
-import org.apache.pekko.persistence.journal.JournalPerfSpec.{ BenchActor, Cmd,
ResetCounter }
-import org.apache.pekko.testkit.TestProbe
-import org.apache.pekko.persistence.jdbc.testkit.internal.{ H2, SchemaType }
-import org.apache.pekko.persistence.jdbc.util.{ ClasspathResources, DropCreate
}
-import org.apache.pekko.persistence.jdbc.config.JournalConfig
-import org.apache.pekko.persistence.jdbc.db.SlickExtension
+import org.apache.pekko
+import pekko.actor.Props
+import pekko.persistence.CapabilityFlag
+import pekko.persistence.journal.JournalPerfSpec
+import pekko.persistence.journal.JournalPerfSpec.{ BenchActor, Cmd,
ResetCounter }
+import pekko.testkit.TestProbe
+import pekko.persistence.jdbc.testkit.internal.{ H2, SchemaType }
+import pekko.persistence.jdbc.util.{ ClasspathResources, DropCreate }
+import pekko.persistence.jdbc.config.JournalConfig
+import pekko.persistence.jdbc.db.SlickExtension
import com.typesafe.config.{ Config, ConfigFactory }
import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach }
import org.scalatest.concurrent.ScalaFutures
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/JdbcJournalSpec.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/JdbcJournalSpec.scala
index 3ebcbc0..e45d5c5 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/JdbcJournalSpec.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/JdbcJournalSpec.scala
@@ -15,12 +15,13 @@
package org.apache.pekko.persistence.jdbc.journal
import com.typesafe.config.{ Config, ConfigFactory }
-import org.apache.pekko.persistence.CapabilityFlag
-import org.apache.pekko.persistence.journal.JournalSpec
-import org.apache.pekko.persistence.jdbc.config.JournalConfig
-import org.apache.pekko.persistence.jdbc.db.SlickExtension
-import org.apache.pekko.persistence.jdbc.testkit.internal.{ H2, SchemaType }
-import org.apache.pekko.persistence.jdbc.util.{ ClasspathResources, DropCreate
}
+import org.apache.pekko
+import pekko.persistence.CapabilityFlag
+import pekko.persistence.journal.JournalSpec
+import pekko.persistence.jdbc.config.JournalConfig
+import pekko.persistence.jdbc.db.SlickExtension
+import pekko.persistence.jdbc.testkit.internal.{ H2, SchemaType }
+import pekko.persistence.jdbc.util.{ ClasspathResources, DropCreate }
import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach }
import org.scalatest.concurrent.ScalaFutures
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/dao/TrySeqTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/dao/TrySeqTest.scala
index 1396d7d..97c8416 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/dao/TrySeqTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/journal/dao/TrySeqTest.scala
@@ -14,8 +14,9 @@
package org.apache.pekko.persistence.jdbc.journal.dao
-import org.apache.pekko.persistence.jdbc.util.TrySeq
-import org.apache.pekko.persistence.jdbc.SimpleSpec
+import org.apache.pekko
+import pekko.persistence.jdbc.util.TrySeq
+import pekko.persistence.jdbc.SimpleSpec
import scala.collection.immutable._
import scala.util.{ Failure, Success }
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/CurrentEventsByPersistenceIdTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/CurrentEventsByPersistenceIdTest.scala
index 3bf92cb..6d7dcbe 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/CurrentEventsByPersistenceIdTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/CurrentEventsByPersistenceIdTest.scala
@@ -14,12 +14,13 @@
package org.apache.pekko.persistence.jdbc.query
-import org.apache.pekko.Done
-import org.apache.pekko.persistence.Persistence
-import org.apache.pekko.persistence.jdbc.journal.JdbcAsyncWriteJournal
-import org.apache.pekko.persistence.query.Offset
-import org.apache.pekko.persistence.query.{ EventEnvelope, Sequence }
-import org.apache.pekko.testkit.TestProbe
+import org.apache.pekko
+import pekko.Done
+import pekko.persistence.Persistence
+import pekko.persistence.jdbc.journal.JdbcAsyncWriteJournal
+import pekko.persistence.query.Offset
+import pekko.persistence.query.{ EventEnvelope, Sequence }
+import pekko.testkit.TestProbe
abstract class CurrentEventsByPersistenceIdTest(config: String) extends
QueryTestSpec(config) {
import QueryTestSpec.EventEnvelopeProbeOps
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/CurrentEventsByTagTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/CurrentEventsByTagTest.scala
index a472074..9848713 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/CurrentEventsByTagTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/CurrentEventsByTagTest.scala
@@ -14,13 +14,14 @@
package org.apache.pekko.persistence.jdbc.query
-import org.apache.pekko.persistence.query.{ EventEnvelope, NoOffset, Sequence }
-import org.apache.pekko.pattern.ask
+import org.apache.pekko
+import pekko.persistence.query.{ EventEnvelope, NoOffset, Sequence }
+import pekko.pattern.ask
import com.typesafe.config.{ ConfigValue, ConfigValueFactory }
import scala.concurrent.duration._
-import org.apache.pekko.Done
-import org.apache.pekko.persistence.jdbc.query.EventAdapterTest.{ Event,
TaggedAsyncEvent }
+import pekko.Done
+import pekko.persistence.jdbc.query.EventAdapterTest.{ Event, TaggedAsyncEvent
}
import scala.concurrent.Future
import CurrentEventsByTagTest._
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventAdapterTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventAdapterTest.scala
index 111e03e..5b49d47 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventAdapterTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventAdapterTest.scala
@@ -14,11 +14,12 @@
package org.apache.pekko.persistence.jdbc.query
-import org.apache.pekko.persistence.query.{ EventEnvelope, NoOffset, Sequence }
+import org.apache.pekko
+import pekko.persistence.query.{ EventEnvelope, NoOffset, Sequence }
import scala.concurrent.duration._
-import org.apache.pekko.pattern.ask
-import org.apache.pekko.persistence.journal.{ EventSeq, ReadEventAdapter,
Tagged, WriteEventAdapter }
+import pekko.pattern.ask
+import pekko.persistence.journal.{ EventSeq, ReadEventAdapter, Tagged,
WriteEventAdapter }
object EventAdapterTest {
case class Event(value: String) {
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventsByPersistenceIdTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventsByPersistenceIdTest.scala
index 1ab3c0e..36565ab 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventsByPersistenceIdTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventsByPersistenceIdTest.scala
@@ -14,14 +14,15 @@
package org.apache.pekko.persistence.jdbc.query
-import org.apache.pekko.Done
-import org.apache.pekko.persistence.jdbc.query.EventAdapterTest.{ Event,
TaggedAsyncEvent }
-import org.apache.pekko.persistence.query.{ EventEnvelope, Sequence }
+import org.apache.pekko
+import pekko.Done
+import pekko.persistence.jdbc.query.EventAdapterTest.{ Event, TaggedAsyncEvent
}
+import pekko.persistence.query.{ EventEnvelope, Sequence }
import scala.concurrent.Future
import scala.concurrent.duration._
-import org.apache.pekko.pattern.ask
-import org.apache.pekko.persistence.query.Offset
+import pekko.pattern.ask
+import pekko.persistence.query.Offset
abstract class EventsByPersistenceIdTest(config: String) extends
QueryTestSpec(config) {
import QueryTestSpec.EventEnvelopeProbeOps
@@ -313,7 +314,7 @@ abstract class EventsByPersistenceIdTest(config: String)
extends QueryTestSpec(c
}
it should "find a large number of events quickly" in withActorSystem {
implicit system =>
- import org.apache.pekko.pattern.ask
+ import pekko.pattern.ask
import system.dispatcher
val journalOps = new JavaDslJdbcReadJournalOperations(system)
withTestActors(replyToMessages = true) { (actor1, _, _) =>
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventsByTagTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventsByTagTest.scala
index 023294b..d5709b2 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventsByTagTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/EventsByTagTest.scala
@@ -14,10 +14,11 @@
package org.apache.pekko.persistence.jdbc.query
-import org.apache.pekko.Done
-import org.apache.pekko.persistence.query.{ EventEnvelope, NoOffset, Sequence }
-import org.apache.pekko.pattern.ask
-import org.apache.pekko.persistence.jdbc.query.EventAdapterTest.{ Event,
EventRestored, TaggedAsyncEvent, TaggedEvent }
+import org.apache.pekko
+import pekko.Done
+import pekko.persistence.query.{ EventEnvelope, NoOffset, Sequence }
+import pekko.pattern.ask
+import pekko.persistence.jdbc.query.EventAdapterTest.{ Event, EventRestored,
TaggedAsyncEvent, TaggedEvent }
import com.typesafe.config.{ ConfigValue, ConfigValueFactory }
import scala.concurrent.duration._
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/HardDeleteQueryTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/HardDeleteQueryTest.scala
index 8e0561b..70ab838 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/HardDeleteQueryTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/HardDeleteQueryTest.scala
@@ -14,8 +14,9 @@
package org.apache.pekko.persistence.jdbc.query
-import org.apache.pekko.persistence.query.NoOffset
-import org.apache.pekko.pattern._
+import org.apache.pekko
+import pekko.persistence.query.NoOffset
+import pekko.pattern._
import scala.concurrent.duration._
import org.scalatest.matchers.should.Matchers
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/JournalDaoStreamMessagesMemoryTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/JournalDaoStreamMessagesMemoryTest.scala
index f6d725f..08f987d 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/JournalDaoStreamMessagesMemoryTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/JournalDaoStreamMessagesMemoryTest.scala
@@ -18,11 +18,12 @@ import java.lang.management.ManagementFactory
import java.lang.management.MemoryMXBean
import java.util.UUID
-import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.persistence.{ AtomicWrite, PersistentRepr }
-import org.apache.pekko.persistence.jdbc.journal.dao.legacy.{
ByteArrayJournalDao, JournalTables }
-import org.apache.pekko.serialization.SerializationExtension
-import org.apache.pekko.stream.scaladsl.{ Sink, Source }
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.persistence.{ AtomicWrite, PersistentRepr }
+import pekko.persistence.jdbc.journal.dao.legacy.{ ByteArrayJournalDao,
JournalTables }
+import pekko.serialization.SerializationExtension
+import pekko.stream.scaladsl.{ Sink, Source }
import com.typesafe.config.{ ConfigValue, ConfigValueFactory }
import org.scalatest.concurrent.PatienceConfiguration.Timeout
import org.slf4j.LoggerFactory
@@ -31,7 +32,7 @@ import scala.collection.immutable
import scala.concurrent.ExecutionContextExecutor
import scala.concurrent.duration._
import scala.util.{ Failure, Success }
-import org.apache.pekko.stream.testkit.scaladsl.TestSink
+import pekko.stream.testkit.scaladsl.TestSink
import org.scalatest.matchers.should.Matchers
object JournalDaoStreamMessagesMemoryTest {
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/JournalSequenceActorTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/JournalSequenceActorTest.scala
index 19e2d4e..81ef0d7 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/JournalSequenceActorTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/JournalSequenceActorTest.scala
@@ -14,17 +14,18 @@
package org.apache.pekko.persistence.jdbc.query
-import org.apache.pekko.actor.{ ActorRef, ActorSystem }
-import org.apache.pekko.pattern.ask
-import org.apache.pekko.persistence.jdbc.config.JournalSequenceRetrievalConfig
-import org.apache.pekko.persistence.jdbc.journal.dao.legacy.{ JournalRow,
JournalTables }
-import org.apache.pekko.persistence.jdbc.query.JournalSequenceActor.{
GetMaxOrderingId, MaxOrderingId }
-import org.apache.pekko.persistence.jdbc.query.dao.TestProbeReadJournalDao
-import org.apache.pekko.persistence.jdbc.SharedActorSystemTestSpec
-import
org.apache.pekko.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao
-import org.apache.pekko.serialization.SerializationExtension
-import org.apache.pekko.stream.scaladsl.{ Sink, Source }
-import org.apache.pekko.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.{ ActorRef, ActorSystem }
+import pekko.pattern.ask
+import pekko.persistence.jdbc.config.JournalSequenceRetrievalConfig
+import pekko.persistence.jdbc.journal.dao.legacy.{ JournalRow, JournalTables }
+import pekko.persistence.jdbc.query.JournalSequenceActor.{ GetMaxOrderingId,
MaxOrderingId }
+import pekko.persistence.jdbc.query.dao.TestProbeReadJournalDao
+import pekko.persistence.jdbc.SharedActorSystemTestSpec
+import pekko.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao
+import pekko.serialization.SerializationExtension
+import pekko.stream.scaladsl.{ Sink, Source }
+import pekko.testkit.TestProbe
import org.slf4j.LoggerFactory
import slick.jdbc.{ JdbcBackend, JdbcCapabilities }
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/MultipleReadJournalTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/MultipleReadJournalTest.scala
index 547684f..da07e7d 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/MultipleReadJournalTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/MultipleReadJournalTest.scala
@@ -14,10 +14,11 @@
package org.apache.pekko.persistence.jdbc.query
-import org.apache.pekko.persistence.jdbc.query.EventsByTagTest._
-import org.apache.pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
-import org.apache.pekko.persistence.query.{ NoOffset, PersistenceQuery }
-import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko
+import pekko.persistence.jdbc.query.EventsByTagTest._
+import pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
+import pekko.persistence.query.{ NoOffset, PersistenceQuery }
+import pekko.stream.scaladsl.Sink
class MultipleReadJournalTest
extends QueryTestSpec("h2-two-read-journals-application.conf",
configOverrides)
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/QueryTestSpec.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/QueryTestSpec.scala
index 03c9097..e738d07 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/QueryTestSpec.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/QueryTestSpec.scala
@@ -14,30 +14,31 @@
package org.apache.pekko.persistence.jdbc.query
-import org.apache.pekko.actor.{ ActorRef, ActorSystem, Props, Stash, Status }
-import org.apache.pekko.pattern.ask
-import org.apache.pekko.event.LoggingReceive
-import org.apache.pekko.persistence.{ DeleteMessagesFailure,
DeleteMessagesSuccess, PersistentActor }
-import org.apache.pekko.persistence.jdbc.SingleActorSystemPerTestSpec
-import org.apache.pekko.persistence.jdbc.query.EventAdapterTest.{ Event,
TaggedAsyncEvent, TaggedEvent }
-import org.apache.pekko.persistence.jdbc.query.javadsl.{ JdbcReadJournal =>
JavaJdbcReadJournal }
-import org.apache.pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
-import org.apache.pekko.persistence.journal.Tagged
-import org.apache.pekko.persistence.query.{ EventEnvelope, Offset,
PersistenceQuery }
-import org.apache.pekko.stream.scaladsl.Sink
-import org.apache.pekko.stream.testkit.TestSubscriber
-import org.apache.pekko.stream.testkit.javadsl.{ TestSink => JavaSink }
-import org.apache.pekko.stream.testkit.scaladsl.TestSink
-import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
+import org.apache.pekko
+import pekko.actor.{ ActorRef, ActorSystem, Props, Stash, Status }
+import pekko.pattern.ask
+import pekko.event.LoggingReceive
+import pekko.persistence.{ DeleteMessagesFailure, DeleteMessagesSuccess,
PersistentActor }
+import pekko.persistence.jdbc.SingleActorSystemPerTestSpec
+import pekko.persistence.jdbc.query.EventAdapterTest.{ Event,
TaggedAsyncEvent, TaggedEvent }
+import pekko.persistence.jdbc.query.javadsl.{ JdbcReadJournal =>
JavaJdbcReadJournal }
+import pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
+import pekko.persistence.journal.Tagged
+import pekko.persistence.query.{ EventEnvelope, Offset, PersistenceQuery }
+import pekko.stream.scaladsl.Sink
+import pekko.stream.testkit.TestSubscriber
+import pekko.stream.testkit.javadsl.{ TestSink => JavaSink }
+import pekko.stream.testkit.scaladsl.TestSink
+import pekko.stream.{ Materializer, SystemMaterializer }
import com.typesafe.config.ConfigValue
import scala.concurrent.Future
import scala.concurrent.duration.{ FiniteDuration, _ }
-import org.apache.pekko.persistence.jdbc.testkit.internal.H2
-import org.apache.pekko.persistence.jdbc.testkit.internal.MySQL
-import org.apache.pekko.persistence.jdbc.testkit.internal.Oracle
-import org.apache.pekko.persistence.jdbc.testkit.internal.Postgres
-import org.apache.pekko.persistence.jdbc.testkit.internal.SqlServer
+import pekko.persistence.jdbc.testkit.internal.H2
+import pekko.persistence.jdbc.testkit.internal.MySQL
+import pekko.persistence.jdbc.testkit.internal.Oracle
+import pekko.persistence.jdbc.testkit.internal.Postgres
+import pekko.persistence.jdbc.testkit.internal.SqlServer
trait ReadJournalOperations {
def withCurrentPersistenceIds(within: FiniteDuration = 60.second)(f:
TestSubscriber.Probe[String] => Unit): Unit
@@ -130,13 +131,13 @@ class JavaDslJdbcReadJournalOperations(readJournal:
javadsl.JdbcReadJournal)(
import system.dispatcher
def withCurrentPersistenceIds(within: FiniteDuration)(f:
TestSubscriber.Probe[String] => Unit): Unit = {
- val sink: org.apache.pekko.stream.javadsl.Sink[String,
TestSubscriber.Probe[String]] = JavaSink.probe(system)
+ val sink: pekko.stream.javadsl.Sink[String, TestSubscriber.Probe[String]]
= JavaSink.probe(system)
val tp = readJournal.currentPersistenceIds().runWith(sink, mat)
tp.within(within)(f(tp))
}
def withPersistenceIds(within: FiniteDuration)(f:
TestSubscriber.Probe[String] => Unit): Unit = {
- val sink: org.apache.pekko.stream.javadsl.Sink[String,
TestSubscriber.Probe[String]] = JavaSink.probe(system)
+ val sink: pekko.stream.javadsl.Sink[String, TestSubscriber.Probe[String]]
= JavaSink.probe(system)
val tp = readJournal.persistenceIds().runWith(sink, mat)
tp.within(within)(f(tp))
}
@@ -144,7 +145,7 @@ class JavaDslJdbcReadJournalOperations(readJournal:
javadsl.JdbcReadJournal)(
def withCurrentEventsByPersistenceId(
within: FiniteDuration)(persistenceId: String, fromSequenceNr: Long = 0,
toSequenceNr: Long = Long.MaxValue)(
f: TestSubscriber.Probe[EventEnvelope] => Unit): Unit = {
- val sink: org.apache.pekko.stream.javadsl.Sink[EventEnvelope,
TestSubscriber.Probe[EventEnvelope]] =
+ val sink: pekko.stream.javadsl.Sink[EventEnvelope,
TestSubscriber.Probe[EventEnvelope]] =
JavaSink.probe(system)
val tp = readJournal.currentEventsByPersistenceId(persistenceId,
fromSequenceNr, toSequenceNr).runWith(sink, mat)
tp.within(within)(f(tp))
@@ -153,7 +154,7 @@ class JavaDslJdbcReadJournalOperations(readJournal:
javadsl.JdbcReadJournal)(
def withEventsByPersistenceId(
within: FiniteDuration)(persistenceId: String, fromSequenceNr: Long,
toSequenceNr: Long)(
f: TestSubscriber.Probe[EventEnvelope] => Unit): Unit = {
- val sink: org.apache.pekko.stream.javadsl.Sink[EventEnvelope,
TestSubscriber.Probe[EventEnvelope]] =
+ val sink: pekko.stream.javadsl.Sink[EventEnvelope,
TestSubscriber.Probe[EventEnvelope]] =
JavaSink.probe(system)
val tp = readJournal.eventsByPersistenceId(persistenceId, fromSequenceNr,
toSequenceNr).runWith(sink, mat)
tp.within(within)(f(tp))
@@ -161,7 +162,7 @@ class JavaDslJdbcReadJournalOperations(readJournal:
javadsl.JdbcReadJournal)(
def withCurrentEventsByTag(within: FiniteDuration)(tag: String, offset:
Offset)(
f: TestSubscriber.Probe[EventEnvelope] => Unit): Unit = {
- val sink: org.apache.pekko.stream.javadsl.Sink[EventEnvelope,
TestSubscriber.Probe[EventEnvelope]] =
+ val sink: pekko.stream.javadsl.Sink[EventEnvelope,
TestSubscriber.Probe[EventEnvelope]] =
JavaSink.probe(system)
val tp = readJournal.currentEventsByTag(tag, offset).runWith(sink, mat)
tp.within(within)(f(tp))
@@ -169,7 +170,7 @@ class JavaDslJdbcReadJournalOperations(readJournal:
javadsl.JdbcReadJournal)(
def withEventsByTag(within: FiniteDuration)(tag: String, offset: Offset)(
f: TestSubscriber.Probe[EventEnvelope] => Unit): Unit = {
- val sink: org.apache.pekko.stream.javadsl.Sink[EventEnvelope,
TestSubscriber.Probe[EventEnvelope]] =
+ val sink: pekko.stream.javadsl.Sink[EventEnvelope,
TestSubscriber.Probe[EventEnvelope]] =
JavaSink.probe(system)
val tp = readJournal.eventsByTag(tag, offset).runWith(sink, mat)
tp.within(within)(f(tp))
@@ -250,26 +251,26 @@ abstract class QueryTestSpec(config: String,
configOverrides: Map[String, Config
case event: Int =>
persist(event) { (event: Int) =>
updateState(event)
- if (replyToMessages) sender() !
org.apache.pekko.actor.Status.Success(event)
+ if (replyToMessages) sender() ! pekko.actor.Status.Success(event)
}
case event @ Tagged(payload: Int, tags) =>
persist(event) { _ =>
updateState(payload)
- if (replyToMessages) sender() !
org.apache.pekko.actor.Status.Success((payload, tags))
+ if (replyToMessages) sender() !
pekko.actor.Status.Success((payload, tags))
}
case event: Event =>
persist(event) { evt =>
- if (replyToMessages) sender() !
org.apache.pekko.actor.Status.Success(evt)
+ if (replyToMessages) sender() ! pekko.actor.Status.Success(evt)
}
case event @ TaggedEvent(payload: Event, tag) =>
persist(event) { _ =>
- if (replyToMessages) sender() !
org.apache.pekko.actor.Status.Success((payload, tag))
+ if (replyToMessages) sender() !
pekko.actor.Status.Success((payload, tag))
}
case event @ TaggedAsyncEvent(payload: Event, tag) =>
persistAsync(event) { _ =>
- if (replyToMessages) sender() !
org.apache.pekko.actor.Status.Success((payload, tag))
+ if (replyToMessages) sender() !
pekko.actor.Status.Success((payload, tag))
}
}
@@ -301,7 +302,7 @@ abstract class QueryTestSpec(config: String,
configOverrides: Map[String, Config
def pendingIfOracleWithLegacy(): Unit = {
if (profile == slick.jdbc.OracleProfile &&
readJournalConfig.pluginConfig.dao == classOf[
-
org.apache.pekko.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao].getName)
+
pekko.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao].getName)
pending // TODO https://github.com/akka/akka-persistence-jdbc/issues/673
}
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/TaggingEventAdapter.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/TaggingEventAdapter.scala
index 46b6ae0..9d0f3dc 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/TaggingEventAdapter.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/TaggingEventAdapter.scala
@@ -14,8 +14,9 @@
package org.apache.pekko.persistence.jdbc.query
-import org.apache.pekko.persistence.jdbc.query.TaggingEventAdapter.TagEvent
-import org.apache.pekko.persistence.journal.{ Tagged, WriteEventAdapter }
+import org.apache.pekko
+import pekko.persistence.jdbc.query.TaggingEventAdapter.TagEvent
+import pekko.persistence.journal.{ Tagged, WriteEventAdapter }
object TaggingEventAdapter {
case class TagEvent(payload: Any, tags: Set[String])
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalTablesTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalTablesTest.scala
index fe8f4cd..85e07a2 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalTablesTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/dao/ReadJournalTablesTest.scala
@@ -14,8 +14,9 @@
package org.apache.pekko.persistence.jdbc.query.dao
-import org.apache.pekko.persistence.jdbc.TablesTestSpec
-import org.apache.pekko.persistence.jdbc.journal.dao.legacy.JournalTables
+import org.apache.pekko
+import pekko.persistence.jdbc.TablesTestSpec
+import pekko.persistence.jdbc.journal.dao.legacy.JournalTables
import slick.jdbc.JdbcProfile
class ReadJournalTablesTest extends TablesTestSpec {
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/dao/TestProbeReadJournalDao.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/dao/TestProbeReadJournalDao.scala
index 817c23a..04247ac 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/dao/TestProbeReadJournalDao.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/dao/TestProbeReadJournalDao.scala
@@ -14,18 +14,19 @@
package org.apache.pekko.persistence.jdbc.query.dao
-import org.apache.pekko.NotUsed
-import
org.apache.pekko.persistence.jdbc.query.dao.TestProbeReadJournalDao.JournalSequence
-import org.apache.pekko.persistence.PersistentRepr
-import org.apache.pekko.stream.scaladsl.Source
-import org.apache.pekko.testkit.TestProbe
-import org.apache.pekko.util.Timeout
-import org.apache.pekko.pattern.ask
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.persistence.jdbc.query.dao.TestProbeReadJournalDao.JournalSequence
+import pekko.persistence.PersistentRepr
+import pekko.stream.scaladsl.Source
+import pekko.testkit.TestProbe
+import pekko.util.Timeout
+import pekko.pattern.ask
import scala.concurrent.Future
import scala.concurrent.duration._
import scala.util.Try
-import org.apache.pekko.actor.Scheduler
+import pekko.actor.Scheduler
object TestProbeReadJournalDao {
case class JournalSequence(offset: Long, limit: Long)
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/serialization/StoreOnlySerializableMessagesTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/serialization/StoreOnlySerializableMessagesTest.scala
index c926e74..ff94c3f 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/serialization/StoreOnlySerializableMessagesTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/serialization/StoreOnlySerializableMessagesTest.scala
@@ -16,15 +16,16 @@ package org.apache.pekko.persistence.jdbc.serialization
import scala.concurrent.duration._
-import org.apache.pekko.actor.ActorRef
-import org.apache.pekko.actor.Props
-import org.apache.pekko.event.LoggingReceive
-import org.apache.pekko.persistence.PersistentActor
-import org.apache.pekko.persistence.RecoveryCompleted
-import org.apache.pekko.persistence.jdbc.SharedActorSystemTestSpec
-import org.apache.pekko.persistence.jdbc.testkit.internal.H2
-import org.apache.pekko.persistence.jdbc.testkit.internal.SchemaType
-import org.apache.pekko.testkit.TestProbe
+import org.apache.pekko
+import pekko.actor.ActorRef
+import pekko.actor.Props
+import pekko.event.LoggingReceive
+import pekko.persistence.PersistentActor
+import pekko.persistence.RecoveryCompleted
+import pekko.persistence.jdbc.SharedActorSystemTestSpec
+import pekko.persistence.jdbc.testkit.internal.H2
+import pekko.persistence.jdbc.testkit.internal.SchemaType
+import pekko.testkit.TestProbe
abstract class StoreOnlySerializableMessagesTest(config: String, schemaType:
SchemaType)
extends SharedActorSystemTestSpec(config) {
@@ -43,7 +44,7 @@ abstract class StoreOnlySerializableMessagesTest(config:
String, schemaType: Sch
override val receiveCommand: Receive = LoggingReceive { case msg =>
persist(msg) { _ =>
- sender ! org.apache.pekko.actor.Status.Success("")
+ sender ! pekko.actor.Status.Success("")
}
}
@@ -74,7 +75,7 @@ abstract class StoreOnlySerializableMessagesTest(config:
String, schemaType: Sch
val tp = TestProbe()
recover.expectMsg(RecoveryCompleted)
tp.send(actor, "foo") // strings are serializable
- tp.expectMsg(org.apache.pekko.actor.Status.Success(""))
+ tp.expectMsg(pekko.actor.Status.Success(""))
failure.expectNoMessage(100.millis)
rejected.expectNoMessage(100.millis)
}
@@ -113,7 +114,7 @@ abstract class StoreOnlySerializableMessagesTest(config:
String, schemaType: Sch
val tp = TestProbe()
recover.expectMsg(RecoveryCompleted)
tp.send(actor, "foo")
- tp.expectMsg(org.apache.pekko.actor.Status.Success(""))
+ tp.expectMsg(pekko.actor.Status.Success(""))
tp.send(actor, new NotSerializable) // the NotSerializable class cannot
be serialized
tp.expectNoMessage(300.millis) // the handler should not have been
called, because persist has failed
// the actor should call the OnPersistRejected
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStoreSpec.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStoreSpec.scala
index f99c393..c82442d 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStoreSpec.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStoreSpec.scala
@@ -14,18 +14,19 @@
package org.apache.pekko.persistence.jdbc.snapshot
-import org.apache.pekko.persistence.CapabilityFlag
-import org.apache.pekko.persistence.jdbc.config._
-import org.apache.pekko.persistence.jdbc.util.{ ClasspathResources, DropCreate
}
-import org.apache.pekko.persistence.jdbc.db.SlickDatabase
-import org.apache.pekko.persistence.snapshot.SnapshotStoreSpec
+import org.apache.pekko
+import pekko.persistence.CapabilityFlag
+import pekko.persistence.jdbc.config._
+import pekko.persistence.jdbc.util.{ ClasspathResources, DropCreate }
+import pekko.persistence.jdbc.db.SlickDatabase
+import pekko.persistence.snapshot.SnapshotStoreSpec
import com.typesafe.config.{ Config, ConfigFactory }
import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
import scala.concurrent.duration._
-import org.apache.pekko.persistence.jdbc.testkit.internal.H2
-import org.apache.pekko.persistence.jdbc.testkit.internal.SchemaType
+import pekko.persistence.jdbc.testkit.internal.H2
+import pekko.persistence.jdbc.testkit.internal.SchemaType
abstract class JdbcSnapshotStoreSpec(config: Config, schemaType: SchemaType)
extends SnapshotStoreSpec(config)
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/ScaladslSnippets.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/ScaladslSnippets.scala
index e3e32be..e43e564 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/ScaladslSnippets.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/ScaladslSnippets.scala
@@ -10,8 +10,10 @@
package org.apache.pekko.persistence.jdbc.state
import scala.concurrent.Future
-import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.Done
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.actor.ActorSystem
+import pekko.Done
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.matchers.should.Matchers
@@ -30,8 +32,9 @@ object ScaladslSnippets extends ScalaFutures with Matchers {
implicit val system: ActorSystem = ActorSystem()
// #jdbc-durable-state-store
- import org.apache.pekko.persistence.state.DurableStateStoreRegistry
- import
org.apache.pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
+ import org.apache.pekko
+ import pekko.persistence.state.DurableStateStoreRegistry
+ import pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
val store = DurableStateStoreRegistry
.get(system)
.durableStateStoreFor[JdbcDurableStateStore[String]](JdbcDurableStateStore.Identifier)
@@ -42,9 +45,10 @@ object ScaladslSnippets extends ScalaFutures with Matchers {
implicit val system: ActorSystem = ActorSystem()
// #get-object
- import org.apache.pekko.persistence.state.DurableStateStoreRegistry
- import
org.apache.pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
- import org.apache.pekko.persistence.state.scaladsl.GetObjectResult
+ import org.apache.pekko
+ import pekko.persistence.state.DurableStateStoreRegistry
+ import pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
+ import pekko.persistence.state.scaladsl.GetObjectResult
val store = DurableStateStoreRegistry
.get(system)
@@ -60,9 +64,10 @@ object ScaladslSnippets extends ScalaFutures with Matchers {
implicit val e = system.dispatcher
// #upsert-get-object
- import org.apache.pekko.persistence.state.DurableStateStoreRegistry
- import
org.apache.pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
- import org.apache.pekko.persistence.state.scaladsl.GetObjectResult
+ import org.apache.pekko
+ import pekko.persistence.state.DurableStateStoreRegistry
+ import pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
+ import pekko.persistence.state.scaladsl.GetObjectResult
val store = DurableStateStoreRegistry
.get(system)
@@ -71,11 +76,11 @@ object ScaladslSnippets extends ScalaFutures with Matchers {
val v: Future[GetObjectResult[String]] =
for {
n <- store.upsertObject("p234", 1, "a valid string", "t123")
- _ = n shouldBe org.apache.pekko.Done
+ _ = n shouldBe pekko.Done
g <- store.getObject("p234")
_ = g.value shouldBe Some("a valid string")
u <- store.upsertObject("p234", 2, "updated valid string", "t123")
- _ = u shouldBe org.apache.pekko.Done
+ _ = u shouldBe pekko.Done
h <- store.getObject("p234")
} yield h
@@ -87,8 +92,9 @@ object ScaladslSnippets extends ScalaFutures with Matchers {
implicit val system: ActorSystem = ActorSystem()
// #delete-object
- import org.apache.pekko.persistence.state.DurableStateStoreRegistry
- import
org.apache.pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
+ import org.apache.pekko
+ import pekko.persistence.state.DurableStateStoreRegistry
+ import pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
val store = DurableStateStoreRegistry
.get(system)
@@ -103,11 +109,12 @@ object ScaladslSnippets extends ScalaFutures with
Matchers {
implicit val system: ActorSystem = ActorSystem()
// #current-changes
- import org.apache.pekko.NotUsed
- import org.apache.pekko.stream.scaladsl.Source
- import org.apache.pekko.persistence.state.DurableStateStoreRegistry
- import
org.apache.pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
- import org.apache.pekko.persistence.query.{ DurableStateChange, NoOffset }
+ import org.apache.pekko
+ import pekko.NotUsed
+ import pekko.stream.scaladsl.Source
+ import pekko.persistence.state.DurableStateStoreRegistry
+ import pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
+ import pekko.persistence.query.{ DurableStateChange, NoOffset }
val store = DurableStateStoreRegistry
.get(system)
@@ -122,11 +129,12 @@ object ScaladslSnippets extends ScalaFutures with
Matchers {
implicit val system: ActorSystem = ActorSystem()
// #changes
- import org.apache.pekko.NotUsed
- import org.apache.pekko.stream.scaladsl.Source
- import org.apache.pekko.persistence.state.DurableStateStoreRegistry
- import
org.apache.pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
- import org.apache.pekko.persistence.query.{ DurableStateChange, NoOffset }
+ import org.apache.pekko
+ import pekko.NotUsed
+ import pekko.stream.scaladsl.Source
+ import pekko.persistence.state.DurableStateStoreRegistry
+ import pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
+ import pekko.persistence.query.{ DurableStateChange, NoOffset }
val store = DurableStateStoreRegistry
.get(system)
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateSequenceActorTest.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateSequenceActorTest.scala
index a37224c..77f6736 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateSequenceActorTest.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateSequenceActorTest.scala
@@ -18,17 +18,15 @@ import scala.concurrent.Future
import scala.concurrent.duration._
import com.typesafe.config.{ Config, ConfigFactory }
-import org.apache.pekko.actor.{ ActorRef, ActorSystem, ExtendedActorSystem }
-import org.apache.pekko.pattern.ask
-import org.apache.pekko.persistence.jdbc.SharedActorSystemTestSpec
-import
org.apache.pekko.persistence.jdbc.state.scaladsl.DurableStateSequenceActor.VisitedElement
-import
org.apache.pekko.persistence.jdbc.state.scaladsl.DurableStateSequenceActor.{
- GetMaxGlobalOffset,
- MaxGlobalOffset
-}
-import org.apache.pekko.persistence.jdbc.testkit.internal.{ H2, SchemaType }
-import org.apache.pekko.testkit.TestProbe
-import org.apache.pekko.util.Timeout
+import org.apache.pekko
+import pekko.actor.{ ActorRef, ActorSystem, ExtendedActorSystem }
+import pekko.pattern.ask
+import pekko.persistence.jdbc.SharedActorSystemTestSpec
+import
pekko.persistence.jdbc.state.scaladsl.DurableStateSequenceActor.VisitedElement
+import pekko.persistence.jdbc.state.scaladsl.DurableStateSequenceActor.{
GetMaxGlobalOffset, MaxGlobalOffset }
+import pekko.persistence.jdbc.testkit.internal.{ H2, SchemaType }
+import pekko.testkit.TestProbe
+import pekko.util.Timeout
import org.scalatest.concurrent.Eventually
abstract class DurableStateSequenceActorTest(config: Config, schemaType:
SchemaType)
@@ -371,7 +369,7 @@ class MockDurableStateSequenceActorTest extends
SharedActorSystemTestSpec {
}
}
- import
org.apache.pekko.persistence.jdbc.config.DurableStateTableConfiguration
+ import pekko.persistence.jdbc.config.DurableStateTableConfiguration
def withTestProbeDurableStateSequenceActor(
batchSize: Int,
maxTries: Int,
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateStorePluginSpec.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateStorePluginSpec.scala
index b217681..f19d69a 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateStorePluginSpec.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/DurableStateStorePluginSpec.scala
@@ -10,13 +10,14 @@
package org.apache.pekko.persistence.jdbc.state.scaladsl
import com.typesafe.config.{ Config, ConfigFactory }
-import org.apache.pekko.actor._
+import org.apache.pekko
+import pekko.actor._
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpecLike
import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
-import org.apache.pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
-import org.apache.pekko.persistence.state.DurableStateStoreRegistry
+import pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateStore
+import pekko.persistence.state.DurableStateStoreRegistry
import slick.jdbc.{ H2Profile, JdbcProfile }
abstract class DurableStateStorePluginSpec(config: Config, profile:
JdbcProfile)
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/JdbcDurableStateSpec.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/JdbcDurableStateSpec.scala
index 85b9f97..54c60f6 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/JdbcDurableStateSpec.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/JdbcDurableStateSpec.scala
@@ -15,13 +15,14 @@
package org.apache.pekko.persistence.jdbc.state.scaladsl
import com.typesafe.config.{ Config, ConfigFactory }
-import org.apache.pekko.actor._
-import org.apache.pekko.persistence.jdbc.state.{ MyPayload, OffsetSyntax }
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence.jdbc.state.{ MyPayload, OffsetSyntax }
import OffsetSyntax._
-import org.apache.pekko.persistence.jdbc.testkit.internal.{ H2, Postgres,
SchemaType }
-import org.apache.pekko.persistence.query.UpdatedDurableState
-import org.apache.pekko.persistence.query.{ NoOffset, Offset, Sequence }
-import org.apache.pekko.stream.scaladsl.Sink
+import pekko.persistence.jdbc.testkit.internal.{ H2, Postgres, SchemaType }
+import pekko.persistence.query.UpdatedDurableState
+import pekko.persistence.query.{ NoOffset, Offset, Sequence }
+import pekko.stream.scaladsl.Sink
import org.scalatest.time.Millis
import org.scalatest.time.Seconds
import org.scalatest.time.Span
@@ -46,7 +47,7 @@ abstract class JdbcDurableStateSpec(config: Config,
schemaType: SchemaType) exte
whenReady {
stateStoreString.upsertObject("p123", 1, "a valid string", "t123")
} { v =>
- v shouldBe org.apache.pekko.Done
+ v shouldBe pekko.Done
}
}
"support composite upsert-fetch-repeat loop" in {
@@ -54,11 +55,11 @@ abstract class JdbcDurableStateSpec(config: Config,
schemaType: SchemaType) exte
for {
n <- stateStoreString.upsertObject("p234", 1, "a valid string",
"t123")
- _ = n shouldBe org.apache.pekko.Done
+ _ = n shouldBe pekko.Done
g <- stateStoreString.getObject("p234")
_ = g.value shouldBe Some("a valid string")
u <- stateStoreString.upsertObject("p234", 2, "updated valid
string", "t123")
- _ = u shouldBe org.apache.pekko.Done
+ _ = u shouldBe pekko.Done
h <- stateStoreString.getObject("p234")
} yield h
@@ -71,7 +72,7 @@ abstract class JdbcDurableStateSpec(config: Config,
schemaType: SchemaType) exte
(for {
n <- stateStoreString.upsertObject("p345", 1, "a valid string",
"t123")
- _ = n shouldBe org.apache.pekko.Done
+ _ = n shouldBe pekko.Done
g <- stateStoreString.getObject("p345")
_ = g.value shouldBe Some("a valid string")
u <- stateStoreString.upsertObject("p345", 1, "updated valid
string", "t123")
@@ -105,7 +106,7 @@ abstract class JdbcDurableStateSpec(config: Config,
schemaType: SchemaType) exte
whenReady {
stateStoreString.deleteObject("p123")
} { v =>
- v shouldBe org.apache.pekko.Done
+ v shouldBe pekko.Done
whenReady {
stateStoreString.getObject("p123")
} { v =>
@@ -130,7 +131,7 @@ abstract class JdbcDurableStateSpec(config: Config,
schemaType: SchemaType) exte
whenReady {
stateStorePayload.upsertObject("p123", 1, MyPayload("a valid string"),
"t123")
} { v =>
- v shouldBe org.apache.pekko.Done
+ v shouldBe pekko.Done
}
}
"support composite upsert-fetch-repeat loop" in {
@@ -138,11 +139,11 @@ abstract class JdbcDurableStateSpec(config: Config,
schemaType: SchemaType) exte
for {
n <- stateStorePayload.upsertObject("p234", 1, MyPayload("a valid
string"), "t123")
- _ = n shouldBe org.apache.pekko.Done
+ _ = n shouldBe pekko.Done
g <- stateStorePayload.getObject("p234")
_ = g.value shouldBe Some(MyPayload("a valid string"))
u <- stateStorePayload.upsertObject("p234", 2, MyPayload("updated
valid string"), "t123")
- _ = u shouldBe org.apache.pekko.Done
+ _ = u shouldBe pekko.Done
h <- stateStorePayload.getObject("p234")
} yield h
@@ -154,7 +155,7 @@ abstract class JdbcDurableStateSpec(config: Config,
schemaType: SchemaType) exte
whenReady {
stateStorePayload.deleteObject("p234")
} { v =>
- v shouldBe org.apache.pekko.Done
+ v shouldBe pekko.Done
whenReady {
stateStorePayload.getObject("p234")
} { v =>
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/StateSpecBase.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/StateSpecBase.scala
index 877db61..c159bca 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/StateSpecBase.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/StateSpecBase.scala
@@ -23,13 +23,14 @@ import org.scalatest.{ BeforeAndAfterAll,
BeforeAndAfterEach }
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.time._
-import org.apache.pekko.actor._
-import org.apache.pekko.persistence.jdbc.db.SlickDatabase
-import org.apache.pekko.persistence.jdbc.config._
-import org.apache.pekko.persistence.jdbc.testkit.internal.{ H2, Postgres,
SchemaType }
-import org.apache.pekko.persistence.jdbc.util.DropCreate
-import org.apache.pekko.serialization.SerializationExtension
-import org.apache.pekko.util.Timeout
+import org.apache.pekko
+import pekko.actor._
+import pekko.persistence.jdbc.db.SlickDatabase
+import pekko.persistence.jdbc.config._
+import pekko.persistence.jdbc.testkit.internal.{ H2, Postgres, SchemaType }
+import pekko.persistence.jdbc.util.DropCreate
+import pekko.serialization.SerializationExtension
+import pekko.util.Timeout
abstract class StateSpecBase(val config: Config, schemaType: SchemaType)
extends AnyWordSpecLike
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/TestProbeDurableStateStoreQuery.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/TestProbeDurableStateStoreQuery.scala
index 1bced26..c1ae64e 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/TestProbeDurableStateStoreQuery.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/state/scaladsl/TestProbeDurableStateStoreQuery.scala
@@ -16,18 +16,19 @@ package org.apache.pekko.persistence.jdbc.state.scaladsl
import scala.concurrent.Future
import scala.concurrent.duration._
-import org.apache.pekko.NotUsed
-import org.apache.pekko.actor.ExtendedActorSystem
-import org.apache.pekko.pattern.ask
-import org.apache.pekko.persistence.jdbc.config.DurableStateTableConfiguration
-import org.apache.pekko.persistence.query.DurableStateChange
-import org.apache.pekko.persistence.query.Offset
-import org.apache.pekko.persistence.state.scaladsl.GetObjectResult
-import org.apache.pekko.stream.scaladsl.Source
-import org.apache.pekko.testkit.TestProbe
-import org.apache.pekko.util.Timeout
+import org.apache.pekko
+import pekko.NotUsed
+import pekko.actor.ExtendedActorSystem
+import pekko.pattern.ask
+import pekko.persistence.jdbc.config.DurableStateTableConfiguration
+import pekko.persistence.query.DurableStateChange
+import pekko.persistence.query.Offset
+import pekko.persistence.state.scaladsl.GetObjectResult
+import pekko.stream.scaladsl.Source
+import pekko.testkit.TestProbe
+import pekko.util.Timeout
import slick.jdbc.{ JdbcBackend, JdbcProfile }
-import org.apache.pekko.serialization.Serialization
+import pekko.serialization.Serialization
object TestProbeDurableStateStoreQuery {
case class StateInfoSequence(offset: Long, limit: Long)
diff --git
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/util/DropCreate.scala
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/util/DropCreate.scala
index 0bad7f3..0460ff6 100644
---
a/core/src/test/scala/org/apache/pekko/persistence/jdbc/util/DropCreate.scala
+++
b/core/src/test/scala/org/apache/pekko/persistence/jdbc/util/DropCreate.scala
@@ -16,9 +16,10 @@ package org.apache.pekko.persistence.jdbc.util
import java.sql.Statement
-import org.apache.pekko.annotation.InternalApi
-import org.apache.pekko.persistence.jdbc.testkit.internal.SchemaType
-import org.apache.pekko.persistence.jdbc.testkit.internal.SchemaUtilsImpl
+import org.apache.pekko
+import pekko.annotation.InternalApi
+import pekko.persistence.jdbc.testkit.internal.SchemaType
+import pekko.persistence.jdbc.testkit.internal.SchemaUtilsImpl
import com.typesafe.config.Config
import org.slf4j.LoggerFactory
import slick.jdbc.JdbcBackend.Database
diff --git
a/migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/JournalMigratorTest.scala
b/migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/JournalMigratorTest.scala
index afe9170..b2e7f66 100644
---
a/migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/JournalMigratorTest.scala
+++
b/migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/JournalMigratorTest.scala
@@ -9,8 +9,9 @@
package org.apache.pekko.persistence.jdbc.migrator.integration
-import org.apache.pekko.persistence.jdbc.migrator.MigratorSpec._
-import org.apache.pekko.persistence.jdbc.migrator.JournalMigratorTest
+import org.apache.pekko
+import pekko.persistence.jdbc.migrator.MigratorSpec._
+import pekko.persistence.jdbc.migrator.JournalMigratorTest
class PostgresJournalMigratorTest extends
JournalMigratorTest("postgres-application.conf") with PostgresCleaner
diff --git
a/migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/SnapshotMigratorTest.scala
b/migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/SnapshotMigratorTest.scala
index 77c2957..dab51b4 100644
---
a/migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/SnapshotMigratorTest.scala
+++
b/migrator/src/it/scala/org/apache/pekko/persistence/jdbc/migrator/integration/SnapshotMigratorTest.scala
@@ -9,8 +9,9 @@
package org.apache.pekko.persistence.jdbc.migrator.integration
-import org.apache.pekko.persistence.jdbc.migrator.MigratorSpec._
-import org.apache.pekko.persistence.jdbc.migrator.SnapshotMigratorTest
+import org.apache.pekko
+import pekko.persistence.jdbc.migrator.MigratorSpec._
+import pekko.persistence.jdbc.migrator.SnapshotMigratorTest
class PostgresSnapshotMigratorTest extends
SnapshotMigratorTest("postgres-application.conf") with PostgresCleaner
diff --git
a/migrator/src/main/scala/org/apache/pekko/persistence/jdbc/migrator/JournalMigrator.scala
b/migrator/src/main/scala/org/apache/pekko/persistence/jdbc/migrator/JournalMigrator.scala
index 062aeb5..56fbd21 100644
---
a/migrator/src/main/scala/org/apache/pekko/persistence/jdbc/migrator/JournalMigrator.scala
+++
b/migrator/src/main/scala/org/apache/pekko/persistence/jdbc/migrator/JournalMigrator.scala
@@ -14,19 +14,20 @@
package org.apache.pekko.persistence.jdbc.migrator
-import org.apache.pekko.Done
-import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.persistence.PersistentRepr
-import org.apache.pekko.persistence.jdbc.PekkoSerialization
-import org.apache.pekko.persistence.jdbc.config.{ JournalConfig,
ReadJournalConfig }
-import org.apache.pekko.persistence.jdbc.db.SlickExtension
-import org.apache.pekko.persistence.jdbc.journal.dao.JournalQueries
-import
org.apache.pekko.persistence.jdbc.journal.dao.legacy.ByteArrayJournalSerializer
-import org.apache.pekko.persistence.jdbc.journal.dao.JournalTables.{
JournalPekkoSerializationRow, TagRow }
-import org.apache.pekko.persistence.jdbc.migrator.JournalMigrator.{
JournalConfig, ReadJournalConfig }
-import org.apache.pekko.persistence.jdbc.query.dao.legacy.ReadJournalQueries
-import org.apache.pekko.serialization.{ Serialization, SerializationExtension }
-import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.ActorSystem
+import pekko.persistence.PersistentRepr
+import pekko.persistence.jdbc.PekkoSerialization
+import pekko.persistence.jdbc.config.{ JournalConfig, ReadJournalConfig }
+import pekko.persistence.jdbc.db.SlickExtension
+import pekko.persistence.jdbc.journal.dao.JournalQueries
+import pekko.persistence.jdbc.journal.dao.legacy.ByteArrayJournalSerializer
+import pekko.persistence.jdbc.journal.dao.JournalTables.{
JournalPekkoSerializationRow, TagRow }
+import pekko.persistence.jdbc.migrator.JournalMigrator.{ JournalConfig,
ReadJournalConfig }
+import pekko.persistence.jdbc.query.dao.legacy.ReadJournalQueries
+import pekko.serialization.{ Serialization, SerializationExtension }
+import pekko.stream.scaladsl.Source
import org.slf4j.{ Logger, LoggerFactory }
import slick.jdbc._
diff --git
a/migrator/src/main/scala/org/apache/pekko/persistence/jdbc/migrator/SnapshotMigrator.scala
b/migrator/src/main/scala/org/apache/pekko/persistence/jdbc/migrator/SnapshotMigrator.scala
index 686634d..3c961dd 100644
---
a/migrator/src/main/scala/org/apache/pekko/persistence/jdbc/migrator/SnapshotMigrator.scala
+++
b/migrator/src/main/scala/org/apache/pekko/persistence/jdbc/migrator/SnapshotMigrator.scala
@@ -14,19 +14,20 @@
package org.apache.pekko.persistence.jdbc.migrator
-import org.apache.pekko.actor.ActorSystem
-import org.apache.pekko.persistence.SnapshotMetadata
-import org.apache.pekko.persistence.jdbc.config.{ ReadJournalConfig,
SnapshotConfig }
-import org.apache.pekko.persistence.jdbc.db.SlickExtension
-import
org.apache.pekko.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao
-import org.apache.pekko.persistence.jdbc.snapshot.dao.DefaultSnapshotDao
-import org.apache.pekko.persistence.jdbc.snapshot.dao.legacy.{
ByteArraySnapshotSerializer, SnapshotQueries }
-import
org.apache.pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.SnapshotRow
-import org.apache.pekko.serialization.{ Serialization, SerializationExtension }
-import org.apache.pekko.stream.scaladsl.{ Sink, Source }
-import org.apache.pekko.Done
-import
org.apache.pekko.persistence.jdbc.migrator.JournalMigrator.ReadJournalConfig
-import org.apache.pekko.persistence.jdbc.migrator.SnapshotMigrator.{
NoParallelism, SnapshotStoreConfig }
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.persistence.SnapshotMetadata
+import pekko.persistence.jdbc.config.{ ReadJournalConfig, SnapshotConfig }
+import pekko.persistence.jdbc.db.SlickExtension
+import pekko.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao
+import pekko.persistence.jdbc.snapshot.dao.DefaultSnapshotDao
+import pekko.persistence.jdbc.snapshot.dao.legacy.{
ByteArraySnapshotSerializer, SnapshotQueries }
+import pekko.persistence.jdbc.snapshot.dao.legacy.SnapshotTables.SnapshotRow
+import pekko.serialization.{ Serialization, SerializationExtension }
+import pekko.stream.scaladsl.{ Sink, Source }
+import pekko.Done
+import pekko.persistence.jdbc.migrator.JournalMigrator.ReadJournalConfig
+import pekko.persistence.jdbc.migrator.SnapshotMigrator.{ NoParallelism,
SnapshotStoreConfig }
import org.slf4j.{ Logger, LoggerFactory }
import slick.jdbc
import slick.jdbc.{ JdbcBackend, JdbcProfile }
diff --git
a/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/JournalMigratorTest.scala
b/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/JournalMigratorTest.scala
index ab6a383..51fea78 100644
---
a/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/JournalMigratorTest.scala
+++
b/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/JournalMigratorTest.scala
@@ -9,10 +9,11 @@
package org.apache.pekko.persistence.jdbc.migrator
-import org.apache.pekko.Done
-import org.apache.pekko.pattern.ask
-import org.apache.pekko.persistence.jdbc.db.SlickDatabase
-import org.apache.pekko.persistence.jdbc.migrator.MigratorSpec._
+import org.apache.pekko
+import pekko.Done
+import pekko.pattern.ask
+import pekko.persistence.jdbc.db.SlickDatabase
+import pekko.persistence.jdbc.migrator.MigratorSpec._
abstract class JournalMigratorTest(configName: String) extends
MigratorSpec(configName) {
diff --git
a/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/MigratorSpec.scala
b/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/MigratorSpec.scala
index 3b13d3b..b65e3c6 100644
---
a/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/MigratorSpec.scala
+++
b/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/MigratorSpec.scala
@@ -9,22 +9,23 @@
package org.apache.pekko.persistence.jdbc.migrator
-import org.apache.pekko.actor.{ ActorRef, ActorSystem, Props, Stash }
-import org.apache.pekko.event.LoggingReceive
-import org.apache.pekko.pattern.ask
-import org.apache.pekko.persistence.jdbc.SimpleSpec
-import org.apache.pekko.persistence.jdbc.config.{ JournalConfig,
SlickConfiguration }
-import org.apache.pekko.persistence.jdbc.db.SlickDatabase
-import org.apache.pekko.persistence.jdbc.migrator.MigratorSpec._
-import org.apache.pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
-import org.apache.pekko.persistence.jdbc.testkit.internal._
-import org.apache.pekko.persistence.journal.EventSeq.single
-import org.apache.pekko.persistence.journal.{ EventAdapter, EventSeq, Tagged }
-import org.apache.pekko.persistence.query.PersistenceQuery
-import org.apache.pekko.persistence.{ PersistentActor, SaveSnapshotSuccess,
SnapshotMetadata, SnapshotOffer }
-import org.apache.pekko.stream.Materializer
-import org.apache.pekko.stream.scaladsl.Sink
-import org.apache.pekko.util.Timeout
+import org.apache.pekko
+import pekko.actor.{ ActorRef, ActorSystem, Props, Stash }
+import pekko.event.LoggingReceive
+import pekko.pattern.ask
+import pekko.persistence.jdbc.SimpleSpec
+import pekko.persistence.jdbc.config.{ JournalConfig, SlickConfiguration }
+import pekko.persistence.jdbc.db.SlickDatabase
+import pekko.persistence.jdbc.migrator.MigratorSpec._
+import pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal
+import pekko.persistence.jdbc.testkit.internal._
+import pekko.persistence.journal.EventSeq.single
+import pekko.persistence.journal.{ EventAdapter, EventSeq, Tagged }
+import pekko.persistence.query.PersistenceQuery
+import pekko.persistence.{ PersistentActor, SaveSnapshotSuccess,
SnapshotMetadata, SnapshotOffer }
+import pekko.stream.Materializer
+import pekko.stream.scaladsl.Sink
+import pekko.util.Timeout
import com.typesafe.config.{ Config, ConfigFactory, ConfigValue,
ConfigValueFactory }
import org.scalatest.BeforeAndAfterEach
import org.slf4j.{ Logger, LoggerFactory }
@@ -263,22 +264,22 @@ object MigratorSpec {
persist(AccountCreated(balance)) { (event: AccountCreated) =>
updateState(event)
saveSnapshot()
- sender() ! org.apache.pekko.actor.Status.Success(event)
+ sender() ! pekko.actor.Status.Success(event)
}
case Deposit(balance) =>
persist(Deposited(balance)) { (event: Deposited) =>
updateState(event)
saveSnapshot()
- sender() ! org.apache.pekko.actor.Status.Success(event)
+ sender() ! pekko.actor.Status.Success(event)
}
case Withdraw(balance) =>
persist(Withdrawn(balance)) { (event: Withdrawn) =>
updateState(event)
saveSnapshot()
- sender() ! org.apache.pekko.actor.Status.Success(event)
+ sender() ! pekko.actor.Status.Success(event)
}
case State =>
- sender() ! org.apache.pekko.actor.Status.Success(state)
+ sender() ! pekko.actor.Status.Success(state)
}
def updateState(event: AccountEvent): Unit = event match {
diff --git
a/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/SnapshotMigratorTest.scala
b/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/SnapshotMigratorTest.scala
index d4f3afa..c68176e 100644
---
a/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/SnapshotMigratorTest.scala
+++
b/migrator/src/test/scala/org/apache/pekko/persistence/jdbc/migrator/SnapshotMigratorTest.scala
@@ -9,10 +9,11 @@
package org.apache.pekko.persistence.jdbc.migrator
-import org.apache.pekko.Done
-import org.apache.pekko.pattern.ask
-import org.apache.pekko.persistence.jdbc.db.SlickDatabase
-import org.apache.pekko.persistence.jdbc.migrator.MigratorSpec._
+import org.apache.pekko
+import pekko.Done
+import pekko.pattern.ask
+import pekko.persistence.jdbc.db.SlickDatabase
+import pekko.persistence.jdbc.migrator.MigratorSpec._
abstract class SnapshotMigratorTest(configName: String) extends
MigratorSpec(configName) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
