Skip to content

Commit ba4ea3f

Browse files
pjfanningpan3793
andauthored
[TOREE-554] Use Pekko instead of Akka (#222)
--------- Co-authored-by: Cheng Pan <[email protected]>
1 parent f6c2c6d commit ba4ea3f

File tree

100 files changed

+200
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+200
-200
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ enablePlugins(ScalaUnidocPlugin)
203203
(ScalaUnidoc / unidoc / scalacOptions) ++= Seq(
204204
"-Ymacro-expand:none",
205205
"-skip-packages", Seq(
206-
"akka",
206+
"org.apache.pekko",
207207
"scala"
208208
).mkString(":"),
209209
"-no-link-warnings" // Suppresses problems with Scaladoc @throws links

client/build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ scalacOptions += "-language:reflectiveCalls"
1919

2020
// Main library dependencies to function
2121
libraryDependencies ++= Seq(
22-
Dependencies.akkaActor,
23-
Dependencies.akkaSlf4j,
24-
Dependencies.akkaTestkit % "test"
22+
Dependencies.pekkoActor,
23+
Dependencies.pekkoSlf4j,
24+
Dependencies.pekkoTestkit % "test"
2525
)

client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/ActorLoader.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.toree.kernel.protocol.v5.client
1919

20-
import akka.actor.{ActorRefFactory, ActorSelection}
20+
import org.apache.pekko.actor.{ActorRefFactory, ActorSelection}
2121

2222
/**
2323
* This trait defines the interface for loading actors based on some value

client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClient.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
package org.apache.toree.kernel.protocol.v5.client
1919

20-
import akka.actor.ActorSystem
21-
import akka.pattern.ask
22-
import akka.util.Timeout
20+
import org.apache.pekko.actor.ActorSystem
21+
import org.apache.pekko.pattern.ask
22+
import org.apache.pekko.util.Timeout
2323
import org.apache.toree.comm._
2424
import org.apache.toree.kernel.protocol.v5._
2525
import org.apache.toree.kernel.protocol.v5.client.execution.{DeferredExecution, ExecuteRequestTuple}

client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package org.apache.toree.kernel.protocol.v5.client
1919

2020
import java.nio.charset.Charset
2121

22-
import akka.util.{ByteString, Timeout}
22+
import org.apache.pekko.util.{ByteString, Timeout}
2323
import org.apache.toree.communication.ZMQMessage
2424
import org.apache.toree.kernel.protocol.v5._
2525
import org.apache.toree.kernel.protocol.v5.content.ExecuteRequest

client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/ClientBootstrap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.toree.kernel.protocol.v5.client.boot
1919

20-
import akka.actor.ActorSystem
20+
import org.apache.pekko.actor.ActorSystem
2121
import org.apache.toree.comm.{CommRegistrar, CommStorage}
2222
import org.apache.toree.kernel.protocol.v5.client.boot.layers._
2323
import org.apache.toree.kernel.protocol.v5.client.socket.{SocketConfig, SocketFactory}

client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/HandlerInitialization.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.toree.kernel.protocol.v5.client.boot.layers
1919

20-
import akka.actor.{ActorSystem, Props}
20+
import org.apache.pekko.actor.{ActorSystem, Props}
2121
import org.apache.toree.kernel.protocol.v5.client.ActorLoader
2222
import org.apache.toree.kernel.protocol.v5.MessageType
2323
import org.apache.toree.kernel.protocol.v5.MessageType.MessageType

client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/SystemInitialization.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.toree.kernel.protocol.v5.client.boot.layers
1919

20-
import akka.actor.{Props, ActorRef, ActorSystem}
20+
import org.apache.pekko.actor.{Props, ActorRef, ActorSystem}
2121
import org.apache.toree.comm.{CommRegistrar, CommStorage}
2222
import org.apache.toree.communication.security.{SecurityActorType, SignatureManagerActor}
2323
import org.apache.toree.kernel.protocol.v5.SocketType

client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/handler/ExecuteHandler.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package org.apache.toree.kernel.protocol.v5.client.handler
1919

20-
import akka.actor.Actor
21-
import akka.util.Timeout
20+
import org.apache.pekko.actor.Actor
21+
import org.apache.pekko.util.Timeout
2222
import org.apache.toree.kernel.protocol.v5._
2323
import org.apache.toree.kernel.protocol.v5.client.{ActorLoader, Utilities}
2424
import org.apache.toree.kernel.protocol.v5.client.execution.{ExecuteRequestTuple, DeferredExecutionManager}

client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClient.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
package org.apache.toree.kernel.protocol.v5.client.socket
1919

20-
import akka.actor.{ActorRef, Actor}
21-
import akka.util.{ByteString, Timeout}
20+
import org.apache.pekko.actor.{ActorRef, Actor}
21+
import org.apache.pekko.util.{ByteString, Timeout}
2222
import org.apache.toree.communication.ZMQMessage
23-
import akka.pattern.ask
23+
import org.apache.pekko.pattern.ask
2424
import org.apache.toree.kernel.protocol.v5.client.ActorLoader
2525
import org.apache.toree.utils.LogLike
2626
import org.apache.toree.kernel.protocol.v5.UUID

0 commit comments

Comments
 (0)