Skip to content

Commit 3deba11

Browse files
committed
Add "since" annotations to javadocs for new Experimental/Beta methods
1 parent 96786bb commit 3deba11

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/main/java/rx/Observable.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1749,6 +1749,7 @@ public final static <T> Observable<T> merge(Observable<? extends Observable<? ex
17491749
* @throws IllegalArgumentException
17501750
* if {@code maxConcurrent} is less than or equal to 0
17511751
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
1752+
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
17521753
*/
17531754
@Experimental
17541755
@SuppressWarnings({"unchecked", "rawtypes"})
@@ -2047,11 +2048,13 @@ public final static <T> Observable<T> merge(Observable<? extends T>[] sequences)
20472048
* the maximum number of Observables that may be subscribed to concurrently
20482049
* @return an Observable that emits all of the items emitted by the Observables in the Array
20492050
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
2051+
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
20502052
*/
20512053
@Experimental
20522054
public final static <T> Observable<T> merge(Observable<? extends T>[] sequences, int maxConcurrent) {
20532055
return merge(from(sequences), maxConcurrent);
20542056
}
2057+
20552058
/**
20562059
* Flattens an Observable that emits Observables into one Observable, in a way that allows an Observer to
20572060
* receive all successfully emitted items from all of the source Observables without being interrupted by
@@ -2079,6 +2082,7 @@ public final static <T> Observable<T> merge(Observable<? extends T>[] sequences,
20792082
public final static <T> Observable<T> mergeDelayError(Observable<? extends Observable<? extends T>> source) {
20802083
return source.lift(OperatorMerge.<T>instance(true));
20812084
}
2085+
20822086
/**
20832087
* Flattens an Observable that emits Observables into one Observable, in a way that allows an Observer to
20842088
* receive all successfully emitted items from all of the source Observables without being interrupted by
@@ -2105,6 +2109,7 @@ public final static <T> Observable<T> mergeDelayError(Observable<? extends Obser
21052109
* @return an Observable that emits all of the items emitted by the Observables emitted by the
21062110
* {@code source} Observable
21072111
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
2112+
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
21082113
*/
21092114
@Experimental
21102115
public final static <T> Observable<T> mergeDelayError(Observable<? extends Observable<? extends T>> source, int maxConcurrent) {
@@ -5513,6 +5518,7 @@ public final Observable<T> onBackpressureDrop() {
55135518
public final Observable<T> onBackpressureBlock(int maxQueueLength) {
55145519
return lift(new OperatorOnBackpressureBlock<T>(maxQueueLength));
55155520
}
5521+
55165522
/**
55175523
* Instructs an Observable that is emitting items faster than its observer can consume them to block the
55185524
* producer thread if the number of undelivered onNext events reaches the system-wide ring buffer size.

src/main/java/rx/observers/Subscribers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public final void onNext(T args) {
213213
* <code>subscriber</code>, has backpressure controlled by
214214
* <code>subscriber</code> and uses <code>subscriber</code> to
215215
* manage unsubscription.
216-
*
216+
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
217217
*/
218218
@Experimental
219219
public static <T> Subscriber<T> wrap(final Subscriber<? super T> subscriber) {

0 commit comments

Comments
 (0)