Skip to content

Commit

Permalink
Merge pull request ReactiveX#3077 from ReactiveX/PLP
Browse files Browse the repository at this point in the history
Add "since" annotations to javadocs for new Experimental/Beta methods
  • Loading branch information
akarnokd committed Jul 23, 2015
2 parents afbd89a + 18a47ea commit f036cd0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion src/main/java/rx/Observable.java
Original file line number Diff line number Diff line change
Expand Up @@ -1750,6 +1750,7 @@ public final static <T> Observable<T> merge(Observable<? extends Observable<? ex
* @throws IllegalArgumentException
* if {@code maxConcurrent} is less than or equal to 0
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
*/
@Experimental
@SuppressWarnings({"unchecked", "rawtypes"})
Expand Down Expand Up @@ -2048,11 +2049,13 @@ public final static <T> Observable<T> merge(Observable<? extends T>[] sequences)
* the maximum number of Observables that may be subscribed to concurrently
* @return an Observable that emits all of the items emitted by the Observables in the Array
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
*/
@Experimental
public final static <T> Observable<T> merge(Observable<? extends T>[] sequences, int maxConcurrent) {
return merge(from(sequences), maxConcurrent);
}

/**
* Flattens an Observable that emits Observables into one Observable, in a way that allows an Observer to
* receive all successfully emitted items from all of the source Observables without being interrupted by
Expand Down Expand Up @@ -2080,6 +2083,7 @@ public final static <T> Observable<T> merge(Observable<? extends T>[] sequences,
public final static <T> Observable<T> mergeDelayError(Observable<? extends Observable<? extends T>> source) {
return source.lift(OperatorMerge.<T>instance(true));
}

/**
* Flattens an Observable that emits Observables into one Observable, in a way that allows an Observer to
* receive all successfully emitted items from all of the source Observables without being interrupted by
Expand All @@ -2106,6 +2110,7 @@ public final static <T> Observable<T> mergeDelayError(Observable<? extends Obser
* @return an Observable that emits all of the items emitted by the Observables emitted by the
* {@code source} Observable
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
*/
@Experimental
public final static <T> Observable<T> mergeDelayError(Observable<? extends Observable<? extends T>> source, int maxConcurrent) {
Expand Down Expand Up @@ -5519,6 +5524,7 @@ public final Observable<T> onBackpressureDrop() {
public final Observable<T> onBackpressureBlock(int maxQueueLength) {
return lift(new OperatorOnBackpressureBlock<T>(maxQueueLength));
}

/**
* Instructs an Observable that is emitting items faster than its observer can consume them to block the
* producer thread if the number of undelivered onNext events reaches the system-wide ring buffer size.
Expand Down Expand Up @@ -9149,7 +9155,7 @@ public final <U, R> Observable<R> withLatestFrom(Observable<? extends U> other,
* Observable emits connected, non-overlapping windows. It emits the current window and opens a new one
* whenever the Observable produced by the specified {@code closingSelector} emits an item.
* <p>
* <img width="640" height="485" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window1.png" alt="">
* <img width="640" height="460" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window1.png" alt="">
* <dl>
* <dt><b>Backpressure Support:</b></dt>
* <dd>This operator does not support backpressure as it uses the {@code closingSelector} to control data
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/rx/observers/Subscribers.java
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public final void onNext(T args) {
* <code>subscriber</code>, has backpressure controlled by
* <code>subscriber</code> and uses <code>subscriber</code> to
* manage unsubscription.
*
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
*/
@Experimental
public static <T> Subscriber<T> wrap(final Subscriber<? super T> subscriber) {
Expand Down

0 comments on commit f036cd0

Please sign in to comment.