Skip to content

1.x: apply API promotions for 1.3 #5318

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

Merged
merged 2 commits into from
Apr 27, 2017
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
4 changes: 1 addition & 3 deletions src/main/java/rx/BackpressureOverflow.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@
*/
package rx;

import rx.annotations.Beta;
import rx.exceptions.MissingBackpressureException;

/**
* Generic strategy and default implementations to deal with backpressure buffer overflows.
*
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
* @since 1.3
*/
@Beta
public final class BackpressureOverflow {

private BackpressureOverflow() {
Expand Down
13 changes: 5 additions & 8 deletions src/main/java/rx/Completable.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;

import rx.annotations.*;
import rx.exceptions.*;
import rx.functions.*;
import rx.internal.observers.AssertableSubscriberObservable;
Expand All @@ -35,10 +34,9 @@
* Represents a deferred computation without any value but only indication for completion or exception.
*
* The class follows a similar event pattern as Reactive-Streams: onSubscribe (onError|onComplete)?
*
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
*
* @since 1.3
*/
@Beta
public class Completable {
/** The actual subscription action. */
private final OnSubscribe onSubscribe;
Expand Down Expand Up @@ -539,9 +537,8 @@ public void call(rx.CompletableSubscriber s) {
* Completable's protocol are held.
* @param producer the callback invoked for each incoming CompletableSubscriber
* @return the new Completable instance
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
* @since 1.3
*/
@Experimental
public static Completable fromEmitter(Action1<CompletableEmitter> producer) {
return create(new CompletableFromEmitter(producer));
}
Expand Down Expand Up @@ -2385,10 +2382,10 @@ public void call() {
* <dt><b>Scheduler:</b></dt>
* <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
* <p>History: 1.2.3 - experimental
* @return the new AssertableSubscriber instance
* @since 1.2.3
* @since 1.3
*/
@Experimental
public final AssertableSubscriber<Void> test() {
AssertableSubscriberObservable<Void> ts = AssertableSubscriberObservable.create(Long.MAX_VALUE);
subscribe(ts);
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/rx/CompletableEmitter.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package rx;

import rx.annotations.Experimental;
import rx.functions.Cancellable;

/**
Expand All @@ -24,9 +23,8 @@
* <p>
* All methods are thread-safe; calling onCompleted or onError twice or one after the other has
* no effect.
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
* @since 1.3
*/
@Experimental
public interface CompletableEmitter {

/**
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/rx/CompletableSubscriber.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@
*/
package rx;

import rx.annotations.Experimental;

/**
* Represents the subscription API callbacks when subscribing to a Completable instance.
* @since 1.3
*/
@Experimental
public interface CompletableSubscriber {
/**
* Called once the deferred computation completes normally.
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/rx/Emitter.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package rx;

import rx.annotations.Experimental;
import rx.functions.Cancellable;

/**
Expand All @@ -29,9 +28,8 @@
* other methods are thread-safe.
*
* @param <T> the value type to emit
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
* @since 1.3
*/
@Experimental
public interface Emitter<T> extends Observer<T> {

/**
Expand Down
Loading