Refactor to more descriptive name: OnErrorThrowable.addValueAsLastCause

Author: benjchristensen

rxjava-core/src/main/java/rx/exceptions/OnErrorThrowable.java

@@ -51,7 +51,14 @@ public static OnErrorThrowable from(Throwable t) {
         }
     }
 
-    public static Throwable decorate(Throwable e, Object value) {
+    /**
+     * Adds the given value as the final cause of the given Throwable wrapped in OnNextValue RuntimeException..
+     * 
+     * @param e
+     * @param value
+     * @return Throwable e passed in
+     */
+    public static Throwable addValueAsLastCause(Throwable e, Object value) {
         Exceptions.addCause(e, new OnNextValue(value));
         return e;
     }

rxjava-core/src/main/java/rx/operators/OperatorCast.java

@@ -50,7 +50,7 @@ public void onNext(T t) {
                 try {
                     o.onNext(castClass.cast(t));
                 } catch (Throwable e) {
-                    onError(OnErrorThrowable.decorate(e, t));
+                    onError(OnErrorThrowable.addValueAsLastCause(e, t));
                 }
             }
         };

rxjava-core/src/main/java/rx/operators/OperatorDoOnEach.java

@@ -60,7 +60,7 @@ public void onNext(T value) {
                 try {
                     doOnEachObserver.onNext(value);
                 } catch (Throwable e) {
-                    onError(OnErrorThrowable.decorate(e, value));
+                    onError(OnErrorThrowable.addValueAsLastCause(e, value));
                     return;
                 }
                 observer.onNext(value);

rxjava-core/src/main/java/rx/operators/OperatorFilter.java

@@ -54,7 +54,7 @@ public void onNext(T t) {
                         child.onNext(t);
                     }
                 } catch (Throwable e) {
-                    child.onError(OnErrorThrowable.decorate(e, t));
+                    child.onError(OnErrorThrowable.addValueAsLastCause(e, t));
                 }
             }
 

rxjava-core/src/main/java/rx/operators/OperatorGroupBy.java

@@ -131,7 +131,7 @@ public void onNext(T t) {
                     // we have the correct group so send value to it
                     gps.onNext(t);
                 } catch (Throwable e) {
-                    onError(OnErrorThrowable.decorate(e, t));
+                    onError(OnErrorThrowable.addValueAsLastCause(e, t));
                 }
             }
 

rxjava-core/src/main/java/rx/operators/OperatorMap.java

@@ -53,7 +53,7 @@ public void onNext(T t) {
                 try {
                     o.onNext(transformer.call(t));
                 } catch (Throwable e) {
-                    onError(OnErrorThrowable.decorate(e, t));
+                    onError(OnErrorThrowable.addValueAsLastCause(e, t));
                 }
             }
 

rxjava-core/src/main/java/rx/operators/OperatorScan.java

@@ -97,7 +97,7 @@ public void onNext(T value) {
                     try {
                         this.value = accumulator.call(this.value, value);
                     } catch (Throwable e) {
-                        observer.onError(OnErrorThrowable.decorate(e, value));
+                        observer.onError(OnErrorThrowable.addValueAsLastCause(e, value));
                     }
                 }
                 observer.onNext(this.value);

rxjava-core/src/main/java/rx/operators/OperatorZip.java

@@ -194,7 +194,7 @@ void tick() {
                             // all have something so emit
                             observer.onNext(zipFunction.call(vs));
                         } catch (Throwable e) {
-                            observer.onError(OnErrorThrowable.decorate(e, vs));
+                            observer.onError(OnErrorThrowable.addValueAsLastCause(e, vs));
                             return;
                         }
                         // now remove them

rxjava-core/src/test/java/rx/operators/OperatorMapTest.java

@@ -165,7 +165,14 @@ public String call(String s) {
                 }
                 return s;
             }
-        }));
+        })).doOnError(new Action1<Throwable>() {
+
+            @Override
+            public void call(Throwable t1) {
+                t1.printStackTrace();
+            }
+            
+        });
 
         m.subscribe(stringObserver);
         verify(stringObserver, times(1)).onNext("one");