Deprecation Removal

Removing all deprecated methods and types for 1.0 #1001

Author: benjchristensen

rxjava/src/main/java/rx/Observable.java

@@ -40,13 +40,6 @@ public abstract class Subscriber<T> implements Observer<T>, Subscription {
     /* protected by `this` */
     private long requested = Long.MIN_VALUE; // default to not set
 
-    @Deprecated
-    protected Subscriber(CompositeSubscription cs) {
-        this.op = null;
-        this.cs = new SubscriptionList();
-        add(cs);
-    }
-
     protected Subscriber() {
         this.op = null;
         this.cs = new SubscriptionList();

rxjava/src/main/java/rx/Subscriber.java

@@ -38,27 +38,6 @@
 public class GroupedObservable<K, T> extends Observable<T> {
     private final K key;
 
-    /**
-     * Converts an {@link Observable} into a {@code GroupedObservable} with a particular key.
-     *
-     * @param key
-     *          the key to identify the group of items emitted by this {@code GroupedObservable}
-     * @param o
-     *          the {@link Observable} to convert
-     * @return a {@code GroupedObservable} representation of {@code o}, with key {@code key}
-     * @deprecated Use Observable.groupBy with element selector instead. 
-     */
-    @Deprecated
-    public static <K, T> GroupedObservable<K, T> from(K key, final Observable<T> o) {
-        return new GroupedObservable<K, T>(key, new OnSubscribe<T>() {
-
-            @Override
-            public void call(Subscriber<? super T> s) {
-                o.unsafeSubscribe(s);
-            }
-        });
-    }
-
     public GroupedObservable(K key, OnSubscribe<T> onSubscribe) {
         super(onSubscribe);
         this.key = key;

rxjava/src/main/java/rx/observables/GroupedObservable.java

@@ -34,8 +34,6 @@ public class RxJavaPlugins {
 
     private final AtomicReference<RxJavaErrorHandler> errorHandler = new AtomicReference<RxJavaErrorHandler>();
     private final AtomicReference<RxJavaObservableExecutionHook> observableExecutionHook = new AtomicReference<RxJavaObservableExecutionHook>();
-    //deprecated
-    private final AtomicReference<RxJavaDefaultSchedulers> schedulerOverrides = new AtomicReference<RxJavaDefaultSchedulers>();
     private final AtomicReference<RxJavaSchedulersHook> schedulersHook = new AtomicReference<RxJavaSchedulersHook>();
 
     /**
@@ -169,48 +167,6 @@ private static Object getPluginImplementationViaProperty(Class<?> pluginClass) {
         }
     }
 
-    /**
-     * Retrieves the instance of {@link RxJavaDefaultSchedulers} to use based on order of precedence as defined
-     * in the {@link RxJavaPlugins} class header.
-     * <p>
-     * Override the default by calling {@link #registerDefaultSchedulers(RxJavaDefaultSchedulers)} or by setting
-     * the property {@code rxjava.plugin.RxJavaDefaultSchedulers.implementation} with the full classname to
-     * load.
-     * 
-     * @return the {@link RxJavaDefaultSchedulers} implementation in use
-     */
-    public RxJavaDefaultSchedulers getDefaultSchedulers() {
-        if (schedulerOverrides.get() == null) {
-            // check for an implementation from System.getProperty first
-            Object impl = getPluginImplementationViaProperty(RxJavaDefaultSchedulers.class);
-            if (impl == null) {
-                // nothing set via properties so initialize with default 
-                schedulerOverrides.compareAndSet(null, RxJavaDefaultSchedulersDefault.getInstance());
-                // we don't return from here but call get() again in case of thread-race so the winner will always get returned
-            } else {
-                // we received an implementation from the system property so use it
-                schedulerOverrides.compareAndSet(null, (RxJavaDefaultSchedulers) impl);
-            }
-        }
-        return schedulerOverrides.get();
-    }
-
-    /**
-     * Registers an {@link RxJavaDefaultSchedulers} implementation as a global override of any injected or
-     * default implementations.
-     * 
-     * @param impl
-     *            {@link RxJavaDefaultSchedulers} implementation
-     * @throws IllegalStateException
-     *             if called more than once or after the default was initialized (if usage occurs before trying
-     *             to register)
-     */
-    public void registerDefaultSchedulers(RxJavaDefaultSchedulers impl) {
-        if (!schedulerOverrides.compareAndSet(null, impl)) {
-            throw new IllegalStateException("Another strategy was already registered: " + schedulerOverrides.get());
-        }
-    }
-
     /**
      * Retrieves the instance of {@link RxJavaSchedulersHook} to use based on order of precedence as defined
      * in the {@link RxJavaPlugins} class header.

rxjava/src/main/java/rx/plugins/RxJavaDefaultSchedulers.java

@@ -32,21 +32,21 @@ public final class Schedulers {
     private static final Schedulers INSTANCE = new Schedulers();
 
     private Schedulers() {
-        Scheduler c = RxJavaPlugins.getInstance().getDefaultSchedulers().getComputationScheduler();
+        Scheduler c = RxJavaPlugins.getInstance().getSchedulersHook().getComputationScheduler();
         if (c != null) {
             computationScheduler = c;
         } else {
             computationScheduler = new EventLoopsScheduler();
         }
 
-        Scheduler io = RxJavaPlugins.getInstance().getDefaultSchedulers().getIOScheduler();
+        Scheduler io = RxJavaPlugins.getInstance().getSchedulersHook().getIOScheduler();
         if (io != null) {
             ioScheduler = io;
         } else {
             ioScheduler = new CachedThreadScheduler();
         }
 
-        Scheduler nt = RxJavaPlugins.getInstance().getDefaultSchedulers().getNewThreadScheduler();
+        Scheduler nt = RxJavaPlugins.getInstance().getSchedulersHook().getNewThreadScheduler();
         if (nt != null) {
             newThreadScheduler = nt;
         } else {

rxjava/src/main/java/rx/plugins/RxJavaDefaultSchedulersDefault.java

@@ -61,24 +61,24 @@ public Integer call(Media t1, Media t2) {
 
     @Test
     public void testCovarianceOfCompose() {
-        Observable<HorrorMovie> movie = Observable.<HorrorMovie> from(new HorrorMovie());
+        Observable<HorrorMovie> movie = Observable.<HorrorMovie> just(new HorrorMovie());
         Observable<Movie> movie2 = movie.compose(new Transformer<Movie, Movie>() {
 
             @Override
             public Observable<Movie> call(Observable<? extends Movie> t1) {
-                return Observable.from(new Movie());
+                return Observable.just(new Movie());
             }
 
         });
     }
 
     @Test
     public void testCovarianceOfCompose2() {
-        Observable<Movie> movie = Observable.<Movie> from(new HorrorMovie());
+        Observable<Movie> movie = Observable.<Movie> just(new HorrorMovie());
         Observable<HorrorMovie> movie2 = movie.compose(new Transformer<Movie, HorrorMovie>() {
             @Override
             public Observable<HorrorMovie> call(Observable<? extends Movie> t1) {
-                return Observable.from(new HorrorMovie());
+                return Observable.just(new HorrorMovie());
             }
         });
     }

rxjava/src/main/java/rx/plugins/RxJavaPlugins.java

@@ -959,7 +959,7 @@ public void testIgnoreElements() {
     @Test
             public void testJustWithScheduler() {
                 TestScheduler scheduler = new TestScheduler();
-                Observable<Integer> observable = Observable.from(Arrays.asList(1, 2), scheduler);
+                Observable<Integer> observable = Observable.from(Arrays.asList(1, 2)).subscribeOn(scheduler);
 
                 @SuppressWarnings("unchecked")
                 Observer<Integer> observer = mock(Observer.class);
@@ -977,7 +977,7 @@ public void testJustWithScheduler() {
     @Test
     public void testStartWithWithScheduler() {
         TestScheduler scheduler = new TestScheduler();
-        Observable<Integer> observable = Observable.just(3, 4).startWith(Arrays.asList(1, 2), scheduler);
+        Observable<Integer> observable = Observable.just(3, 4).startWith(Arrays.asList(1, 2)).subscribeOn(scheduler);
 
         @SuppressWarnings("unchecked")
         Observer<Integer> observer = mock(Observer.class);

rxjava/src/main/java/rx/schedulers/Schedulers.java

@@ -115,7 +115,7 @@ public void testSimpleJustNext() {
     public void testHasNextThrows() {
         TestScheduler scheduler = new TestScheduler();
 
-        BlockingObservable<Long> source = Observable.<Long> error(new RuntimeException("Forced failure!"), scheduler).toBlocking();
+        BlockingObservable<Long> source = Observable.<Long> error(new RuntimeException("Forced failure!")).subscribeOn(scheduler).toBlocking();
 
         Iterable<Long> iter = source.latest();
 
@@ -130,7 +130,7 @@ public void testHasNextThrows() {
     public void testNextThrows() {
         TestScheduler scheduler = new TestScheduler();
 
-        BlockingObservable<Long> source = Observable.<Long> error(new RuntimeException("Forced failure!"), scheduler).toBlocking();
+        BlockingObservable<Long> source = Observable.<Long> error(new RuntimeException("Forced failure!")).subscribeOn(scheduler).toBlocking();
 
         Iterable<Long> iter = source.latest();
         Iterator<Long> it = iter.iterator();