From 5bf2ab43bdc2fe6f7970f7ad4d13d9b674b4c049 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 16 Dec 2014 17:02:27 +0100 Subject: [PATCH] !str #16557 Rename Source.singleton to Source.single --- .../akka/http/engine/rendering/BodyPartRenderer.scala | 2 +- .../engine/rendering/HttpRequestRendererFactory.scala | 4 ++-- .../engine/rendering/HttpResponseRendererFactory.scala | 2 +- .../scala/akka/http/engine/rendering/RenderSupport.scala | 2 +- .../src/main/scala/akka/http/model/HttpEntity.scala | 4 ++-- akka-http-core/src/test/scala/akka/http/TestClient.scala | 2 +- .../akka/http/engine/rendering/RequestRendererSpec.scala | 2 +- .../akka/http/engine/rendering/ResponseRendererSpec.scala | 2 +- .../akka/http/server/directives/RangeDirectivesSpec.scala | 2 +- .../test/scala/akka/stream/scaladsl/FlowSectionSpec.scala | 2 +- .../src/test/scala/akka/stream/scaladsl/SourceSpec.scala | 8 ++++---- .../src/main/scala/akka/stream/javadsl/Source.scala | 4 ++-- .../src/main/scala/akka/stream/scaladsl/Source.scala | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala index ff367e1b39..d16c46bfe9 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala +++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala @@ -66,7 +66,7 @@ private[http] object BodyPartRenderer { override def onUpstreamFinish(ctx: Context[Source[ChunkStreamPart]]): TerminationDirective = ctx.absorbTermination() private def chunkStream(byteString: ByteString): Source[ChunkStreamPart] = - Source.singleton(Chunk(byteString)) + Source.single(Chunk(byteString)) } diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala index 480a624e7f..49879e6b41 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala +++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala @@ -106,11 +106,11 @@ private[http] class HttpRequestRendererFactory(userAgentHeader: Option[headers.` entity match { case x if x.isKnownEmpty ⇒ renderContentLength(0) ~~ CrLf - Source.singleton(r.get) + Source.single(r.get) case HttpEntity.Strict(_, data) ⇒ renderContentLength(data.length) ~~ CrLf - Source.singleton(r.get ++ data) + Source.single(r.get ++ data) case HttpEntity.Default(_, contentLength, data) ⇒ renderContentLength(contentLength) ~~ CrLf diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala index 04e1f5309e..7d21143822 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala +++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala @@ -150,7 +150,7 @@ private[http] class HttpResponseRendererFactory(serverHeader: Option[headers.Ser renderEntityContentType(r, entity) renderContentLengthHeader(data.length) ~~ CrLf val entityBytes = if (noEntity) ByteString.empty else data - Source.singleton(r.get ++ entityBytes) + Source.single(r.get ++ entityBytes) case HttpEntity.Default(_, contentLength, data) ⇒ renderHeaders(headers.toList) diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala index ff9f268a0d..6b5c577449 100644 --- a/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala +++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala @@ -46,7 +46,7 @@ private object RenderSupport { def renderByteStrings(r: ByteStringRendering, entityBytes: ⇒ Source[ByteString], skipEntity: Boolean = false): Source[ByteString] = { - val messageStart = Source.singleton(r.get) + val messageStart = Source.single(r.get) val messageBytes = if (!skipEntity) messageStart ++ entityBytes else CancelSecond(messageStart, entityBytes) diff --git a/akka-http-core/src/main/scala/akka/http/model/HttpEntity.scala b/akka-http-core/src/main/scala/akka/http/model/HttpEntity.scala index 4c50df13bc..e29a26263e 100644 --- a/akka-http-core/src/main/scala/akka/http/model/HttpEntity.scala +++ b/akka-http-core/src/main/scala/akka/http/model/HttpEntity.scala @@ -176,7 +176,7 @@ object HttpEntity { case Success(Some(newData)) ⇒ copy(data = newData) case Success(None) ⇒ - Chunked.fromData(contentType, Source.singleton(data).via(transformer)) + Chunked.fromData(contentType, Source.single(data).via(transformer)) case Failure(ex) ⇒ Chunked(contentType, Source.failed(ex)) } @@ -188,7 +188,7 @@ object HttpEntity { throw new IllegalStateException(s"Transformer didn't produce as much bytes (${newData.length}:'${newData.utf8String}') as claimed ($newContentLength)") copy(data = newData) case Success(None) ⇒ - Default(contentType, newContentLength, Source.singleton(data).via(transformer)) + Default(contentType, newContentLength, Source.single(data).via(transformer)) case Failure(ex) ⇒ Default(contentType, newContentLength, Source.failed(ex)) } diff --git a/akka-http-core/src/test/scala/akka/http/TestClient.scala b/akka-http-core/src/test/scala/akka/http/TestClient.scala index 055859610c..f42aaed86b 100644 --- a/akka-http-core/src/test/scala/akka/http/TestClient.scala +++ b/akka-http-core/src/test/scala/akka/http/TestClient.scala @@ -25,7 +25,7 @@ object TestClient extends App { println(s"Fetching HTTP server version of host `$host` ...") val connection = Http().outgoingConnection(host) - val result = Source.singleton(HttpRequest()).via(connection.flow).runWith(Sink.head) + val result = Source.single(HttpRequest()).via(connection.flow).runWith(Sink.head) result.map(_.header[headers.Server]) onComplete { case Success(res) ⇒ println(s"$host is running ${res mkString ", "}") diff --git a/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala index 805c91b8d2..d62f4a7acf 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala @@ -253,7 +253,7 @@ class RequestRendererSpec extends FreeSpec with Matchers with BeforeAndAfterAll def renderTo(expected: String): Matcher[HttpRequest] = equal(expected.stripMarginWithNewline("\r\n")).matcher[String] compose { request ⇒ val renderer = newRenderer - val byteStringSource = Await.result(Source.singleton(RequestRenderingContext(request, serverAddress)). + val byteStringSource = Await.result(Source.single(RequestRenderingContext(request, serverAddress)). section(name("renderer"))(_.transform(() ⇒ renderer)). runWith(Sink.head), 1.second) val future = byteStringSource.grouped(1000).runWith(Sink.head).map(_.reduceLeft(_ ++ _).utf8String) diff --git a/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala index 63492ba916..6cec8ad941 100644 --- a/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala @@ -400,7 +400,7 @@ class ResponseRendererSpec extends FreeSpec with Matchers with BeforeAndAfterAll def renderTo(expected: String, close: Boolean): Matcher[ResponseRenderingContext] = equal(expected.stripMarginWithNewline("\r\n") -> close).matcher[(String, Boolean)] compose { ctx ⇒ val renderer = newRenderer - val byteStringSource = Await.result(Source.singleton(ctx). + val byteStringSource = Await.result(Source.single(ctx). section(name("renderer"))(_.transform(() ⇒ renderer)). runWith(Sink.head), 1.second) val future = byteStringSource.grouped(1000).runWith(Sink.head).map(_.reduceLeft(_ ++ _).utf8String) diff --git a/akka-http-tests/src/test/scala/akka/http/server/directives/RangeDirectivesSpec.scala b/akka-http-tests/src/test/scala/akka/http/server/directives/RangeDirectivesSpec.scala index 40d9610b8c..8401186b83 100644 --- a/akka-http-tests/src/test/scala/akka/http/server/directives/RangeDirectivesSpec.scala +++ b/akka-http-tests/src/test/scala/akka/http/server/directives/RangeDirectivesSpec.scala @@ -119,7 +119,7 @@ class RangeDirectivesSpec extends RoutingSpec with Inspectors with Inside { "return a 'multipart/byteranges' for a ranged request with multiple ranges if entity data source isn't reusable" in { val content = "Some random and not super short entity." - def entityData() = StreamUtils.oneTimeSource(Source.singleton(ByteString(content))) + def entityData() = StreamUtils.oneTimeSource(Source.single(ByteString(content))) Get() ~> addHeader(Range(ByteRange(5, 10), ByteRange(0, 1), ByteRange(1, 2))) ~> { wrs { complete(HttpEntity.Default(MediaTypes.`text/plain`, content.length, entityData())) } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala index 4ca75d53bb..80f0eb27a5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSectionSpec.scala @@ -28,7 +28,7 @@ class FlowSectionSpec extends AkkaSpec(FlowSectionSpec.config) { "have an op with a different dispatcher" in { val flow = Flow[Int].section(dispatcher("my-dispatcher"))(_.map(sendThreadNameTo(testActor))) - Source.singleton(1).via(flow).to(Sink.ignore).run() + Source.single(1).via(flow).to(Sink.ignore).run() receiveN(1).foreach { case s: String ⇒ s should include("my-dispatcher") diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala index 8fbc2e4f2f..cfc3e830d7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala @@ -16,7 +16,7 @@ class SourceSpec extends AkkaSpec { "Singleton Source" must { "produce element" in { - val p = Source.singleton(1).runWith(Sink.publisher) + val p = Source.single(1).runWith(Sink.publisher) val c = StreamTestKit.SubscriberProbe[Int]() p.subscribe(c) val sub = c.expectSubscription() @@ -26,7 +26,7 @@ class SourceSpec extends AkkaSpec { } "produce elements to later subscriber" in { - val p = Source.singleton(1).runWith(Sink.publisher) + val p = Source.single(1).runWith(Sink.publisher) val c1 = StreamTestKit.SubscriberProbe[Int]() val c2 = StreamTestKit.SubscriberProbe[Int]() p.subscribe(c1) @@ -85,7 +85,7 @@ class SourceSpec extends AkkaSpec { val s = mm.get(ks) mm.get(mk1) should be(s.toString) mm.get(mk2) should be(s.toString.toUpperCase) - val p = Source.singleton(1).runWith(Sink.publisher) + val p = Source.single(1).runWith(Sink.publisher) p.subscribe(s) val sub = sp.expectSubscription() sub.request(1) @@ -112,7 +112,7 @@ class SourceSpec extends AkkaSpec { val s = mm.get(ks) mm.get(mk1) should be(s.toString) mm.get(mk2) should be(s.toString.toUpperCase) - val p = Source.singleton(1).runWith(Sink.publisher) + val p = Source.single(1).runWith(Sink.publisher) p.subscribe(s) val sub = sp.expectSubscription() sub.request(1) diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala index 2db9a4bc16..22caf8fca5 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala @@ -124,8 +124,8 @@ object Source { * Create a `Source` with one element. * Every connected `Sink` of this stream will see an individual stream consisting of one element. */ - def singleton[T](element: T): Source[T] = - new Source(scaladsl.Source.singleton(element)) + def single[T](element: T): Source[T] = + new Source(scaladsl.Source.single(element)) /** * Create a `Source` that immediately ends the stream with the `cause` error to every connected `Sink`. diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala index 2c4cd52bd2..e63e797959 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala @@ -169,7 +169,7 @@ object Source { * Create a `Source` with one element. * Every connected `Sink` of this stream will see an individual stream consisting of one element. */ - def singleton[T](element: T): Source[T] = apply(SynchronousIterablePublisher(List(element), "singleton")) // FIXME optimize + def single[T](element: T): Source[T] = apply(SynchronousIterablePublisher(List(element), "single")) // FIXME optimize /** * A `Source` with no elements, i.e. an empty stream that is completed immediately for every connected `Sink`.