From 2e24b6e961bafb9276d8977980611ba56bacae2b Mon Sep 17 00:00:00 2001 From: Enno <458526+ennru@users.noreply.github.com> Date: Thu, 21 Mar 2019 13:49:50 +0100 Subject: [PATCH] Add MiMa filters for internal API changes --- .../src/main/mima-filters/1.0-RC1.backwards.excludes | 9 +++++++++ .../alpakka/mqtt/streaming/scaladsl/MqttSession.scala | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 mqtt-streaming/src/main/mima-filters/1.0-RC1.backwards.excludes diff --git a/mqtt-streaming/src/main/mima-filters/1.0-RC1.backwards.excludes b/mqtt-streaming/src/main/mima-filters/1.0-RC1.backwards.excludes new file mode 100644 index 0000000000..7ba1ec195a --- /dev/null +++ b/mqtt-streaming/src/main/mima-filters/1.0-RC1.backwards.excludes @@ -0,0 +1,9 @@ +# PR #1595 +# https://github.com/akka/alpakka/pull/1595 +ProblemFilters.exclude[Problem]("akka.stream.alpakka.mqtt.streaming.impl.*") +# private[streaming] +ProblemFilters.exclude[MissingMethodProblem]("akka.stream.alpakka.mqtt.streaming.scaladsl.MqttClientSession.commandFlow") +ProblemFilters.exclude[MissingMethodProblem]("akka.stream.alpakka.mqtt.streaming.scaladsl.ActorMqttClientSession.commandFlow") +# private[streaming] +ProblemFilters.exclude[MissingMethodProblem]("akka.stream.alpakka.mqtt.streaming.scaladsl.MqttClientSession.eventFlow") +ProblemFilters.exclude[MissingMethodProblem]("akka.stream.alpakka.mqtt.streaming.scaladsl.ActorMqttClientSession.eventFlow") diff --git a/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/scaladsl/MqttSession.scala b/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/scaladsl/MqttSession.scala index 9d42abcc70..26585cf0d3 100644 --- a/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/scaladsl/MqttSession.scala +++ b/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/scaladsl/MqttSession.scala @@ -152,7 +152,7 @@ final class ActorMqttClientSession(settings: MqttSessionSettings)(implicit mat: private val pingReqBytes = PingReq.encode(ByteString.newBuilder).result() - override def commandFlow[A](connectionId: ByteString): CommandFlow[A] = + private[streaming] override def commandFlow[A](connectionId: ByteString): CommandFlow[A] = Flow .lazyInitAsync { () => val killSwitch = KillSwitches.shared("command-kill-switch-" + clientSessionId) @@ -249,7 +249,7 @@ final class ActorMqttClientSession(settings: MqttSessionSettings)(implicit mat: } .mapMaterializedValue(_ => NotUsed) - override def eventFlow[A](connectionId: ByteString): EventFlow[A] = + private[streaming] override def eventFlow[A](connectionId: ByteString): EventFlow[A] = Flow[ByteString] .watch(clientConnector.toUntyped) .watchTermination() {