Skip to content

Commit 1ed3e5e

Browse files
authored
2.x: Observable marble fixes 01/08-b (#5797)
1 parent 732927c commit 1ed3e5e

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

src/main/java/io/reactivex/Observable.java

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8741,7 +8741,7 @@ public final Single<T> last(T defaultItem) {
87418741
* Returns a Single that emits only the last item emitted by this Observable or
87428742
* signals a {@link NoSuchElementException} if this Observable is empty.
87438743
* <p>
8744-
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/last.2.png" alt="">
8744+
* <img width="640" height="236" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastOrError.png" alt="">
87458745
* <dl>
87468746
* <dt><b>Scheduler:</b></dt>
87478747
* <dd>{@code lastOrError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9054,7 +9054,7 @@ public final Observable<T> onErrorResumeNext(final ObservableSource<? extends T>
90549054
* Instructs an ObservableSource to emit an item (returned by a specified function) rather than invoking
90559055
* {@link Observer#onError onError} if it encounters an error.
90569056
* <p>
9057-
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
9057+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.o.png" alt="">
90589058
* <p>
90599059
* By default, when an ObservableSource encounters an error that prevents it from emitting the expected item to
90609060
* its {@link Observer}, the ObservableSource invokes its Observer's {@code onError} method, and then quits
@@ -9087,7 +9087,7 @@ public final Observable<T> onErrorReturn(Function<? super Throwable, ? extends T
90879087
* Instructs an ObservableSource to emit an item (returned by a specified function) rather than invoking
90889088
* {@link Observer#onError onError} if it encounters an error.
90899089
* <p>
9090-
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
9090+
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturnItem.o.png" alt="">
90919091
* <p>
90929092
* By default, when an ObservableSource encounters an error that prevents it from emitting the expected item to
90939093
* its {@link Observer}, the ObservableSource invokes its Observer's {@code onError} method, and then quits
@@ -9158,6 +9158,8 @@ public final Observable<T> onExceptionResumeNext(final ObservableSource<? extend
91589158
/**
91599159
* Nulls out references to the upstream producer and downstream Observer if
91609160
* the sequence is terminated or downstream calls dispose().
9161+
* <p>
9162+
* <img width="640" height="246" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onTerminateDetach.o.png" alt="">
91619163
* <dl>
91629164
* <dt><b>Scheduler:</b></dt>
91639165
* <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9197,7 +9199,7 @@ public final ConnectableObservable<T> publish() {
91979199
* Returns an Observable that emits the results of invoking a specified selector on items emitted by a
91989200
* {@link ConnectableObservable} that shares a single subscription to the underlying sequence.
91999201
* <p>
9200-
* <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.f.png" alt="">
9202+
* <img width="640" height="647" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishFunction.o.png" alt="">
92019203
* <dl>
92029204
* <dt><b>Scheduler:</b></dt>
92039205
* <dd>{@code publish} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9256,7 +9258,7 @@ public final Maybe<T> reduce(BiFunction<T, T, T> reducer) {
92569258
* emitted by an ObservableSource into the same function, and so on until all items have been emitted by the
92579259
* source ObservableSource, emitting the final result from the final call to your function as its sole item.
92589260
* <p>
9259-
* <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.2.png" alt="">
9261+
* <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.o.png" alt="">
92609262
* <p>
92619263
* This technique, which is called "reduce" here, is sometimes called "aggregate," "fold," "accumulate,"
92629264
* "compress," or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
@@ -9311,7 +9313,7 @@ public final <R> Single<R> reduce(R seed, BiFunction<R, ? super T, R> reducer) {
93119313
* and so on until all items have been emitted by the source ObservableSource, emitting the final result
93129314
* from the final call to your function as its sole item.
93139315
* <p>
9314-
* <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.2.png" alt="">
9316+
* <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceWith.o.png" alt="">
93159317
* <p>
93169318
* This technique, which is called "reduce" here, is sometimes called "aggregate," "fold," "accumulate,"
93179319
* "compress," or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
@@ -9343,7 +9345,7 @@ public final <R> Single<R> reduceWith(Callable<R> seedSupplier, BiFunction<R, ?
93439345
/**
93449346
* Returns an Observable that repeats the sequence of items emitted by the source ObservableSource indefinitely.
93459347
* <p>
9346-
* <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.o.png" alt="">
9348+
* <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatInf.o.png" alt="">
93479349
* <dl>
93489350
* <dt><b>Scheduler:</b></dt>
93499351
* <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9362,7 +9364,7 @@ public final Observable<T> repeat() {
93629364
* Returns an Observable that repeats the sequence of items emitted by the source ObservableSource at most
93639365
* {@code count} times.
93649366
* <p>
9365-
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
9367+
* <img width="640" height="336" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatCount.o.png" alt="">
93669368
* <dl>
93679369
* <dt><b>Scheduler:</b></dt>
93689370
* <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9393,15 +9395,16 @@ public final Observable<T> repeat(long times) {
93939395
* Returns an Observable that repeats the sequence of items emitted by the source ObservableSource until
93949396
* the provided stop function returns true.
93959397
* <p>
9396-
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
9398+
* <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatUntil.o.png" alt="">
93979399
* <dl>
93989400
* <dt><b>Scheduler:</b></dt>
93999401
* <dd>{@code repeatUntil} does not operate by default on a particular {@link Scheduler}.</dd>
94009402
* </dl>
94019403
*
94029404
* @param stop
9403-
* a boolean supplier that is called when the current Observable completes and unless it returns
9404-
* false, the current Observable is resubscribed
9405+
* a boolean supplier that is called when the current Observable completes;
9406+
* if it returns true, the returned Observable completes; if it returns false,
9407+
* the upstream Observable is resubscribed.
94059408
* @return the new Observable instance
94069409
* @throws NullPointerException
94079410
* if {@code stop} is null
@@ -9446,7 +9449,7 @@ public final Observable<T> repeatWhen(final Function<? super Observable<Object>,
94469449
* ObservableSource resembles an ordinary ObservableSource, except that it does not begin emitting items when it is
94479450
* subscribed to, but only when its {@code connect} method is called.
94489451
* <p>
9449-
* <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.png" alt="">
9452+
* <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.png" alt="">
94509453
* <dl>
94519454
* <dt><b>Scheduler:</b></dt>
94529455
* <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9735,7 +9738,7 @@ public final <R> Observable<R> replay(final Function<? super Observable<T>, ? ex
97359738
* an ordinary ObservableSource, except that it does not begin emitting items when it is subscribed to, but only
97369739
* when its {@code connect} method is called.
97379740
* <p>
9738-
* <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.n.png" alt="">
9741+
* <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.n.png" alt="">
97399742
* <dl>
97409743
* <dt><b>Scheduler:</b></dt>
97419744
* <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9760,7 +9763,7 @@ public final ConnectableObservable<T> replay(final int bufferSize) {
97609763
* ObservableSource resembles an ordinary ObservableSource, except that it does not begin emitting items when it is
97619764
* subscribed to, but only when its {@code connect} method is called.
97629765
* <p>
9763-
* <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nt.png" alt="">
9766+
* <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.nt.png" alt="">
97649767
* <dl>
97659768
* <dt><b>Scheduler:</b></dt>
97669769
* <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -9789,7 +9792,7 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, TimeUnit
97899792
* Connectable ObservableSource resembles an ordinary ObservableSource, except that it does not begin emitting items
97909793
* when it is subscribed to, but only when its {@code connect} method is called.
97919794
* <p>
9792-
* <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nts.png" alt="">
9795+
* <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.nts.png" alt="">
97939796
* <dl>
97949797
* <dt><b>Scheduler:</b></dt>
97959798
* <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -9825,7 +9828,7 @@ public final ConnectableObservable<T> replay(final int bufferSize, final long ti
98259828
* an ordinary ObservableSource, except that it does not begin emitting items when it is subscribed to, but only
98269829
* when its {@code connect} method is called.
98279830
* <p>
9828-
* <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ns.png" alt="">
9831+
* <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.ns.png" alt="">
98299832
* <dl>
98309833
* <dt><b>Scheduler:</b></dt>
98319834
* <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -9852,7 +9855,7 @@ public final ConnectableObservable<T> replay(final int bufferSize, final Schedul
98529855
* resembles an ordinary ObservableSource, except that it does not begin emitting items when it is subscribed to,
98539856
* but only when its {@code connect} method is called.
98549857
* <p>
9855-
* <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.t.png" alt="">
9858+
* <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.t.png" alt="">
98569859
* <dl>
98579860
* <dt><b>Scheduler:</b></dt>
98589861
* <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -9878,7 +9881,7 @@ public final ConnectableObservable<T> replay(long time, TimeUnit unit) {
98789881
* resembles an ordinary ObservableSource, except that it does not begin emitting items when it is subscribed to,
98799882
* but only when its {@code connect} method is called.
98809883
* <p>
9881-
* <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ts.png" alt="">
9884+
* <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.ts.png" alt="">
98829885
* <dl>
98839886
* <dt><b>Scheduler:</b></dt>
98849887
* <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -9908,7 +9911,7 @@ public final ConnectableObservable<T> replay(final long time, final TimeUnit uni
99089911
* {@link Scheduler}. A Connectable ObservableSource resembles an ordinary ObservableSource, except that it does not
99099912
* begin emitting items when it is subscribed to, but only when its {@code connect} method is called.
99109913
* <p>
9911-
* <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.s.png" alt="">
9914+
* <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.s.png" alt="">
99129915
* <dl>
99139916
* <dt><b>Scheduler:</b></dt>
99149917
* <dd>You specify which {@link Scheduler} this operator will use.</dd>

0 commit comments

Comments
 (0)