Refactor OnErrorResumeNextViaFunction to Operator

Author: benjchristensen

rxjava-core/src/main/java/rx/Observable.java

@@ -79,7 +79,7 @@
 import rx.operators.OperationMergeMaxConcurrent;
 import rx.operators.OperationMinMax;
 import rx.operators.OperationMulticast;
-import rx.operators.OperationOnErrorResumeNextViaFunction;
+import rx.operators.OperatorOnErrorResumeNextViaFunction;
 import rx.operators.OperationOnErrorResumeNextViaObservable;
 import rx.operators.OperationOnErrorReturn;
 import rx.operators.OperationOnExceptionResumeNextViaObservable;
@@ -5209,7 +5209,7 @@ public final Boolean call(T t) {
      * @see <a href="https://github.com/Netflix/RxJava/wiki/Error-Handling-Operators#wiki-onerrorresumenext">RxJava Wiki: onErrorResumeNext()</a>
      */
     public final Observable<T> onErrorResumeNext(final Func1<Throwable, ? extends Observable<? extends T>> resumeFunction) {
-        return create(OperationOnErrorResumeNextViaFunction.onErrorResumeNextViaFunction(this, resumeFunction));
+        return create(OperatorOnErrorResumeNextViaFunction.onErrorResumeNextViaFunction(this, resumeFunction));
     }
 
     /**

rxjava-core/src/main/java/rx/operators/OperationOnErrorResumeNextViaFunction.java renamed to rxjava-core/src/main/java/rx/operators/OperatorOnErrorResumeNextViaFunction.java

@@ -20,7 +20,9 @@
 
 import rx.Observable;
 import rx.Observable.OnSubscribeFunc;
+import rx.Observable.Operator;
 import rx.Observer;
+import rx.Subscriber;
 import rx.Subscription;
 import rx.exceptions.CompositeException;
 import rx.functions.Action0;
@@ -46,10 +48,18 @@
  * You can use this to prevent errors from propagating or to supply fallback data should errors be
  * encountered.
  */
-public final class OperationOnErrorResumeNextViaFunction<T> {
+public final class OperatorOnErrorResumeNextViaFunction<T> implements Operator<T, T> {
 
-    public static <T> OnSubscribeFunc<T> onErrorResumeNextViaFunction(Observable<? extends T> originalSequence, Func1<Throwable, ? extends Observable<? extends T>> resumeFunction) {
-        return new OnErrorResumeNextViaFunction<T>(originalSequence, resumeFunction);
+    private final Func1<Throwable, ? extends Observable<? extends T>> resumeFunction;
+    
+    OperatorOnErrorResumeNextViaFunction(Func1<Throwable, ? extends Observable<? extends T>> f) {
+        this.resumeFunction = f;
+    }
+    
+    @Override
+    public Subscriber<? super T> call(Subscriber<? super T> t1) {
+        // TODO Auto-generated method stub
+        return null;
     }
 
     private static class OnErrorResumeNextViaFunction<T> implements OnSubscribeFunc<T> {
@@ -116,4 +126,6 @@ public void call() {
             });
         }
     }
+
+
 }

rxjava-core/src/test/java/rx/operators/OperationOnErrorResumeNextViaFunctionTest.java renamed to rxjava-core/src/test/java/rx/operators/OperatorOnErrorResumeNextViaFunctionTest.java

@@ -18,7 +18,7 @@
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
-import static rx.operators.OperationOnErrorResumeNextViaFunction.*;
+import static rx.operators.OperatorOnErrorResumeNextViaFunction.*;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -31,7 +31,7 @@
 import rx.functions.Func1;
 import rx.subscriptions.Subscriptions;
 
-public class OperationOnErrorResumeNextViaFunctionTest {
+public class OperatorOnErrorResumeNextViaFunctionTest {
 
     @Test
     public void testResumeNextWithSynchronousExecution() {