[TOREE-554] Use Pekko instead of Akka (#222)

--------- Co-authored-by: Cheng Pan <[email protected]>
apache · Mar 26, 2024 · ba4ea3f · ba4ea3f
1 parent f6c2c6d
commit ba4ea3f
Show file tree

Hide file tree

Showing 100 changed files with 200 additions and 200 deletions.
diff --git a/build.sbt b/build.sbt
@@ -203,7 +203,7 @@ enablePlugins(ScalaUnidocPlugin)
 (ScalaUnidoc / unidoc / scalacOptions) ++= Seq(
  "-Ymacro-expand:none",
  "-skip-packages", Seq(
- "akka",
+ "org.apache.pekko",
  "scala"
  ).mkString(":"),
  "-no-link-warnings" // Suppresses problems with Scaladoc @throws links

diff --git a/client/build.sbt b/client/build.sbt
@@ -19,7 +19,7 @@ scalacOptions += "-language:reflectiveCalls"
 
 // Main library dependencies to function
 libraryDependencies ++= Seq(
- Dependencies.akkaActor,
- Dependencies.akkaSlf4j,
- Dependencies.akkaTestkit % "test"
+ Dependencies.pekkoActor,
+ Dependencies.pekkoSlf4j,
+ Dependencies.pekkoTestkit % "test"
 )
diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/ActorLoader.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/ActorLoader.scala
@@ -17,7 +17,7 @@
 
 package org.apache.toree.kernel.protocol.v5.client
 
-import akka.actor.{ActorRefFactory, ActorSelection}
+import org.apache.pekko.actor.{ActorRefFactory, ActorSelection}
 
 /**
  * This trait defines the interface for loading actors based on some value

diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClient.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClient.scala
@@ -17,9 +17,9 @@
 
 package org.apache.toree.kernel.protocol.v5.client
 
-import akka.actor.ActorSystem
-import akka.pattern.ask
-import akka.util.Timeout
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.pattern.ask
+import org.apache.pekko.util.Timeout
 import org.apache.toree.comm._
 import org.apache.toree.kernel.protocol.v5._
 import org.apache.toree.kernel.protocol.v5.client.execution.{DeferredExecution, ExecuteRequestTuple}

diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala
@@ -19,7 +19,7 @@ package org.apache.toree.kernel.protocol.v5.client
 
 import java.nio.charset.Charset
 
-import akka.util.{ByteString, Timeout}
+import org.apache.pekko.util.{ByteString, Timeout}
 import org.apache.toree.communication.ZMQMessage
 import org.apache.toree.kernel.protocol.v5._
 import org.apache.toree.kernel.protocol.v5.content.ExecuteRequest

diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/ClientBootstrap.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/ClientBootstrap.scala
@@ -17,7 +17,7 @@
 
 package org.apache.toree.kernel.protocol.v5.client.boot
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 import org.apache.toree.comm.{CommRegistrar, CommStorage}
 import org.apache.toree.kernel.protocol.v5.client.boot.layers._
 import org.apache.toree.kernel.protocol.v5.client.socket.{SocketConfig, SocketFactory}

diff --git a/.../scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/HandlerInitialization.scala b/.../scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/HandlerInitialization.scala
@@ -17,7 +17,7 @@
 
 package org.apache.toree.kernel.protocol.v5.client.boot.layers
 
-import akka.actor.{ActorSystem, Props}
+import org.apache.pekko.actor.{ActorSystem, Props}
 import org.apache.toree.kernel.protocol.v5.client.ActorLoader
 import org.apache.toree.kernel.protocol.v5.MessageType
 import org.apache.toree.kernel.protocol.v5.MessageType.MessageType

diff --git a/...n/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/SystemInitialization.scala b/...n/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/SystemInitialization.scala
@@ -17,7 +17,7 @@
 
 package org.apache.toree.kernel.protocol.v5.client.boot.layers
 
-import akka.actor.{Props, ActorRef, ActorSystem}
+import org.apache.pekko.actor.{Props, ActorRef, ActorSystem}
 import org.apache.toree.comm.{CommRegistrar, CommStorage}
 import org.apache.toree.communication.security.{SecurityActorType, SignatureManagerActor}
 import org.apache.toree.kernel.protocol.v5.SocketType

diff --git a/...nt/src/main/scala/org/apache/toree/kernel/protocol/v5/client/handler/ExecuteHandler.scala b/...nt/src/main/scala/org/apache/toree/kernel/protocol/v5/client/handler/ExecuteHandler.scala
@@ -17,8 +17,8 @@
 
 package org.apache.toree.kernel.protocol.v5.client.handler
 
-import akka.actor.Actor
-import akka.util.Timeout
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.util.Timeout
 import org.apache.toree.kernel.protocol.v5._
 import org.apache.toree.kernel.protocol.v5.client.{ActorLoader, Utilities}
 import org.apache.toree.kernel.protocol.v5.client.execution.{ExecuteRequestTuple, DeferredExecutionManager}

diff --git a/...nt/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClient.scala b/...nt/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClient.scala
@@ -17,10 +17,10 @@
 
 package org.apache.toree.kernel.protocol.v5.client.socket
 
-import akka.actor.{ActorRef, Actor}
-import akka.util.{ByteString, Timeout}
+import org.apache.pekko.actor.{ActorRef, Actor}
+import org.apache.pekko.util.{ByteString, Timeout}
 import org.apache.toree.communication.ZMQMessage
-import akka.pattern.ask
+import org.apache.pekko.pattern.ask
 import org.apache.toree.kernel.protocol.v5.client.ActorLoader
 import org.apache.toree.utils.LogLike
 import org.apache.toree.kernel.protocol.v5.UUID

diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClient.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClient.scala
@@ -17,7 +17,7 @@
 
 package org.apache.toree.kernel.protocol.v5.client.socket
 
-import akka.actor.Actor
+import org.apache.pekko.actor.Actor
 import org.apache.toree.communication.ZMQMessage
 import org.apache.toree.comm.{CommStorage, CommRegistrar, ClientCommWriter}
 import org.apache.toree.kernel.protocol.v5.client.{ActorLoader, Utilities}

diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClient.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClient.scala
@@ -17,8 +17,8 @@
 
 package org.apache.toree.kernel.protocol.v5.client.socket
 
-import akka.actor.Actor
-import akka.util.Timeout
+import org.apache.pekko.actor.Actor
+import org.apache.pekko.util.Timeout
 import org.apache.toree.communication.ZMQMessage
 import org.apache.toree.communication.security.SecurityActorType
 import org.apache.toree.kernel.protocol.v5.client.{ActorLoader, Utilities}
@@ -30,7 +30,7 @@ import org.apache.toree.kernel.protocol.v5.content.ExecuteReply
 import org.apache.toree.utils.LogLike
 import scala.concurrent.Await
 import scala.concurrent.duration._
-import akka.pattern.ask
+import org.apache.pekko.pattern.ask
 
 /**
  * The client endpoint for Shell messages specified in the IPython Kernel Spec

diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketFactory.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketFactory.scala
@@ -19,7 +19,7 @@ package org.apache.toree.kernel.protocol.v5.client.socket
 
 import java.util.UUID
 
-import akka.actor.{Props, ActorRef, ActorSystem}
+import org.apache.pekko.actor.{Props, ActorRef, ActorSystem}
 import org.apache.toree.communication.actors.{DealerSocketActor, ReqSocketActor, SubSocketActor}
 
 object SocketFactory {

diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClient.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClient.scala
@@ -17,7 +17,7 @@
 
 package org.apache.toree.kernel.protocol.v5.client.socket
 
-import akka.actor.Actor
+import org.apache.pekko.actor.Actor
 import org.apache.toree.communication.ZMQMessage
 import org.apache.toree.communication.security.SecurityActorType
 import org.apache.toree.kernel.protocol.v5.client.ActorLoader
@@ -28,7 +28,7 @@ import org.apache.toree.kernel.protocol.v5.client.Utilities._
 import play.api.libs.json.Json
 
 import StdinClient._
-import akka.pattern.ask
+import org.apache.pekko.pattern.ask
 
 import scala.concurrent.duration._
 import scala.concurrent.Await

diff --git a/...est/scala/integration/unused.integration.socket/ClientToHeartbeatSpecForIntegration.scala b/...est/scala/integration/unused.integration.socket/ClientToHeartbeatSpecForIntegration.scala
@@ -22,10 +22,10 @@ package integration.socket
 
 import java.io.File
 
-import akka.actor.{ActorRef, ActorSystem, Props}
-import akka.pattern.ask
-import akka.testkit.{ImplicitSender, TestKit, TestProbe}
-import akka.util.Timeout
+import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
+import org.apache.pekko.pattern.ask
+import org.apache.pekko.testkit.{ImplicitSender, TestKit, TestProbe}
+import org.apache.pekko.util.Timeout
 import org.apache.toree.kernel.protocol.v5.client.ZMQMessage
 import org.apache.toree.kernel.protocol.v5.SocketType
 import org.apache.toree.kernel.protocol.v5.socket._

diff --git a/...rc/test/scala/integration/unused.integration.socket/ClientToIOPubSpecForIntegration.scala b/...rc/test/scala/integration/unused.integration.socket/ClientToIOPubSpecForIntegration.scala
@@ -22,8 +22,8 @@ package integration.socket
 
 import java.util.UUID
 
-import akka.actor.{ActorRef, ActorSystem, Props}
-import akka.testkit.{ImplicitSender, TestKit, TestProbe}
+import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
+import org.apache.pekko.testkit.{ImplicitSender, TestKit, TestProbe}
 import org.apache.toree.kernel.protocol.v5._
 import org.apache.toree.kernel.protocol.v5.content.ExecuteResult
 import org.apache.toree.kernel.protocol.v5.socket._

diff --git a/...rc/test/scala/integration/unused.integration.socket/ClientToShellSpecForIntegration.scala b/...rc/test/scala/integration/unused.integration.socket/ClientToShellSpecForIntegration.scala
@@ -22,9 +22,9 @@ package integration.socket
 
 import java.util.UUID
 
-import akka.actor.{ActorRef, ActorSystem, Props}
-import akka.testkit.{ImplicitSender, TestKit, TestProbe}
-import akka.zeromq._
+import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
+import org.apache.pekko.testkit.{ImplicitSender, TestKit, TestProbe}
+import org.apache.pekko.zeromq._
 import org.apache.toree.kernel.protocol.v5._
 import org.apache.toree.kernel.protocol.v5.content.ExecuteRequest
 import org.apache.toree.kernel.protocol.v5.socket._

diff --git a/client/src/test/scala/org/apache/toree/comm/ClientCommWriterSpec.scala b/client/src/test/scala/org/apache/toree/comm/ClientCommWriterSpec.scala
@@ -19,8 +19,8 @@ package org.apache.toree.comm
 
 import java.util.UUID
 
-import akka.actor.{ActorSelection, ActorSystem}
-import akka.testkit.{TestKit, TestProbe}
+import org.apache.pekko.actor.{ActorSelection, ActorSystem}
+import org.apache.pekko.testkit.{TestKit, TestProbe}
 import org.apache.toree.kernel.protocol.v5._
 import org.apache.toree.kernel.protocol.v5.client.ActorLoader
 import org.apache.toree.kernel.protocol.v5.content._
@@ -37,7 +37,7 @@ import scala.concurrent.duration._
 
 object ClientCommWriterSpec {
  val config ="""
- akka {
+ pekko {
  loglevel = "WARNING"
  }"""
 }

diff --git a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClientSpec.scala b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClientSpec.scala
@@ -17,8 +17,8 @@
 
 package org.apache.toree.kernel.protocol.v5.client
 
-import akka.actor.ActorSystem
-import akka.testkit.{TestKit, TestProbe}
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.testkit.{TestKit, TestProbe}
 import org.apache.toree.comm.{CommCallbacks, CommStorage, CommRegistrar}
 import org.apache.toree.kernel.protocol.v5
 import org.apache.toree.kernel.protocol.v5._

diff --git a/...rc/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClientSpec.scala b/...rc/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClientSpec.scala
@@ -17,8 +17,8 @@
 
 package org.apache.toree.kernel.protocol.v5.client.socket
 
-import akka.actor.{ActorRef, ActorSystem, Props}
-import akka.testkit.{TestProbe, ImplicitSender, TestKit}
+import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
+import org.apache.pekko.testkit.{TestProbe, ImplicitSender, TestKit}
 import org.apache.toree.communication.ZMQMessage
 import org.apache.toree.kernel.protocol.v5.client.ActorLoader
 import org.scalatestplus.mockito.MockitoSugar

diff --git a/...nt/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClientSpec.scala b/...nt/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClientSpec.scala
@@ -19,10 +19,10 @@ package org.apache.toree.kernel.protocol.v5.client.socket
 
 import java.util.UUID
 
-import akka.actor.{ActorRef, ActorSystem, Props}
-import akka.pattern.ask
-import akka.testkit.{ImplicitSender, TestKit, TestProbe}
-import akka.util.Timeout
+import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
+import org.apache.pekko.pattern.ask
+import org.apache.pekko.testkit.{ImplicitSender, TestKit, TestProbe}
+import org.apache.pekko.util.Timeout
 import org.apache.toree.comm.{CommCallbacks, CommRegistrar, CommStorage, CommWriter}
 import org.apache.toree.communication.ZMQMessage
 import org.apache.toree.kernel.protocol.v5
@@ -48,7 +48,7 @@ import scala.util.Failure
 
 object IOPubClientSpec {
  val config ="""
- akka {
+ pekko {
  loglevel = "WARNING"
  }"""
 }

diff --git a/...nt/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClientSpec.scala b/...nt/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClientSpec.scala
@@ -19,8 +19,8 @@ package org.apache.toree.kernel.protocol.v5.client.socket
 
 import java.util.UUID
 
-import akka.actor.{ActorRef, ActorSystem, Props}
-import akka.testkit.{TestProbe, ImplicitSender, TestKit}
+import org.apache.pekko.actor.{ActorRef, ActorSystem, Props}
+import org.apache.pekko.testkit.{TestProbe, ImplicitSender, TestKit}
 import org.apache.toree.communication.ZMQMessage
 import org.apache.toree.communication.security.SecurityActorType
 import org.apache.toree.kernel.protocol.v5._

diff --git a/...nt/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClientSpec.scala b/...nt/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClientSpec.scala
@@ -17,8 +17,8 @@
 
 package org.apache.toree.kernel.protocol.v5.client.socket
 
-import akka.actor.{ActorRef, Props, ActorSystem}
-import akka.testkit.{TestProbe, ImplicitSender, TestKit}
+import org.apache.pekko.actor.{ActorRef, Props, ActorSystem}
+import org.apache.pekko.testkit.{TestProbe, ImplicitSender, TestKit}
 import org.apache.toree.communication.ZMQMessage
 import org.apache.toree.communication.security.SecurityActorType
 import org.apache.toree.kernel.protocol.v5._

diff --git a/client/src/test/scala/system/ClientCommSpecForSystem.scala b/client/src/test/scala/system/ClientCommSpecForSystem.scala
@@ -17,7 +17,7 @@
 
 package system
 
-import akka.testkit.{TestKit, TestProbe}
+import org.apache.pekko.testkit.{TestKit, TestProbe}
 import org.apache.toree.communication.ZMQMessage
 import org.apache.toree.kernel.protocol.v5
 import org.apache.toree.kernel.protocol.v5.client.Utilities._

diff --git a/client/src/test/scala/test/utils/SparkClientDeployer.scala b/client/src/test/scala/test/utils/SparkClientDeployer.scala
@@ -17,8 +17,8 @@
 
 package test.utils
 
-import akka.actor.{Actor, Props, ActorRef, ActorSystem}
-import akka.testkit.TestProbe
+import org.apache.pekko.actor.{Actor, Props, ActorRef, ActorSystem}
+import org.apache.pekko.testkit.TestProbe
 import org.apache.toree.comm.{CommRegistrar, CommStorage}
 import org.apache.toree.kernel.protocol.v5.client.socket._
 import org.apache.toree.kernel.protocol.v5.client.{ActorLoader, SparkKernelClient}

diff --git a/communication/build.sbt b/communication/build.sbt
@@ -17,7 +17,7 @@
 
 libraryDependencies ++= Seq(
  Dependencies.jeroMq,
- Dependencies.akkaActor,
- Dependencies.akkaSlf4j,
- Dependencies.akkaTestkit % "test"
+ Dependencies.pekkoActor,
+ Dependencies.pekkoSlf4j,
+ Dependencies.pekkoTestkit % "test"
 )
diff --git a/communication/src/main/scala/org/apache/toree/communication/ZMQMessage.scala b/communication/src/main/scala/org/apache/toree/communication/ZMQMessage.scala
@@ -16,7 +16,7 @@
  */
 package org.apache.toree.communication
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 
 /**
  * Represents a ZeroMQ message containing a collection of Akka ByteString

diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/DealerSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/DealerSocketActor.scala
@@ -16,8 +16,8 @@
  */
 package org.apache.toree.communication.actors
 
-import akka.actor.{Actor, ActorRef}
-import akka.util.ByteString
+import org.apache.pekko.actor.{Actor, ActorRef}
+import org.apache.pekko.util.ByteString
 import org.apache.toree.communication.{ZMQMessage, SocketManager}
 import org.apache.toree.utils.LogLike
 import org.zeromq.ZMQ

diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/PubSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/PubSocketActor.scala
@@ -16,7 +16,7 @@
  */
 package org.apache.toree.communication.actors
 
-import akka.actor.Actor
+import org.apache.pekko.actor.Actor
 import org.apache.toree.communication.utils.OrderedSupport
 import org.apache.toree.communication.{SocketManager, ZMQMessage}
 import org.apache.toree.kernel.protocol.v5.KernelMessage

diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/RepSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/RepSocketActor.scala
@@ -16,8 +16,8 @@
  */
 package org.apache.toree.communication.actors
 
-import akka.actor.{Actor, ActorRef}
-import akka.util.ByteString
+import org.apache.pekko.actor.{Actor, ActorRef}
+import org.apache.pekko.util.ByteString
 import org.apache.toree.communication.{SocketManager, ZMQMessage}
 import org.apache.toree.utils.LogLike
 import org.zeromq.ZMQ

diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/ReqSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/ReqSocketActor.scala
@@ -16,8 +16,8 @@
  */
 package org.apache.toree.communication.actors
 
-import akka.actor.{Actor, ActorRef}
-import akka.util.ByteString
+import org.apache.pekko.actor.{Actor, ActorRef}
+import org.apache.pekko.util.ByteString
 import org.apache.toree.communication.{ZMQMessage, SocketManager}
 import org.apache.toree.utils.LogLike
 import org.zeromq.ZMQ

diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/RouterSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/RouterSocketActor.scala
@@ -16,8 +16,8 @@
  */
 package org.apache.toree.communication.actors
 
-import akka.actor.{Actor, ActorRef}
-import akka.util.ByteString
+import org.apache.pekko.actor.{Actor, ActorRef}
+import org.apache.pekko.util.ByteString
 import org.apache.toree.communication.{SocketManager, ZMQMessage}
 import org.apache.toree.utils.LogLike
 import org.zeromq.ZMQ

diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/SubSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/SubSocketActor.scala
@@ -16,8 +16,8 @@
  */
 package org.apache.toree.communication.actors
 
-import akka.actor.{Actor, ActorRef}
-import akka.util.ByteString
+import org.apache.pekko.actor.{Actor, ActorRef}
+import org.apache.pekko.util.ByteString
 import org.apache.toree.communication.{ZMQMessage, SocketManager}
 import org.apache.toree.utils.LogLike
 

diff --git a/...cation/src/main/scala/org/apache/toree/communication/security/SignatureCheckerActor.scala b/...cation/src/main/scala/org/apache/toree/communication/security/SignatureCheckerActor.scala
@@ -17,7 +17,7 @@
 
 package org.apache.toree.communication.security
 
-import akka.actor.Actor
+import org.apache.pekko.actor.Actor
 import org.apache.toree.communication.utils.OrderedSupport
 import org.apache.toree.utils.LogLike