Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.2: Promote all Experimental/Beta API to standard #6105

Merged
merged 1 commit into from
Jul 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/main/java/io/reactivex/Completable.java
Original file line number Diff line number Diff line change
Expand Up @@ -458,10 +458,12 @@ public static Completable fromFuture(final Future<?> future) {
* <dt><b>Scheduler:</b></dt>
* <dd>{@code fromMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
* <p>History: 2.1.17 - beta
* @param <T> the value type of the {@link MaybeSource} element
* @param maybe the Maybe instance to subscribe to, not null
* @return the new Completable instance
* @throws NullPointerException if single is null
* @since 2.2
*/
@CheckReturnValue
@SchedulerSupport(SchedulerSupport.NONE)
Expand Down Expand Up @@ -1138,14 +1140,13 @@ public final Completable andThen(CompletableSource next) {
* <dt><b>Scheduler:</b></dt>
* <dd>{@code as} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* <p>History: 2.1.7 - experimental
* @param <R> the resulting object type
* @param converter the function that receives the current Completable instance and returns a value
* @return the converted value
* @throws NullPointerException if converter is null
* @since 2.1.7 - experimental
* @since 2.2
*/
@Experimental
@CheckReturnValue
@SchedulerSupport(SchedulerSupport.NONE)
public final <R> R as(@NonNull CompletableConverter<? extends R> converter) {
Expand Down Expand Up @@ -1827,11 +1828,11 @@ public final Completable onErrorResumeNext(final Function<? super Throwable, ? e
* <dt><b>Scheduler:</b></dt>
* <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
* <p>History: 2.1.5 - experimental
* @return a Completable which nulls out references to the upstream producer and downstream CompletableObserver if
* the sequence is terminated or downstream calls dispose()
* @since 2.1.5 - experimental
* @since 2.2
*/
@Experimental
@CheckReturnValue
@SchedulerSupport(SchedulerSupport.NONE)
public final Completable onTerminateDetach() {
Expand Down Expand Up @@ -1975,15 +1976,15 @@ public final Completable retry(long times) {
* <dt><b>Scheduler:</b></dt>
* <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
* <p>History: 2.1.8 - experimental
* @param times the number of times the returned Completable should retry this Completable
* @param predicate the predicate that is called with the latest throwable and should return
* true to indicate the returned Completable should resubscribe to this Completable.
* @return the new Completable instance
* @throws NullPointerException if predicate is null
* @throws IllegalArgumentException if times is negative
* @since 2.1.8 - experimental
* @since 2.2
*/
@Experimental
@CheckReturnValue
@SchedulerSupport(SchedulerSupport.NONE)
public final Completable retry(long times, Predicate<? super Throwable> predicate) {
Expand Down Expand Up @@ -2304,12 +2305,12 @@ public final Completable subscribeOn(final Scheduler scheduler) {
* is signaled to the downstream and the other error is signaled to the global
* error handler via {@link RxJavaPlugins#onError(Throwable)}.</dd>
* </dl>
* <p>History: 2.1.17 - experimental
* @param other the other completable source to observe for the terminal signals
* @return the new Completable instance
* @since 2.1.17 - experimental
* @since 2.2
*/
@CheckReturnValue
@Experimental
@SchedulerSupport(SchedulerSupport.NONE)
public final Completable takeUntil(CompletableSource other) {
ObjectHelper.requireNonNull(other, "other is null");
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/io/reactivex/CompletableConverter.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@
/**
* Convenience interface and callback used by the {@link Completable#as} operator to turn a Completable into another
* value fluently.
*
* <p>History: 2.1.7 - experimental
* @param <R> the output type
* @since 2.1.7 - experimental
* @since 2.2
*/
@Experimental
public interface CompletableConverter<R> {
/**
* Applies a function to the upstream Completable and returns a converted value of type {@code R}.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/reactivex/CompletableEmitter.java
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ public interface CompletableEmitter {
* <p>
* Unlike {@link #onError(Throwable)}, the {@code RxJavaPlugins.onError} is not called
* if the error could not be delivered.
* <p>History: 2.1.1 - experimental
* @param t the throwable error to signal if possible
* @return true if successful, false if the downstream is not able to accept further
* events
* @since 2.1.1 - experimental
* @since 2.2
*/
@Experimental
boolean tryOnError(@NonNull Throwable t);
}
Loading