From 54d408b1c5f6d8599af9a4a12fbb7b6d17263857 Mon Sep 17 00:00:00 2001 From: Nadav Wiener Date: Mon, 18 Sep 2017 09:48:57 +0300 Subject: [PATCH] deprecate Source.combine instance method #22452 --- akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 12e5a691ac..3f0c0ea88e 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala @@ -162,8 +162,9 @@ final class Source[+Out, +Mat]( def asJava: javadsl.Source[Out, Mat] = new javadsl.Source(this) /** - * Combines several sources with fun-in strategy like `Merge` or `Concat` and returns `Source`. + * Combines several sources with fan-in strategy like `Merge` or `Concat` and returns `Source`. */ + @deprecated("Use `Source.combine` on companion object instead", "2.5.5") def combine[T, U](first: Source[T, _], second: Source[T, _], rest: Source[T, _]*)(strategy: Int ⇒ Graph[UniformFanInShape[T, U], NotUsed]): Source[U, NotUsed] = Source.fromGraph(GraphDSL.create() { implicit b ⇒ import GraphDSL.Implicits._ @@ -429,7 +430,7 @@ object Source { } /** - * Combines several sources with fun-in strategy like `Merge` or `Concat` and returns `Source`. + * Combines several sources with fan-in strategy like `Merge` or `Concat` and returns `Source`. */ def combine[T, U](first: Source[T, _], second: Source[T, _], rest: Source[T, _]*)(strategy: Int ⇒ Graph[UniformFanInShape[T, U], NotUsed]): Source[U, NotUsed] = Source.fromGraph(GraphDSL.create() { implicit b ⇒