remove AsyncEmitter deprecations (#4725)

Author: davidmoten

src/main/java/rx/AsyncEmitter.java

@@ -15,8 +15,8 @@
  */
 package rx;
 
-import rx.AsyncEmitter.Cancellable;
 import rx.annotations.Experimental;
+import rx.functions.Cancellable;
 
 /**
  * Abstraction over a {@link CompletableSubscriber} that gets either an onCompleted or onError
@@ -25,10 +25,8 @@
  * 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)
- * @deprecated as of 1.2.1 because `setCancellation` method will change signature (not name) for 1.2.2.
  */
 @Experimental
-@Deprecated
 public interface CompletableEmitter {
 
     /**

src/main/java/rx/CompletableEmitter.java

@@ -1976,55 +1976,6 @@ public static <T> Observable<T> from(T[] array) {
         return create(new OnSubscribeFromArray<T>(array));
     }
 
-    /**
-     * Provides an API (via a cold Observable) that bridges the reactive world with the callback-style,
-     * generally non-backpressured world.
-     * <p>
-     * Example:
-     * <pre><code>
-     * Observable.&lt;Event&gt;fromEmitter(emitter -&gt; {
-     *     Callback listener = new Callback() {
-     *         &#64;Override
-     *         public void onEvent(Event e) {
-     *             emitter.onNext(e);
-     *             if (e.isLast()) {
-     *                 emitter.onCompleted();
-     *             }
-     *         }
-     *
-     *         &#64;Override
-     *         public void onFailure(Exception e) {
-     *             emitter.onError(e);
-     *         }
-     *     };
-     *
-     *     AutoCloseable c = api.someMethod(listener);
-     *
-     *     emitter.setCancellation(c::close);
-     *
-     * }, BackpressureMode.BUFFER);
-     * </code></pre>
-     * <p>
-     * You should call the AsyncEmitter's onNext, onError and onCompleted methods in a serialized fashion. The
-     * rest of its methods are thread-safe.
-     *
-     * @param <T> the element type
-     * @param emitter the emitter that is called when a Subscriber subscribes to the returned {@code Observable}
-     * @param backpressure the backpressure mode to apply if the downstream Subscriber doesn't request (fast) enough
-     * @return the new Observable instance
-     * @see AsyncEmitter
-     * @see AsyncEmitter.BackpressureMode
-     * @see AsyncEmitter.Cancellable
-     * @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
-     * @deprecated since 1.2.1 because Async prefix of AsyncEmitter class is potentially misleading. Use
-     *            {@link #fromEmitter(Action1, Emitter.BackpressureMode)} instead.
-     */
-    @Experimental
-    @Deprecated
-    public static <T> Observable<T> fromEmitter(Action1<AsyncEmitter<T>> emitter, AsyncEmitter.BackpressureMode backpressure) {
-        return create(new OnSubscribeFromAsyncEmitter<T>(emitter, backpressure));
-    }
-
     /**
      * Provides an API (via a cold Observable) that bridges the reactive world with the callback-style,
      * generally non-backpressured world.

src/main/java/rx/Observable.java

@@ -18,17 +18,16 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import rx.*;
-import rx.AsyncEmitter.Cancellable;
 import rx.exceptions.Exceptions;
 import rx.functions.Action1;
-import rx.internal.operators.OnSubscribeFromAsyncEmitter.CancellableSubscription;
+import rx.functions.Cancellable;
+import rx.internal.operators.OnSubscribeFromEmitter.CancellableSubscription;
 import rx.internal.subscriptions.SequentialSubscription;
 import rx.plugins.RxJavaHooks;
 
 /**
  * Allows push-based emission of terminal events to a CompletableSubscriber.
  */
-@SuppressWarnings("deprecation")
 public final class CompletableFromEmitter implements Completable.OnSubscribe {
 
     final Action1<CompletableEmitter> producer;