Merge pull request #318 from ReactiveX/jw/track

Remove OnErrorNotImplementedException handling, track interface rename.

Author: JakeWharton

rxandroid/src/main/java/io/reactivex/android/schedulers/HandlerScheduler.java

@@ -18,7 +18,6 @@
 import io.reactivex.Scheduler;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.disposables.Disposables;
-import io.reactivex.exceptions.OnErrorNotImplementedException;
 import io.reactivex.plugins.RxJavaPlugins;
 import java.util.concurrent.TimeUnit;
 
@@ -111,13 +110,8 @@ public void run() {
             try {
                 delegate.run();
             } catch (Throwable t) {
-                IllegalStateException ie;
-                if (t instanceof OnErrorNotImplementedException) {
-                    ie = new IllegalStateException(
-                        "Exception thrown on Scheduler. Add `onError` handling.", t);
-                } else {
-                    ie = new IllegalStateException("Fatal Exception thrown on Scheduler.", t);
-                }
+                IllegalStateException ie =
+                    new IllegalStateException("Fatal Exception thrown on Scheduler.", t);
                 RxJavaPlugins.onError(ie);
                 Thread thread = Thread.currentThread();
                 thread.getUncaughtExceptionHandler().uncaughtException(thread, ie);

rxandroid/src/test/java/io/reactivex/android/schedulers/HandlerSchedulerTest.java

@@ -19,7 +19,6 @@
 import io.reactivex.Scheduler.Worker;
 import io.reactivex.android.testutil.CountingRunnable;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.exceptions.OnErrorNotImplementedException;
 import io.reactivex.functions.Function;
 import io.reactivex.plugins.RxJavaPlugins;
 import java.lang.Thread.UncaughtExceptionHandler;
@@ -652,41 +651,6 @@ public void disposedWorkerReturnsDisposedDisposables() {
         thread.setUncaughtExceptionHandler(originalHandler);
     }
 
-    @Test public void actionMissingErrorHandlerRoutedToHookAndThreadHandler() {
-        // TODO Test hook as well. Requires https://github.com/ReactiveX/RxJava/pull/3820.
-
-        Thread thread = Thread.currentThread();
-        UncaughtExceptionHandler originalHandler = thread.getUncaughtExceptionHandler();
-
-        final AtomicReference<Throwable> throwableRef = new AtomicReference<>();
-        thread.setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
-            @Override public void uncaughtException(Thread thread, Throwable ex) {
-                throwableRef.set(ex);
-            }
-        });
-
-        Worker worker = scheduler.createWorker();
-
-        final OnErrorNotImplementedException oenie =
-            new OnErrorNotImplementedException(new NullPointerException());
-        Runnable action = new Runnable() {
-            @Override public void run() {
-                throw oenie;
-            }
-        };
-        worker.schedule(action);
-
-        runUiThreadTasks();
-        Throwable throwable = throwableRef.get();
-        assertTrue(throwable instanceof IllegalStateException);
-        assertEquals("Exception thrown on Scheduler. Add `onError` handling.",
-            throwable.getMessage());
-        assertSame(oenie, throwable.getCause());
-
-        // Restore the original uncaught exception handler.
-        thread.setUncaughtExceptionHandler(originalHandler);
-    }
-
     @Test
     public void directScheduleOnceInputValidation() {
         try {

sample-app/src/main/java/io/reactivex/android/samples/MainActivity.java

@@ -19,7 +19,7 @@
 import android.util.Log;
 import android.view.View;
 import io.reactivex.Observable;
-import io.reactivex.ObservableConsumable;
+import io.reactivex.ObservableSource;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.observers.AsyncObserver;
 import io.reactivex.schedulers.Schedulers;
@@ -60,8 +60,8 @@ void onRunSchedulerExampleButtonClicked() {
     }
 
     static Observable<String> sampleObservable() {
-        return Observable.defer(new Callable<ObservableConsumable<? extends String>>() {
-          @Override public ObservableConsumable<? extends String> call() throws Exception {
+        return Observable.defer(new Callable<ObservableSource<? extends String>>() {
+          @Override public ObservableSource<? extends String> call() throws Exception {
                 // Do some long running operation
                 SystemClock.sleep(5000);
                 return Observable.just("one", "two", "three", "four", "five");