2.x: Reuse SingleDoOnEvent

src/main/java/io/reactivex/Single.java

@@ -1588,7 +1588,7 @@ public final Single<T> doOnSubscribe(final Consumer<? super Disposable> onSubscr
      */
     public final Single<T> doOnSuccess(final Consumer<? super T> onSuccess) {
         ObjectHelper.requireNonNull(onSuccess, "onSuccess is null");
-        return RxJavaPlugins.onAssembly(new SingleDoOnSuccess<T>(this, onSuccess));
+        return RxJavaPlugins.onAssembly(new SingleDoOnEvent<T>(this, onSuccess, Functions.emptyConsumer()));
     }
 
     /**
@@ -1604,7 +1604,17 @@ public final Single<T> doOnSuccess(final Consumer<? super T> onSuccess) {
      */
     public final Single<T> doOnEvent(final BiConsumer<? super T, ? super Throwable> onEvent) {
         ObjectHelper.requireNonNull(onEvent, "onEvent is null");
-        return RxJavaPlugins.onAssembly(new SingleDoOnEvent<T>(this, onEvent));
+        return RxJavaPlugins.onAssembly(new SingleDoOnEvent<T>(this, new Consumer<T>() {
+            @Override
+            public void accept(final T t) throws Exception {
+                onEvent.accept(t, null);
+            }
+        }, new Consumer<Throwable>() {
+            @Override
+            public void accept(final Throwable throwable) throws Exception {
+                onEvent.accept(null, throwable);
+            }
+        }));
     }
 
     /**
@@ -1620,7 +1630,7 @@ public final Single<T> doOnEvent(final BiConsumer<? super T, ? super Throwable>
      */
     public final Single<T> doOnError(final Consumer<? super Throwable> onError) {
         ObjectHelper.requireNonNull(onError, "onError is null");
-        return RxJavaPlugins.onAssembly(new SingleDoOnError<T>(this, onError));
+        return RxJavaPlugins.onAssembly(new SingleDoOnEvent<T>(this, Functions.emptyConsumer(), onError));
     }
 
     /**

src/main/java/io/reactivex/internal/operators/single/SingleDoOnEvent.java

@@ -19,16 +19,18 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.exceptions.CompositeException;
 import io.reactivex.exceptions.Exceptions;
-import io.reactivex.functions.BiConsumer;
+import io.reactivex.functions.Consumer;
 
 public final class SingleDoOnEvent<T> extends Single<T> {
     final SingleSource<T> source;
 
-    final BiConsumer<? super T, ? super Throwable> onEvent;
+    final Consumer<? super T> onSuccess;
+    final Consumer<? super Throwable> onError;
 
-    public SingleDoOnEvent(SingleSource<T> source, BiConsumer<? super T, ? super Throwable> onEvent) {
+    public SingleDoOnEvent(final SingleSource<T> source, final Consumer<? super T> onSuccess, final Consumer<? super Throwable> onError) {
         this.source = source;
-        this.onEvent = onEvent;
+        this.onSuccess = onSuccess;
+        this.onError = onError;
     }
 
     @Override
@@ -43,7 +45,7 @@ public void onSubscribe(Disposable d) {
             @Override
             public void onSuccess(T value) {
                 try {
-                    onEvent.accept(value, null);
+                    onSuccess.accept(value);
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     s.onError(ex);
@@ -56,7 +58,7 @@ public void onSuccess(T value) {
             @Override
             public void onError(Throwable e) {
                 try {
-                    onEvent.accept(null, e);
+                    onError.accept(e);
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     e = new CompositeException(ex, e);