raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #19727 from enelson/master

Browse source 
spelling corrections
This commit is contained in:
Konrad Malawski 2016-02-09 21:02:29 +01:00
commit 9f8a2a1fc6
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala
View file

@ -314,7 +314,7 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends
* '''Backpressures when''' downstream backpressures or there are still remaining elements from the
* previously calculated collection
*
* '''Completes when''' upstream completes and all remaining elements has been emitted
* '''Completes when''' upstream completes and all remaining elements have been emitted
*
* '''Cancels when''' downstream cancels
*/
@ -343,7 +343,7 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends
* '''Backpressures when''' the number of futures reaches the configured parallelism and the downstream
* backpressures or the first future is not completed
*
* '''Completes when''' upstream completes and all futures has been completed and all elements has been emitted
* '''Completes when''' upstream completes and all futures have been completed and all elements have been emitted
*
* '''Cancels when''' downstream cancels
*
@ -375,7 +375,7 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends
*
* '''Backpressures when''' the number of futures reaches the configured parallelism and the downstream backpressures
*
* '''Completes when''' upstream completes and all futures has been completed and all elements has been emitted
* '''Completes when''' upstream completes and all futures have been completed and all elements have been emitted
*
* '''Cancels when''' downstream cancels
*
@ -670,7 +670,7 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends
* * DropHead, DropTail, DropBuffer - never backpressures
* * Fail - fails the stream if buffer gets full
*
* '''Completes when''' upstream completes and buffered elements has been drained
* '''Completes when''' upstream completes and buffered elements have been drained
*
* '''Cancels when''' downstream cancels
*
@ -954,7 +954,7 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends
* * DropHead, DropTail, DropBuffer - never backpressures
* * Fail - fails the stream if buffer gets full
*
* '''Completes when''' upstream completes and buffered elements has been drained
* '''Completes when''' upstream completes and buffered elements have been drained
*
* '''Cancels when''' downstream cancels
*
@ -979,7 +979,7 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends
* of an empty collection and a stream containing the whole upstream unchanged.
*
* In case of an upstream error, depending on the current state
* - the master stream signals the error if less than `n` elements has been seen, and therefore the substream
* - the master stream signals the error if less than `n` elements have been seen, and therefore the substream
* has not yet been emitted
* - the tail substream signals the error after the prefix and tail has been emitted by the main stream
* (at that point the main stream has already completed)
@ -989,7 +989,7 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends
*
* '''Backpressures when''' downstream backpressures or substream backpressures
*
* '''Completes when''' prefix elements has been consumed and substream has been consumed
* '''Completes when''' prefix elements have been consumed and substream has been consumed
*
* '''Cancels when''' downstream cancels or substream cancels
*/
@ -1398,7 +1398,7 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends
/**
* Combine the elements of current [[Flow]] and the given [[Source]] into a stream of tuples.
*
* '''Emits when''' all of the inputs has an element available
* '''Emits when''' all of the inputs have an element available
*
* '''Backpressures when''' downstream backpressures
*
@ -1429,7 +1429,7 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends
* Put together the elements of current [[Flow]] and the given [[Source]]
* into a stream of combined elements using a combiner function.
*
* '''Emits when''' all of the inputs has an element available
* '''Emits when''' all of the inputs have an element available
*
* '''Backpressures when''' downstream backpressures
*

18
akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala
View file

@ -448,7 +448,7 @@ trait FlowOps[+Out, +Mat] {
* '''Backpressures when''' downstream backpressures or there are still remaining elements from the
* previously calculated collection
*
* '''Completes when''' upstream completes and all remaining elements has been emitted
* '''Completes when''' upstream completes and all remaining elements have been emitted
*
* '''Cancels when''' downstream cancels
*
@ -478,7 +478,7 @@ trait FlowOps[+Out, +Mat] {
* '''Backpressures when''' the number of futures reaches the configured parallelism and the downstream
* backpressures or the first future is not completed
*
* '''Completes when''' upstream completes and all futures has been completed and all elements has been emitted
* '''Completes when''' upstream completes and all futures have been completed and all elements have been emitted
*
* '''Cancels when''' downstream cancels
*
@ -509,7 +509,7 @@ trait FlowOps[+Out, +Mat] {
*
* '''Backpressures when''' the number of futures reaches the configured parallelism and the downstream backpressures
*
* '''Completes when''' upstream completes and all futures has been completed and all elements has been emitted
* '''Completes when''' upstream completes and all futures have been completed and all elements have been emitted
*
* '''Cancels when''' downstream cancels
*
@ -600,7 +600,7 @@ trait FlowOps[+Out, +Mat] {
*
* `n` must be positive, otherwise IllegalArgumentException is thrown.
*
* '''Emits when''' the specified number of elements has been accumulated or upstream completed
* '''Emits when''' the specified number of elements have been accumulated or upstream completed
*
* '''Backpressures when''' a group has been assembled and downstream backpressures
*
@ -832,7 +832,7 @@ trait FlowOps[+Out, +Mat] {
* * DropHead, DropTail, DropBuffer - never backpressures
* * Fail - fails the stream if buffer gets full
*
* '''Completes when''' upstream completes and buffered elements has been drained
* '''Completes when''' upstream completes and buffered elements have been drained
*
* '''Cancels when''' downstream cancels
*
@ -1058,7 +1058,7 @@ trait FlowOps[+Out, +Mat] {
* * DropHead, DropTail, DropBuffer - never backpressures
* * Fail - fails the stream if buffer gets full
*
* '''Completes when''' upstream completes and buffered elements has been drained
* '''Completes when''' upstream completes and buffered elements have been drained
*
* '''Cancels when''' downstream cancels
*
@ -1092,7 +1092,7 @@ trait FlowOps[+Out, +Mat] {
*
* '''Backpressures when''' downstream backpressures or substream backpressures
*
* '''Completes when''' prefix elements has been consumed and substream has been consumed
* '''Completes when''' prefix elements have been consumed and substream has been consumed
*
* '''Cancels when''' downstream cancels or substream cancels
*/
@ -1473,7 +1473,7 @@ trait FlowOps[+Out, +Mat] {
/**
* Combine the elements of current flow and the given [[Source]] into a stream of tuples.
*
* '''Emits when''' all of the inputs has an element available
* '''Emits when''' all of the inputs have an element available
*
* '''Backpressures when''' downstream backpressures
*
@ -1495,7 +1495,7 @@ trait FlowOps[+Out, +Mat] {
* Put together the elements of current flow and the given [[Source]]
* into a stream of combined elements using a combiner function.
*
* '''Emits when''' all of the inputs has an element available
* '''Emits when''' all of the inputs have an element available
*
* '''Backpressures when''' downstream backpressures
*