From 542b259630feaa778cce756e1cbc4f63d37893b5 Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Sun, 20 Mar 2016 01:44:19 +0100 Subject: [PATCH 1/2] +htc #20086 make ws.*Message.Streamed not private In order to allow matching on it. --- .../main/scala/akka/http/scaladsl/model/ws/Message.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala index 0aa8362f24..a1609e455e 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala @@ -37,7 +37,7 @@ object TextMessage { def textStream: Source[String, _] = Source.single(text) override def toString: String = s"TextMessage.Strict($text)" } - final private case class Streamed(textStream: Source[String, _]) extends TextMessage + final case class Streamed(textStream: Source[String, _]) extends TextMessage } /** @@ -65,5 +65,5 @@ object BinaryMessage { def dataStream: Source[ByteString, _] = Source.single(data) override def toString: String = s"BinaryMessage.Strict($data)" } - final private case class Streamed(dataStream: Source[ByteString, _]) extends BinaryMessage -} \ No newline at end of file + final case class Streamed(dataStream: Source[ByteString, _]) extends BinaryMessage +} From 15bd45a004261e266e281f1fb2d5cda631d03bc3 Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Sun, 20 Mar 2016 02:37:31 +0100 Subject: [PATCH 2/2] =htc make ws.Message toString reprs consistent --- .../main/scala/akka/http/scaladsl/model/ws/Message.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala index a1609e455e..59ed41f773 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala @@ -37,7 +37,9 @@ object TextMessage { def textStream: Source[String, _] = Source.single(text) override def toString: String = s"TextMessage.Strict($text)" } - final case class Streamed(textStream: Source[String, _]) extends TextMessage + final case class Streamed(textStream: Source[String, _]) extends TextMessage { + override def toString: String = s"TextMessage.Streamed($textStream)" + } } /** @@ -65,5 +67,7 @@ object BinaryMessage { def dataStream: Source[ByteString, _] = Source.single(data) override def toString: String = s"BinaryMessage.Strict($data)" } - final case class Streamed(dataStream: Source[ByteString, _]) extends BinaryMessage + final case class Streamed(dataStream: Source[ByteString, _]) extends BinaryMessage { + override def toString: String = s"BinaryMessage.Streamed($dataStream)" + } }