akka replacement with pekko migration

build.sbt

@@ -16,9 +16,11 @@ val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.2"
 //val scalameter = "com.github.axel22" %% "scalameter" % "0.4"
 
 val rediscalaDependencies = Seq(
-  akkaActor,
+  //akkaActor,
+  "org.apache.pekko" %% "pekko-actor-typed" % "0.0.0+26544-4c021960-SNAPSHOT",
   stm,
-  akkaTestkit % "test",
+  //akkaTestkit % "test",
+  "org.apache.pekko" %% "pekko-actor-testkit-typed" % "0.0.0+26544-4c021960-SNAPSHOT" % Test,
   //scalameter % "test",
   specs2 % "test",
   scalacheck % "test"
@@ -28,12 +30,16 @@ val rediscalaDependencies = Seq(
 val baseSourceUrl = "https://github.com/etaty/rediscala/tree/"
 
 val Scala211 = "2.11.12"
+val Scala212 = "2.12.8"
+
+lazy val pekkoResolver1 = "ApachePekkoSnapshots" at "https://repository.apache.org/content/groups/snapshots"
+lazy val pekkoResolver2 = "pekko-http-snapshot-repository" at "https://repository.apache.org/content/repositories/snapshots"
 
 lazy val standardSettings = Def.settings(
   name := "rediscala",
   organization := "com.github.etaty",
-  scalaVersion := Scala211,
-  crossScalaVersions := Seq(Scala211, "2.12.10", "2.13.0"),
+  scalaVersion := Scala212,
+  crossScalaVersions := Seq(Scala211, Scala212, "2.13.0"),
   licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.html")),
   homepage := Some(url("https://github.com/etaty/rediscala")),
   scmInfo := Some(ScmInfo(url("https://github.com/etaty/rediscala"), "scm:git:[email protected]:etaty/rediscala.git")),
@@ -119,6 +125,8 @@ lazy val root = Project(id = "rediscala",
   base = file(".")
 ).settings(
   standardSettings,
+  resolvers += pekkoResolver1,
+  resolvers += pekkoResolver2,
   libraryDependencies ++= rediscalaDependencies
 ).configs(
   BenchTest

src/main/scala/redis/Converter.scala

@@ -1,6 +1,7 @@
 package redis
 
-import akka.util.ByteString
+//import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol._
 import scala.util.Try
 import scala.annotation.{tailrec, implicitNotFound}

src/main/scala/redis/Operation.scala

@@ -2,7 +2,8 @@ package redis
 
 import scala.concurrent.Promise
 import redis.protocol.{DecodeResult, RedisReply}
-import akka.util.ByteString
+//import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 
 case class Operation[RedisReplyT <: RedisReply, T](redisCommand: RedisCommand[RedisReplyT, T], promise: Promise[T]) {
   def decodeRedisReplyThenComplete(bs: ByteString): DecodeResult[Unit] = {

src/main/scala/redis/Redis.scala

@@ -1,7 +1,9 @@
 package redis
 
-import akka.actor._
-import akka.util.Helpers
+//import akka.actor._
+import org.apache.pekko.actor.{ActorRef, ActorRefFactory, ActorSystem, Props}
+import org.apache.pekko.util.Helpers
+//import akka.util.Helpers
 import redis.commands._
 import scala.concurrent._
 import java.net.InetSocketAddress

src/main/scala/redis/RedisCluster.scala

@@ -2,9 +2,9 @@ package redis
 
 import java.util.concurrent.{ThreadLocalRandom, TimeUnit}
 
-import akka.actor.{ActorRef, ActorSystem}
-import akka.event.Logging
-import akka.util.ByteString
+import org.apache.pekko.actor.{ActorRef, ActorSystem}
+import org.apache.pekko.event.Logging
+import org.apache.pekko.util.ByteString
 import redis.api.clusters.{ClusterNode, ClusterSlot}
 import redis.protocol.RedisReply
 import redis.util.CRC16

src/main/scala/redis/RedisCommand.scala

@@ -1,6 +1,6 @@
 package redis
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol._
 
 

src/main/scala/redis/RedisPool.scala

@@ -2,7 +2,7 @@ package redis
 
 import java.net.InetSocketAddress
 
-import akka.actor.{ActorRef, ActorSystem}
+import org.apache.pekko.actor.{ActorRef, ActorSystem}
 
 import scala.concurrent.stm._
 import redis.actors.RedisClientActor

src/main/scala/redis/Request.scala

@@ -3,7 +3,7 @@ package redis
 import redis.protocol.RedisReply
 import scala.concurrent.{ExecutionContext, Promise, Future}
 import scala.collection.immutable.Queue
-import akka.actor.ActorRef
+import org.apache.pekko.actor.ActorRef
 import java.util.concurrent.atomic.AtomicInteger
 
 

src/main/scala/redis/Sentinel.scala

@@ -1,8 +1,10 @@
 package redis
 
 import redis.commands.Sentinel
-import akka.actor.{ActorSystem, Props, ActorRef}
-import akka.event.Logging
+//import akka.actor.{ActorSystem, Props, ActorRef}
+import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
+import org.apache.pekko.event.Logging
+//import akka.event.Logging
 import redis.api.pubsub.{PMessage, Message}
 import redis.actors.RedisSubscriberActorWithCallback
 import java.net.InetSocketAddress

src/main/scala/redis/actors/RedisClientActor.scala

@@ -1,10 +1,11 @@
 package redis.actors
 
+import org.apache.pekko.actor.{OneForOneStrategy, PoisonPill, Terminated}
+import org.apache.pekko.actor.TypedActor.dispatcher
 import java.net.InetSocketAddress
-
-import akka.actor.SupervisorStrategy.Stop
-import akka.actor._
-import akka.util.{ByteString, ByteStringBuilder}
+import org.apache.pekko.actor.SupervisorStrategy.Stop
+import org.apache.pekko.actor.{ActorRef, Props}
+import org.apache.pekko.util.{ByteString, ByteStringBuilder}
 import redis.{Operation, Transaction}
 
 import scala.collection.mutable
@@ -23,7 +24,7 @@ class RedisClientActor(override val address: InetSocketAddress, getConnectOperat
   Seq[Operation[_, _]], onConnectStatus: Boolean => Unit, dispatcherName: String, connectTimeout: Option[FiniteDuration] = None) extends RedisWorkerIO(address, onConnectStatus, connectTimeout) {
 
 
-  import context._
+  //import context._
 
   var repliesDecoder = initRepliesDecoder()
 

src/main/scala/redis/actors/RedisReplyDecoder.scala

@@ -1,10 +1,10 @@
 package redis.actors
 
-import akka.actor.Actor
+import org.apache.pekko.actor.Actor
 import scala.collection.mutable
 import redis.protocol.{FullyDecoded, DecodeResult, RedisProtocolReply, RedisReply}
-import akka.util.ByteString
-import akka.event.Logging
+import org.apache.pekko.util.ByteString
+import org.apache.pekko.event.Logging
 import scala.annotation.tailrec
 import redis.Operation
 

src/main/scala/redis/actors/RedisSubscriberActor.scala

@@ -1,6 +1,6 @@
 package redis.actors
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol.{Error, MultiBulk, RedisReply}
 import redis.api.pubsub._
 import java.net.InetSocketAddress

src/main/scala/redis/actors/RedisWorkerIO.scala

@@ -1,15 +1,15 @@
 package redis.actors
 
-import akka.actor.{ActorLogging, ActorRef, Actor}
-import akka.io.Tcp
-import akka.util.{ByteStringBuilder, ByteString}
+import org.apache.pekko.actor.{ActorLogging, ActorRef, Actor}
+import org.apache.pekko.io.Tcp
+import org.apache.pekko.util.{ByteStringBuilder, ByteString}
 import java.net.InetSocketAddress
-import akka.io.Tcp._
-import akka.io.Tcp.Connected
-import akka.io.Tcp.Register
-import akka.io.Tcp.Connect
-import akka.io.Tcp.CommandFailed
-import akka.io.Tcp.Received
+import org.apache.pekko.io.Tcp._
+import org.apache.pekko.io.Tcp.Connected
+import org.apache.pekko.io.Tcp.Register
+import org.apache.pekko.io.Tcp.Connect
+import org.apache.pekko.io.Tcp.CommandFailed
+import org.apache.pekko.io.Tcp.Received
 import scala.concurrent.duration.FiniteDuration
 
 abstract class RedisWorkerIO(val address: InetSocketAddress, onConnectStatus: Boolean => Unit, connectTimeout: Option[FiniteDuration] = None) extends Actor with ActorLogging {
@@ -18,7 +18,7 @@ abstract class RedisWorkerIO(val address: InetSocketAddress, onConnectStatus: Bo
 
   import context._
 
-  val tcp = akka.io.IO(Tcp)(context.system)
+  val tcp = org.apache.pekko.io.IO(Tcp)(context.system)
 
   // todo watch tcpWorker
   var tcpWorker: ActorRef = null

src/main/scala/redis/api/BLists.scala

@@ -2,7 +2,7 @@ package redis.api.blists
 
 import scala.concurrent.duration.{Duration, FiniteDuration}
 import redis._
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol.{RedisReply, MultiBulk, Bulk}
 
 case class Blpop[KK: ByteStringSerializer, R: ByteStringDeserializer](keys: Seq[KK], timeout: FiniteDuration = Duration.Zero)

src/main/scala/redis/api/Clusters.scala

@@ -1,6 +1,6 @@
 package redis.api.clusters
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.RedisCommand
 import redis.protocol.{DecodeResult, Bulk, MultiBulk, RedisProtocolReply, RedisReply}
 

src/main/scala/redis/api/Connection.scala

@@ -1,7 +1,7 @@
 package redis.api.connection
 
 import redis._
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol.Status
 
 case class Auth[V](value: V)(implicit convert: ByteStringSerializer[V]) extends RedisCommandStatus[Status] {

src/main/scala/redis/api/Hashes.scala

@@ -1,7 +1,7 @@
 package redis.api.hashes
 
 import redis._
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import scala.collection.mutable
 import scala.annotation.tailrec
 import redis.protocol.{RedisReply, MultiBulk}

src/main/scala/redis/api/HyperLogLog.scala

@@ -1,6 +1,6 @@
 package redis.api.hyperloglog
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.{RedisCommandIntegerLong, RedisCommandStatusBoolean, ByteStringSerializer}
 
 case class Pfadd[K, V](key: K, values: Seq[V])(implicit redisKey: ByteStringSerializer[K], convert: ByteStringSerializer[V]) extends RedisCommandIntegerLong {

src/main/scala/redis/api/Keys.scala

@@ -1,7 +1,7 @@
 package redis.api.keys
 
 import redis._
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol._
 import scala.concurrent.duration.FiniteDuration
 import redis.api.Order

src/main/scala/redis/api/Lists.scala

@@ -1,7 +1,7 @@
 package redis.api.lists
 
 import redis._
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.api.ListPivot
 import redis.protocol.MultiBulk
 

src/main/scala/redis/api/Publish.scala

@@ -1,7 +1,7 @@
 package redis.api.publish
 
 import redis.{RedisCommandIntegerLong, ByteStringSerializer}
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 
 case class Publish[A](channel: String, value: A)(implicit convert: ByteStringSerializer[A]) extends RedisCommandIntegerLong {
   val isMasterOnly = true

src/main/scala/redis/api/Scripting.scala

@@ -4,7 +4,7 @@ import java.io.File
 import java.security.MessageDigest
 import redis.protocol.{MultiBulk, Bulk}
 import redis._
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 
 object RedisScript {
   def fromFile(file: File): RedisScript = {

src/main/scala/redis/api/Sentinel.scala

@@ -1,7 +1,7 @@
 package redis.api
 
 import redis._
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol.MultiBulk
 
 case class SenMasters() extends RedisCommandMultiBulk[Seq[Map[String,String]]] {

src/main/scala/redis/api/Servers.scala

@@ -1,7 +1,7 @@
 package redis.api.servers
 
 import redis._
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol.{MultiBulk, Bulk}
 import redis.api.ShutdownModifier
 

src/main/scala/redis/api/Sets.scala

@@ -1,7 +1,7 @@
 package redis.api.sets
 
 import redis._
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol.RedisReply
 
 case class Sadd[K, V](key: K, members: Seq[V])(implicit redisKey: ByteStringSerializer[K], convert: ByteStringSerializer[V]) extends SimpleClusterKey[K] with RedisCommandIntegerLong {

src/main/scala/redis/api/SortedSets.scala

@@ -1,6 +1,6 @@
 package redis.api.sortedsets
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis._
 import redis.api.{Aggregate, Limit, SUM, ZaddOption}
 import redis.protocol.RedisReply

src/main/scala/redis/api/Strings.scala

@@ -1,7 +1,7 @@
 package redis.api.strings
 
 import redis._
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol.{RedisReply, MultiBulk, Status, RedisProtocolRequest}
 import redis.api.BitOperator
 

src/main/scala/redis/api/Transactions.scala

@@ -1,7 +1,7 @@
 package redis.api.transactions
 
 import redis.{RedisCommandMultiBulk, RedisCommandStatusBoolean}
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol.MultiBulk
 
 case object Multi extends RedisCommandStatusBoolean {

src/main/scala/redis/api/api.scala

@@ -1,6 +1,6 @@
 package redis.api
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 
 
 trait Aggregate

src/main/scala/redis/api/geo/DistUnits.scala

@@ -3,7 +3,7 @@ package redis.api.geo
 object DistUnits{
   sealed trait Measurement{
     def value:String = {
-      this match {
+      this match {git add 
         case Meter => "m"
         case Kilometer => "km"
         case Mile => "mi"

src/main/scala/redis/api/geo/Geo.scala

@@ -1,6 +1,6 @@
 package redis.api.geo
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis._
 import redis.api.geo.DistUnits.Measurement
 import redis.api.geo.GeoOptions.WithOption

src/main/scala/redis/api/pubsub/pubsub.scala

@@ -1,6 +1,6 @@
 package redis.api.pubsub
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol.RedisProtocolRequest
 
 case class Message(channel: String, data: ByteString)

src/test/scala/redis/ConverterSpec.scala

@@ -1,7 +1,7 @@
 package redis
 
 import org.specs2.mutable.Specification
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 import redis.protocol.{Bulk, RedisReply}
 
 case class DumbClass(s1: String, s2: String)