Keep original exception class and message as a message for the Enhanced Expection

Author: akaita

rxjava2debug/src/main/java/com/akaita/java/rxjava2debug/ExceptionUtils.java

@@ -17,7 +17,6 @@
 package com.akaita.java.rxjava2debug;
 
 import io.reactivex.annotations.NonNull;
-import io.reactivex.annotations.Nullable;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -27,7 +26,7 @@ class ExceptionUtils {
     static Throwable setRootCause(@NonNull Throwable throwable, @NonNull Throwable rootCause) {
         List<Throwable> causes = listCauses(throwable);
         causes.add(rootCause);
-        return collapseCauses(causes);
+        return reverseAndCollapseCauses(causes);
     }
 
     @NonNull
@@ -42,14 +41,22 @@ private static List<Throwable> listCauses(@NonNull Throwable throwable) {
     }
 
     @NonNull
-    private static Throwable collapseCauses(@NonNull List<Throwable> causes) {
+    private static Throwable reverseAndCollapseCauses(@NonNull List<Throwable> causes) {
         if (causes.size() == 0) {
             return new RuntimeException("Empty list of causes");
         }
 
+        String originalEnhancedMessage = causes.get(causes.size() - 1).getLocalizedMessage();
+        String topMessage = "caused by " + originalEnhancedMessage;
+
         Throwable topThrowable = null;
         for (int i = causes.size() - 1; i >= 0; i--) {
-            topThrowable = new Throwable(causes.get(i).getMessage(), topThrowable);
+            if (i > 0) {
+                topThrowable = new Throwable(causes.get(i).getMessage(), topThrowable);
+            } else {
+                topThrowable = new Throwable(topMessage, topThrowable);
+            }
+
             if (causes.get(i).getStackTrace() != null) {
                 // This array should never be null, if everybody follows the Java spec
                 // Sometimes this part of the spec is not followed, so we better protect ourselves

rxjava2debug/src/main/java/com/akaita/java/rxjava2debug/RxJava2Debug.java

@@ -70,7 +70,9 @@ public static Throwable getEnhancedStackTrace(@NonNull Throwable original) {
         RxJavaAssemblyException assembledException = RxJavaAssemblyException.find(original);
         if (assembledException != null) {
             StackTraceElement[] clearStack = parseStackTrace(assembledException, basePackages);
-            Throwable clearException = new Throwable();
+            String enhancedMessage = original.toString();
+
+            Throwable clearException = new Throwable(enhancedMessage);
             clearException.setStackTrace(clearStack);
             enhanced = setRootCause(original, clearException);
         }