Backwards compatible deprecated rx.concurrency classes

These will exist for a few releases to allow people to migrate from rx.concurrency to rx.schedulers.

Author: benjchristensen

rxjava-core/src/main/java/rx/concurrency/CurrentThreadScheduler.java

@@ -0,0 +1,39 @@
+package rx.concurrency;
+
+import java.util.concurrent.TimeUnit;
+
+import rx.Scheduler;
+import rx.Subscription;
+import rx.util.functions.Func2;
+
+/**
+ * Deprecated. Package changed from rx.concurrency to rx.schedulers.
+ * 
+ * @deprecated Use {@link rx.schedulers.CurrentThreadScheduler} instead. This will be removed before 1.0 release.
+ */
+@Deprecated
+public class CurrentThreadScheduler extends Scheduler {
+
+    private final static CurrentThreadScheduler INSTANCE = new CurrentThreadScheduler();
+
+    public static CurrentThreadScheduler getInstance() {
+        return INSTANCE;
+    }
+
+    private final rx.schedulers.CurrentThreadScheduler actual;
+
+    private CurrentThreadScheduler() {
+        actual = rx.schedulers.CurrentThreadScheduler.getInstance();
+    }
+
+    @Override
+    public <T> Subscription schedule(T state, Func2<? super Scheduler, ? super T, ? extends Subscription> action) {
+        return actual.schedule(state, action);
+    }
+
+    @Override
+    public <T> Subscription schedule(T state, Func2<? super Scheduler, ? super T, ? extends Subscription> action, long delayTime, TimeUnit unit) {
+        return actual.schedule(state, action, delayTime, unit);
+    }
+
+}

rxjava-core/src/main/java/rx/concurrency/ExecutorScheduler.java

@@ -0,0 +1,24 @@
+package rx.concurrency;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+
+/**
+ * Deprecated. Package changed from rx.concurrency to rx.schedulers.
+ * 
+ * @deprecated Use {@link rx.schedulers.ExecutorScheduler} instead. This will be removed before 1.0 release.
+ */
+@Deprecated
+public class ExecutorScheduler extends rx.schedulers.ExecutorScheduler {
+
+    @Deprecated
+    public ExecutorScheduler(Executor executor) {
+        super(executor);
+    }
+
+    @Deprecated
+    public ExecutorScheduler(ScheduledExecutorService executor) {
+        super(executor);
+    }
+
+}

rxjava-core/src/main/java/rx/concurrency/ImmediateScheduler.java

@@ -0,0 +1,39 @@
+package rx.concurrency;
+
+import java.util.concurrent.TimeUnit;
+
+import rx.Scheduler;
+import rx.Subscription;
+import rx.util.functions.Func2;
+
+/**
+ * Deprecated. Package changed from rx.concurrency to rx.schedulers.
+ * 
+ * @deprecated Use {@link rx.schedulers.ImmediateScheduler} instead. This will be removed before 1.0 release.
+ */
+@Deprecated
+public class ImmediateScheduler extends Scheduler {
+
+    private final static ImmediateScheduler INSTANCE = new ImmediateScheduler();
+
+    public static ImmediateScheduler getInstance() {
+        return INSTANCE;
+    }
+
+    private final rx.schedulers.ImmediateScheduler actual;
+
+    private ImmediateScheduler() {
+        actual = rx.schedulers.ImmediateScheduler.getInstance();
+    }
+
+    @Override
+    public <T> Subscription schedule(T state, Func2<? super Scheduler, ? super T, ? extends Subscription> action) {
+        return actual.schedule(state, action);
+    }
+
+    @Override
+    public <T> Subscription schedule(T state, Func2<? super Scheduler, ? super T, ? extends Subscription> action, long delayTime, TimeUnit unit) {
+        return actual.schedule(state, action, delayTime, unit);
+    }
+
+}

rxjava-core/src/main/java/rx/concurrency/NewThreadScheduler.java

@@ -0,0 +1,39 @@
+package rx.concurrency;
+
+import java.util.concurrent.TimeUnit;
+
+import rx.Scheduler;
+import rx.Subscription;
+import rx.util.functions.Func2;
+
+/**
+ * Deprecated. Package changed from rx.concurrency to rx.schedulers.
+ * 
+ * @deprecated Use {@link rx.schedulers.NewThreadScheduler} instead. This will be removed before 1.0 release.
+ */
+@Deprecated
+public class NewThreadScheduler extends Scheduler {
+
+    private final static NewThreadScheduler INSTANCE = new NewThreadScheduler();
+
+    public static NewThreadScheduler getInstance() {
+        return INSTANCE;
+    }
+
+    private final rx.schedulers.NewThreadScheduler actual;
+
+    private NewThreadScheduler() {
+        actual = rx.schedulers.NewThreadScheduler.getInstance();
+    }
+
+    @Override
+    public <T> Subscription schedule(T state, Func2<? super Scheduler, ? super T, ? extends Subscription> action) {
+        return actual.schedule(state, action);
+    }
+
+    @Override
+    public <T> Subscription schedule(T state, Func2<? super Scheduler, ? super T, ? extends Subscription> action, long delayTime, TimeUnit unit) {
+        return actual.schedule(state, action, delayTime, unit);
+    }
+
+}

