Migrating from Akka to Pekko

README.md

@@ -621,8 +621,8 @@ ElasticMQ exposes `Queues` MBean. It contains three operations:
 
 # Technology
 
-* Core: [Scala](http://scala-lang.org) and [Akka](http://akka.io/).
-* Rest server: [Akka HTTP](http://doc.akka.io/docs/akka-http/current/), a high-performance,
+* Core: [Scala](http://scala-lang.org) and [Pekko](https://pekko.apache.org/).
+* Rest server: [Pekko HTTP](https://pekko.apache.org/docs/pekko-http/current/), a high-performance,
   asynchronous, REST/HTTP toolkit.
 * Testing the SQS interface: [Amazon Java SDK](http://aws.amazon.com/sdkforjava/);
   see the `rest-sqs-testing-amazon-java-sdk` module for the testsuite.

build.sbt

@@ -38,16 +38,16 @@ val awaitility = "org.awaitility" % "awaitility-scala" % "4.2.0"
 
 val amazonJavaSdkSqs = "com.amazonaws" % "aws-java-sdk-sqs" % "1.12.472" exclude ("commons-logging", "commons-logging")
 
-val akkaVersion = "2.6.20"
-val akkaHttpVersion = "10.2.10"
-val akka2Actor = "com.typesafe.akka" %% "akka-actor" % akkaVersion
-val akka2Slf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion
-val akka2Streams = "com.typesafe.akka" %% "akka-stream" % akkaVersion
-val akka2Testkit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test"
-val akka2Http = "com.typesafe.akka" %% "akka-http" % akkaHttpVersion
+val pekkoVersion = "1.0.1"
+val pekkoHttpVersion = "1.0.0"
+val pekkoActor = "org.apache.pekko" %% "pekko-actor" % pekkoVersion
+val pekkoSlf4j = "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion
+val pekkoStreams = "org.apache.pekko" %% "pekko-stream" % pekkoVersion
+val pekkoTestkit = "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % "test"
+val pekkoHttp = "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion
 val sprayJson = "io.spray" %% "spray-json" % "1.3.6"
-val akkaHttpSprayJson = "com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpVersion
-val akka2HttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "test"
+val pekkoHttpSprayJson = "org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion
+val pekkoHttpTestkit = "org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % "test"
 
 val awsSpringMessagingVersion = "2.2.6.RELEASE"
 val springVersion = "5.3.30"
@@ -61,10 +61,10 @@ val h2 = "com.h2database" % "h2" % "2.2.224"
 
 val common = Seq(scalalogging)
 
-val akka25Overrides =
-  Seq( // override the 2.4.x transitive dependency from Akka HTTP
-    "com.typesafe.akka" %% "akka-stream" % akkaVersion,
-    "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion
+val pekko100verrides =
+  Seq( // override transitive dependency from Pekko HTTP
+    "org.apache.pekko" %% "pekko-stream" % pekkoVersion,
+    "org.apache.pekko" %% "pekko-stream-testkit" % pekkoVersion
   )
 
 val buildSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
@@ -75,7 +75,7 @@ val buildSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
   scalaVersion := resolvedScalaVersion,
   scalacOptions ++= Seq("-Xasync", "-target:jvm-1.8"),
   libraryDependencies += scalaXml,
-  dependencyOverrides := akka25Overrides,
+  dependencyOverrides := pekko100verrides,
   parallelExecution := false,
   sonatypeProfileName := "org.elasticmq",
   // workaround for: https://github.com/sbt/sbt/issues/692
@@ -109,7 +109,7 @@ lazy val core: Project = (project in file("core"))
   .settings(
     Seq(
       name := "elasticmq-core",
-      libraryDependencies ++= Seq(akka2Actor, akka2Testkit) ++ common,
+      libraryDependencies ++= Seq(pekkoActor, pekkoTestkit) ++ common,
       coverageMinimumStmtTotal := 94
     )
   )
@@ -126,10 +126,10 @@ lazy val persistenceCore: Project = (project in file("persistence/persistence-co
     Seq(
       name := "elasticmq-persistence-core",
       libraryDependencies ++= Seq(
-        akka2Actor,
-        akka2Slf4j,
+        pekkoActor,
+        pekkoSlf4j,
         config,
-        akka2Testkit,
+        pekkoTestkit,
         scalaAsync
       ) ++ common
     )
@@ -171,14 +171,14 @@ lazy val restSqs: Project = (project in file("rest/rest-sqs"))
     Seq(
       name := "elasticmq-rest-sqs",
       libraryDependencies ++= Seq(
-        akka2Actor,
-        akka2Slf4j,
-        akka2Http,
-        akka2Streams,
+        pekkoActor,
+        pekkoSlf4j,
+        pekkoHttp,
+        pekkoStreams,
         sprayJson,
-        akkaHttpSprayJson,
-        akka2Testkit,
-        akka2HttpTestkit,
+        pekkoHttpSprayJson,
+        pekkoTestkit,
+        pekkoHttpTestkit,
         scalaAsync
       ) ++ common
     )

core/src/main/scala/org/elasticmq/actor/QueueManagerActor.scala

@@ -1,6 +1,6 @@
 package org.elasticmq.actor
 
-import akka.actor.{ActorRef, Props}
+import org.apache.pekko.actor.{ActorRef, Props}
 import org.elasticmq._
 import org.elasticmq.actor.queue.{QueueActor, QueueEvent}
 import org.elasticmq.actor.reply._

core/src/main/scala/org/elasticmq/actor/queue/QueueActor.scala

@@ -1,6 +1,6 @@
 package org.elasticmq.actor.queue
 
-import akka.actor.ActorRef
+import org.apache.pekko.actor.ActorRef
 import org.elasticmq.QueueData
 import org.elasticmq.actor.reply.ReplyingActor
 import org.elasticmq.msg._

core/src/main/scala/org/elasticmq/actor/queue/QueueActorMessageOps.scala

@@ -1,6 +1,6 @@
 package org.elasticmq.actor.queue
 
-import akka.actor.Timers
+import org.apache.pekko.actor.Timers
 import org.elasticmq.actor.queue.operations._
 import org.elasticmq.actor.reply._
 import org.elasticmq.msg._
@@ -19,7 +19,7 @@ trait QueueActorMessageOps
   this: QueueActorStorage =>
 
   def nowProvider: NowProvider
-  def context: akka.actor.ActorContext
+  def context: org.apache.pekko.actor.ActorContext
 
   timers.startTimerWithFixedDelay(s"Timer: ${queueData.name}", DeduplicationIdsCleanup, 1.second)
 

core/src/main/scala/org/elasticmq/actor/queue/QueueActorStorage.scala

@@ -1,7 +1,7 @@
 package org.elasticmq.actor.queue
 
-import akka.actor.{ActorContext, ActorRef}
-import akka.util.Timeout
+import org.apache.pekko.actor.{ActorContext, ActorRef}
+import org.apache.pekko.util.Timeout
 import org.elasticmq.actor.reply._
 import org.elasticmq.util.{Logging, NowProvider}
 import org.elasticmq.{FifoDeduplicationIdsHistory, QueueData}

core/src/main/scala/org/elasticmq/actor/queue/QueueActorWaitForMessagesOps.scala

@@ -1,6 +1,6 @@
 package org.elasticmq.actor.queue
 
-import akka.actor.{ActorRef, Cancellable}
+import org.apache.pekko.actor.{ActorRef, Cancellable}
 import org.elasticmq.actor.reply._
 import org.elasticmq.msg.{QueueMessageMsg, ReceiveMessages, SendMessage, UpdateVisibilityTimeout}
 

core/src/main/scala/org/elasticmq/actor/queue/QueueEventListener.scala

@@ -1,6 +1,6 @@
 package org.elasticmq.actor.queue
 
-import akka.actor.ActorRef
+import org.apache.pekko.actor.ActorRef
 import org.elasticmq.actor.reply.Replyable
 import org.elasticmq.{ElasticMQError, QueueData}
 

core/src/main/scala/org/elasticmq/actor/queue/operations/SendMessageOp.scala

@@ -1,6 +1,6 @@
 package org.elasticmq.actor.queue.operations
 
-import akka.actor.{ActorContext, ActorRef}
+import org.apache.pekko.actor.{ActorContext, ActorRef}
 import org.elasticmq.actor.queue.{InternalMessage, QueueActorStorage, QueueEvent}
 import org.elasticmq.msg.SendMessage
 import org.elasticmq.util.Logging

core/src/main/scala/org/elasticmq/actor/reply/ReplySupport.scala

@@ -1,14 +1,15 @@
 package org.elasticmq.actor.reply
 
-import akka.actor.ActorRef
-import akka.util.Timeout
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.util.Timeout
+import org.apache.pekko.pattern
 import scala.concurrent.Future
 import scala.reflect.ClassTag
 
 trait ReplySupport {
   implicit class ReplyActorRef(actorRef: ActorRef) {
     def ?[T](message: Replyable[T])(implicit timeout: Timeout, tag: ClassTag[T]): Future[T] = {
-      akka.pattern.ask(actorRef, message).mapTo[T]
+      pattern.ask(actorRef, message).mapTo[T]
     }
   }
 

core/src/main/scala/org/elasticmq/actor/reply/ReplyingActor.scala

@@ -1,7 +1,7 @@
 package org.elasticmq.actor.reply
 
-import akka.actor.Actor
-import akka.actor.Status.Failure
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.actor.Status.Failure
 import scala.reflect.ClassTag
 import scala.language.higherKinds
 

core/src/main/scala/org/elasticmq/metrics/MBeanMetrics.scala

@@ -2,8 +2,8 @@ package org.elasticmq.metrics
 
 import java.util.concurrent.{Executors, TimeUnit}
 
-import akka.actor.ActorRef
-import akka.util.Timeout
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.util.Timeout
 import javax.management.openmbean._
 import org.elasticmq.QueueStatistics
 import org.elasticmq.metrics.QueuesMetrics.{queueDataNames, queueStatisticsCompositeType, queueStatisticsTabularType}

core/src/main/scala/org/elasticmq/metrics/QueueMetricsOps.scala

@@ -1,7 +1,7 @@
 package org.elasticmq.metrics
 
-import akka.actor.ActorRef
-import akka.util.Timeout
+import org.apache.pekko.actor.ActorRef
+import org.apache.pekko.util.Timeout
 import org.elasticmq.QueueStatistics
 import org.elasticmq.actor.reply.ReplyActorRef
 import org.elasticmq.msg.{GetQueueStatistics, ListQueues, LookupQueue}

core/src/main/scala/org/elasticmq/msg/QueueManagerMsg.scala

@@ -1,6 +1,6 @@
 package org.elasticmq.msg
 
-import akka.actor.ActorRef
+import org.apache.pekko.actor.ActorRef
 import org.elasticmq.actor.reply.Replyable
 import org.elasticmq.{CreateQueueData, ElasticMQError}
 

core/src/main/scala/org/elasticmq/msg/QueueMsg.scala

@@ -1,6 +1,6 @@
 package org.elasticmq.msg
 
-import akka.actor.ActorRef
+import org.apache.pekko.actor.ActorRef
 import org.elasticmq._
 import org.elasticmq.actor.queue.InternalMessage
 import org.elasticmq.actor.reply.Replyable

core/src/test/scala/org/elasticmq/actor/test/ActorTest.scala

@@ -1,8 +1,8 @@
 package org.elasticmq.actor.test
 
-import akka.actor.ActorSystem
-import akka.testkit.TestKit
-import akka.util.Timeout
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.testkit.TestKit
+import org.apache.pekko.util.Timeout
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.BeforeAndAfterAll
 

core/src/test/scala/org/elasticmq/actor/test/QueueManagerForEachTest.scala

@@ -1,6 +1,6 @@
 package org.elasticmq.actor.test
 
-import akka.actor.{ActorRef, ActorSystem, Props}
+import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
 import org.elasticmq.StrictSQSLimits
 import org.elasticmq.actor.QueueManagerActor
 import org.elasticmq.util.MutableNowProvider

core/src/test/scala/org/elasticmq/actor/test/QueueManagerWithListenerForEachTest.scala

@@ -1,7 +1,7 @@
 package org.elasticmq.actor.test
 
-import akka.actor.{ActorRef, ActorSystem, Props}
-import akka.testkit.{TestActor, TestActors, TestProbe}
+import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
+import org.apache.pekko.testkit.{TestActor, TestActors, TestProbe}
 import org.elasticmq.StrictSQSLimits
 import org.elasticmq.actor.QueueManagerActor
 import org.elasticmq.actor.queue.{OperationSuccessful, QueueEvent}