Skip to content

Commit e8930c2

Browse files
authored
2.x: Promote all Experimental/Beta API to standard (#6105)
1 parent ce5ce4b commit e8930c2

File tree

89 files changed

+428
-535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+428
-535
lines changed

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

+10-9
Original file line numberDiff line numberDiff line change
@@ -458,10 +458,12 @@ public static Completable fromFuture(final Future<?> future) {
458458
* <dt><b>Scheduler:</b></dt>
459459
* <dd>{@code fromMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
460460
* </dl>
461+
* <p>History: 2.1.17 - beta
461462
* @param <T> the value type of the {@link MaybeSource} element
462463
* @param maybe the Maybe instance to subscribe to, not null
463464
* @return the new Completable instance
464465
* @throws NullPointerException if single is null
466+
* @since 2.2
465467
*/
466468
@CheckReturnValue
467469
@SchedulerSupport(SchedulerSupport.NONE)
@@ -1138,14 +1140,13 @@ public final Completable andThen(CompletableSource next) {
11381140
* <dt><b>Scheduler:</b></dt>
11391141
* <dd>{@code as} does not operate by default on a particular {@link Scheduler}.</dd>
11401142
* </dl>
1141-
*
1143+
* <p>History: 2.1.7 - experimental
11421144
* @param <R> the resulting object type
11431145
* @param converter the function that receives the current Completable instance and returns a value
11441146
* @return the converted value
11451147
* @throws NullPointerException if converter is null
1146-
* @since 2.1.7 - experimental
1148+
* @since 2.2
11471149
*/
1148-
@Experimental
11491150
@CheckReturnValue
11501151
@SchedulerSupport(SchedulerSupport.NONE)
11511152
public final <R> R as(@NonNull CompletableConverter<? extends R> converter) {
@@ -1827,11 +1828,11 @@ public final Completable onErrorResumeNext(final Function<? super Throwable, ? e
18271828
* <dt><b>Scheduler:</b></dt>
18281829
* <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
18291830
* </dl>
1831+
* <p>History: 2.1.5 - experimental
18301832
* @return a Completable which nulls out references to the upstream producer and downstream CompletableObserver if
18311833
* the sequence is terminated or downstream calls dispose()
1832-
* @since 2.1.5 - experimental
1834+
* @since 2.2
18331835
*/
1834-
@Experimental
18351836
@CheckReturnValue
18361837
@SchedulerSupport(SchedulerSupport.NONE)
18371838
public final Completable onTerminateDetach() {
@@ -1975,15 +1976,15 @@ public final Completable retry(long times) {
19751976
* <dt><b>Scheduler:</b></dt>
19761977
* <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
19771978
* </dl>
1979+
* <p>History: 2.1.8 - experimental
19781980
* @param times the number of times the returned Completable should retry this Completable
19791981
* @param predicate the predicate that is called with the latest throwable and should return
19801982
* true to indicate the returned Completable should resubscribe to this Completable.
19811983
* @return the new Completable instance
19821984
* @throws NullPointerException if predicate is null
19831985
* @throws IllegalArgumentException if times is negative
1984-
* @since 2.1.8 - experimental
1986+
* @since 2.2
19851987
*/
1986-
@Experimental
19871988
@CheckReturnValue
19881989
@SchedulerSupport(SchedulerSupport.NONE)
19891990
public final Completable retry(long times, Predicate<? super Throwable> predicate) {
@@ -2304,12 +2305,12 @@ public final Completable subscribeOn(final Scheduler scheduler) {
23042305
* is signaled to the downstream and the other error is signaled to the global
23052306
* error handler via {@link RxJavaPlugins#onError(Throwable)}.</dd>
23062307
* </dl>
2308+
* <p>History: 2.1.17 - experimental
23072309
* @param other the other completable source to observe for the terminal signals
23082310
* @return the new Completable instance
2309-
* @since 2.1.17 - experimental
2311+
* @since 2.2
23102312
*/
23112313
@CheckReturnValue
2312-
@Experimental
23132314
@SchedulerSupport(SchedulerSupport.NONE)
23142315
public final Completable takeUntil(CompletableSource other) {
23152316
ObjectHelper.requireNonNull(other, "other is null");

src/main/java/io/reactivex/CompletableConverter.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@
1818
/**
1919
* Convenience interface and callback used by the {@link Completable#as} operator to turn a Completable into another
2020
* value fluently.
21-
*
21+
* <p>History: 2.1.7 - experimental
2222
* @param <R> the output type
23-
* @since 2.1.7 - experimental
23+
* @since 2.2
2424
*/
25-
@Experimental
2625
public interface CompletableConverter<R> {
2726
/**
2827
* Applies a function to the upstream Completable and returns a converted value of type {@code R}.

src/main/java/io/reactivex/CompletableEmitter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ public interface CompletableEmitter {
8888
* <p>
8989
* Unlike {@link #onError(Throwable)}, the {@code RxJavaPlugins.onError} is not called
9090
* if the error could not be delivered.
91+
* <p>History: 2.1.1 - experimental
9192
* @param t the throwable error to signal if possible
9293
* @return true if successful, false if the downstream is not able to accept further
9394
* events
94-
* @since 2.1.1 - experimental
95+
* @since 2.2
9596
*/
96-
@Experimental
9797
boolean tryOnError(@NonNull Throwable t);
9898
}

0 commit comments

Comments
 (0)