From e12a492679e5934c02d97dd82bb944c3e0bef4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20van=20den=20Hoek?= Date: Wed, 30 May 2018 16:05:01 +0200 Subject: [PATCH] eliminate extraneous takeWhile method --- akka-stream/src/main/mima-filters/2.5.13.backwards.excludes | 2 ++ akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 akka-stream/src/main/mima-filters/2.5.13.backwards.excludes diff --git a/akka-stream/src/main/mima-filters/2.5.13.backwards.excludes b/akka-stream/src/main/mima-filters/2.5.13.backwards.excludes new file mode 100644 index 0000000000..61bfee9450 --- /dev/null +++ b/akka-stream/src/main/mima-filters/2.5.13.backwards.excludes @@ -0,0 +1,2 @@ +# #25175 eliminate extraneous takeWhile$default$2 method in Java DSL +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.javadsl.Flow.takeWhile$default$2") \ No newline at end of file diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala index 9cf078863f..7d436e0da3 100755 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala @@ -1256,7 +1256,7 @@ final class Flow[In, Out, Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends Gr * * See also [[Flow.limit]], [[Flow.limitWeighted]] */ - def takeWhile(p: function.Predicate[Out], inclusive: Boolean = false): javadsl.Flow[In, Out, Mat] = new Flow(delegate.takeWhile(p.test, inclusive)) + def takeWhile(p: function.Predicate[Out], inclusive: Boolean): javadsl.Flow[In, Out, Mat] = new Flow(delegate.takeWhile(p.test, inclusive)) /** * Terminate processing (and cancel the upstream publisher) after predicate