This is an automated email from the ASF dual-hosted git repository. fanningpj pushed a commit to branch scala3 in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git
commit 3a8be3e59306d6557dc79ddf787f84c4e60294c0 Author: PJ Fanning <[email protected]> AuthorDate: Sat Jun 10 11:28:17 2023 +0100 support scala3 in mqtt-streaming (#161) Update MqttFlowSpec.scala Update MqttFlowSpec.scala Update MqttFlowSpec.scala Update MqttFlowSpec.scala remove val declarations --- .../pekko/stream/connectors/mqtt/streaming/model.scala | 18 +++++++++++------- .../mqtt/streaming/scaladsl/MqttSession.scala | 4 ++-- .../src/test/scala/docs/scaladsl/MqttFlowSpec.scala | 17 ++++++++--------- project/Dependencies.scala | 1 - 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/model.scala b/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/model.scala index 64089ba3e..f52addaed 100644 --- a/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/model.scala +++ b/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/model.scala @@ -53,7 +53,8 @@ object ControlPacketType { val DISCONNECT = ControlPacketType(14) val Reserved2 = ControlPacketType(15) } -final case class ControlPacketType private (underlying: Int) extends AnyVal +@InternalApi +final case class ControlPacketType(underlying: Int) extends AnyVal /** * 2.2.2 Flags @@ -75,7 +76,8 @@ object ControlPacketFlags { val RETAIN = ControlPacketFlags(1) } -final case class ControlPacketFlags private (underlying: Int) extends AnyVal { +@InternalApi +final case class ControlPacketFlags(underlying: Int) extends AnyVal { /** * Convenience bitwise OR @@ -110,7 +112,8 @@ case object Reserved2 extends ControlPacket(ControlPacketType.Reserved2, Control * 2.3.1 Packet Identifier * http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html */ -final case class PacketId private (underlying: Int) extends AnyVal +@InternalApi +final case class PacketId(underlying: Int) extends AnyVal object ConnectFlags { val None = ConnectFlags(0) @@ -127,7 +130,7 @@ object ConnectFlags { * 3.1.2.3 Connect Flags * http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html */ -final case class ConnectFlags private (underlying: Int) extends AnyVal { +final case class ConnectFlags private[streaming] (underlying: Int) extends AnyVal { /** * Convenience bitwise OR @@ -223,7 +226,7 @@ object ConnAckFlags { * 3.2.2.1 Connect Acknowledge Flags * http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html */ -final case class ConnAckFlags private (underlying: Int) extends AnyVal +final case class ConnAckFlags private[streaming] (underlying: Int) extends AnyVal object ConnAckReturnCode { val ConnectionAccepted = ConnAckReturnCode(0) @@ -238,7 +241,7 @@ object ConnAckReturnCode { * 3.2.2.3 Connect Return code * http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html */ -final case class ConnAckReturnCode private (underlying: Int) extends AnyVal { +final case class ConnAckReturnCode private[streaming] (underlying: Int) extends AnyVal { /** * Convenience bitwise OR @@ -286,7 +289,8 @@ object Publish { * 3.3 PUBLISH – Publish message * http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html */ -final case class Publish @InternalApi private[streaming] (override val flags: ControlPacketFlags, +@InternalApi +final case class Publish(override val flags: ControlPacketFlags, topicName: String, packetId: Option[PacketId], payload: ByteString) diff --git a/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/scaladsl/MqttSession.scala b/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/scaladsl/MqttSession.scala index afbfc222e..111eb7f42 100644 --- a/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/scaladsl/MqttSession.scala +++ b/mqtt-streaming/src/main/scala/org/apache/pekko/stream/connectors/mqtt/streaming/scaladsl/MqttSession.scala @@ -169,7 +169,7 @@ final class ActorMqttClientSession(settings: MqttSessionSettings)(implicit syste import MqttSession._ import system.dispatcher - private implicit val loggingAdapter: LoggingAdapter = Logging(system, this.getClass) + private implicit val loggingAdapter: LoggingAdapter = Logging(system, classOf[ActorMqttClientSession]) override def : Unit = cp match { case Command(cp: Publish, _, carry) => @@ -504,7 +504,7 @@ final class ActorMqttServerSession(settings: MqttSessionSettings)(implicit syste import MqttSession._ import system.dispatcher - private implicit val loggingAdapter: LoggingAdapter = Logging(system, this.getClass) + private implicit val loggingAdapter: LoggingAdapter = Logging(system, classOf[ActorMqttClientSession]) override def : Unit = cp match { case Command(cp: Publish, _, carry) => diff --git a/mqtt-streaming/src/test/scala/docs/scaladsl/MqttFlowSpec.scala b/mqtt-streaming/src/test/scala/docs/scaladsl/MqttFlowSpec.scala index 190dc0afa..fd73bfa50 100644 --- a/mqtt-streaming/src/test/scala/docs/scaladsl/MqttFlowSpec.scala +++ b/mqtt-streaming/src/test/scala/docs/scaladsl/MqttFlowSpec.scala @@ -36,20 +36,17 @@ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike class UntypedMqttFlowSpec - extends ParametrizedTestKit("untyped-flow-spec/flow", + extends MqttFlowSpecBase("untyped-flow-spec/flow", "untyped-flow-spec/topic1", ActorSystem("UntypedMqttFlowSpec")) - with MqttFlowSpec + class TypedMqttFlowSpec - extends ParametrizedTestKit("typed-flow-spec/flow", + extends MqttFlowSpecBase("typed-flow-spec/flow", "typed-flow-spec/topic1", - org.apache.pekko.actor.typed.ActorSystem(Behaviors.ignore, "TypedMqttFlowSpec").toClassic) - with MqttFlowSpec - -class ParametrizedTestKit(val clientId: String, val topic: String, system: ActorSystem) extends TestKit(system) + pekko.actor.typed.ActorSystem(Behaviors.ignore, "TypedMqttFlowSpec").toClassic) -trait MqttFlowSpec extends AnyWordSpecLike with Matchers with BeforeAndAfterAll with ScalaFutures with LogCapturing { - self: ParametrizedTestKit => +abstract class MqttFlowSpecBase(clientId: String, topic: String, system: ActorSystem) extends TestKit(system) + with AnyWordSpecLike with Matchers with BeforeAndAfterAll with ScalaFutures with LogCapturing { override def sourceActorSytem = Some(system.name) @@ -57,6 +54,8 @@ trait MqttFlowSpec extends AnyWordSpecLike with Matchers with BeforeAndAfterAll private implicit val dispatcherExecutionContext: ExecutionContext = system.dispatcher + private implicit val implicitSystem: ActorSystem = system + implicit val logAdapter: LoggingAdapter = Logging(system, this.getClass.getName) override def afterAll(): Unit = diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3d2f90082..dabba7361 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -345,7 +345,6 @@ object Dependencies { "org.eclipse.paho" % "org.eclipse.paho.client.mqttv3" % "1.2.5")) val MqttStreaming = Seq( - crossScalaVersions -= Scala3, libraryDependencies ++= Seq( "org.apache.pekko" %% "pekko-actor-typed" % PekkoVersion, "org.apache.pekko" %% "pekko-actor-testkit-typed" % PekkoVersion % Test, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
