4.x: Cleanup, wording minor things (#8186)

* 4.x: Cleanup, wording minor things

* + tests, +Timed cleanup

Author: akarnokd

src/main/java/io/reactivex/rxjava4/core/Completable.java

@@ -3257,8 +3257,8 @@ public final TestObserver<Void> test() {
     }
 
     /**
-     * Creates a {@link TestObserver} optionally in canceled state, then subscribes it to this {@code Completable}.
-     * @param dispose if {@code true}, the {@code TestObserver} will be canceled before subscribing to this
+     * Creates a {@link TestObserver} optionally in cancelled state, then subscribes it to this {@code Completable}.
+     * @param dispose if {@code true}, the {@code TestObserver} will be cancelled before subscribing to this
      * {@code Completable}.
      * <p>
      * <img width="640" height="499" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.test.b.png" alt="">
@@ -3324,10 +3324,10 @@ public static Completable fromCompletionStage(@NonNull CompletionStage<?> stage)
      * <p>
      * <img width="640" height="323" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toCompletionStage.c.png" alt="">
      * <p>
-     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * The upstream can be cancelled by converting the resulting {@code CompletionStage} into
      * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
      * calling {@link CompletableFuture#cancel(boolean)} on it.
-     * The upstream will be also canceled if the resulting {@code CompletionStage} is converted to and
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
      * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
      * <p>
      * {@code CompletionStage}s don't have a notion of emptiness and allow {@code null}s, therefore, one can either use

src/main/java/io/reactivex/rxjava4/core/Flowable.java

@@ -4388,7 +4388,7 @@ public final Maybe<T> retryUntil(@NonNull BooleanSupplier stop) {
      * Note that the inner {@code Publisher} returned by the handler function should signal
      * either {@code onNext}, {@code onError} or {@code onComplete} in response to the received
      * {@code Throwable} to indicate the operator should retry or terminate. If the upstream to
-     * the operator is asynchronous, signalling {@code onNext} followed by {@code onComplete} immediately may
+     * the operator is asynchronous, signaling {@code onNext} followed by {@code onComplete} immediately may
      * result in the sequence to be completed immediately. Similarly, if this inner
      * {@code Publisher} signals {@code onError} or {@code onComplete} while the upstream is
      * active, the sequence is terminated with the same signal immediately.
@@ -5571,7 +5571,7 @@ public final TestObserver<T> test(boolean dispose) {
      * <p>
      * <img width="640" height="349" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toCompletionStage.m.png" alt="">
      * <p>
-     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * The upstream can be cancelled by converting the resulting {@code CompletionStage} into
      * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
      * calling {@link CompletableFuture#cancel(boolean)} on it.
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
@@ -5604,7 +5604,7 @@ public final CompletionStage<T> toCompletionStage() {
      * <p>
      * <img width="640" height="323" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toCompletionStage.mv.png" alt="">
      * <p>
-     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * The upstream can be cancelled by converting the resulting {@code CompletionStage} into
      * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
      * calling {@link CompletableFuture#cancel(boolean)} on it.
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and

src/main/java/io/reactivex/rxjava4/core/Maybe.java

@@ -31,7 +31,7 @@
  * <pre><code>    onSubscribe (onSuccess | onError | onComplete)?</code></pre>
  * <p>
  * Note that unlike with the {@code Observable} protocol, {@link #onComplete()} is not called after the success item has been
- * signalled via {@link #onSuccess(Object)}.
+ * signaled via {@link #onSuccess(Object)}.
  * <p>
  * Subscribing a {@code MaybeObserver} to multiple {@code MaybeSource}s is not recommended. If such reuse
  * happens, it is the duty of the {@code MaybeObserver} implementation to be ready to receive multiple calls to

src/main/java/io/reactivex/rxjava4/core/MaybeObserver.java

@@ -1391,7 +1391,7 @@ public static int bufferSize() {
      *  <dt><b>Error handling:</b></dt>
      *  <dd> If the {@code Action} throws an exception, the respective {@link Throwable} is
      *  delivered to the downstream via {@link Observer#onError(Throwable)},
-     *  except when the downstream has canceled the resulting {@code Observable} source.
+     *  except when the downstream has cancelled the resulting {@code Observable} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava4.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>
@@ -1688,7 +1688,7 @@ public static int bufferSize() {
      *  <dt><b>Error handling:</b></dt>
      *  <dd> If the {@code Runnable} throws an exception, the respective {@code Throwable} is
      *  delivered to the downstream via {@link Observer#onError(Throwable)},
-     *  except when the downstream has canceled the resulting {@code Observable} source.
+     *  except when the downstream has cancelled the resulting {@code Observable} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava4.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>
@@ -15923,7 +15923,7 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
      * <p>
      * <img width="640" height="313" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstStage.o.png" alt="">
      * <p>
-     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * The upstream can be cancelled by converting the resulting {@code CompletionStage} into
      * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
      * calling {@link CompletableFuture#cancel(boolean)} on it.
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
@@ -15958,7 +15958,7 @@ public final CompletionStage<T> firstStage(@Nullable T defaultItem) {
      * <p>
      * <img width="640" height="227" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleStage.o.png" alt="">
      * <p>
-     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * The upstream can be cancelled by converting the resulting {@code CompletionStage} into
      * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
      * calling {@link CompletableFuture#cancel(boolean)} on it.
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
@@ -15992,7 +15992,7 @@ public final CompletionStage<T> singleStage(@Nullable T defaultItem) {
      * <p>
      * <img width="640" height="313" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastStage.o.png" alt="">
      * <p>
-     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * The upstream can be cancelled by converting the resulting {@code CompletionStage} into
      * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
      * calling {@link CompletableFuture#cancel(boolean)} on it.
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
@@ -16026,7 +16026,7 @@ public final CompletionStage<T> lastStage(@Nullable T defaultItem) {
      * <p>
      * <img width="640" height="341" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstOrErrorStage.o.png" alt="">
      * <p>
-     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * The upstream can be cancelled by converting the resulting {@code CompletionStage} into
      * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
      * calling {@link CompletableFuture#cancel(boolean)} on it.
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
@@ -16053,7 +16053,7 @@ public final CompletionStage<T> firstOrErrorStage() {
      * <p>
      * <img width="640" height="227" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrErrorStage.o.png" alt="">
      * <p>
-     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * The upstream can be cancelled by converting the resulting {@code CompletionStage} into
      * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
      * calling {@link CompletableFuture#cancel(boolean)} on it.
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
@@ -16079,7 +16079,7 @@ public final CompletionStage<T> singleOrErrorStage() {
      * <p>
      * <img width="640" height="343" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastOrErrorStage.o.png" alt="">
      * <p>
-     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * The upstream can be cancelled by converting the resulting {@code CompletionStage} into
      * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
      * calling {@link CompletableFuture#cancel(boolean)} on it.
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and

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

@@ -5206,7 +5206,7 @@ private static <T> Single<T> toSingle(@NonNull Flowable<T> source) {
      * <p>
      * <img width="640" height="321" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toCompletionStage.s.png" alt="">
      * <p>
-     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * The upstream can be cancelled by converting the resulting {@code CompletionStage} into
      * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
      * calling {@link CompletableFuture#cancel(boolean)} on it.
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and

src/main/java/io/reactivex/rxjava4/core/Single.java

@@ -67,9 +67,9 @@ static Disposable fromAction(@NonNull Action action) {
 
     /**
      * Construct a {@code Disposable} by wrapping a {@link Future} that is
-     * canceled exactly once when the {@code Disposable} is disposed.
+     * cancelled exactly once when the {@code Disposable} is disposed.
      * <p>
-     * The {@code Future} is canceled with {@code mayInterruptIfRunning == true}.
+     * The {@code Future} is cancelled with {@code mayInterruptIfRunning == true}.
      * @param future the {@code Future} to wrap
      * @return the new {@code Disposable} instance
      * @throws NullPointerException if {@code future} is {@code null}
@@ -84,7 +84,7 @@ static Disposable fromFuture(@NonNull Future<?> future) {
 
     /**
      * Construct a {@code Disposable} by wrapping a {@link Future} that is
-     * canceled exactly once when the {@code Disposable} is disposed.
+     * cancelled exactly once when the {@code Disposable} is disposed.
      * @param future the {@code Future} to wrap
      * @param allowInterrupt if true, the future cancel happens via {@code Future.cancel(true)}
      * @return the new {@code Disposable} instance
@@ -99,7 +99,7 @@ static Disposable fromFuture(@NonNull Future<?> future, boolean allowInterrupt)
 
     /**
      * Construct a {@code Disposable} by wrapping a {@link Subscription} that is
-     * canceled exactly once when the {@code Disposable} is disposed.
+     * cancelled exactly once when the {@code Disposable} is disposed.
      * @param subscription the {@code Runnable} to wrap
      * @return the new {@code Disposable} instance
      * @throws NullPointerException if {@code subscription} is {@code null}

src/main/java/io/reactivex/rxjava4/disposables/Disposable.java

@@ -31,7 +31,7 @@ public final class OnErrorNotImplementedException extends RuntimeException {
 
     /**
      * Customizes the {@code Throwable} with a custom message and wraps it before it
-     * is signalled to the {@code RxJavaPlugins.onError()} handler as {@code OnErrorNotImplementedException}.
+     * is signaled to the {@code RxJavaPlugins.onError()} handler as {@code OnErrorNotImplementedException}.
      *
      * @param message
      *          the message to assign to the {@code Throwable} to signal
@@ -44,7 +44,7 @@ public OnErrorNotImplementedException(String message, @NonNull Throwable e) {
 
     /**
      * Wraps the {@code Throwable} before it
-     * is signalled to the {@code RxJavaPlugins.onError()}
+     * is signaled to the {@code RxJavaPlugins.onError()}
      * handler as {@code OnErrorNotImplementedException}.
      *
      * @param e

src/main/java/io/reactivex/rxjava4/exceptions/OnErrorNotImplementedException.java

@@ -31,7 +31,7 @@ public final class UndeliverableException extends IllegalStateException {
      * @param cause the cause, not null
      */
     public UndeliverableException(Throwable cause) {
-        super("The exception could not be delivered to the consumer because it has already canceled/disposed the flow "
+        super("The exception could not be delivered to the consumer because it has already cancelled/disposed the flow "
                 + "or the exception has nowhere to go to begin with. "
                 + "Further reading: https://github.com/ReactiveX/RxJava/wiki/What's-different-in-2.0#error-handling | " + cause, cause);
     }

src/main/java/io/reactivex/rxjava4/exceptions/UndeliverableException.java

@@ -68,7 +68,7 @@ public static boolean set(AtomicReference<Disposable> field, Disposable d) {
      * or returns false if the field is non-null.
      * If the target field contains the common DISPOSED instance, the supplied disposable
      * is disposed. If the field contains other non-null Disposable, an IllegalStateException
-     * is signalled to the RxJavaPlugins.onError hook.
+     * is signaled to the RxJavaPlugins.onError hook.
      * 
      * @param field the target field
      * @param d the disposable to set, not null