diff --git a/rxjava-core/src/main/java/rx/schedulers/ExecutorScheduler.java b/rxjava-core/src/main/java/rx/schedulers/ExecutorScheduler.java index ed5006aa22..c6f1344320 100644 --- a/rxjava-core/src/main/java/rx/schedulers/ExecutorScheduler.java +++ b/rxjava-core/src/main/java/rx/schedulers/ExecutorScheduler.java @@ -36,10 +36,20 @@ public class ExecutorScheduler extends Scheduler { private final Executor executor; + /** + * @deprecated Use Schedulers.executor(); + * @return + */ + @Deprecated public ExecutorScheduler(Executor executor) { this.executor = executor; } + /** + * @deprecated Use Schedulers.executor(); + * @return + */ + @Deprecated public ExecutorScheduler(ScheduledExecutorService executor) { this.executor = executor; } @@ -50,7 +60,6 @@ public Subscription schedule(Action1 action) { inner.schedule(action); return inner.innerSubscription; } - @Override public Subscription schedule(Action1 action, long delayTime, TimeUnit unit) { diff --git a/rxjava-core/src/main/java/rx/schedulers/ImmediateScheduler.java b/rxjava-core/src/main/java/rx/schedulers/ImmediateScheduler.java index eca1a2f5d7..e5f5ca6e8a 100644 --- a/rxjava-core/src/main/java/rx/schedulers/ImmediateScheduler.java +++ b/rxjava-core/src/main/java/rx/schedulers/ImmediateScheduler.java @@ -28,10 +28,19 @@ public final class ImmediateScheduler extends Scheduler { private static final ImmediateScheduler INSTANCE = new ImmediateScheduler(); + /** + * @deprecated Use Schedulers.immediate(); + * @return + */ + @Deprecated public static ImmediateScheduler getInstance() { return INSTANCE; } + /* package */static ImmediateScheduler instance() { + return INSTANCE; + } + /* package accessible for unit tests */ImmediateScheduler() { } @@ -49,7 +58,6 @@ public Subscription schedule(Action1 action, long delayTime, TimeUnit uni return inner.innerSubscription; } - private class InnerImmediateScheduler extends Scheduler.Inner implements Subscription { final BooleanSubscription innerSubscription = new BooleanSubscription(); diff --git a/rxjava-core/src/main/java/rx/schedulers/NewThreadScheduler.java b/rxjava-core/src/main/java/rx/schedulers/NewThreadScheduler.java index 96db3f7bcf..90eb5dbeb3 100644 --- a/rxjava-core/src/main/java/rx/schedulers/NewThreadScheduler.java +++ b/rxjava-core/src/main/java/rx/schedulers/NewThreadScheduler.java @@ -46,9 +46,18 @@ public Thread newThread(Runnable r) { } }; + /** + * @deprecated Use Schedulers.newThread(); + * @return + */ + @Deprecated public static NewThreadScheduler getInstance() { return INSTANCE; } + + /* package */ static NewThreadScheduler instance() { + return INSTANCE; + } private NewThreadScheduler() { diff --git a/rxjava-core/src/main/java/rx/schedulers/Schedulers.java b/rxjava-core/src/main/java/rx/schedulers/Schedulers.java index bb0a75e358..bd1b6173b6 100644 --- a/rxjava-core/src/main/java/rx/schedulers/Schedulers.java +++ b/rxjava-core/src/main/java/rx/schedulers/Schedulers.java @@ -41,7 +41,7 @@ private Schedulers() { * @return {@link ImmediateScheduler} instance */ public static Scheduler immediate() { - return ImmediateScheduler.getInstance(); + return ImmediateScheduler.instance(); } /** @@ -52,7 +52,7 @@ public static Scheduler immediate() { */ @Deprecated public static Scheduler currentThread() { - return TrampolineScheduler.getInstance(); + return TrampolineScheduler.instance(); } /** @@ -61,7 +61,7 @@ public static Scheduler currentThread() { * @return {@link TrampolineScheduler} instance */ public static Scheduler trampoline() { - return TrampolineScheduler.getInstance(); + return TrampolineScheduler.instance(); } /** @@ -70,7 +70,7 @@ public static Scheduler trampoline() { * @return {@link NewThreadScheduler} instance */ public static Scheduler newThread() { - return NewThreadScheduler.getInstance(); + return NewThreadScheduler.instance(); } /** diff --git a/rxjava-core/src/main/java/rx/schedulers/TrampolineScheduler.java b/rxjava-core/src/main/java/rx/schedulers/TrampolineScheduler.java index 2539fe4d4a..314a43dc7d 100644 --- a/rxjava-core/src/main/java/rx/schedulers/TrampolineScheduler.java +++ b/rxjava-core/src/main/java/rx/schedulers/TrampolineScheduler.java @@ -30,9 +30,18 @@ public class TrampolineScheduler extends Scheduler { private static final TrampolineScheduler INSTANCE = new TrampolineScheduler(); + /** + * @deprecated Use Schedulers.trampoline(); + * @return + */ + @Deprecated public static TrampolineScheduler getInstance() { return INSTANCE; } + + /* package */ static TrampolineScheduler instance() { + return INSTANCE; + } @Override public Subscription schedule(Action1 action) {