Deprecate Direct Access to Scheduler Implementations

This enforces the convention of using `Schedulers.*` and then makes the RxJavaDefaultSchedulers plugin more reliable.

Author: benjchristensen

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<Scheduler.Inner> action) {
         inner.schedule(action);
         return inner.innerSubscription;
     }
-    
 
     @Override
     public Subscription schedule(Action1<Inner> action, long delayTime, TimeUnit unit) {

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<Inner> action, long delayTime, TimeUnit uni
         return inner.innerSubscription;
     }
 
-    
     private class InnerImmediateScheduler extends Scheduler.Inner implements Subscription {
 
         final BooleanSubscription innerSubscription = new BooleanSubscription();

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

@@ -46,12 +46,16 @@ public Thread newThread(Runnable r) {
         }
     };
 
+    /**
+     * @deprecated Use Schedulers.newThread();
+     * @return
+     */
     @Deprecated
     public static NewThreadScheduler getInstance() {
         return INSTANCE;
     }
-    
-    /* package */ static NewThreadScheduler instance() {
+
+    /* package */static NewThreadScheduler instance() {
         return INSTANCE;
     }
 

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

@@ -88,7 +88,7 @@ public Scheduler call() {
      * @return {@link ImmediateScheduler} instance
      */
     public static Scheduler immediate() {
-        return ImmediateScheduler.getInstance();
+        return ImmediateScheduler.instance();
     }
 
     /**
@@ -99,7 +99,7 @@ public static Scheduler immediate() {
      */
     @Deprecated
     public static Scheduler currentThread() {
-        return TrampolineScheduler.getInstance();
+        return TrampolineScheduler.instance();
     }
 
     /**
@@ -108,7 +108,7 @@ public static Scheduler currentThread() {
      * @return {@link TrampolineScheduler} instance
      */
     public static Scheduler trampoline() {
-        return TrampolineScheduler.getInstance();
+        return TrampolineScheduler.instance();
     }
 
     /**

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<Scheduler.Inner> action) {