Skip to content

Commit e65cd8d

Browse files
authored
3.x: Fix self-see references, some comments (#6729)
1 parent 33a498d commit e65cd8d

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

Diff for: src/main/java/io/reactivex/rxjava3/core/Flowable.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -8134,7 +8134,6 @@ public final Single<Boolean> contains(final Object item) {
81348134
* @return a Single that emits a single item: the number of items emitted by the source Publisher as a
81358135
* 64-bit Long item
81368136
* @see <a href="http://reactivex.io/documentation/operators/count.html">ReactiveX operators documentation: Count</a>
8137-
* @see #count()
81388137
*/
81398138
@CheckReturnValue
81408139
@BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -14978,6 +14977,7 @@ public final Flowable<T> switchIfEmpty(Publisher<? extends T> other) {
1497814977
* Publisher
1497914978
* @return a Flowable that emits the items emitted by the Publisher returned from applying {@code func} to the most recently emitted item emitted by the source Publisher
1498014979
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
14980+
* @see #switchMapDelayError(Function)
1498114981
*/
1498214982
@CheckReturnValue
1498314983
@BackpressureSupport(BackpressureKind.FULL)
@@ -15013,6 +15013,7 @@ public final <R> Flowable<R> switchMap(Function<? super T, ? extends Publisher<?
1501315013
* the number of elements to prefetch from the current active inner Publisher
1501415014
* @return a Flowable that emits the items emitted by the Publisher returned from applying {@code func} to the most recently emitted item emitted by the source Publisher
1501515015
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
15016+
* @see #switchMapDelayError(Function, int)
1501615017
*/
1501715018
@CheckReturnValue
1501815019
@BackpressureSupport(BackpressureKind.FULL)
@@ -15102,7 +15103,7 @@ public final Completable switchMapCompletable(@NonNull Function<? super T, ? ext
1510215103
* {@link CompletableSource} to be subscribed to and awaited for
1510315104
* (non blockingly) for its terminal event
1510415105
* @return the new Completable instance
15105-
* @see #switchMapCompletableDelayError(Function)
15106+
* @see #switchMapCompletable(Function)
1510615107
* @since 2.2
1510715108
*/
1510815109
@CheckReturnValue
@@ -15140,6 +15141,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
1514015141
* Publisher
1514115142
* @return a Flowable that emits the items emitted by the Publisher returned from applying {@code func} to the most recently emitted item emitted by the source Publisher
1514215143
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
15144+
* @see #switchMap(Function)
1514315145
* @since 2.0
1514415146
*/
1514515147
@CheckReturnValue
@@ -15177,6 +15179,7 @@ public final <R> Flowable<R> switchMapDelayError(Function<? super T, ? extends P
1517715179
* the number of elements to prefetch from the current active inner Publisher
1517815180
* @return a Flowable that emits the items emitted by the Publisher returned from applying {@code func} to the most recently emitted item emitted by the source Publisher
1517915181
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
15182+
* @see #switchMap(Function, int)
1518015183
* @since 2.0
1518115184
*/
1518215185
@CheckReturnValue
@@ -15229,7 +15232,7 @@ <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<? extends R>>
1522915232
* return a {@code MaybeSource} to replace the current active inner source
1523015233
* and get subscribed to.
1523115234
* @return the new Flowable instance
15232-
* @see #switchMapMaybe(Function)
15235+
* @see #switchMapMaybeDelayError(Function)
1523315236
* @since 2.2
1523415237
*/
1523515238
@CheckReturnValue
@@ -15301,7 +15304,7 @@ public final <R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super
1530115304
* return a {@code SingleSource} to replace the current active inner source
1530215305
* and get subscribed to.
1530315306
* @return the new Flowable instance
15304-
* @see #switchMapSingle(Function)
15307+
* @see #switchMapSingleDelayError(Function)
1530515308
* @since 2.2
1530615309
*/
1530715310
@CheckReturnValue

Diff for: src/main/java/io/reactivex/rxjava3/core/Observable.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -7191,7 +7191,6 @@ public final Single<Boolean> contains(final Object element) {
71917191
* @return a Single that emits a single item: the number of items emitted by the source ObservableSource as a
71927192
* 64-bit Long item
71937193
* @see <a href="http://reactivex.io/documentation/operators/count.html">ReactiveX operators documentation: Count</a>
7194-
* @see #count()
71957194
*/
71967195
@CheckReturnValue
71977196
@SchedulerSupport(SchedulerSupport.NONE)
@@ -12357,6 +12356,7 @@ public final Observable<T> switchIfEmpty(ObservableSource<? extends T> other) {
1235712356
* ObservableSource
1235812357
* @return an Observable that emits the items emitted by the ObservableSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
1235912358
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
12359+
* @see #switchMapDelayError(Function)
1236012360
*/
1236112361
@CheckReturnValue
1236212362
@SchedulerSupport(SchedulerSupport.NONE)
@@ -12386,6 +12386,7 @@ public final <R> Observable<R> switchMap(Function<? super T, ? extends Observabl
1238612386
* the number of elements to prefetch from the current active inner ObservableSource
1238712387
* @return an Observable that emits the items emitted by the ObservableSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
1238812388
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
12389+
* @see #switchMapDelayError(Function, int)
1238912390
*/
1239012391
@CheckReturnValue
1239112392
@SchedulerSupport(SchedulerSupport.NONE)
@@ -12476,7 +12477,7 @@ public final Completable switchMapCompletable(@NonNull Function<? super T, ? ext
1247612477
* {@link CompletableSource} to be subscribed to and awaited for
1247712478
* (non blockingly) for its terminal event
1247812479
* @return the new Completable instance
12479-
* @see #switchMapCompletableDelayError(Function)
12480+
* @see #switchMapCompletable(Function)
1248012481
* @since 2.2
1248112482
*/
1248212483
@CheckReturnValue
@@ -12512,7 +12513,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
1251212513
* return a {@code MaybeSource} to replace the current active inner source
1251312514
* and get subscribed to.
1251412515
* @return the new Observable instance
12515-
* @see #switchMapMaybe(Function)
12516+
* @see #switchMapMaybeDelayError(Function)
1251612517
* @since 2.2
1251712518
*/
1251812519
@CheckReturnValue
@@ -12568,6 +12569,7 @@ public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? supe
1256812569
* SingleSource
1256912570
* @return an Observable that emits the item emitted by the SingleSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
1257012571
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
12572+
* @see #switchMapSingleDelayError(Function)
1257112573
* @since 2.2
1257212574
*/
1257312575
@CheckReturnValue
@@ -12599,6 +12601,7 @@ public final <R> Observable<R> switchMapSingle(@NonNull Function<? super T, ? ex
1259912601
* SingleSource
1260012602
* @return an Observable that emits the item emitted by the SingleSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
1260112603
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
12604+
* @see #switchMapSingle(Function)
1260212605
* @since 2.2
1260312606
*/
1260412607
@CheckReturnValue
@@ -12630,6 +12633,7 @@ public final <R> Observable<R> switchMapSingleDelayError(@NonNull Function<? sup
1263012633
* ObservableSource
1263112634
* @return an Observable that emits the items emitted by the ObservableSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
1263212635
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
12636+
* @see #switchMap(Function)
1263312637
* @since 2.0
1263412638
*/
1263512639
@CheckReturnValue
@@ -12661,6 +12665,7 @@ public final <R> Observable<R> switchMapDelayError(Function<? super T, ? extends
1266112665
* the number of elements to prefetch from the current active inner ObservableSource
1266212666
* @return an Observable that emits the items emitted by the ObservableSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
1266312667
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
12668+
* @see #switchMap(Function, int)
1266412669
* @since 2.0
1266512670
*/
1266612671
@CheckReturnValue

Diff for: src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
import io.reactivex.rxjava3.functions.Action;
1717
import io.reactivex.rxjava3.internal.util.ExceptionHelper;
1818

19+
/**
20+
* A Disposable container that manages an Action instance.
21+
*/
1922
final class ActionDisposable extends ReferenceDisposable<Action> {
2023

2124
private static final long serialVersionUID = -8219729196779211169L;

Diff for: src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java

-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ public BlockingFlowableMostRecent(Flowable<T> source, T initialValue) {
4242
public Iterator<T> iterator() {
4343
MostRecentSubscriber<T> mostRecentSubscriber = new MostRecentSubscriber<T>(initialValue);
4444

45-
/**
46-
* Subscribe instead of unsafeSubscribe since this is the final subscribe in the chain
47-
* since it is for BlockingObservable.
48-
*/
4945
source.subscribe(mostRecentSubscriber);
5046

5147
return mostRecentSubscriber.getIterable();

Diff for: src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java

-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ public BlockingObservableMostRecent(ObservableSource<T> source, T initialValue)
4242
public Iterator<T> iterator() {
4343
MostRecentObserver<T> mostRecentObserver = new MostRecentObserver<T>(initialValue);
4444

45-
/**
46-
* Subscribe instead of unsafeSubscribe since this is the final subscribe in the chain
47-
* since it is for BlockingObservable.
48-
*/
4945
source.subscribe(mostRecentObserver);
5046

5147
return mostRecentObserver.getIterable();

0 commit comments

Comments
 (0)