rxjava-core/src/main/java/rx/concurrency/README.txt

@@ -0,0 +1,3 @@
+This package is deprecated and will be removed prior to a 1.0 release.
+
+Use rx.schedulers.* instead of rx.concurrency.*

rxjava-core/src/main/java/rx/concurrency/Schedulers.java

@@ -0,0 +1,100 @@
+package rx.concurrency;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+
+import rx.Scheduler;
+
+/**
+ * Deprecated. Package changed from rx.concurrency to rx.schedulers.
+ * 
+ * @deprecated Use {@link rx.schedulers.Schedulers} instead. This will be removed before 1.0 release.
+ */
+@Deprecated
+public class Schedulers {
+
+    /**
+     * {@link Scheduler} that executes work immediately on the current thread.
+     * 
+     * @return {@link ImmediateScheduler} instance
+     */
+    @Deprecated
+    public static Scheduler immediate() {
+        return rx.schedulers.ImmediateScheduler.getInstance();
+    }
+
+    /**
+     * {@link Scheduler} that queues work on the current thread to be executed after the current work completes.
+     * 
+     * @return {@link CurrentThreadScheduler} instance
+     */
+    @Deprecated
+    public static Scheduler currentThread() {
+        return rx.schedulers.CurrentThreadScheduler.getInstance();
+    }
+
+    /**
+     * {@link Scheduler} that creates a new {@link Thread} for each unit of work.
+     * 
+     * @return {@link NewThreadScheduler} instance
+     */
+    @Deprecated
+    public static Scheduler newThread() {
+        return rx.schedulers.NewThreadScheduler.getInstance();
+    }
+
+    /**
+     * {@link Scheduler} that queues work on an {@link Executor}.
+     * <p>
+     * Note that this does not support scheduled actions with a delay.
+     * 
+     * @return {@link ExecutorScheduler} instance
+     */
+    @Deprecated
+    public static Scheduler executor(Executor executor) {
+        return new rx.schedulers.ExecutorScheduler(executor);
+    }
+
+    /**
+     * {@link Scheduler} that queues work on an {@link ScheduledExecutorService}.
+     * 
+     * @return {@link ExecutorScheduler} instance
+     */
+    @Deprecated
+    public static Scheduler executor(ScheduledExecutorService executor) {
+        return new rx.schedulers.ExecutorScheduler(executor);
+    }
+
+    /**
+     * {@link Scheduler} intended for computational work.
+     * <p>
+     * The implementation is backed by a {@link ScheduledExecutorService} thread-pool sized to the number of CPU cores.
+     * <p>
+     * This can be used for event-loops, processing callbacks and other computational work.
+     * <p>
+     * Do not perform IO-bound work on this scheduler. Use {@link #threadPoolForComputation()} instead.
+     * 
+     * @return {@link ExecutorScheduler} for computation-bound work.
+     */
+    @Deprecated
+    public static Scheduler threadPoolForComputation() {
+        return rx.schedulers.Schedulers.threadPoolForComputation();
+    }
+
+    /**
+     * {@link Scheduler} intended for IO-bound work.
+     * <p>
+     * The implementation is backed by an {@link Executor} thread-pool that will grow as needed.
+     * <p>
+     * This can be used for asynchronously performing blocking IO.
+     * <p>
+     * Do not perform computational work on this scheduler. Use {@link #threadPoolForComputation()} instead.
+     * 
+     * @return {@link ExecutorScheduler} for IO-bound work.
+     */
+    @Deprecated
+    public static Scheduler threadPoolForIO() {
+        return rx.schedulers.Schedulers.threadPoolForIO();
+    }
+
+}

rxjava-core/src/main/java/rx/concurrency/TestScheduler.java

@@ -0,0 +1,14 @@
+package rx.concurrency;
+
+/**
+ * Deprecated. Package changed from rx.concurrency to rx.schedulers.
+ * 
+ * @deprecated Use {@link rx.schedulers.TestScheduler} instead. This will be removed before 1.0 release.
+ */
+@Deprecated
+public class TestScheduler extends rx.schedulers.TestScheduler {
+
+    public TestScheduler() {
+    }
+
+}