More plugging in

Author: odeke-em

google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbortedException.java

@@ -35,16 +35,17 @@ public class AbortedException extends SpannerException {
   /** Private constructor. Use {@link SpannerExceptionFactory} to create instances. */
   AbortedException(
       DoNotConstructDirectly token, @Nullable String message, @Nullable Throwable cause) {
-    this(token, message, cause, null);
+    this(token, message, cause, null, null);
   }
 
   /** Private constructor. Use {@link SpannerExceptionFactory} to create instances. */
   AbortedException(
       DoNotConstructDirectly token,
       @Nullable String message,
       @Nullable Throwable cause,
-      @Nullable ApiException apiException) {
-    super(token, ErrorCode.ABORTED, IS_RETRYABLE, message, cause, apiException);
+      @Nullable ApiException apiException,
+      @Nullable XGoogSpannerRequestId reqId) {
+    super(token, ErrorCode.ABORTED, IS_RETRYABLE, message, cause, apiException, reqId);
   }
 
   /**

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java

@@ -62,14 +62,22 @@ public static SpannerException newSpannerException(ErrorCode code, @Nullable Str
   }
 
   public static SpannerException newSpannerException(
-      ErrorCode code, @Nullable String message, @Nullable XGoogSpannerRequestId reqId) {
+      ErrorCode code,
+      @Nullable String message,
+      @Nullable Throwable cause,
+      @Nullable XGoogSpannerRequestId reqId) {
     return newSpannerExceptionPreformatted(
-        code, formatMessage(code, message), (Throwable) (null), (ApiException) (null), reqId);
+        code, formatMessage(code, message), cause, (ApiException) (null), reqId);
+  }
+
+  public static SpannerException newSpannerException(
+      ErrorCode code, @Nullable String message, @Nullable XGoogSpannerRequestId reqId) {
+    return newSpannerException(code, message, (Throwable) (null), reqId);
   }
 
   public static SpannerException newSpannerException(
       ErrorCode code, @Nullable String message, @Nullable Throwable cause) {
-    return newSpannerExceptionPreformatted(code, formatMessage(code, message), cause, null, null);
+    return newSpannerException(code, message, cause, null);
   }
 
   public static SpannerException propagateInterrupt(InterruptedException e) {
@@ -121,9 +129,8 @@ public static SpannerException newSpannerException(Throwable cause) {
     return newSpannerException(null, cause, null);
   }
 
-  public static SpannerException newSpannerException(
-      Throwable cause, XGoogSpannerRequestId requestId) {
-    return newSpannerException(null, cause, requestId);
+  public static SpannerException newSpannerException(Throwable cause, XGoogSpannerRequestId reqId) {
+    return newSpannerException(null, cause, reqId);
   }
 
   public static SpannerBatchUpdateException newSpannerBatchUpdateException(
@@ -185,6 +192,10 @@ public static SpannerBatchUpdateException newSpannerBatchUpdateException(
         cause);
   }
 
+  public static SpannerException newSpannerException(@Nullable Context context, Throwable cause) {
+    return newSpannerException(context, cause, null);
+  }
+
   /**
    * Creates a new exception based on {@code cause}. If {@code cause} indicates cancellation, {@code
    * context} will be inspected to establish the type of cancellation.
@@ -230,6 +241,11 @@ static SpannerException newRetryOnDifferentGrpcChannelException(
     return new RetryOnDifferentGrpcChannelException(message, channel, cause);
   }
 
+  static SpannerException newSpannerExceptionForCancellation(
+      @Nullable Context context, @Nullable Throwable cause) {
+    return newSpannerExceptionForCancellation(context, cause, null);
+  }
+
   static SpannerException newSpannerExceptionForCancellation(
       @Nullable Context context, @Nullable Throwable cause, @Nullable XGoogSpannerRequestId reqId) {
     if (context != null && context.isCancelled()) {
@@ -247,7 +263,7 @@ static SpannerException newSpannerExceptionForCancellation(
       }
     }
     return newSpannerException(
-        ErrorCode.CANCELLED, cause == null ? "Cancelled" : cause.getMessage(), cause);
+        ErrorCode.CANCELLED, cause == null ? "Cancelled" : cause.getMessage(), cause, reqId);
   }
 
   private static String formatMessage(ErrorCode code, @Nullable String message) {
@@ -325,7 +341,7 @@ static SpannerException newSpannerExceptionPreformatted(
     DoNotConstructDirectly token = DoNotConstructDirectly.ALLOWED;
     switch (code) {
       case ABORTED:
-        return new AbortedException(token, message, cause, apiException);
+        return new AbortedException(token, message, cause, apiException, reqId);
       case RESOURCE_EXHAUSTED:
         ErrorInfo info = extractErrorInfo(cause);
         if (info != null