BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Pekko in bbb-common-message, bbb-common-web, and akka-apps

Browse Source
This commit is contained in:
Paul Trudel 2023-08-31 18:03:00 +00:00
parent 225b2f2d74
commit 90eef86bc1
53 changed files with 122 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
akka-bbb-apps/project/Dependencies.scala
View File

@ -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,

6
akka-bbb-apps/src/main/scala/org/bigbluebutton/ApiService.scala
View File

@ -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._

8
akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
View File

@ -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._

8
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
View File

@ -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._

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/audiocaptions/AudioCaptionsApp2x.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala
View File

@ -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 }

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/chat/ChatApp2x.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/GroupChatHdlrs.scala
View File

@ -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

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/pads/PadsApp2x.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/PollApp2x.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp2x.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPodHdlrs.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareApp2x.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/timer/TimerApp2x.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
View File

@ -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

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/webcam/WebcamApp2x.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp2x.scala
View File

@ -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 }

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/BbbMsgRouterEventBus.scala
View File

@ -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)

3
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/InMsgBusGW.scala
View File

@ -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 = {

6
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/IncomingEventBusImp.scala
View File

@ -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

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/InternalEventBus.scala
View File

@ -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)

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/OutEventBus2.scala
View File

@ -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)

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/RecordingEventBus.scala
View File

@ -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)

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
View File

@ -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._

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/BaseMeetingActor.scala
View File

@ -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 {

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LogHelper.scala
View File

@ -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] {

10
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
View File

@ -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

10
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala
View File

@ -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

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
View File

@ -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._

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala
View File

@ -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 {

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
View File

@ -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

4
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AkkaAppsRedisSubscriberActor.scala
View File

@ -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(

8
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/ExportAnnotationsActor.scala
View File

@ -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._

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/LearningDashboardActor.scala
View File

@ -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

8
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
View File

@ -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._

6
akka-bbb-apps/src/main/scala/org/bigbluebutton/service/HealthzService.scala
View File

@ -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 }

8
akka-bbb-apps/src/main/scala/org/bigbluebutton/service/MeetingInfoService.scala
View File

@ -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 }

4
bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/JsonMsgFromAkkaAppsBus.scala
View File

@ -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)

4
bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/MsgFromAkkaAppsEventBus.scala
View File

@ -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)

4
bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala
View File

@ -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)

2
bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisStorageProvider.scala
View File

@ -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 {

4
bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
View File

@ -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._

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala
View File

@ -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)

4
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/JsonMsgToAkkaAppsBus.scala
View File

@ -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)

4
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MessageSenderActor.scala
View File

@ -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._

4
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsEventBus.scala
View File

@ -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)

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgToAkkaAppsToJsonActor.scala
View File

@ -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

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageJsonReceiverActor.scala
View File

@ -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 {

6
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
View File

@ -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._

4
bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/WebRedisSubscriberActor.scala
View File

@ -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

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
View File

@ -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._