Skip to content

Commit 021d07b

Browse files
authored
3.x: Simplify @return sentences in Flowable JavaDocs (#6847)
* 3.x: Simplify @return sentences in Flowable * Clear Completable * Clear Single * Clean Maybe * Clean Observable
1 parent 68a12c8 commit 021d07b

File tree

8 files changed

+1018
-1476
lines changed

8 files changed

+1018
-1476
lines changed

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

+17-20
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public static Completable amb(@NonNull Iterable<@NonNull ? extends CompletableSo
165165
* <dt><b>Scheduler:</b></dt>
166166
* <dd>{@code complete} does not operate by default on a particular {@link Scheduler}.</dd>
167167
* </dl>
168-
* @return a {@code Completable} instance that completes immediately
168+
* @return the shared {@code Completable} instance
169169
*/
170170
@CheckReturnValue
171171
@NonNull
@@ -183,7 +183,7 @@ public static Completable complete() {
183183
* <dd>{@code concatArray} does not operate by default on a particular {@link Scheduler}.</dd>
184184
* </dl>
185185
* @param sources the sources to concatenate
186-
* @return the {@code Completable} instance which completes only when all sources complete
186+
* @return the new {@code Completable} instance
187187
* @throws NullPointerException if {@code sources} is {@code null}
188188
*/
189189
@CheckReturnValue
@@ -210,7 +210,7 @@ public static Completable concatArray(@NonNull CompletableSource... sources) {
210210
* <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
211211
* </dl>
212212
* @param sources the sources to concatenate
213-
* @return the {@code Completable} instance which completes only when all sources complete
213+
* @return the new {@code Completable} instance
214214
* @throws NullPointerException if {@code sources} is {@code null}
215215
*/
216216
@CheckReturnValue
@@ -234,7 +234,7 @@ public static Completable concat(@NonNull Iterable<@NonNull ? extends Completabl
234234
* <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
235235
* </dl>
236236
* @param sources the sources to concatenate
237-
* @return the {@code Completable} instance which completes only when all sources complete
237+
* @return the new {@code Completable} instance
238238
* @throws NullPointerException if {@code sources} is {@code null}
239239
*/
240240
@CheckReturnValue
@@ -258,7 +258,7 @@ public static Completable concat(@NonNull Publisher<@NonNull ? extends Completab
258258
* </dl>
259259
* @param sources the sources to concatenate
260260
* @param prefetch the number of sources to prefetch from the sources
261-
* @return the {@code Completable} instance which completes only when all sources complete
261+
* @return the new {@code Completable} instance
262262
* @throws NullPointerException if {@code sources} is {@code null}
263263
* @throws IllegalArgumentException if {@code prefetch} is non-positive
264264
*/
@@ -334,7 +334,7 @@ public static Completable create(@NonNull CompletableOnSubscribe source) {
334334
* </dl>
335335
* @param source the callback which will receive the {@link CompletableObserver} instances
336336
* when the {@code Completable} is subscribed to.
337-
* @return the created {@code Completable} instance
337+
* @return the new {@code Completable} instance
338338
* @throws NullPointerException if {@code source} is {@code null}
339339
* @throws IllegalArgumentException if {@code source} is a {@code Completable}
340340
*/
@@ -358,7 +358,7 @@ public static Completable unsafeCreate(@NonNull CompletableSource source) {
358358
* <dd>{@code defer} does not operate by default on a particular {@link Scheduler}.</dd>
359359
* </dl>
360360
* @param completableSupplier the supplier that returns the {@code Completable} that will be subscribed to.
361-
* @return the {@code Completable} instance
361+
* @return the new {@code Completable} instance
362362
* @throws NullPointerException if {@code completableSupplier} is {@code null}
363363
*/
364364
@CheckReturnValue
@@ -1008,7 +1008,7 @@ public static Completable timer(long delay, @NonNull TimeUnit unit, @NonNull Sch
10081008
/**
10091009
* Creates a {@link NullPointerException} instance and sets the given {@link Throwable} as its initial cause.
10101010
* @param ex the {@code Throwable} instance to use as cause, not {@code null} (not verified)
1011-
* @return the created {@code NullPointerException}
1011+
* @return the new {@code NullPointerException}
10121012
*/
10131013
private static NullPointerException toNpe(Throwable ex) {
10141014
NullPointerException npe = new NullPointerException("Actually not, but can't pass out an exception otherwise...");
@@ -1096,7 +1096,7 @@ public static <R> Completable using(
10961096
* <dd>{@code wrap} does not operate by default on a particular {@link Scheduler}.</dd>
10971097
* </dl>
10981098
* @param source the source to wrap
1099-
* @return the source or its wrapper {@code Completable}
1099+
* @return the new wrapped or cast {@code Completable} instance
11001100
* @throws NullPointerException if {@code source} is {@code null}
11011101
*/
11021102
@CheckReturnValue
@@ -1344,7 +1344,7 @@ public final Completable cache() {
13441344
* <dd>{@code compose} does not operate by default on a particular {@link Scheduler}.</dd>
13451345
* </dl>
13461346
* @param transformer the transformer function, not {@code null}
1347-
* @return a {@code Completable} wrapping the {@code CompletableSource} returned by the function via {@link #wrap(CompletableSource)}
1347+
* @return the new {@code Completable} instance
13481348
* @throws NullPointerException if {@code transformer} is {@code null}
13491349
*/
13501350
@CheckReturnValue
@@ -1461,7 +1461,7 @@ public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
14611461
*
14621462
* @param delay the time to delay the subscription
14631463
* @param unit the time unit of {@code delay}
1464-
* @return a {@code Completable} that delays the subscription to the upstream by the given amount
1464+
* @return the new {@code Completable} instance
14651465
* @throws NullPointerException if {@code unit} is {@code null}
14661466
* @since 3.0.0
14671467
* @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
@@ -1486,8 +1486,7 @@ public final Completable delaySubscription(long delay, @NonNull TimeUnit unit) {
14861486
* @param delay the time to delay the subscription
14871487
* @param unit the time unit of {@code delay}
14881488
* @param scheduler the {@code Scheduler} on which the waiting and subscription will happen
1489-
* @return a {@code Completable} that delays the subscription to the upstream by a given
1490-
* amount of time, waiting and subscribing on the given {@code Scheduler}
1489+
* @return the new {@code Completable} instance
14911490
* @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
14921491
* @since 3.0.0
14931492
* @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
@@ -1998,8 +1997,7 @@ public final Completable onErrorResumeNext(@NonNull Function<? super Throwable,
19981997
* <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
19991998
* </dl>
20001999
* <p>History: 2.1.5 - experimental
2001-
* @return a {@code Completable} which {@code null}s out references to the upstream producer and downstream {@code CompletableObserver} if
2002-
* the sequence is terminated or downstream calls {@code dispose()}
2000+
* @return the new {@code Completable} instance
20032001
* @since 2.2
20042002
*/
20052003
@CheckReturnValue
@@ -2336,7 +2334,7 @@ public final Completable hide() {
23362334
* <dt><b>Scheduler:</b></dt>
23372335
* <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
23382336
* </dl>
2339-
* @return the {@code Disposable} that allows disposing the subscription
2337+
* @return the new {@code Disposable} that can be used for disposing the subscription at any time
23402338
*/
23412339
@SchedulerSupport(SchedulerSupport.NONE)
23422340
@NonNull
@@ -2420,7 +2418,7 @@ public final void subscribe(@NonNull CompletableObserver observer) {
24202418
* </dl>
24212419
* @param onComplete the {@link Action} that is called if the {@code Completable} completes normally
24222420
* @param onError the {@link Consumer} that is called if this {@code Completable} emits an error
2423-
* @return the {@link Disposable} that can be used for disposing the subscription asynchronously
2421+
* @return the new {@link Disposable} that can be used for disposing the subscription at any time
24242422
* @throws NullPointerException if {@code onComplete} or {@code onError} is {@code null}
24252423
*/
24262424
@CheckReturnValue
@@ -2449,7 +2447,7 @@ public final Disposable subscribe(@NonNull Action onComplete, @NonNull Consumer<
24492447
* <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
24502448
* </dl>
24512449
* @param onComplete the {@code Action} called when this {@code Completable} completes normally
2452-
* @return the {@link Disposable} that allows disposing the subscription
2450+
* @return the new {@link Disposable} that can be used for disposing the subscription at any time
24532451
* @throws NullPointerException if {@code onComplete} is {@code null}
24542452
*/
24552453
@CheckReturnValue
@@ -2691,8 +2689,7 @@ public final <T> Flowable<T> toFlowable() {
26912689
* </dl>
26922690
*
26932691
* @param <T> the value type
2694-
* @return a {@code Maybe} that only calls {@code onComplete} or {@code onError}, based on which one is
2695-
* called by the current {@code Completable}.
2692+
* @return the new {@code Maybe} instance
26962693
*/
26972694
@CheckReturnValue
26982695
@SuppressWarnings("unchecked")

0 commit comments

Comments
 (0)