From 90eef86bc1b0c1947e161779fd142d1e1539fbee Mon Sep 17 00:00:00 2001 From: Paul Trudel Date: Thu, 31 Aug 2023 18:03:00 +0000 Subject: [PATCH] Use Pekko in bbb-common-message, bbb-common-web, and akka-apps --- akka-bbb-apps/project/Dependencies.scala | 14 ++++++++++++++ .../main/scala/org/bigbluebutton/ApiService.scala | 6 +++--- .../src/main/scala/org/bigbluebutton/Boot.scala | 8 ++++---- .../bigbluebutton/core/BigBlueButtonActor.scala | 8 ++++---- .../apps/audiocaptions/AudioCaptionsApp2x.scala | 2 +- .../core/apps/caption/CaptionApp2x.scala | 4 ++-- .../bigbluebutton/core/apps/chat/ChatApp2x.scala | 2 +- .../apps/externalvideo/ExternalVideoApp2x.scala | 4 ++-- .../core/apps/groupchats/GroupChatHdlrs.scala | 4 ++-- .../bigbluebutton/core/apps/pads/PadsApp2x.scala | 2 +- .../bigbluebutton/core/apps/polls/PollApp2x.scala | 4 ++-- .../core/apps/presentation/PresentationApp2x.scala | 4 ++-- .../presentationpod/PresentationPodHdlrs.scala | 4 ++-- .../core/apps/screenshare/ScreenshareApp2x.scala | 4 ++-- .../bigbluebutton/core/apps/timer/TimerApp2x.scala | 4 ++-- .../bigbluebutton/core/apps/users/UsersApp.scala | 4 ++-- .../bigbluebutton/core/apps/voice/VoiceApp.scala | 2 +- .../core/apps/webcam/WebcamApp2x.scala | 4 ++-- .../core/apps/whiteboard/WhiteboardApp2x.scala | 4 ++-- .../core/bus/BbbMsgRouterEventBus.scala | 4 ++-- .../org/bigbluebutton/core/bus/InMsgBusGW.scala | 3 ++- .../core/bus/IncomingEventBusImp.scala | 6 +++--- .../bigbluebutton/core/bus/InternalEventBus.scala | 2 +- .../org/bigbluebutton/core/bus/OutEventBus2.scala | 4 ++-- .../bigbluebutton/core/bus/RecordingEventBus.scala | 4 ++-- .../senders/ReceivedJsonMsgHandlerActor.scala | 2 +- .../core/running/BaseMeetingActor.scala | 2 +- .../org/bigbluebutton/core/running/LogHelper.scala | 4 ++-- .../bigbluebutton/core/running/MeetingActor.scala | 10 +++++----- .../core/running/MeetingActorAudit.scala | 10 +++++----- .../core/running/RunningMeeting.scala | 2 +- .../org/bigbluebutton/core2/AnalyticsActor.scala | 2 +- .../core2/FromAkkaAppsMsgSenderActor.scala | 2 +- .../redis/AkkaAppsRedisSubscriberActor.scala | 4 ++-- .../endpoint/redis/ExportAnnotationsActor.scala | 8 ++++---- .../endpoint/redis/LearningDashboardActor.scala | 2 +- .../endpoint/redis/RedisRecorderActor.scala | 8 ++++---- .../org/bigbluebutton/service/HealthzService.scala | 6 +++--- .../bigbluebutton/service/MeetingInfoService.scala | 8 ++++---- .../common2/bus/JsonMsgFromAkkaAppsBus.scala | 4 ++-- .../common2/bus/MsgFromAkkaAppsEventBus.scala | 4 ++-- .../common2/bus/OldMessageEventBus.scala | 4 ++-- .../common2/redis/RedisStorageProvider.scala | 2 +- .../org/bigbluebutton/api2/BbbWebApiGWApp.scala | 4 ++-- .../scala/org/bigbluebutton/api2/MsgBuilder.scala | 2 +- .../api2/bus/JsonMsgToAkkaAppsBus.scala | 4 ++-- .../api2/bus/MessageSenderActor.scala | 4 ++-- .../api2/bus/MsgToAkkaAppsEventBus.scala | 4 ++-- .../api2/bus/MsgToAkkaAppsToJsonActor.scala | 2 +- .../api2/bus/OldMessageJsonReceiverActor.scala | 2 +- .../api2/bus/ReceivedJsonMsgHdlrActor.scala | 6 +++--- .../endpoint/redis/WebRedisSubscriberActor.scala | 4 ++-- .../api2/meeting/OldMeetingMsgHdlrActor.scala | 2 +- 53 files changed, 122 insertions(+), 107 deletions(-) diff --git a/akka-bbb-apps/project/Dependencies.scala b/akka-bbb-apps/project/Dependencies.scala index ba7cf1f299..2ec2795862 100755 --- a/akka-bbb-apps/project/Dependencies.scala +++ b/akka-bbb-apps/project/Dependencies.scala @@ -14,7 +14,9 @@ object Dependencies { // Libraries val akkaVersion = "2.6.17" + val pekkoVersion = "1.0.1" val akkaHttpVersion = "10.2.7" + val pekkoHttpVersion = "1.0.0" val gson = "2.8.9" val jackson = "2.13.5" val logback = "1.2.11" @@ -46,6 +48,9 @@ object Dependencies { val akkaActor = "com.typesafe.akka" % "akka-actor_2.13" % Versions.akkaVersion val akkaSl4fj = "com.typesafe.akka" % "akka-slf4j_2.13" % Versions.akkaVersion + val pekkoActor = "org.apache.pekko" %% "pekko-actor" % Versions.pekkoVersion + val pekkoSlf4j = "org.apache.pekko" %% "pekko-slf4j" % Versions.pekkoVersion + val googleGson = "com.google.code.gson" % "gson" % Versions.gson val jacksonModule = "com.fasterxml.jackson.module" %% "jackson-module-scala" % Versions.jackson val quicklens = "com.softwaremill.quicklens" %% "quicklens" % Versions.quicklens @@ -57,6 +62,10 @@ object Dependencies { val akkaHttp = "com.typesafe.akka" %% "akka-http" % Versions.akkaHttpVersion val akkaHttpSprayJson = "com.typesafe.akka" %% "akka-http-spray-json" % Versions.akkaHttpVersion + val pekkoStream = "org.apache.pekko" %% "pekko-stream" % Versions.pekkoVersion + val pekkoHttp = "org.apache.pekko" %% "pekko-http" % Versions.pekkoHttpVersion + val pekkoHttpSprayJson = "org.apache.pekko" %% "pekko-http-spray-json" % Versions.pekkoHttpVersion + val apacheLang = "org.apache.commons" % "commons-lang3" % Versions.lang val bbbCommons = "org.bigbluebutton" % "bbb-common-message_2.13" % Versions.bbbCommons @@ -88,6 +97,9 @@ object Dependencies { Compile.akkaActor, Compile.akkaSl4fj, Compile.akkaStream, + Compile.pekkoActor, + Compile.pekkoSlf4j, + Compile.pekkoStream, Compile.googleGson, Compile.jacksonModule, Compile.quicklens, @@ -97,6 +109,8 @@ object Dependencies { Compile.apacheLang, Compile.akkaHttp, Compile.akkaHttpSprayJson, + Compile.pekkoHttp, + Compile.pekkoHttpSprayJson, Compile.bbbCommons, Compile.slick, Compile.slickHikaricp, diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/ApiService.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/ApiService.scala index 3ee84a44ee..224335c05c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/ApiService.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/ApiService.scala @@ -1,8 +1,8 @@ package org.bigbluebutton -import akka.http.scaladsl.model._ -import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import akka.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport +import org.apache.pekko.http.scaladsl.server.Directives._ import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.service.{ HealthzService, MeetingInfoService, PubSubReceiveStatus, PubSubSendStatus, RecordingDBSendStatus } import spray.json._ diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala index 7054a5509b..af0b53a488 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala @@ -1,9 +1,9 @@ package org.bigbluebutton -import akka.actor.ActorSystem -import akka.event.Logging -import akka.http.scaladsl.Http -import akka.stream.ActorMaterializer +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.event.Logging +import org.apache.pekko.http.scaladsl.Http +import org.apache.pekko.stream.ActorMaterializer import org.bigbluebutton.common2.redis.{ MessageSender, RedisConfig, RedisPublisher } import org.bigbluebutton.core._ import org.bigbluebutton.core.bus._ diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala index 56d945ab16..0221f166b0 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala @@ -1,10 +1,10 @@ package org.bigbluebutton.core import java.io.{ PrintWriter, StringWriter } -import akka.actor._ -import akka.actor.ActorLogging -import akka.actor.SupervisorStrategy.Resume -import akka.util.Timeout +import org.apache.pekko.actor._ +import org.apache.pekko.actor.ActorLogging +import org.apache.pekko.actor.SupervisorStrategy.Resume +import org.apache.pekko.util.Timeout import scala.concurrent.duration._ import org.bigbluebutton.core.bus._ diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/audiocaptions/AudioCaptionsApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/audiocaptions/AudioCaptionsApp2x.scala index 93abe8bdb9..853708c5cb 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/audiocaptions/AudioCaptionsApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/audiocaptions/AudioCaptionsApp2x.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core.apps.audiocaptions -import akka.actor.ActorContext +import org.apache.pekko.actor.ActorContext class AudioCaptionsApp2x(implicit val context: ActorContext) extends UpdateTranscriptPubMsgHdlr diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala index 90dd3555e1..8f9ec319fa 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.caption -import akka.actor.ActorContext -import akka.event.Logging +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.Logging import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.bus.MessageBus import org.bigbluebutton.core.running.{ LiveMeeting } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp2x.scala index 66d7f9afb3..dd00c9e049 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp2x.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core.apps.chat -import akka.actor.ActorContext +import org.apache.pekko.actor.ActorContext class ChatApp2x(implicit val context: ActorContext) extends GetChatHistoryReqMsgHdlr diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala index 0630711d64..dbcc67308d 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.externalvideo -import akka.actor.ActorContext -import akka.event.Logging +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.Logging class ExternalVideoApp2x(implicit val context: ActorContext) extends StartExternalVideoPubMsgHdlr diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/GroupChatHdlrs.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/GroupChatHdlrs.scala index c0e8115b58..6b815f90a8 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/GroupChatHdlrs.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/GroupChatHdlrs.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.groupchats -import akka.actor.ActorContext -import akka.event.Logging +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.Logging class GroupChatHdlrs(implicit val context: ActorContext) extends CreateGroupChatReqMsgHdlr diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/pads/PadsApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/pads/PadsApp2x.scala index 2efa4cf7e3..29402d16bd 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/pads/PadsApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/pads/PadsApp2x.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core.apps.pads -import akka.actor.ActorContext +import org.apache.pekko.actor.ActorContext class PadsApp2x(implicit val context: ActorContext) extends PadCreateGroupReqMsgHdlr diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/PollApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/PollApp2x.scala index 31dbeb73fa..2e737c7e7b 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/PollApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/PollApp2x.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.polls -import akka.actor.ActorContext -import akka.event.Logging +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.Logging class PollApp2x(implicit val context: ActorContext) extends GetCurrentPollReqMsgHdlr diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp2x.scala index 9f80d264cc..24ed60f015 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp2x.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.presentation -import akka.actor.ActorContext -import akka.event.Logging +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.Logging import org.bigbluebutton.core.apps.Presentation import org.bigbluebutton.core.running.LiveMeeting diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPodHdlrs.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPodHdlrs.scala index d640dda323..c66c2400e8 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPodHdlrs.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPodHdlrs.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.presentationpod -import akka.actor.ActorContext -import akka.event.Logging +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.Logging class PresentationPodHdlrs(implicit val context: ActorContext) extends CreateNewPresentationPodPubMsgHdlr diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareApp2x.scala index 4d1289931b..9a74f80501 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareApp2x.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.screenshare -import akka.actor.ActorContext -import akka.event.Logging +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.Logging import org.bigbluebutton.core.apps.ScreenshareModel import org.bigbluebutton.core.running.{ LiveMeeting, OutMsgRouter } import org.bigbluebutton.core2.message.senders.MsgBuilder diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/timer/TimerApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/timer/TimerApp2x.scala index fbefacbcc1..09909c7eb7 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/timer/TimerApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/timer/TimerApp2x.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.timer -import akka.actor.ActorContext -import akka.event.Logging +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.Logging class TimerApp2x(implicit val context: ActorContext) extends CreateTimerPubMsgHdlr diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala index 5381578b45..c7dcba4224 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.users -import akka.actor.ActorContext -import akka.event.Logging +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.Logging import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.apps.ExternalVideoModel import org.bigbluebutton.core.bus.InternalEventBus diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala index 96a2b121c9..ce6d28cc44 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core.apps.voice -import akka.actor.{ ActorContext, ActorSystem, Cancellable } +import org.apache.pekko.actor.{ ActorContext, ActorSystem, Cancellable } import org.bigbluebutton.SystemConfiguration import org.bigbluebutton.LockSettingsUtil import org.bigbluebutton.core.apps.breakout.BreakoutHdlrHelpers diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/webcam/WebcamApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/webcam/WebcamApp2x.scala index 9dc619331a..403dd977fd 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/webcam/WebcamApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/webcam/WebcamApp2x.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.webcam -import akka.actor.ActorContext -import akka.event.Logging +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.Logging class WebcamApp2x(implicit val context: ActorContext) extends CamBroadcastStoppedInSfuEvtMsgHdlr diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp2x.scala index 17ed317397..8a8945718d 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp2x.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp2x.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.apps.whiteboard -import akka.actor.ActorContext -import akka.event.Logging +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.Logging import org.bigbluebutton.core.running.LiveMeeting import org.bigbluebutton.common2.msgs.AnnotationVO import scala.collection.immutable.{ Map } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/BbbMsgRouterEventBus.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/BbbMsgRouterEventBus.scala index 7ceccf0e98..0d6201c871 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/BbbMsgRouterEventBus.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/BbbMsgRouterEventBus.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.bus -import akka.actor.ActorRef -import akka.event.{ EventBus, LookupClassification } +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.event.{ EventBus, LookupClassification } import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg case class BbbMsgEvent(val topic: String, val payload: BbbCommonEnvCoreMsg) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/InMsgBusGW.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/InMsgBusGW.scala index acf44ee55f..24797417d6 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/InMsgBusGW.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/InMsgBusGW.scala @@ -1,5 +1,6 @@ package org.bigbluebutton.core.bus -import akka.actor.ActorRef + +import org.apache.pekko.actor.ActorRef class InMsgBusGW(bus: IncomingEventBusImp) extends InternalEventBus { override def publish(event: BigBlueButtonEvent): Unit = { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/IncomingEventBusImp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/IncomingEventBusImp.scala index c940656662..e8b17844da 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/IncomingEventBusImp.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/IncomingEventBusImp.scala @@ -1,8 +1,8 @@ package org.bigbluebutton.core.bus -import akka.actor.ActorRef -import akka.event.EventBus -import akka.event.LookupClassification +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.event.EventBus +import org.apache.pekko.event.LookupClassification class IncomingEventBusImp extends EventBus with LookupClassification { type Event = BigBlueButtonEvent diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/InternalEventBus.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/InternalEventBus.scala index a420ad8b6b..3c42b085f1 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/InternalEventBus.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/InternalEventBus.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core.bus -import akka.actor.ActorRef +import org.apache.pekko.actor.ActorRef import org.bigbluebutton.core.api.InMessage case class BigBlueButtonEvent(val topic: String, val payload: InMessage) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/OutEventBus2.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/OutEventBus2.scala index 0dba14564b..b9aa1f2105 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/OutEventBus2.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/OutEventBus2.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.bus -import akka.actor.ActorRef -import akka.event.{ EventBus, LookupClassification } +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.event.{ EventBus, LookupClassification } import org.bigbluebutton.common2.msgs.{ BbbCommonEnvCoreMsg } case class BbbOutMessage(val topic: String, val payload: BbbCommonEnvCoreMsg) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/RecordingEventBus.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/RecordingEventBus.scala index 2446c4c89e..e2fb6553ae 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/RecordingEventBus.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/RecordingEventBus.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.bus -import akka.actor.ActorRef -import akka.event.{ EventBus, LookupClassification } +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.event.{ EventBus, LookupClassification } import org.bigbluebutton.common2.msgs.{ BbbCoreMsg } case class BbbRecordMessage(val topic: String, val payload: BbbCoreMsg) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala index 33fcd143bc..3e74f0ab18 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core.pubsub.senders -import akka.actor.{ Actor, ActorLogging, Props } +import org.apache.pekko.actor.{ Actor, ActorLogging, Props } import org.bigbluebutton.SystemConfiguration import com.fasterxml.jackson.databind.JsonNode import org.bigbluebutton.common2.msgs._ diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/BaseMeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/BaseMeetingActor.scala index 62ff3d2d62..956fce2e55 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/BaseMeetingActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/BaseMeetingActor.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core.running -import akka.actor.{ Actor, ActorLogging } +import org.apache.pekko.actor.{ Actor, ActorLogging } // A marker trait so we can create testable meeting actors trait BaseMeetingActor extends Actor with ActorLogging { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LogHelper.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LogHelper.scala index bf4a70562a..213fc6aaf6 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LogHelper.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LogHelper.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.running -import akka.actor.ActorContext -import akka.event.{ LogSource, Logging } +import org.apache.pekko.actor.ActorContext +import org.apache.pekko.event.{ LogSource, Logging } object MyType { implicit val logSource: LogSource[AnyRef] = new LogSource[AnyRef] { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala index 3454b923d3..4dc243c51d 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.core.running import java.io.{ PrintWriter, StringWriter } -import akka.actor.SupervisorStrategy.Resume +import org.apache.pekko.actor.SupervisorStrategy.Resume import org.bigbluebutton.SystemConfiguration import org.bigbluebutton.core.apps.groupchats.GroupChatHdlrs import org.bigbluebutton.core.apps.presentationpod._ @@ -32,18 +32,18 @@ import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.core.apps.breakout._ import org.bigbluebutton.core.apps.polls._ import org.bigbluebutton.core.apps.voice._ -import akka.actor.Props -import akka.actor.OneForOneStrategy +import org.apache.pekko.actor.Props +import org.apache.pekko.actor.OneForOneStrategy import org.bigbluebutton.common2.msgs import scala.concurrent.duration._ import org.bigbluebutton.core.apps.layout.LayoutApp2x import org.bigbluebutton.core.apps.meeting.{ SyncGetMeetingInfoRespMsgHdlr, ValidateConnAuthTokenSysMsgHdlr } import org.bigbluebutton.core.apps.users.ChangeLockSettingsInMeetingCmdMsgHdlr -import org.bigbluebutton.core.db.{ UserStateDAO } +import org.bigbluebutton.core.db.UserStateDAO import org.bigbluebutton.core.models.VoiceUsers.{ findAllFreeswitchCallers, findAllListenOnlyVoiceUsers } import org.bigbluebutton.core.models.Webcams.findAll -import org.bigbluebutton.core2.MeetingStatus2x.{ hasAuthedUserJoined } +import org.bigbluebutton.core2.MeetingStatus2x.hasAuthedUserJoined import org.bigbluebutton.core2.message.senders.{ MsgBuilder, Sender } import java.util.concurrent.TimeUnit diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala index ed481e82ab..4b6d6a78b1 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala @@ -2,11 +2,11 @@ package org.bigbluebutton.core.running import java.io.{ PrintWriter, StringWriter } -import akka.actor.Actor -import akka.actor.ActorLogging -import akka.actor.Props -import akka.actor.OneForOneStrategy -import akka.actor.SupervisorStrategy.Resume +import org.apache.pekko.actor.Actor +import org.apache.pekko.actor.ActorLogging +import org.apache.pekko.actor.Props +import org.apache.pekko.actor.OneForOneStrategy +import org.apache.pekko.actor.SupervisorStrategy.Resume import scala.concurrent.duration._ import org.bigbluebutton.SystemConfiguration diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala index 7ed0bb6b97..68b32cefa5 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core.running -import akka.actor.ActorContext +import org.apache.pekko.actor.ActorContext import org.bigbluebutton.common2.domain.DefaultProps import org.bigbluebutton.core.apps._ import org.bigbluebutton.core.bus._ diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala index d4f305dda5..0522fd1ef2 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core2 -import akka.actor.{ Actor, ActorLogging, Props } +import org.apache.pekko.actor.{ Actor, ActorLogging, Props } import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.util.JsonUtil object AnalyticsActor { diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala index 7f7b005de2..c020a7da4e 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core2 -import akka.actor.{ Actor, ActorLogging, Props } +import org.apache.pekko.actor.{ Actor, ActorLogging, Props } import org.bigbluebutton.SystemConfiguration import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.util.JsonUtil diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AkkaAppsRedisSubscriberActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AkkaAppsRedisSubscriberActor.scala index 9b3eb27333..311b9a2f8c 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AkkaAppsRedisSubscriberActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AkkaAppsRedisSubscriberActor.scala @@ -2,8 +2,8 @@ package org.bigbluebutton.endpoint.redis import org.bigbluebutton.common2.bus.IncomingJsonMessageBus import org.bigbluebutton.common2.redis.{ RedisConfig, RedisSubscriberProvider } -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props object AppsRedisSubscriberActor { def props( diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/ExportAnnotationsActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/ExportAnnotationsActor.scala index 471e57c2d5..c027cc90fb 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/ExportAnnotationsActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/ExportAnnotationsActor.scala @@ -5,10 +5,10 @@ import scala.collection.JavaConverters._ import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.redis.{ RedisConfig, RedisStorageProvider } import org.bigbluebutton.core.record.events.{ AbstractPresentationWithAnnotations, StoreAnnotationsInRedisPresAnnEvent, StoreExportJobInRedisPresAnnEvent } -import akka.actor.Actor -import akka.actor.ActorLogging -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.Actor +import org.apache.pekko.actor.ActorLogging +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props import org.bigbluebutton.service.HealthzService import scala.concurrent.duration._ diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/LearningDashboardActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/LearningDashboardActor.scala index bdc12a78a4..44aba21711 100644 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/LearningDashboardActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/LearningDashboardActor.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.endpoint.redis -import akka.actor.{Actor, ActorLogging, ActorSystem, Props} +import org.apache.pekko.actor.{Actor, ActorLogging, ActorSystem, Props} import org.bigbluebutton.common2.domain.PresentationVO import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.util.JsonUtil diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala index ae91ed9b5f..c7554ed7f0 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala @@ -6,10 +6,10 @@ import org.bigbluebutton.common2.msgs._ import org.bigbluebutton.common2.redis.{ RedisConfig, RedisStorageProvider } import org.bigbluebutton.core.apps.groupchats.GroupChatApp import org.bigbluebutton.core.record.events._ -import akka.actor.Actor -import akka.actor.ActorLogging -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.Actor +import org.apache.pekko.actor.ActorLogging +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props import org.bigbluebutton.service.HealthzService import scala.concurrent.duration._ diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/HealthzService.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/HealthzService.scala index 8a3dd79a07..d3f748142d 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/HealthzService.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/HealthzService.scala @@ -1,11 +1,11 @@ package org.bigbluebutton.service -import akka.actor.{ Actor, ActorLogging, ActorSystem, Props } -import akka.util.Timeout +import org.apache.pekko.actor.{ Actor, ActorLogging, ActorSystem, Props } +import org.apache.pekko.util.Timeout import scala.concurrent.Future import scala.concurrent.duration._ -import akka.pattern.{ AskTimeoutException, ask } +import org.apache.pekko.pattern.{ AskTimeoutException, ask } import org.bigbluebutton.core.BigBlueButtonActor import java.time.{ Instant, LocalDateTime } diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/MeetingInfoService.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/MeetingInfoService.scala index f7af5a95a6..2dd5994a7a 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/MeetingInfoService.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/service/MeetingInfoService.scala @@ -1,9 +1,9 @@ package org.bigbluebutton.service -import akka.actor.{ Actor, ActorLogging, ActorRef, ActorSystem, Props } -import akka.pattern.ask -import akka.pattern.AskTimeoutException -import akka.util.Timeout +import org.apache.pekko.actor.{ Actor, ActorLogging, ActorRef, ActorSystem, Props } +import org.apache.pekko.pattern.ask +import org.apache.pekko.pattern.AskTimeoutException +import org.apache.pekko.util.Timeout import org.bigbluebutton.MeetingInfoAnalytics import org.bigbluebutton.common2.msgs.{ BbbCommonEnvCoreMsg, MeetingEndingEvtMsg, MeetingInfoAnalyticsServiceMsg } diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/JsonMsgFromAkkaAppsBus.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/JsonMsgFromAkkaAppsBus.scala index 871f6f76f9..85020ee62c 100644 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/JsonMsgFromAkkaAppsBus.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/JsonMsgFromAkkaAppsBus.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.common2.bus -import akka.actor.ActorRef -import akka.event.{ EventBus, LookupClassification } +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.event.{ EventBus, LookupClassification } case class JsonMsgFromAkkaApps(name: String, data: String) case class JsonMsgFromAkkaAppsEvent(val topic: String, val payload: JsonMsgFromAkkaApps) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/MsgFromAkkaAppsEventBus.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/MsgFromAkkaAppsEventBus.scala index 3847b41cd4..d10447baf0 100644 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/MsgFromAkkaAppsEventBus.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/MsgFromAkkaAppsEventBus.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.api2.bus -import akka.actor.ActorRef -import akka.event.{ EventBus, LookupClassification } +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.event.{ EventBus, LookupClassification } import org.bigbluebutton.common2.msgs.BbbCommonMsg case class MsgFromAkkaApps(val topic: String, val payload: BbbCommonMsg) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala index 78c2b11659..c115ea555a 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.common2.bus -import akka.actor.ActorRef -import akka.event.{ EventBus, LookupClassification } +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.event.{ EventBus, LookupClassification } import akka.actor.actorRef2Scala case class OldReceivedJsonMessage(pattern: String, channel: String, msg: String) diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisStorageProvider.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisStorageProvider.scala index 7585205efa..47cc6ba268 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisStorageProvider.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisStorageProvider.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.common2.redis -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem abstract class RedisStorageProvider(system: ActorSystem, clientName: String, config: RedisConfig) { val redisPass = config.password match { diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala index d15244fc2d..4a21fecf1d 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala @@ -1,8 +1,8 @@ package org.bigbluebutton.api2 import scala.collection.JavaConverters._ -import akka.actor.ActorSystem -import akka.event.Logging +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.event.Logging import org.bigbluebutton.api.domain.{BreakoutRoomsParams, Group, LockSettingsParams} import org.bigbluebutton.api.messaging.converters.messages._ import org.bigbluebutton.api2.bus._ diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala index af5efd4afc..4bb4be36d8 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala @@ -79,7 +79,7 @@ object MsgBuilder { val pngUrl = presBaseUrl + "/png/" + page val urls = Map("thumb" -> thumbUrl, "text" -> txtUrl, "svg" -> svgUrl, "png" -> pngUrl) - + try { val imgUrl = new URL(svgUrl) val imgContent = XML.load(imgUrl) diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/JsonMsgToAkkaAppsBus.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/JsonMsgToAkkaAppsBus.scala index d7a589e2b5..bb5255c1fc 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/JsonMsgToAkkaAppsBus.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/JsonMsgToAkkaAppsBus.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.api2.bus -import akka.actor.ActorRef -import akka.event.{ EventBus, LookupClassification } +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.event.{ EventBus, LookupClassification } case class JsonMsgToSendToAkkaApps(channel: String, json: String) case class JsonMsgToAkkaAppsBusMsg(val topic: String, payload: JsonMsgToSendToAkkaApps) diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MessageSenderActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MessageSenderActor.scala index c697f21821..0634338d69 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MessageSenderActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MessageSenderActor.scala @@ -2,8 +2,8 @@ package org.bigbluebutton.api2.bus import java.io.{ PrintWriter, StringWriter } -import akka.actor.SupervisorStrategy.Resume -import akka.actor.{ Actor, ActorLogging, OneForOneStrategy, Props } +import org.apache.pekko.actor.SupervisorStrategy.Resume +import org.apache.pekko.actor.{ Actor, ActorLogging, OneForOneStrategy, Props } import org.bigbluebutton.common2.redis.MessageSender import scala.concurrent.duration._ diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsEventBus.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsEventBus.scala index 521c010056..d8b5e1729d 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsEventBus.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsEventBus.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.api2.bus -import akka.actor.ActorRef -import akka.event.{ EventBus, LookupClassification } +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.event.{ EventBus, LookupClassification } import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg case class MsgToAkkaApps(val topic: String, val payload: BbbCommonEnvCoreMsg) diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsToJsonActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsToJsonActor.scala index f68d03605a..7bff747617 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsToJsonActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsToJsonActor.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.api2.bus -import akka.actor.{ Actor, ActorLogging, Props } +import org.apache.pekko.actor.{ Actor, ActorLogging, Props } import org.bigbluebutton.api2.SystemConfiguration import org.bigbluebutton.common2.msgs.BbbCommonEnvCoreMsg import org.bigbluebutton.common2.util.JsonUtil diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageJsonReceiverActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageJsonReceiverActor.scala index f623d30fca..4c368f4ece 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageJsonReceiverActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageJsonReceiverActor.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.api2.bus -import akka.actor.{ Actor, ActorLogging, Props } +import org.apache.pekko.actor.{ Actor, ActorLogging, Props } import org.bigbluebutton.common2.bus.OldReceivedJsonMessage object OldMessageJsonReceiverActor { diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala index 0318a883b7..d022aee94c 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala @@ -4,9 +4,9 @@ import org.bigbluebutton.api2.SystemConfiguration import org.bigbluebutton.common2.bus._ import org.bigbluebutton.common2.msgs._ import com.fasterxml.jackson.databind.JsonNode -import akka.actor.Actor -import akka.actor.ActorLogging -import akka.actor.Props +import org.apache.pekko.actor.Actor +import org.apache.pekko.actor.ActorLogging +import org.apache.pekko.actor.Props import scala.reflect.runtime.universe._ diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/WebRedisSubscriberActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/WebRedisSubscriberActor.scala index d1cd834ff7..b044fb775f 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/WebRedisSubscriberActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/WebRedisSubscriberActor.scala @@ -3,8 +3,8 @@ package org.bigbluebutton.api2.endpoint.redis import org.bigbluebutton.api2.SystemConfiguration import org.bigbluebutton.common2.bus._ import org.bigbluebutton.common2.redis.{ RedisConfig, RedisSubscriberProvider } -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props import io.lettuce.core.pubsub.RedisPubSubListener diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala index dd15781791..3126552de1 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala @@ -2,7 +2,7 @@ package org.bigbluebutton.api2.meeting import java.util -import akka.actor.{ Actor, ActorLogging, Props } +import org.apache.pekko.actor.{ Actor, ActorLogging, Props } import org.bigbluebutton.api.messaging.messages._ import org.bigbluebutton.api2.bus.OldMessageReceivedGW import org.bigbluebutton.common2.msgs._