Hide HandlerThreadScheduler implementation detail.

Author: JakeWharton

rxandroid/src/main/java/rx/android/concurrency/AndroidSchedulers.java

@@ -18,29 +18,25 @@
 import android.os.Looper;
 
 /**
- * Schedulers that have Android specific functionality
+ * Schedulers that have Android-specific functionality
  */
-public class AndroidSchedulers {
-    private AndroidSchedulers(){
+public final class AndroidSchedulers {
+    private AndroidSchedulers() {
         throw new AssertionError("No instances");
     }
 
     private static final Scheduler MAIN_THREAD_SCHEDULER =
             new HandlerThreadScheduler(new Handler(Looper.getMainLooper()));
 
     /**
-     * {@link Scheduler} which uses the provided {@link Handler} to execute an action
-     * @param handler The handler that will be used when executing the action
-     * @return A handler based scheduler
+     * {@link Scheduler} which uses the provided {@link Handler} to execute actions.
      */
     public static Scheduler handlerThread(final Handler handler) {
         return new HandlerThreadScheduler(handler);
     }
 
     /**
-     * {@link Scheduler} which will execute an action on the main Android UI thread.
-     *
-     * @return A Main {@link Looper} based scheduler
+     * {@link Scheduler} which will execute actions on the Android UI thread.
      */
     public static Scheduler mainThread() {
         return MAIN_THREAD_SCHEDULER;

rxandroid/src/main/java/rx/android/concurrency/HandlerThreadScheduler.java

@@ -24,18 +24,18 @@
 import android.os.Handler;
 
 /**
- * Schedules actions to run on an Android Handler thread.
+ * @deprecated Use {@link AndroidSchedulers#handlerThread}. This type will not be part of the
+ * public API in a future release.
  */
+@Deprecated
 public class HandlerThreadScheduler extends Scheduler {
 
     private final Handler handler;
 
     /**
-     * Constructs a {@link HandlerThreadScheduler} using the given {@link Handler}
-     *
-     * @param handler
-     *            {@link Handler} to use when scheduling actions
+     * @deprecated Use {@link AndroidSchedulers#handlerThread}.
      */
+    @Deprecated
     public HandlerThreadScheduler(Handler handler) {
         this.handler = handler;
     }

rxandroid/src/main/java/rx/android/schedulers/AndroidSchedulers.java

@@ -41,15 +41,15 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest=Config.NONE)
-public class HandlerThreadSchedulerTest {
+public class AndroidSchedulersTest {
 
     @Test
     public void shouldScheduleImmediateActionOnHandlerThread() {
         final Handler handler = mock(Handler.class);
         @SuppressWarnings("unchecked")
         final Action0 action = mock(Action0.class);
 
-        Scheduler scheduler = new HandlerThreadScheduler(handler);
+        Scheduler scheduler = AndroidSchedulers.handlerThread(handler);
         Worker inner = scheduler.createWorker();
         inner.schedule(action);
 
@@ -68,7 +68,7 @@ public void shouldScheduleDelayedActionOnHandlerThread() {
         @SuppressWarnings("unchecked")
         final Action0 action = mock(Action0.class);
 
-        Scheduler scheduler = new HandlerThreadScheduler(handler);
+        Scheduler scheduler = AndroidSchedulers.handlerThread(handler);
         Worker inner = scheduler.createWorker();
         inner.schedule(action, 1L, TimeUnit.SECONDS);
 
@@ -85,8 +85,9 @@ public void shouldScheduleDelayedActionOnHandlerThread() {
     public void shouldRemoveCallbacksFromHandlerWhenUnsubscribedSubscription() {
         final Handler handler = spy(new Handler());
         final Observable.OnSubscribe<Integer> onSubscribe = mock(Observable.OnSubscribe.class);
-        final Subscription subscription = Observable.create(onSubscribe).subscribeOn(
-                new HandlerThreadScheduler(handler)).subscribe();
+        final Subscription subscription = Observable.create(onSubscribe)
+                .subscribeOn(AndroidSchedulers.handlerThread(handler))
+                .subscribe();
 
         verify(onSubscribe).call(Matchers.any(Subscriber.class));
 
@@ -100,7 +101,7 @@ public void shouldNotCallOnSubscribeWhenSubscriptionUnsubscribedBeforeDelay() {
         final Observable.OnSubscribe<Integer> onSubscribe = mock(Observable.OnSubscribe.class);
         final Handler handler = spy(new Handler());
 
-        final Scheduler scheduler = new HandlerThreadScheduler(handler);
+        final Scheduler scheduler = AndroidSchedulers.handlerThread(handler);
         final Worker worker = spy(scheduler.createWorker());
 
         final Scheduler spyScheduler = spy(scheduler);