You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/02/24 19:45:29 UTC
[incubator-pekko-persistence-dynamodb] branch main updated: uptaking pekko jars (#17)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-persistence-dynamodb.git
The following commit(s) were added to refs/heads/main by this push:
new 65478cb uptaking pekko jars (#17)
65478cb is described below
commit 65478cb787c6ca1c941057a0a5c521e14f593c45
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Fri Feb 24 20:45:23 2023 +0100
uptaking pekko jars (#17)
---
.github/workflows/check-build-test.yml | 16 +--
.github/workflows/format.yml | 2 +-
README.md | 6 +-
RELEASING.md | 2 +-
build.sbt | 21 ++--
project/PekkoDependency.scala | 125 +++++++++++++++++++++
project/Publish.scala | 4 +-
project/Whitesource.scala | 2 +-
src/main/resources/reference.conf | 14 +--
.../persistence/dynamodb/DynamoDBConfig.scala | 7 +-
.../persistence/dynamodb/DynamoDBRequests.scala | 12 +-
.../dynamodb/journal/DynamoDBHelper.scala | 12 +-
.../dynamodb/journal/DynamoDBJournal.scala | 37 +++---
.../dynamodb/journal/DynamoDBJournalConfig.scala | 4 +-
.../dynamodb/journal/DynamoDBJournalRequests.scala | 18 +--
.../dynamodb/journal/DynamoDBRecovery.scala | 26 +++--
.../persistence/dynamodb/journal/package.scala | 2 +-
.../pekko}/persistence/dynamodb/package.scala | 15 +--
.../pekko}/persistence/dynamodb/providers.scala | 10 +-
.../dynamodb/query/DynamoDBReadJournalConfig.scala | 9 +-
.../query/DynamoDBReadJournalProvider.scala | 14 +--
.../query/javadsl/DynamoDBReadJournal.scala | 30 ++---
.../persistence/dynamodb/query/package.scala | 6 +-
...DynamoDBCurrentEventsByPersistenceIdQuery.scala | 12 +-
.../DynamoDBCurrentPersistenceIdsQuery.scala | 16 +--
.../query/scaladsl/DynamoDBReadJournal.scala | 8 +-
...DynamoDBCurrentEventsByPersistenceIdQuery.scala | 27 +++--
.../DynamoDBCurrentPersistenceIdsQuery.scala | 22 ++--
.../scaladsl/internal/DynamoDBReadJournal.scala | 21 ++--
.../dynamodb/snapshot/DynamoDBSnapshotConfig.scala | 4 +-
.../snapshot/DynamoDBSnapshotRequests.scala | 15 ++-
.../dynamodb/snapshot/DynamoDBSnapshotStore.scala | 12 +-
.../persistence/dynamodb/snapshot/package.scala | 2 +-
src/test/resources/application.conf | 6 +-
.../dynamodb/snapshot/SnapshotStoreTckSpec.scala | 28 -----
.../pekko}/persistence/dynamodb/IntegSpec.scala | 2 +-
.../journal/AsyncDynamoDBJournalSpec.scala | 17 +--
.../journal/BackwardsCompatibilityV1Spec.scala | 12 +-
.../dynamodb/journal/DeletionSpec.scala | 22 ++--
.../journal/DynamoDBIntegrationLoadSpec.scala | 14 +--
.../dynamodb/journal/DynamoDBJournalSpec.scala | 12 +-
.../dynamodb/journal/DynamoDBUtils.scala | 12 +-
.../journal/DynamoPartitionGroupedSpec.scala | 12 +-
.../dynamodb/journal/FailureReportingSpec.scala | 28 ++---
.../journal/PartialAsyncSerializationSpec.scala | 19 ++--
.../journal/PersistAllConsistencySpec.scala | 12 +-
.../dynamodb/journal/RecoveryConsistencySpec.scala | 22 ++--
.../dynamodb/journal/TestSerializer.scala | 6 +-
.../dynamodb/journal/WriteThroughputBench.scala | 14 +--
.../dynamodb/query/CurrentPersistenceIdsSpec.scala | 25 +++--
.../dynamodb/snapshot/DynamoDBUtils.scala | 16 ++-
.../dynamodb/snapshot/SnapshotStoreTckSpec.scala | 20 ++++
52 files changed, 478 insertions(+), 354 deletions(-)
diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml
index b90d656..e499588 100644
--- a/.github/workflows/check-build-test.yml
+++ b/.github/workflows/check-build-test.yml
@@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
fetch-depth: 0
@@ -31,7 +31,7 @@ jobs:
git checkout scratch
- name: Set up JDK 11
- uses: olafurpg/setup-scala@v10
+ uses: olafurpg/setup-scala@v13
with:
java-version: adopt@1.11.0-9
@@ -49,13 +49,13 @@ jobs:
fail-fast: false
matrix:
include:
- - { java-version: adopt@1.8, scala-version: 2.12.13, sbt-opts: '' }
- - { java-version: adopt@1.8, scala-version: 2.13.5, sbt-opts: '' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.12.13, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.13.5, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: adopt@1.8, scala-version: 2.12.15, sbt-opts: '' }
+ - { java-version: adopt@1.8, scala-version: 2.13.7, sbt-opts: '' }
+ - { java-version: adopt@1.11.0-9, scala-version: 2.12.15, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: adopt@1.11.0-9, scala-version: 2.13.7, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
fetch-depth: 0
@@ -66,7 +66,7 @@ jobs:
git checkout scratch
- name: Setup Scala with Java ${{ matrix.java-version }}
- uses: olafurpg/setup-scala@v10
+ uses: olafurpg/setup-scala@v13
with:
java-version: ${{ matrix.java-version }}
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 9ce98e5..502401a 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout current branch (full)
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
fetch-depth: 0
persist-credentials: false
diff --git a/README.md b/README.md
index f9419ec..92d9064 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Configuration
### Journal
~~~
-akka.persistence.journal.plugin = "my-dynamodb-journal"
+pekko.persistence.journal.plugin = "my-dynamodb-journal"
my-dynamodb-journal = ${dynamodb-journal} # include the default settings
my-dynamodb-journal { # and add some overrides
@@ -50,7 +50,7 @@ my-dynamodb-journal { # and add some overrides
}
~~~
-For details on the endpoint URL please refer to the [DynamoDB documentation](http://docs.aws.amazon.com/general/latest/gr/rande.html#ddb_region). There are many more settings that can be used for fine-tuning and adapting this journal plugin to your use-case, please refer to the [reference.conf](https://github.com/akka/akka-persistence-dynamodb/blob/master/src/main/resources/reference.conf) file.
+For details on the endpoint URL please refer to the [DynamoDB documentation](http://docs.aws.amazon.com/general/latest/gr/rande.html#ddb_region). There are many more settings that can be used for fine-tuning and adapting this journal plugin to your use-case, please refer to the [reference.conf](https://github.com/apache/incubator-pekko-persistence-dynamodb/blob/main/src/main/resources/reference.conf) file.
Before you can use these settings you will have to create a table, e.g. using the AWS console, with the following schema:
@@ -61,7 +61,7 @@ Before you can use these settings you will have to create a table, e.g. using th
(**Since:** `1.1.0`; contributed by [@joost-de-vries](https://github.com/joost-de-vries))
~~~
-akka.persistence.snapshot-store.plugin = "my-dynamodb-snapshot-store"
+pekko.persistence.snapshot-store.plugin = "my-dynamodb-snapshot-store"
my-dynamodb-snapshot-store = ${dynamodb-snapshot-store} # include the default settings
my-dynamodb-snapshot-store { # and add some overrides
diff --git a/RELEASING.md b/RELEASING.md
index ac2bf4f..e38aeef 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -2,7 +2,7 @@ How to release
--------------
- create an annotated tag for the next version. EG: `git tag -a -m 'release v1.3.1' v1.3.1`
-- push tags and commits to akka remote master
+- push tags and commits to pekko remote master
- If the workspace is not clean or HEAD != the tag then published version will be a snapshot. To use
exactly the tagged version the workspace must be clean and there are no additional commits beyond
the tag.
diff --git a/build.sbt b/build.sbt
index 51ba27d..a3ff4e7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,24 +1,27 @@
-name := "akka-persistence-dynamodb"
+import PekkoDependency.pekkoVersion
+
+name := "pekko-persistence-dynamodb"
scalaVersion := "2.13.7"
-crossScalaVersions := Seq("2.12.13", "2.12.15", "2.13.5", "2.13.7")
+crossScalaVersions := Seq("2.12.15", "2.13.7")
crossVersion := CrossVersion.binary
-val akkaVersion = "2.6.20"
val amzVersion = "1.12.286"
val testcontainersScalaVersion = "0.40.10"
+resolvers += "Apache Nexus Snapshots".at("https://repository.apache.org/content/repositories/snapshots/")
+
libraryDependencies ++= Seq(
"com.amazonaws" % "aws-java-sdk-core" % amzVersion,
"com.amazonaws" % "aws-java-sdk-dynamodb" % amzVersion,
"javax.xml.bind" % "jaxb-api" % "2.3.1", // see https://github.com/seek-oss/gradle-aws-plugin/issues/15
- "com.typesafe.akka" %% "akka-persistence" % akkaVersion,
- "com.typesafe.akka" %% "akka-persistence-query" % akkaVersion,
- "com.typesafe.akka" %% "akka-stream" % akkaVersion,
+ "org.apache.pekko" %% "pekko-persistence" % pekkoVersion,
+ "org.apache.pekko" %% "pekko-persistence-query" % pekkoVersion,
+ "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
"org.scala-lang.modules" %% "scala-collection-compat" % "2.6.0",
- "com.typesafe.akka" %% "akka-persistence-tck" % akkaVersion % "test",
- "com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test",
- "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion % "test",
+ "org.apache.pekko" %% "pekko-persistence-tck" % pekkoVersion % "test",
+ "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % "test",
+ "org.apache.pekko" %% "pekko-stream-testkit" % pekkoVersion % "test",
"org.scalatest" %% "scalatest" % "3.1.4" % "test",
"commons-io" % "commons-io" % "2.11.0" % "test",
"org.hdrhistogram" % "HdrHistogram" % "2.1.8" % "test",
diff --git a/project/PekkoDependency.scala b/project/PekkoDependency.scala
new file mode 100644
index 0000000..9fdfd39
--- /dev/null
+++ b/project/PekkoDependency.scala
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, derived from Akka.
+ */
+
+/*
+ * Copyright (C) 2017-2020 Lightbend Inc. <https://www.lightbend.com>
+ */
+
+import sbt._
+import Keys._
+
+import scala.util.matching.Regex.Groups
+
+object PekkoDependency {
+
+ sealed trait Pekko {
+ def version: String
+ // The version to use in api/japi/docs links,
+ // so 'x.y', 'x.y.z', 'current' or 'snapshot'
+ def link: String
+ }
+ case class Artifact(version: String, isSnapshot: Boolean = false) extends Pekko {
+ override def link = VersionNumber(version) match { case VersionNumber(Seq(x, y, _*), _, _) => s"$x.$y" }
+ }
+ case class Sources(uri: String, link: String = "current") extends Pekko {
+ def version = link
+ }
+
+ def pekkoDependency(defaultVersion: String): Pekko = {
+ Option(System.getProperty("pekko.sources")) match {
+ case Some(pekkoSources) =>
+ Sources(pekkoSources)
+ case None =>
+ Option(System.getProperty("pekko.build.pekko.version")) match {
+ case Some("main") => mainSnapshot
+ case Some("release-1.0") =>
+ // Don't 'downgrade' building even if pekko.sources asks for it
+ // (typically for the docs that require 2.6)
+ if (defaultVersion.startsWith("1.0")) Artifact(determineLatestSnapshot("0.0.0"), true)
+ else Artifact(defaultVersion)
+ case Some("default") | None =>
+ // TODO: Revert to Artifact(defaultVersion) when release of Pekko is made
+ mainSnapshot
+ case Some(other) => Artifact(other, true)
+ }
+ }
+ }
+
+ // Default version updated only when needed, https://doc.akka.io//docs/akka/current/project/downstream-upgrade-strategy.html
+ val minimumExpectedPekkoVersion = "1.0.0"
+ val default = pekkoDependency(defaultVersion = minimumExpectedPekkoVersion)
+ val minimumExpectedPekko26Version = "1.0.0"
+ val docs = pekkoDependency(defaultVersion = minimumExpectedPekko26Version)
+
+ lazy val mainSnapshot = Artifact(determineLatestSnapshot("0.0.0"), true)
+
+ val pekkoVersion: String = default match {
+ case Artifact(version, _) => version
+ case Sources(uri, _) => uri
+ }
+
+ implicit class RichProject(project: Project) {
+
+ /** Adds either a source or a binary dependency, depending on whether the above settings are set */
+ def addPekkoModuleDependency(module: String,
+ config: String = "",
+ pekko: Pekko = default): Project =
+ pekko match {
+ case Sources(sources, _) =>
+ // as a little hacky side effect also disable aggregation of samples
+ System.setProperty("pekko.build.aggregateSamples", "false")
+
+ val moduleRef = ProjectRef(uri(sources), module)
+ val withConfig: ClasspathDependency =
+ if (config == "") moduleRef
+ else moduleRef % config
+
+ project.dependsOn(withConfig)
+ case Artifact(pekkoVersion, pekkoSnapshot) =>
+ project.settings(
+ libraryDependencies += {
+ if (config == "")
+ "org.apache.pekko" %% module % pekkoVersion
+ else
+ "org.apache.pekko" %% module % pekkoVersion % config
+ },
+ resolvers ++= (if (pekkoSnapshot)
+ Seq("Apache Snapshots".at("https://repository.apache.org/content/repositories/snapshots/"))
+ else Nil))
+ }
+ }
+
+ private def determineLatestSnapshot(prefix: String = ""): String = {
+ import sbt.librarymanagement.Http.http
+ import gigahorse.GigahorseSupport.url
+ import scala.concurrent.Await
+ import scala.concurrent.duration._
+
+ val snapshotVersionR = """href=".*/((\d+)\.(\d+)\.(\d+)\+(\d+)-[0-9a-f]+-SNAPSHOT)/"""".r
+
+ // pekko-cluster-sharding-typed_2.13 seems to be the last nightly published by `pekko-publish-nightly` so if that's there then it's likely the rest also made it
+ val body = Await.result(http.run(url(
+ "https://repository.apache.org/content/repositories/snapshots/org/apache/pekko/pekko-cluster-sharding-typed_2.13/")),
+ 10.seconds).bodyAsString
+
+ val allVersions =
+ snapshotVersionR.findAllMatchIn(body)
+ .map {
+ case Groups(full, ep, maj, min, offset) =>
+ (
+ ep.toInt,
+ maj.toInt,
+ min.toInt,
+ offset.toInt) -> full
+ }
+ .filter(_._2.startsWith(prefix))
+ .toVector.sortBy(_._1)
+ allVersions.last._2
+ }
+}
diff --git a/project/Publish.scala b/project/Publish.scala
index f30550f..8b27bc7 100644
--- a/project/Publish.scala
+++ b/project/Publish.scala
@@ -1,7 +1,7 @@
/**
* Copyright (C) 2009-2015 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka
+package org.apache.pekko
import sbt._
import sbt.Keys._
@@ -56,6 +56,6 @@ object Publish extends AutoPlugin {
Some(Resolver.file("Default Local Repository", repository))
private def akkaCredentials: Seq[Credentials] =
- Option(System.getProperty("akka.publish.credentials", null)).map(f => Credentials(new File(f))).toSeq
+ Option(System.getProperty("pekko.publish.credentials", null)).map(f => Credentials(new File(f))).toSeq
}
diff --git a/project/Whitesource.scala b/project/Whitesource.scala
index 5aac5e6..892dadd 100644
--- a/project/Whitesource.scala
+++ b/project/Whitesource.scala
@@ -19,7 +19,7 @@ object Whitesource extends AutoPlugin {
else "adhoc"
else
CrossVersion
- .partialVersion((version in LocalRootProject).value)
+ .partialVersion((LocalRootProject / version).value)
.map { case (major, minor) => s"$major.$minor-stable" }
.getOrElse("adhoc"))
},
diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf
index 5d4213c..4c47009 100644
--- a/src/main/resources/reference.conf
+++ b/src/main/resources/reference.conf
@@ -1,6 +1,6 @@
# This configures the default settings for all DynamoDB Journal plugin
# instances in the system. If you are using just one configuration for
-# all persistent actors then you should point your akka.persistence.journal.plugin
+# all persistent actors then you should point your pekko.persistence.journal.plugin
# setting to this section.
#
# Otherwise you need to create differently named sections containing
@@ -15,7 +15,7 @@
dynamodb-journal {
# The FQCN for the journal plugin implementation - DO NOT CHANGE
- class = "akka.persistence.dynamodb.journal.DynamoDBJournal"
+ class = "org.apache.pekko.persistence.dynamodb.journal.DynamoDBJournal"
# The service endpoint to connect to for the DynamoDB instance that
# shall be used. Please refer to the AWS documentation for details.
@@ -23,7 +23,7 @@ dynamodb-journal {
# The dispatcher that executes the replay logic for this plugin
# instance - should not normally need to be changed.
- replay-dispatcher = "akka.persistence.dispatchers.default-replay-dispatcher"
+ replay-dispatcher = "pekko.persistence.dispatchers.default-replay-dispatcher"
# The dispatcher that executes the future combinators needed for
# transforming the AmazonDynamoDBAsyncClient results (i.e.
@@ -35,7 +35,7 @@ dynamodb-journal {
plugin-dispatcher = "dynamodb-journal.dispatcher"
# The name of the DynamoDB table to be used for this plugin instance
- journal-table = "akka-persistence"
+ journal-table = "pekko-persistence"
# The logical journal name, used in the partition keys.
journal-name = "journal"
@@ -145,7 +145,7 @@ dynamodb-journal {
}
dynamodb-snapshot-store {
- class="akka.persistence.dynamodb.snapshot.DynamoDBSnapshotStore"
+ class="org.apache.pekko.persistence.dynamodb.snapshot.DynamoDBSnapshotStore"
# The service endpoint to connect to for the DynamoDB instance that
# shall be used. Please refer to the AWS documentation for details.
@@ -157,7 +157,7 @@ dynamodb-snapshot-store {
client-dispatcher = ${dynamodb-journal.client-dispatcher}
# The name of the DynamoDB table to be used for this plugin instance
- snapshot-table = "akka-persistence-snapshot"
+ snapshot-table = "pekko-persistence-snapshot"
# The logical journal name for which we persist snapshots, used in the partition keys.
journal-name = ${dynamodb-journal.journal-name}
@@ -195,7 +195,7 @@ dynamodb-snapshot-store {
dynamodb-read-journal = ${dynamodb-journal}
dynamodb-read-journal {
- class = "akka.persistence.dynamodb.query.DynamoDBReadJournalProvider"
+ class = "org.apache.pekko.persistence.dynamodb.query.DynamoDBReadJournalProvider"
# The name of the Global Secondary Index that is used to query currentPersistenceIds
# see CreatePersistenceIdsIndex.createPersistenceIdsIndexRequest
diff --git a/src/main/scala/akka/persistence/dynamodb/DynamoDBConfig.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/DynamoDBConfig.scala
similarity index 94%
rename from src/main/scala/akka/persistence/dynamodb/DynamoDBConfig.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/DynamoDBConfig.scala
index 46571ad..b7f0a28 100644
--- a/src/main/scala/akka/persistence/dynamodb/DynamoDBConfig.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/DynamoDBConfig.scala
@@ -1,12 +1,11 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb
+package org.apache.pekko.persistence.dynamodb
import java.net.InetAddress
-
-import akka.persistence.dynamodb.journal.DynamoDBHelper
-import akka.serialization.Serialization
+import org.apache.pekko.persistence.dynamodb.journal.DynamoDBHelper
+import org.apache.pekko.serialization.Serialization
import com.amazonaws.{ ClientConfiguration, Protocol }
import com.typesafe.config.Config
diff --git a/src/main/scala/akka/persistence/dynamodb/DynamoDBRequests.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/DynamoDBRequests.scala
similarity index 92%
rename from src/main/scala/akka/persistence/dynamodb/DynamoDBRequests.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/DynamoDBRequests.scala
index 0cab091..55ae2b1 100644
--- a/src/main/scala/akka/persistence/dynamodb/DynamoDBRequests.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/DynamoDBRequests.scala
@@ -1,21 +1,21 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb
+package org.apache.pekko.persistence.dynamodb
import java.util.Collections
import java.util.{ Collections, HashMap => JHMap, List => JList, Map => JMap }
-
-import akka.Done
-import akka.actor.{ Actor, ActorLogging }
-import akka.persistence.dynamodb.journal.DynamoDBHelper
+import org.apache.pekko.Done
+import org.apache.pekko.actor.{ Actor, ActorLogging }
+import org.apache.pekko.pattern.after
+import org.apache.pekko.persistence.dynamodb.journal.DynamoDBHelper
import com.amazonaws.services.dynamodbv2.model._
+
import scala.collection.JavaConverters._
import scala.concurrent.Future
import scala.concurrent.duration.FiniteDuration
import scala.util.control.NonFatal
import scala.concurrent.duration._
-import akka.pattern.after
private[dynamodb] trait DynamoDBRequests {
this: ActorLogging with Actor =>
diff --git a/src/main/scala/akka/persistence/dynamodb/journal/DynamoDBHelper.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBHelper.scala
similarity index 96%
rename from src/main/scala/akka/persistence/dynamodb/journal/DynamoDBHelper.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBHelper.scala
index 9339976..946a180 100644
--- a/src/main/scala/akka/persistence/dynamodb/journal/DynamoDBHelper.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBHelper.scala
@@ -1,15 +1,17 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
import com.amazonaws.{ AmazonServiceException, AmazonWebServiceRequest }
import com.amazonaws.handlers.AsyncHandler
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBAsyncClient
import com.amazonaws.services.dynamodbv2.model._
-import akka.actor.Scheduler
-import akka.event.LoggingAdapter
-import akka.pattern.after
+import org.apache.pekko.actor.{ ActorRef, Scheduler }
+import org.apache.pekko.event.LoggingAdapter
+import org.apache.pekko.pattern.after
+import org.apache.pekko.persistence.dynamodb.{ DynamoDBConfig, Item }
+
import java.util.{ concurrent => juc }
import scala.collection.JavaConverters._
@@ -17,8 +19,6 @@ import scala.concurrent.{ ExecutionContext, Future, Promise }
import scala.concurrent.duration._
import scala.reflect.ClassTag
import scala.util.control.NoStackTrace
-import akka.actor.ActorRef
-import akka.persistence.dynamodb.{ DynamoDBConfig, Item }
case class LatencyReport(nanos: Long, retries: Int)
private class RetryStateHolder(var retries: Int = 10, var backoff: FiniteDuration = 1.millis)
diff --git a/src/main/scala/akka/persistence/dynamodb/journal/DynamoDBJournal.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournal.scala
similarity index 87%
rename from src/main/scala/akka/persistence/dynamodb/journal/DynamoDBJournal.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournal.scala
index d6ff86b..6901088 100644
--- a/src/main/scala/akka/persistence/dynamodb/journal/DynamoDBJournal.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournal.scala
@@ -1,33 +1,24 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
-import java.nio.ByteBuffer
import java.util.{ HashMap => JHMap, Map => JMap }
-import akka.Done
-import akka.actor.{ ActorLogging, ActorRef, ActorRefFactory, ActorSystem, ExtendedActorSystem }
-import akka.event.{ Logging, LoggingAdapter }
-import akka.pattern.pipe
-import akka.persistence.journal.AsyncWriteJournal
-import akka.persistence.{ AtomicWrite, Persistence, PersistentRepr }
-import akka.serialization.{ AsyncSerializer, Serialization, SerializationExtension }
-import akka.stream.{ ActorMaterializer, Materializer, SystemMaterializer }
-import akka.util.ByteString
-import com.amazonaws.AmazonServiceException
-import com.amazonaws.auth.BasicAWSCredentials
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient
+import org.apache.pekko.Done
+import org.apache.pekko.actor.{ ActorLogging, ActorRef, ExtendedActorSystem }
+import org.apache.pekko.dispatch.ExecutionContexts
+import org.apache.pekko.pattern.pipe
+import org.apache.pekko.persistence.journal.AsyncWriteJournal
+import org.apache.pekko.persistence.{ AtomicWrite, Persistence }
+import org.apache.pekko.persistence.dynamodb._
+import org.apache.pekko.serialization.{ Serialization, SerializationExtension }
+import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
import com.amazonaws.services.dynamodbv2.model._
import com.typesafe.config.Config
import scala.collection.immutable
-import scala.concurrent.{ ExecutionContext, Future }
-import scala.util.{ Failure, Success, Try }
-import scala.util.control.NoStackTrace
-import akka.actor.TypedActor.context
-
-import scala.concurrent.Promise
-import akka.persistence.dynamodb._
+import scala.concurrent.{ Future, Promise }
+import scala.util.{ Success, Try }
class DynamoDBJournalFailure(message: String, cause: Throwable = null) extends RuntimeException(message, cause)
class DynamoDBJournalRejection(message: String, cause: Throwable = null) extends RuntimeException(message, cause)
@@ -62,7 +53,7 @@ case class ListAllResult(persistenceId: String, lowest: Set[Long], highest: Set[
*/
case class Purge(persistenceId: String, replyTo: ActorRef)
-private[akka] case class SetDBHelperReporter(ref: ActorRef)
+private[pekko] case class SetDBHelperReporter(ref: ActorRef)
/**
* Confirmation that all information stored for the given `persistenceId` has
@@ -117,7 +108,7 @@ class DynamoDBJournal(config: Config)
f.onComplete { _ =>
self ! OpFinished(pid, p.future)
p.success(Done)
- }(akka.dispatch.ExecutionContexts.sameThreadExecutionContext)
+ }(ExecutionContexts.sameThreadExecutionContext)
f
}
diff --git a/src/main/scala/akka/persistence/dynamodb/journal/DynamoDBJournalConfig.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournalConfig.scala
similarity index 92%
rename from src/main/scala/akka/persistence/dynamodb/journal/DynamoDBJournalConfig.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournalConfig.scala
index 1b65cb9..3c02ca7 100644
--- a/src/main/scala/akka/persistence/dynamodb/journal/DynamoDBJournalConfig.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournalConfig.scala
@@ -1,11 +1,11 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
import com.typesafe.config.Config
-import akka.persistence.dynamodb.{ DynamoDBClientConfig, DynamoDBConfig }
+import org.apache.pekko.persistence.dynamodb.{ DynamoDBClientConfig, DynamoDBConfig }
class DynamoDBJournalConfig(c: Config) extends DynamoDBConfig {
val JournalTable = c.getString("journal-table")
diff --git a/src/main/scala/akka/persistence/dynamodb/journal/DynamoDBJournalRequests.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournalRequests.scala
similarity index 95%
rename from src/main/scala/akka/persistence/dynamodb/journal/DynamoDBJournalRequests.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournalRequests.scala
index 7b04305..ab02c35 100644
--- a/src/main/scala/akka/persistence/dynamodb/journal/DynamoDBJournalRequests.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournalRequests.scala
@@ -1,12 +1,10 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
import java.nio.ByteBuffer
import java.util.Collections
-
-import akka.persistence.{ AtomicWrite, PersistentRepr }
import com.amazonaws.services.dynamodbv2.model._
import scala.collection.JavaConverters._
@@ -14,11 +12,13 @@ import scala.concurrent.Future
import scala.concurrent.duration._
import scala.util.{ Failure, Success, Try }
import scala.util.control.NonFatal
-import akka.Done
-import akka.actor.ExtendedActorSystem
-import akka.pattern.after
-import akka.persistence.dynamodb._
-import akka.serialization.{ AsyncSerializer, Serialization, Serializers }
+import org.apache.pekko.Done
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.pattern.after
+import org.apache.pekko.persistence.{ AtomicWrite, PersistentRepr }
+import org.apache.pekko.persistence.dynamodb._
+import org.apache.pekko.serialization.{ AsyncSerializer, Serialization, Serializers }
+import org.apache.pekko.persistence.dynamodb.DynamoDBRequests
trait DynamoDBJournalRequests extends DynamoDBRequests {
this: DynamoDBJournal =>
@@ -36,7 +36,7 @@ trait DynamoDBJournalRequests extends DynamoDBRequests {
// optimize the common case
if (writes.size == 1) {
writeMessages(writes.head)
- .map(bubbleUpFailures(_) :: Nil)(akka.dispatch.ExecutionContexts.sameThreadExecutionContext)
+ .map(bubbleUpFailures(_) :: Nil)(org.apache.pekko.dispatch.ExecutionContexts.sameThreadExecutionContext)
} else {
def rec(todo: List[AtomicWrite], acc: List[Try[Unit]]): Future[List[Try[Unit]]] =
todo match {
diff --git a/src/main/scala/akka/persistence/dynamodb/journal/DynamoDBRecovery.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBRecovery.scala
similarity index 97%
rename from src/main/scala/akka/persistence/dynamodb/journal/DynamoDBRecovery.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBRecovery.scala
index 193dfe9..b4418f6 100644
--- a/src/main/scala/akka/persistence/dynamodb/journal/DynamoDBRecovery.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBRecovery.scala
@@ -1,16 +1,22 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
-
-import akka.NotUsed
-import akka.actor.{ ActorSystem, ExtendedActorSystem }
-import akka.persistence.PersistentRepr
-import akka.persistence.dynamodb._
-import akka.serialization.{ AsyncSerializer, Serialization }
-import akka.stream._
-import akka.stream.scaladsl._
-import akka.stream.stage._
+package org.apache.pekko.persistence.dynamodb.journal
+
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.{ ActorSystem, ExtendedActorSystem }
+import org.apache.pekko.persistence.PersistentRepr
+import org.apache.pekko.persistence.dynamodb._
+import org.apache.pekko.persistence.dynamodb.{
+ ActorSystemProvider,
+ DynamoProvider,
+ LoggingProvider,
+ MaterializerProvider
+}
+import org.apache.pekko.serialization.{ AsyncSerializer, Serialization }
+import org.apache.pekko.stream._
+import org.apache.pekko.stream.scaladsl._
+import org.apache.pekko.stream.stage._
import com.amazonaws.services.dynamodbv2.model._
import java.util.function.Consumer
diff --git a/src/main/scala/akka/persistence/dynamodb/journal/package.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/package.scala
similarity index 96%
rename from src/main/scala/akka/persistence/dynamodb/journal/package.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/journal/package.scala
index 63c9c4c..18fc6da 100644
--- a/src/main/scala/akka/persistence/dynamodb/journal/package.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/journal/package.scala
@@ -1,7 +1,7 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb
+package org.apache.pekko.persistence.dynamodb
import com.amazonaws.services.dynamodbv2.model._
diff --git a/src/main/scala/akka/persistence/dynamodb/package.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/package.scala
similarity index 87%
rename from src/main/scala/akka/persistence/dynamodb/package.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/package.scala
index e8fb3a2..2ddba03 100644
--- a/src/main/scala/akka/persistence/dynamodb/package.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/package.scala
@@ -1,17 +1,18 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence
+package org.apache.pekko.persistence
import java.nio.ByteBuffer
import java.util.concurrent.Executors
-
-import akka.actor.{ ActorSystem, Scheduler }
-import akka.event.{ Logging, LoggingAdapter }
-import akka.persistence.dynamodb.journal.DynamoDBHelper
+import org.apache.pekko.actor.{ ActorSystem, Scheduler }
+import org.apache.pekko.dispatch.ExecutionContexts
+import org.apache.pekko.event.{ Logging, LoggingAdapter }
+import org.apache.pekko.persistence.dynamodb.journal.DynamoDBHelper
import com.amazonaws.auth.BasicAWSCredentials
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBAsyncClient
import com.amazonaws.services.dynamodbv2.model.{ AttributeValue, AttributeValueUpdate }
+
import java.util.{ Map => JMap }
import scala.collection.generic.CanBuildFrom
import scala.concurrent.{ ExecutionContext, Future, Promise }
@@ -31,7 +32,7 @@ package object dynamodb {
def lift[T](f: Future[T]): Future[Try[T]] = {
val p = Promise[Try[T]]
- f.onComplete(p.success)(akka.dispatch.ExecutionContexts.sameThreadExecutionContext)
+ f.onComplete(p.success)(ExecutionContexts.sameThreadExecutionContext)
p.future
}
@@ -40,7 +41,7 @@ package object dynamodb {
f.onComplete {
case Success(_) => p.success(Success(()))
case f @ Failure(_) => p.success(f.asInstanceOf[Failure[Unit]])
- }(akka.dispatch.ExecutionContexts.sameThreadExecutionContext)
+ }(ExecutionContexts.sameThreadExecutionContext)
p.future
}
diff --git a/src/main/scala/akka/persistence/dynamodb/providers.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/providers.scala
similarity index 60%
rename from src/main/scala/akka/persistence/dynamodb/providers.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/providers.scala
index 604c1a8..f0ff941 100644
--- a/src/main/scala/akka/persistence/dynamodb/providers.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/providers.scala
@@ -1,9 +1,9 @@
-package akka.persistence.dynamodb
+package org.apache.pekko.persistence.dynamodb
-import akka.actor.ExtendedActorSystem
-import akka.event.LoggingAdapter
-import akka.persistence.dynamodb.journal.{ DynamoDBHelper, DynamoDBJournalConfig }
-import akka.stream.Materializer
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.event.LoggingAdapter
+import org.apache.pekko.persistence.dynamodb.journal.{ DynamoDBHelper, DynamoDBJournalConfig }
+import org.apache.pekko.stream.Materializer
trait LoggingProvider {
protected def log: LoggingAdapter
diff --git a/src/main/scala/akka/persistence/dynamodb/query/DynamoDBReadJournalConfig.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/DynamoDBReadJournalConfig.scala
similarity index 81%
rename from src/main/scala/akka/persistence/dynamodb/query/DynamoDBReadJournalConfig.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/query/DynamoDBReadJournalConfig.scala
index 5d35a48..42ba189 100644
--- a/src/main/scala/akka/persistence/dynamodb/query/DynamoDBReadJournalConfig.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/DynamoDBReadJournalConfig.scala
@@ -1,7 +1,8 @@
-package akka.persistence.dynamodb.query
-import akka.actor.ActorSystem
-import akka.persistence.dynamodb.query.scaladsl.DynamoDBReadJournal
-import akka.persistence.dynamodb.{ ClientConfig, DynamoDBClientConfig, DynamoDBConfig }
+package org.apache.pekko.persistence.dynamodb.query
+
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.DynamoDBReadJournal
+import org.apache.pekko.persistence.dynamodb.{ ClientConfig, DynamoDBClientConfig, DynamoDBConfig }
import com.typesafe.config.Config
class DynamoDBReadJournalConfig(c: Config) extends DynamoDBConfig {
diff --git a/src/main/scala/akka/persistence/dynamodb/query/DynamoDBReadJournalProvider.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/DynamoDBReadJournalProvider.scala
similarity index 51%
rename from src/main/scala/akka/persistence/dynamodb/query/DynamoDBReadJournalProvider.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/query/DynamoDBReadJournalProvider.scala
index 8dfaa7b..7eace06 100644
--- a/src/main/scala/akka/persistence/dynamodb/query/DynamoDBReadJournalProvider.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/DynamoDBReadJournalProvider.scala
@@ -1,11 +1,11 @@
-package akka.persistence.dynamodb.query
+package org.apache.pekko.persistence.dynamodb.query
-import akka.actor.ExtendedActorSystem
-import akka.persistence.dynamodb.query.javadsl.{ DynamoDBReadJournal => JavaDynamoDBReadJournal }
-import akka.persistence.dynamodb.query.scaladsl.internal.{ DynamoDBReadJournal => ScalaDynamoDBReadJournal }
-import akka.persistence.query.ReadJournalProvider
-import akka.persistence.query.javadsl.{ ReadJournal => JavaReadJournal }
-import akka.persistence.query.scaladsl.{ ReadJournal => ScalaReadJournal }
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.persistence.dynamodb.query.javadsl.{ DynamoDBReadJournal => JavaDynamoDBReadJournal }
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.internal.{ DynamoDBReadJournal => ScalaDynamoDBReadJournal }
+import org.apache.pekko.persistence.query.ReadJournalProvider
+import org.apache.pekko.persistence.query.javadsl.{ ReadJournal => JavaReadJournal }
+import org.apache.pekko.persistence.query.scaladsl.{ ReadJournal => ScalaReadJournal }
import com.typesafe.config.Config
class DynamoDBReadJournalProvider(system: ExtendedActorSystem, config: Config, configPath: String)
diff --git a/src/main/scala/akka/persistence/dynamodb/query/javadsl/DynamoDBReadJournal.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/javadsl/DynamoDBReadJournal.scala
similarity index 67%
rename from src/main/scala/akka/persistence/dynamodb/query/javadsl/DynamoDBReadJournal.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/query/javadsl/DynamoDBReadJournal.scala
index 2efe215..9cb83d9 100644
--- a/src/main/scala/akka/persistence/dynamodb/query/javadsl/DynamoDBReadJournal.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/javadsl/DynamoDBReadJournal.scala
@@ -1,16 +1,16 @@
-package akka.persistence.dynamodb.query.javadsl
+package org.apache.pekko.persistence.dynamodb.query.javadsl
-import akka.NotUsed
-import akka.persistence.query.EventEnvelope
-import akka.stream.javadsl.Source
-import akka.persistence.dynamodb.query.scaladsl
-import akka.persistence.query.javadsl.{ CurrentEventsByPersistenceIdQuery, CurrentPersistenceIdsQuery }
+import org.apache.pekko.NotUsed
+import org.apache.pekko.persistence.query.EventEnvelope
+import org.apache.pekko.stream.javadsl.Source
+import org.apache.pekko.persistence.dynamodb.query.scaladsl
+import org.apache.pekko.persistence.query.javadsl.{ CurrentEventsByPersistenceIdQuery, CurrentPersistenceIdsQuery }
object DynamoDBReadJournal {
/**
* The default identifier for [[DynamoDBReadJournal]] to be used with
- * `akka.persistence.query.PersistenceQuery#readJournalFor`.
+ * `org.apache.pekko.persistence.query.PersistenceQuery#readJournalFor`.
*
* The value is `"dynamodb-read-journal"` and corresponds
* to the absolute path to the read journal configuration entry.
@@ -19,7 +19,7 @@ object DynamoDBReadJournal {
}
/**
- * Java API: `akka.persistence.query.javadsl.ReadJournal` implementation for Dynamodb.
+ * Java API: `org.apache.pekko.persistence.query.javadsl.ReadJournal` implementation for Dynamodb.
*
* It is retrieved with:
* {{{
@@ -34,15 +34,15 @@ object DynamoDBReadJournal {
* for the default [[DynamoDBReadJournal#Identifier]]. See `reference.conf`.
*/
class DynamoDBReadJournal(scaladslReadJournal: scaladsl.DynamoDBReadJournal)
- extends akka.persistence.query.javadsl.ReadJournal
- // with akka.persistence.query.javadsl.EventsByTagQuery
+ extends org.apache.pekko.persistence.query.javadsl.ReadJournal
+ // with org.apache.pekko.persistence.query.javadsl.EventsByTagQuery
with CurrentEventsByPersistenceIdQuery
with CurrentPersistenceIdsQuery
- // with akka.persistence.query.javadsl.CurrentPersistenceIdsQuery
+ // with org.apache.pekko.persistence.query.javadsl.CurrentPersistenceIdsQuery
{
/**
- * Same type of query as [[akka.persistence.query.javadsl.EventsByPersistenceIdQuery.eventsByPersistenceId]]
+ * Same type of query as [[org.apache.pekko.persistence.query.javadsl.EventsByPersistenceIdQuery.eventsByPersistenceId]]
* but the event stream is completed immediately when it reaches the end of
* the results. Events that are stored after the query is completed are
* not included in the event stream.
@@ -58,12 +58,12 @@ class DynamoDBReadJournal(scaladslReadJournal: scaladsl.DynamoDBReadJournal)
scaladslReadJournal.currentEventsByPersistenceId(persistenceId, fromSequenceNr, toSequenceNr).asJava
/**
- * Same type of query as [[akka.persistence.query.javadsl.PersistenceIdsQuery.persistenceIds()]] but the stream
+ * Same type of query as [[org.apache.pekko.persistence.query.javadsl.PersistenceIdsQuery.persistenceIds()]] but the stream
* is completed immediately when it reaches the end of the "result set". Persistent
* actors that are created after the query is completed are not included in the stream.
*
* A dynamodb <code>query</code> will be performed against a Global Secondary Index 'persistence-ids-idx'.
- * See [[akka.persistence.dynamodb.query.scaladsl.CreatePersistenceIdsIndex.createPersistenceIdsIndexRequest]]
+ * See [[org.apache.pekko.persistence.dynamodb.query.scaladsl.CreatePersistenceIdsIndex.createPersistenceIdsIndexRequest]]
*/
def currentPersistenceIds(): Source[String, NotUsed] =
scaladslReadJournal.currentPersistenceIds().asJava
@@ -78,7 +78,7 @@ class DynamoDBReadJournal(scaladslReadJournal: scaladsl.DynamoDBReadJournal)
/**
* Persistence ids are returned page by page.
* A dynamodb <code>query</code> will be performed against a Global Secondary Index 'persistence-ids-idx'.
- * See [[akka.persistence.dynamodb.query.scaladsl.CreatePersistenceIdsIndex.createPersistenceIdsIndexRequest]]
+ * See [[org.apache.pekko.persistence.dynamodb.query.scaladsl.CreatePersistenceIdsIndex.createPersistenceIdsIndexRequest]]
*/
def currentPersistenceIdsByPageQuery(): Source[List[String], NotUsed] =
scaladslReadJournal.currentPersistenceIdsByPageQuery().map(_.toList).asJava
diff --git a/src/main/scala/akka/persistence/dynamodb/query/package.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/package.scala
similarity index 69%
rename from src/main/scala/akka/persistence/dynamodb/query/package.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/query/package.scala
index 431cdbb..2942d69 100644
--- a/src/main/scala/akka/persistence/dynamodb/query/package.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/package.scala
@@ -1,7 +1,7 @@
-package akka.persistence.dynamodb
+package org.apache.pekko.persistence.dynamodb
-import akka.NotUsed
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.stream.scaladsl.Source
package object query {
private[dynamodb] implicit class RichOption[+A](val option: Option[A]) extends AnyVal {
diff --git a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/DynamoDBCurrentEventsByPersistenceIdQuery.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/DynamoDBCurrentEventsByPersistenceIdQuery.scala
similarity index 62%
rename from src/main/scala/akka/persistence/dynamodb/query/scaladsl/DynamoDBCurrentEventsByPersistenceIdQuery.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/DynamoDBCurrentEventsByPersistenceIdQuery.scala
index 356aac5..7910ce4 100644
--- a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/DynamoDBCurrentEventsByPersistenceIdQuery.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/DynamoDBCurrentEventsByPersistenceIdQuery.scala
@@ -1,14 +1,14 @@
-package akka.persistence.dynamodb.query.scaladsl
+package org.apache.pekko.persistence.dynamodb.query.scaladsl
-import akka.NotUsed
-import akka.persistence.query.EventEnvelope
-import akka.persistence.query.scaladsl.CurrentEventsByPersistenceIdQuery
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.persistence.query.EventEnvelope
+import org.apache.pekko.persistence.query.scaladsl.CurrentEventsByPersistenceIdQuery
+import org.apache.pekko.stream.scaladsl.Source
trait DynamoDBCurrentEventsByPersistenceIdQuery extends CurrentEventsByPersistenceIdQuery {
/**
- * Same type of query as [[akka.persistence.query.scaladsl.EventsByPersistenceIdQuery.eventsByPersistenceId]]
+ * Same type of query as [[org.apache.pekko.persistence.query.scaladsl.EventsByPersistenceIdQuery.eventsByPersistenceId]]
* but the event stream is completed immediately when it reaches the end of
* the results. Events that are stored after the query is completed are
* not included in the event stream.
diff --git a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/DynamoDBCurrentPersistenceIdsQuery.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/DynamoDBCurrentPersistenceIdsQuery.scala
similarity index 86%
rename from src/main/scala/akka/persistence/dynamodb/query/scaladsl/DynamoDBCurrentPersistenceIdsQuery.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/DynamoDBCurrentPersistenceIdsQuery.scala
index a8cfa8c..83081fb 100644
--- a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/DynamoDBCurrentPersistenceIdsQuery.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/DynamoDBCurrentPersistenceIdsQuery.scala
@@ -1,11 +1,11 @@
-package akka.persistence.dynamodb.query.scaladsl
+package org.apache.pekko.persistence.dynamodb.query.scaladsl
-import akka.NotUsed
-import akka.persistence.dynamodb.DynamoProvider
-import akka.persistence.dynamodb.query.ReadJournalSettingsProvider
-import akka.persistence.dynamodb.query.scaladsl.CreatePersistenceIdsIndex.createPersistenceIdsIndexRequest
-import akka.persistence.query.scaladsl.CurrentPersistenceIdsQuery
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.persistence.dynamodb.DynamoProvider
+import org.apache.pekko.persistence.dynamodb.query.ReadJournalSettingsProvider
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.CreatePersistenceIdsIndex.createPersistenceIdsIndexRequest
+import org.apache.pekko.persistence.query.scaladsl.CurrentPersistenceIdsQuery
+import org.apache.pekko.stream.scaladsl.Source
import com.amazonaws.services.dynamodbv2.model._
import scala.concurrent.Future
@@ -13,7 +13,7 @@ import scala.concurrent.Future
trait DynamoDBCurrentPersistenceIdsQuery extends CurrentPersistenceIdsQuery {
/**
- * Same type of query as [[akka.persistence.query.scaladsl.PersistenceIdsQuery.persistenceIds()]] but the stream
+ * Same type of query as [[org.apache.pekko.persistence.query.scaladsl.PersistenceIdsQuery.persistenceIds()]] but the stream
* is completed immediately when it reaches the end of the "result set". Persistent
* actors that are created after the query is completed are not included in the stream.
*
diff --git a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/DynamoDBReadJournal.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/DynamoDBReadJournal.scala
similarity index 70%
rename from src/main/scala/akka/persistence/dynamodb/query/scaladsl/DynamoDBReadJournal.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/DynamoDBReadJournal.scala
index 77cfa66..98dfb8c 100644
--- a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/DynamoDBReadJournal.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/DynamoDBReadJournal.scala
@@ -1,14 +1,14 @@
-package akka.persistence.dynamodb.query.scaladsl
+package org.apache.pekko.persistence.dynamodb.query.scaladsl
/**
- * Scala API `akka.persistence.query.scaladsl.ReadJournal` implementation for DynamoDB.
+ * Scala API `org.apache.pekko.persistence.query.scaladsl.ReadJournal` implementation for DynamoDB.
*
* It is retrieved with:
* {{{
* val queries = PersistenceQuery(system).readJournalFor[DynamoDBReadJournal](DynamoDBReadJournal.Identifier)
* }}}
*
- * Corresponding Java API is in [[akka.persistence.dynamodb.query.javadsl.DynamoDBReadJournal]].
+ * Corresponding Java API is in [[org.apache.pekko.persistence.dynamodb.query.javadsl.DynamoDBReadJournal]].
*
* Configuration settings can be defined in the configuration section with the
* absolute path corresponding to the identifier, which is `"dynamodb-read-journal"`
@@ -22,7 +22,7 @@ object DynamoDBReadJournal {
/**
* The default identifier for [[DynamoDBReadJournal]] to be used with
- * `akka.persistence.query.PersistenceQuery#readJournalFor`.
+ * `org.apache.pekko.persistence.query.PersistenceQuery#readJournalFor`.
*
* The value is `"dynamodb-read-journal"` and corresponds
* to the absolute path to the read journal configuration entry.
diff --git a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentEventsByPersistenceIdQuery.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentEventsByPersistenceIdQuery.scala
similarity index 72%
rename from src/main/scala/akka/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentEventsByPersistenceIdQuery.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentEventsByPersistenceIdQuery.scala
index e556f3e..47c861c 100644
--- a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentEventsByPersistenceIdQuery.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentEventsByPersistenceIdQuery.scala
@@ -1,16 +1,21 @@
-package akka.persistence.dynamodb.query.scaladsl.internal
+package org.apache.pekko.persistence.dynamodb.query.scaladsl.internal
-import akka.NotUsed
-import akka.persistence.PersistentRepr
-import akka.persistence.dynamodb.journal._
-import akka.persistence.dynamodb.query.ReadJournalSettingsProvider
-import akka.persistence.dynamodb.query.scaladsl.internal.DynamoDBCurrentEventsByPersistenceIdQuery.RichPersistenceRepr
-import akka.persistence.dynamodb.query.scaladsl.{
+import org.apache.pekko.NotUsed
+import org.apache.pekko.persistence.PersistentRepr
+import org.apache.pekko.persistence.dynamodb.journal._
+import org.apache.pekko.persistence.dynamodb.query.ReadJournalSettingsProvider
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.internal.DynamoDBCurrentEventsByPersistenceIdQuery.RichPersistenceRepr
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.{
DynamoDBCurrentEventsByPersistenceIdQuery => PublicDynamoDBCurrentEventsByPersistenceIdQuery
}
-import akka.persistence.dynamodb.{ ActorSystemProvider, DynamoProvider, LoggingProvider, MaterializerProvider }
-import akka.persistence.query.{ EventEnvelope, Sequence }
-import akka.stream.scaladsl.Source
+import org.apache.pekko.persistence.dynamodb.{
+ ActorSystemProvider,
+ DynamoProvider,
+ LoggingProvider,
+ MaterializerProvider
+}
+import org.apache.pekko.persistence.query.{ EventEnvelope, Sequence }
+import org.apache.pekko.stream.scaladsl.Source
trait DynamoDBCurrentEventsByPersistenceIdQuery
extends PublicDynamoDBCurrentEventsByPersistenceIdQuery
@@ -26,7 +31,7 @@ trait DynamoDBCurrentEventsByPersistenceIdQuery
with SerializationProvider =>
/**
- * Same type of query as [[akka.persistence.query.scaladsl.EventsByPersistenceIdQuery.eventsByPersistenceId]]
+ * Same type of query as [[org.apache.pekko.persistence.query.scaladsl.EventsByPersistenceIdQuery.eventsByPersistenceId]]
* but the event stream is completed immediately when it reaches the end of
* the results. Events that are stored after the query is completed are
* not included in the event stream.
diff --git a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentPersistenceIdsQuery.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentPersistenceIdsQuery.scala
similarity index 91%
rename from src/main/scala/akka/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentPersistenceIdsQuery.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentPersistenceIdsQuery.scala
index 85c81b6..7db0b47 100644
--- a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentPersistenceIdsQuery.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/internal/DynamoDBCurrentPersistenceIdsQuery.scala
@@ -1,21 +1,21 @@
-package akka.persistence.dynamodb.query.scaladsl.internal
+package org.apache.pekko.persistence.dynamodb.query.scaladsl.internal
-import akka.NotUsed
-import akka.persistence.dynamodb.journal.JournalKeys
-import akka.persistence.dynamodb.query.scaladsl.internal.DynamoDBCurrentPersistenceIdsQuery.{
+import org.apache.pekko.NotUsed
+import org.apache.pekko.persistence.dynamodb.journal.JournalKeys
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.internal.DynamoDBCurrentPersistenceIdsQuery.{
RichNumber,
RichString,
SourceLazyOps
}
-import akka.persistence.dynamodb.query.scaladsl.internal.PersistenceIdsResult.RichPersistenceIdsResult
-import akka.persistence.dynamodb.query.scaladsl.{
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.internal.PersistenceIdsResult.RichPersistenceIdsResult
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.{
CreatePersistenceIdsIndex,
DynamoDBCurrentPersistenceIdsQuery => PublicDynamoDBCurrentPersistenceIdsQuery
}
-import akka.persistence.dynamodb.query.{ ReadJournalSettingsProvider, RichOption }
-import akka.persistence.dynamodb.{ ActorSystemProvider, DynamoProvider, LoggingProvider }
-import akka.stream.scaladsl.Source
-import akka.util.ccompat.JavaConverters._
+import org.apache.pekko.persistence.dynamodb.query.{ ReadJournalSettingsProvider, RichOption }
+import org.apache.pekko.persistence.dynamodb.{ ActorSystemProvider, DynamoProvider, LoggingProvider }
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ccompat.JavaConverters._
import com.amazonaws.services.dynamodbv2.model._
import java.util
@@ -30,7 +30,7 @@ trait DynamoDBCurrentPersistenceIdsQuery extends PublicDynamoDBCurrentPersistenc
with JournalKeys =>
/**
- * Same type of query as [[akka.persistence.query.scaladsl.PersistenceIdsQuery.persistenceIds()]] but the stream
+ * Same type of query as [[org.apache.pekko.persistence.query.scaladsl.PersistenceIdsQuery.persistenceIds()]] but the stream
* is completed immediately when it reaches the end of the "result set". Persistent
* actors that are created after the query is completed are not included in the stream.
*
diff --git a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/internal/DynamoDBReadJournal.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/internal/DynamoDBReadJournal.scala
similarity index 58%
rename from src/main/scala/akka/persistence/dynamodb/query/scaladsl/internal/DynamoDBReadJournal.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/internal/DynamoDBReadJournal.scala
index 8971c65..4be903e 100644
--- a/src/main/scala/akka/persistence/dynamodb/query/scaladsl/internal/DynamoDBReadJournal.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/query/scaladsl/internal/DynamoDBReadJournal.scala
@@ -1,18 +1,19 @@
-package akka.persistence.dynamodb.query.scaladsl.internal
+package org.apache.pekko.persistence.dynamodb.query.scaladsl.internal
-import akka.actor.ExtendedActorSystem
-import akka.persistence.dynamodb._
-import akka.persistence.dynamodb.journal._
-import akka.persistence.dynamodb.query.scaladsl.internal.{
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.persistence.dynamodb._
+import org.apache.pekko.persistence.dynamodb.journal._
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.internal.{
DynamoDBCurrentEventsByPersistenceIdQuery => InternalDynamoDBCurrentEventsByPersistenceIdQuery,
DynamoDBCurrentPersistenceIdsQuery => InternalDynamoDBCurrentPersistenceIdsQuery
}
-import akka.persistence.dynamodb.query.scaladsl.{ DynamoDBReadJournal => PublicDynamoDBReadJournal }
-import akka.persistence.dynamodb.query.{ DynamoDBReadJournalConfig, ReadJournalSettingsProvider }
-import akka.persistence.query.scaladsl.ReadJournal
-import akka.serialization.{ Serialization, SerializationExtension }
-import akka.stream.{ Materializer, SystemMaterializer }
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.{ DynamoDBReadJournal => PublicDynamoDBReadJournal }
+import org.apache.pekko.persistence.dynamodb.query.{ DynamoDBReadJournalConfig, ReadJournalSettingsProvider }
+import org.apache.pekko.persistence.query.scaladsl.ReadJournal
+import org.apache.pekko.serialization.{ Serialization, SerializationExtension }
+import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
import com.typesafe.config.Config
+import org.apache.pekko.persistence.dynamodb.journal.{ DynamoDBHelper, JournalSettingsProvider }
class DynamoDBReadJournal(config: Config, configPath: String)(implicit val system: ExtendedActorSystem)
extends ReadJournal
diff --git a/src/main/scala/akka/persistence/dynamodb/snapshot/DynamoDBSnapshotConfig.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBSnapshotConfig.scala
similarity index 85%
rename from src/main/scala/akka/persistence/dynamodb/snapshot/DynamoDBSnapshotConfig.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBSnapshotConfig.scala
index ac90075..69a8e48 100644
--- a/src/main/scala/akka/persistence/dynamodb/snapshot/DynamoDBSnapshotConfig.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBSnapshotConfig.scala
@@ -1,9 +1,9 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.snapshot
+package org.apache.pekko.persistence.dynamodb.snapshot
-import akka.persistence.dynamodb.{ ClientConfig, DynamoDBClientConfig, DynamoDBConfig }
+import org.apache.pekko.persistence.dynamodb.{ ClientConfig, DynamoDBClientConfig, DynamoDBConfig }
import com.typesafe.config.Config
class DynamoDBSnapshotConfig(c: Config) extends DynamoDBConfig {
diff --git a/src/main/scala/akka/persistence/dynamodb/snapshot/DynamoDBSnapshotRequests.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBSnapshotRequests.scala
similarity index 94%
rename from src/main/scala/akka/persistence/dynamodb/snapshot/DynamoDBSnapshotRequests.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBSnapshotRequests.scala
index bf24da5..15bdaab 100644
--- a/src/main/scala/akka/persistence/dynamodb/snapshot/DynamoDBSnapshotRequests.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBSnapshotRequests.scala
@@ -1,20 +1,19 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.snapshot
+package org.apache.pekko.persistence.dynamodb.snapshot
import java.util.{ HashMap => JHMap }
-
-import akka.actor.ExtendedActorSystem
-import akka.persistence.dynamodb.{ DynamoDBRequests, Item }
-import akka.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria }
-import akka.persistence.serialization.Snapshot
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.persistence.dynamodb.{ DynamoDBRequests, Item }
+import org.apache.pekko.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria }
+import org.apache.pekko.persistence.serialization.Snapshot
import com.amazonaws.services.dynamodbv2.model._
import collection.JavaConverters._
import scala.concurrent.Future
-import akka.persistence.dynamodb._
-import akka.serialization.{ AsyncSerializer, Serialization, Serializers }
+import org.apache.pekko.persistence.dynamodb._
+import org.apache.pekko.serialization.{ AsyncSerializer, Serialization, Serializers }
trait DynamoDBSnapshotRequests extends DynamoDBRequests {
this: DynamoDBSnapshotStore =>
diff --git a/src/main/scala/akka/persistence/dynamodb/snapshot/DynamoDBSnapshotStore.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBSnapshotStore.scala
similarity index 77%
rename from src/main/scala/akka/persistence/dynamodb/snapshot/DynamoDBSnapshotStore.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBSnapshotStore.scala
index a752e1f..a6c37d7 100644
--- a/src/main/scala/akka/persistence/dynamodb/snapshot/DynamoDBSnapshotStore.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBSnapshotStore.scala
@@ -1,15 +1,15 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.snapshot
+package org.apache.pekko.persistence.dynamodb.snapshot
-import akka.actor.ActorLogging
-import akka.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria }
-import akka.persistence.snapshot.SnapshotStore
-import akka.serialization.SerializationExtension
+import org.apache.pekko.actor.ActorLogging
+import org.apache.pekko.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria }
+import org.apache.pekko.persistence.dynamodb._
+import org.apache.pekko.persistence.snapshot.SnapshotStore
+import org.apache.pekko.serialization.SerializationExtension
import com.typesafe.config.Config
-import akka.persistence.dynamodb._
import scala.concurrent.Future
class DynamoDBSnapshotStore(config: Config) extends SnapshotStore with DynamoDBSnapshotRequests with ActorLogging {
diff --git a/src/main/scala/akka/persistence/dynamodb/snapshot/package.scala b/src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/package.scala
similarity index 88%
rename from src/main/scala/akka/persistence/dynamodb/snapshot/package.scala
rename to src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/package.scala
index 411dfec..546d802 100644
--- a/src/main/scala/akka/persistence/dynamodb/snapshot/package.scala
+++ b/src/main/scala/org/apache/pekko/persistence/dynamodb/snapshot/package.scala
@@ -1,7 +1,7 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb
+package org.apache.pekko.persistence.dynamodb
package object snapshot {
diff --git a/src/test/resources/application.conf b/src/test/resources/application.conf
index edd4333..4e89f55 100644
--- a/src/test/resources/application.conf
+++ b/src/test/resources/application.conf
@@ -18,9 +18,7 @@ my-dynamodb-snapshot-store {
tracing = off
}
-akka {
- loggers = ["akka.testkit.TestEventListener"]
- loglevel = INFO
+pekko {
actor {
allow-java-serialization = on
}
@@ -30,6 +28,8 @@ akka {
publish-confirmations = on
publish-plugin-commands = on
}
+ loggers = ["org.apache.pekko.testkit.TestEventListener"]
+ loglevel = INFO
}
dynamodb-read-journal {
diff --git a/src/test/scala/akka/persistence/dynamodb/snapshot/SnapshotStoreTckSpec.scala b/src/test/scala/akka/persistence/dynamodb/snapshot/SnapshotStoreTckSpec.scala
deleted file mode 100644
index 611ad29..0000000
--- a/src/test/scala/akka/persistence/dynamodb/snapshot/SnapshotStoreTckSpec.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
- */
-package akka.persistence.dynamodb.snapshot
-
-import akka.persistence.dynamodb.IntegSpec
-
-import akka.actor.{ ActorRef, ActorSystem }
-import akka.persistence.SnapshotProtocol._
-import akka.persistence._
-import akka.persistence.scalatest.OptionalTests
-import akka.persistence.snapshot.SnapshotStoreSpec
-import akka.testkit.TestProbe
-import com.typesafe.config.{ Config, ConfigFactory }
-
-import scala.collection.immutable.Seq
-
-class SnapshotStoreTckSpec extends SnapshotStoreSpec(ConfigFactory.load()) with DynamoDBUtils with IntegSpec {
- override def beforeAll(): Unit = {
- super.beforeAll()
- ensureSnapshotTableExists()
- }
-
- override def afterAll(): Unit = {
- client.shutdown()
- super.afterAll()
- }
-}
diff --git a/src/test/scala/akka/persistence/dynamodb/IntegSpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/IntegSpec.scala
similarity index 93%
rename from src/test/scala/akka/persistence/dynamodb/IntegSpec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/IntegSpec.scala
index 6ae80e5..e4e4536 100644
--- a/src/test/scala/akka/persistence/dynamodb/IntegSpec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/IntegSpec.scala
@@ -1,4 +1,4 @@
-package akka.persistence.dynamodb
+package org.apache.pekko.persistence.dynamodb
import com.dimafeng.testcontainers.{ FixedHostPortGenericContainer, ForAllTestContainer }
import org.scalatest.Suite
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/AsyncDynamoDBJournalSpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/AsyncDynamoDBJournalSpec.scala
similarity index 70%
rename from src/test/scala/akka/persistence/dynamodb/journal/AsyncDynamoDBJournalSpec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/AsyncDynamoDBJournalSpec.scala
index c30d6d9..b8fb086 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/AsyncDynamoDBJournalSpec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/AsyncDynamoDBJournalSpec.scala
@@ -1,13 +1,13 @@
/*
* Copyright (C) 2019 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
-import akka.actor.ActorRef
-import akka.pattern.extended.ask
-import akka.persistence.CapabilityFlag
-import akka.persistence.dynamodb.IntegSpec
-import akka.persistence.journal.JournalSpec
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.pattern.extended.ask
+import org.apache.pekko.persistence.CapabilityFlag
+import org.apache.pekko.persistence.dynamodb.IntegSpec
+import org.apache.pekko.persistence.journal.JournalSpec
import com.typesafe.config.ConfigFactory
import scala.concurrent.Await
@@ -17,9 +17,10 @@ object AsyncDynamoDBJournalSpec {
val config = ConfigFactory
.parseString("""
- |akka.actor {
+ |pekko.actor {
+ | allow-java-serialization = on
| serializers {
- | test = "akka.persistence.dynamodb.journal.TestSerializer"
+ | test = "org.apache.pekko.persistence.dynamodb.journal.TestSerializer"
| }
| serialization-bindings {
| "java.io.Serializable" = test
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/BackwardsCompatibilityV1Spec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/BackwardsCompatibilityV1Spec.scala
similarity index 94%
rename from src/test/scala/akka/persistence/dynamodb/journal/BackwardsCompatibilityV1Spec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/BackwardsCompatibilityV1Spec.scala
index 50ed4f9..a7c26f2 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/BackwardsCompatibilityV1Spec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/BackwardsCompatibilityV1Spec.scala
@@ -1,13 +1,13 @@
/*
* Copyright (C) 2019 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
-import akka.actor.ActorSystem
-import akka.persistence.JournalProtocol._
-import akka.persistence._
-import akka.persistence.dynamodb.IntegSpec
-import akka.testkit._
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.persistence.JournalProtocol._
+import org.apache.pekko.persistence._
+import org.apache.pekko.persistence.dynamodb.IntegSpec
+import org.apache.pekko.testkit._
import com.amazonaws.auth.BasicAWSCredentials
import com.amazonaws.regions.Regions
import com.amazonaws.services.dynamodbv2.document.{ DynamoDB, Item }
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/DeletionSpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DeletionSpec.scala
similarity index 87%
rename from src/test/scala/akka/persistence/dynamodb/journal/DeletionSpec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DeletionSpec.scala
index 14cd785..70a2ba2 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/DeletionSpec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DeletionSpec.scala
@@ -1,17 +1,17 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
-
-import akka.actor.ActorSystem
-import akka.persistence.JournalProtocol._
-import akka.persistence._
-import akka.persistence.dynamodb.IntegSpec
-import akka.persistence.dynamodb.query.scaladsl.DynamoDBReadJournal
-import akka.persistence.query.PersistenceQuery
-import akka.stream.scaladsl.Sink
-import akka.stream.{ Materializer, SystemMaterializer }
-import akka.testkit._
+package org.apache.pekko.persistence.dynamodb.journal
+
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.persistence.JournalProtocol._
+import org.apache.pekko.persistence._
+import org.apache.pekko.persistence.dynamodb.IntegSpec
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.DynamoDBReadJournal
+import org.apache.pekko.persistence.query.PersistenceQuery
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
+import org.apache.pekko.testkit._
import org.scalactic.TypeCheckedTripleEquals
import org.scalatest._
import org.scalatest.concurrent.ScalaFutures
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/DynamoDBIntegrationLoadSpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBIntegrationLoadSpec.scala
similarity index 96%
rename from src/test/scala/akka/persistence/dynamodb/journal/DynamoDBIntegrationLoadSpec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBIntegrationLoadSpec.scala
index 5e2e966..0394144 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/DynamoDBIntegrationLoadSpec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBIntegrationLoadSpec.scala
@@ -1,12 +1,12 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
-import akka.actor._
-import akka.persistence._
-import akka.persistence.dynamodb.IntegSpec
-import akka.testkit._
+import org.apache.pekko.actor._
+import org.apache.pekko.persistence._
+import org.apache.pekko.persistence.dynamodb.IntegSpec
+import org.apache.pekko.testkit._
import com.typesafe.config.ConfigFactory
import org.scalatest._
@@ -29,7 +29,7 @@ my-dynamodb-journal {
aws-secret-access-key = "set something in case no real creds are there"
aws-secret-access-key = ${?AWS_SECRET_ACCESS_KEY}
}
-akka.persistence.snapshot-store.plugin = ""
+pekko.persistence.snapshot-store.plugin = ""
""").withFallback(ConfigFactory.load())
.resolve()
@@ -114,7 +114,7 @@ akka.persistence.snapshot-store.plugin = ""
}
}
-import akka.persistence.dynamodb.journal.DynamoDBIntegrationLoadSpec._
+import org.apache.pekko.persistence.dynamodb.journal.DynamoDBIntegrationLoadSpec._
class DynamoDBIntegrationLoadSpec
extends TestKit(ActorSystem("test", config))
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/DynamoDBJournalSpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournalSpec.scala
similarity index 72%
rename from src/test/scala/akka/persistence/dynamodb/journal/DynamoDBJournalSpec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournalSpec.scala
index 4e86c23..7b63fa1 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/DynamoDBJournalSpec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBJournalSpec.scala
@@ -1,13 +1,13 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
-import akka.actor.ActorRef
-import akka.pattern.extended.ask
-import akka.persistence.CapabilityFlag
-import akka.persistence.dynamodb.IntegSpec
-import akka.persistence.journal.JournalSpec
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.pattern.extended.ask
+import org.apache.pekko.persistence.CapabilityFlag
+import org.apache.pekko.persistence.dynamodb.IntegSpec
+import org.apache.pekko.persistence.journal.JournalSpec
import com.typesafe.config.ConfigFactory
import scala.concurrent.Await
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/DynamoDBUtils.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBUtils.scala
similarity index 87%
rename from src/test/scala/akka/persistence/dynamodb/journal/DynamoDBUtils.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBUtils.scala
index 427c84d..b5f687f 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/DynamoDBUtils.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBUtils.scala
@@ -1,12 +1,12 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
-import akka.actor.ActorSystem
-import akka.persistence.PersistentRepr
-import akka.persistence.dynamodb._
-import akka.util.Timeout
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.persistence.PersistentRepr
+import org.apache.pekko.persistence.dynamodb._
+import org.apache.pekko.util.Timeout
import com.amazonaws.services.dynamodbv2.model._
import java.util.UUID
@@ -21,7 +21,7 @@ trait DynamoDBUtils extends JournalSettingsProvider with DynamoProvider {
override lazy val journalSettings = {
val c = system.settings.config
- val config = c.getConfig(c.getString("akka.persistence.journal.plugin"))
+ val config = c.getConfig(c.getString("pekko.persistence.journal.plugin"))
new DynamoDBJournalConfig(config)
}
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/DynamoPartitionGroupedSpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoPartitionGroupedSpec.scala
similarity index 89%
rename from src/test/scala/akka/persistence/dynamodb/journal/DynamoPartitionGroupedSpec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoPartitionGroupedSpec.scala
index 632f517..d41774d 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/DynamoPartitionGroupedSpec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoPartitionGroupedSpec.scala
@@ -1,10 +1,10 @@
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
-import akka.actor.ActorSystem
-import akka.stream.{ ActorMaterializer, Materializer, SystemMaterializer }
-import akka.stream.scaladsl.Source
-import akka.stream.testkit.scaladsl.TestSink
-import akka.testkit.TestKit
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.{ ActorMaterializer, Materializer, SystemMaterializer }
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.stream.testkit.scaladsl.TestSink
+import org.apache.pekko.testkit.TestKit
import org.scalatest.WordSpecLike
class DynamoPartitionGroupedSpec extends TestKit(ActorSystem("DynamoPartitionGroupedSpec")) with WordSpecLike {
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/FailureReportingSpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/FailureReportingSpec.scala
similarity index 93%
rename from src/test/scala/akka/persistence/dynamodb/journal/FailureReportingSpec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/FailureReportingSpec.scala
index 712fc23..5399fa9 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/FailureReportingSpec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/FailureReportingSpec.scala
@@ -1,14 +1,14 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
-
-import akka.actor._
-import akka.event.Logging
-import akka.persistence.JournalProtocol._
-import akka.persistence._
-import akka.persistence.dynamodb._
-import akka.testkit._
+package org.apache.pekko.persistence.dynamodb.journal
+
+import org.apache.pekko.actor._
+import org.apache.pekko.event.Logging
+import org.apache.pekko.persistence.JournalProtocol._
+import org.apache.pekko.persistence._
+import org.apache.pekko.persistence.dynamodb._
+import org.apache.pekko.testkit._
import com.amazonaws.services.dynamodbv2.model._
import com.typesafe.config.ConfigFactory
import org.scalactic.TypeCheckedTripleEquals
@@ -114,19 +114,19 @@ dynamodb-journal {
aws-access-key-id = "AWS_ACCESS_KEY_ID"
aws-secret-access-key = "AWS_SECRET_ACCESS_KEY"
}
-akka.persistence.journal.plugin = "dynamodb-journal"
-akka.persistence.snapshot-store.plugin = "no-snapshot-store"
-akka.loggers = ["akka.testkit.TestEventListener"]
+pekko.persistence.journal.plugin = "dynamodb-journal"
+pekko.persistence.snapshot-store.plugin = "no-snapshot-store"
+pekko.loggers = ["org.apache.pekko.testkit.TestEventListener"]
""")
implicit val system = ActorSystem("FailureReportingSpec-test4", config)
try {
val probe = TestProbe()
system.eventStream.subscribe(probe.ref, classOf[Logging.LogEvent])
- EventFilter[ResourceNotFoundException](pattern = ".*akka-persistence.*", occurrences = 1).intercept {
+ EventFilter[ResourceNotFoundException](pattern = ".*pekko-persistence.*", occurrences = 1).intercept {
Persistence(system).journalFor("")
}
- probe.expectMsgType[Logging.Error].message.toString should include("DescribeTableRequest(akka-persistence)")
- probe.expectMsgType[Logging.Error].message.toString should include("until the table 'akka-persistence'")
+ probe.expectMsgType[Logging.Error].message.toString should include("DescribeTableRequest(pekko-persistence)")
+ probe.expectMsgType[Logging.Error].message.toString should include("until the table 'pekko-persistence'")
probe.expectNoMsg(0.seconds)
} finally system.terminate()
}
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/PartialAsyncSerializationSpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PartialAsyncSerializationSpec.scala
similarity index 81%
rename from src/test/scala/akka/persistence/dynamodb/journal/PartialAsyncSerializationSpec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PartialAsyncSerializationSpec.scala
index c4d62ac..f8f24ae 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/PartialAsyncSerializationSpec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PartialAsyncSerializationSpec.scala
@@ -1,13 +1,13 @@
/*
* Copyright (C) 2019 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
-import akka.actor.ActorSystem
-import akka.persistence.JournalProtocol._
-import akka.persistence._
-import akka.persistence.dynamodb.IntegSpec
-import akka.testkit._
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.persistence.JournalProtocol._
+import org.apache.pekko.persistence._
+import org.apache.pekko.persistence.dynamodb.IntegSpec
+import org.apache.pekko.testkit._
import com.typesafe.config.ConfigFactory
import org.scalactic.TypeCheckedTripleEquals
import org.scalatest._
@@ -20,12 +20,13 @@ case class TestAsyncMessage(sequence: Int) extends SerializeAsync
object PartialAsyncSerializationSpec {
val config = ConfigFactory
.parseString("""
- |akka.actor {
+ |pekko.actor {
+ | allow-java-serialization = on
| serializers {
- | test = "akka.persistence.dynamodb.journal.TestSerializer"
+ | test = "org.apache.pekko.persistence.dynamodb.journal.TestSerializer"
| }
| serialization-bindings {
- | "akka.persistence.dynamodb.journal.SerializeAsync" = test
+ | "org.apache.pekko.persistence.dynamodb.journal.SerializeAsync" = test
| }
|}
""".stripMargin)
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/PersistAllConsistencySpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PersistAllConsistencySpec.scala
similarity index 92%
rename from src/test/scala/akka/persistence/dynamodb/journal/PersistAllConsistencySpec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PersistAllConsistencySpec.scala
index 86fd2fd..8e48986 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/PersistAllConsistencySpec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/PersistAllConsistencySpec.scala
@@ -1,13 +1,13 @@
/**
* Copyright (C) 2021 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
-import akka.actor.ActorSystem
-import akka.persistence.JournalProtocol._
-import akka.persistence._
-import akka.persistence.dynamodb._
-import akka.testkit._
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.persistence.JournalProtocol._
+import org.apache.pekko.persistence._
+import org.apache.pekko.persistence.dynamodb.IntegSpec
+import org.apache.pekko.testkit._
import org.scalactic.TypeCheckedTripleEquals
import org.scalatest._
import org.scalatest.concurrent.ScalaFutures
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/RecoveryConsistencySpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/RecoveryConsistencySpec.scala
similarity index 92%
rename from src/test/scala/akka/persistence/dynamodb/journal/RecoveryConsistencySpec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/RecoveryConsistencySpec.scala
index 860d583..49050fc 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/RecoveryConsistencySpec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/RecoveryConsistencySpec.scala
@@ -1,17 +1,17 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
-
-import akka.actor.ActorSystem
-import akka.persistence.JournalProtocol._
-import akka.persistence._
-import akka.persistence.dynamodb._
-import akka.persistence.dynamodb.query.scaladsl.DynamoDBReadJournal
-import akka.persistence.query.PersistenceQuery
-import akka.stream.scaladsl.Sink
-import akka.stream.{ Materializer, SystemMaterializer }
-import akka.testkit._
+package org.apache.pekko.persistence.dynamodb.journal
+
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.persistence.JournalProtocol._
+import org.apache.pekko.persistence._
+import org.apache.pekko.persistence.dynamodb._
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.DynamoDBReadJournal
+import org.apache.pekko.persistence.query.PersistenceQuery
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
+import org.apache.pekko.testkit._
import com.amazonaws.services.dynamodbv2.model._
import org.scalactic.TypeCheckedTripleEquals
import org.scalatest._
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/TestSerializer.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/TestSerializer.scala
similarity index 79%
rename from src/test/scala/akka/persistence/dynamodb/journal/TestSerializer.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/TestSerializer.scala
index 1cd0d22..3363967 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/TestSerializer.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/TestSerializer.scala
@@ -1,10 +1,10 @@
/*
* Copyright (C) 2019 Lightbend Inc. <https://www.lightbend.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
-import akka.actor.ExtendedActorSystem
-import akka.serialization.{ AsyncSerializerWithStringManifest, JavaSerializer }
+import org.apache.pekko.actor.ExtendedActorSystem
+import org.apache.pekko.serialization.{ AsyncSerializerWithStringManifest, JavaSerializer }
import scala.concurrent.{ ExecutionContext, Future }
diff --git a/src/test/scala/akka/persistence/dynamodb/journal/WriteThroughputBench.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/WriteThroughputBench.scala
similarity index 94%
rename from src/test/scala/akka/persistence/dynamodb/journal/WriteThroughputBench.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/journal/WriteThroughputBench.scala
index 98226f1..937a81b 100644
--- a/src/test/scala/akka/persistence/dynamodb/journal/WriteThroughputBench.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/WriteThroughputBench.scala
@@ -1,13 +1,13 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.journal
+package org.apache.pekko.persistence.dynamodb.journal
-import akka.actor._
-import akka.persistence._
-import akka.stream._
-import akka.stream.scaladsl.GraphDSL.Implicits._
-import akka.stream.scaladsl._
+import org.apache.pekko.actor._
+import org.apache.pekko.persistence._
+import org.apache.pekko.stream._
+import org.apache.pekko.stream.scaladsl.GraphDSL.Implicits._
+import org.apache.pekko.stream.scaladsl._
import com.typesafe.config.ConfigFactory
import org.HdrHistogram.Histogram
@@ -103,7 +103,7 @@ dispatcher {
parallelism-max = 8
}
}
-akka.actor.default-dispatcher.fork-join-executor.parallelism-max = 4
+pekko.actor.default-dispatcher.fork-join-executor.parallelism-max = 4
writers = 1000
writer-dispatcher {
type = Dispatcher
diff --git a/src/test/scala/akka/persistence/dynamodb/query/CurrentPersistenceIdsSpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/query/CurrentPersistenceIdsSpec.scala
similarity index 84%
rename from src/test/scala/akka/persistence/dynamodb/query/CurrentPersistenceIdsSpec.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/query/CurrentPersistenceIdsSpec.scala
index 17517e5..4037026 100644
--- a/src/test/scala/akka/persistence/dynamodb/query/CurrentPersistenceIdsSpec.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/query/CurrentPersistenceIdsSpec.scala
@@ -1,15 +1,15 @@
-package akka.persistence.dynamodb.query
-
-import akka.actor.ActorSystem
-import akka.persistence.JournalProtocol._
-import akka.persistence._
-import akka.persistence.dynamodb.journal.DynamoDBUtils
-import akka.persistence.dynamodb.query.scaladsl.{ CreatePersistenceIdsIndex, DynamoDBReadJournal }
-import akka.persistence.dynamodb.{ DynamoProvider, IntegSpec }
-import akka.persistence.query.PersistenceQuery
-import akka.stream.scaladsl.Sink
-import akka.stream.{ Materializer, SystemMaterializer }
-import akka.testkit._
+package org.apache.pekko.persistence.dynamodb.query
+
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.persistence.JournalProtocol._
+import org.apache.pekko.persistence._
+import org.apache.pekko.persistence.dynamodb.journal.DynamoDBUtils
+import org.apache.pekko.persistence.dynamodb.query.scaladsl.{ CreatePersistenceIdsIndex, DynamoDBReadJournal }
+import org.apache.pekko.persistence.dynamodb.{ DynamoProvider, IntegSpec }
+import org.apache.pekko.persistence.query.PersistenceQuery
+import org.apache.pekko.stream.scaladsl.Sink
+import org.apache.pekko.stream.{ Materializer, SystemMaterializer }
+import org.apache.pekko.testkit._
import org.scalactic.TypeCheckedTripleEquals
import org.scalatest._
import org.scalatest.concurrent.ScalaFutures
@@ -100,6 +100,7 @@ class CurrentPersistenceIdsSpec
}
object CurrentPersistenceIdsSpec {
+
def toPersistenceId(i: Int) = f"CurrentPersistenceIdsSpec_$i%04d"
implicit class RichSeq(val ids: Seq[String]) {
diff --git a/src/test/scala/akka/persistence/dynamodb/snapshot/DynamoDBUtils.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBUtils.scala
similarity index 88%
rename from src/test/scala/akka/persistence/dynamodb/snapshot/DynamoDBUtils.scala
rename to src/test/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBUtils.scala
index 9acd40d..5d77381 100644
--- a/src/test/scala/akka/persistence/dynamodb/snapshot/DynamoDBUtils.scala
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/snapshot/DynamoDBUtils.scala
@@ -1,21 +1,19 @@
/**
* Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
*/
-package akka.persistence.dynamodb.snapshot
+package org.apache.pekko.persistence.dynamodb.snapshot
-import akka.persistence.dynamodb.IntegSpec
-import akka.persistence.dynamodb.dynamoClient
-
-import akka.actor.ActorSystem
-import akka.persistence.PersistentRepr
-import akka.util.Timeout
+import org.apache.pekko.persistence.dynamodb.dynamoClient
+import org.apache.pekko.persistence.dynamodb.journal.DynamoDBHelper
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.util.Timeout
import com.amazonaws.services.dynamodbv2.model._
+
import java.util.UUID
import scala.collection.JavaConverters._
import scala.concurrent.duration._
import scala.concurrent.{ Await, Future }
import org.scalatest.Suite
-import akka.persistence.dynamodb.journal.DynamoDBHelper
trait DynamoDBUtils {
@@ -24,7 +22,7 @@ trait DynamoDBUtils {
lazy val settings: DynamoDBSnapshotConfig = {
val c = system.settings.config
- val config = c.getConfig(c.getString("akka.persistence.snapshot-store.plugin"))
+ val config = c.getConfig(c.getString("pekko.persistence.snapshot-store.plugin"))
new DynamoDBSnapshotConfig(config)
}
import settings._
diff --git a/src/test/scala/org/apache/pekko/persistence/dynamodb/snapshot/SnapshotStoreTckSpec.scala b/src/test/scala/org/apache/pekko/persistence/dynamodb/snapshot/SnapshotStoreTckSpec.scala
new file mode 100644
index 0000000..9a619dc
--- /dev/null
+++ b/src/test/scala/org/apache/pekko/persistence/dynamodb/snapshot/SnapshotStoreTckSpec.scala
@@ -0,0 +1,20 @@
+/**
+ * Copyright (C) 2016 Typesafe Inc. <http://www.typesafe.com>
+ */
+package org.apache.pekko.persistence.dynamodb.snapshot
+
+import org.apache.pekko.persistence.dynamodb.IntegSpec
+import org.apache.pekko.persistence.snapshot.SnapshotStoreSpec
+import com.typesafe.config.ConfigFactory
+
+class SnapshotStoreTckSpec extends SnapshotStoreSpec(ConfigFactory.load()) with DynamoDBUtils with IntegSpec {
+ override def beforeAll(): Unit = {
+ super.beforeAll()
+ ensureSnapshotTableExists()
+ }
+
+ override def afterAll(): Unit = {
+ client.shutdown()
+ super.afterAll()
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org