port changes in google3 out

googleapis · Feb 28, 2019 · e094636 · e094636
1 parent f5fae7e
commit e094636
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/.../google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java b/.../google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java
@@ -18,6 +18,8 @@
 
 import static com.google.cloud.spanner.SpannerException.DoNotConstructDirectly;
 
+import com.google.api.gax.grpc.GrpcStatusCode;
+import com.google.api.gax.rpc.ApiException;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Predicate;
 import io.grpc.Context;
@@ -48,6 +50,11 @@ public static SpannerException propagateInterrupt(InterruptedException e) {
     return SpannerExceptionFactory.newSpannerException(ErrorCode.CANCELLED, "Interrupted", e);
   }
 
+  public static SpannerException propagateTimeout(TimeoutException e) {
+    return SpannerExceptionFactory.newSpannerException(
+        ErrorCode.DEADLINE_EXCEEDED, "Operation did not complete in the given time", e);
+  }
+
   /**
    * Creates a new exception based on {@code cause}.
    *
@@ -71,6 +78,8 @@ public static SpannerException newSpannerException(@Nullable Context context, Th
       return newSpannerExceptionPreformatted(e.getErrorCode(), e.getMessage(), e);
     } else if (cause instanceof CancellationException) {
       return newSpannerExceptionForCancellation(context, cause);
+    } else if (cause instanceof ApiException) {
+      return fromApiException((ApiException) cause);
     }
     // Extract gRPC status.  This will produce "UNKNOWN" for non-gRPC exceptions.
     Status status = Status.fromThrowable(cause);
@@ -120,6 +129,17 @@ private static SpannerException newSpannerExceptionPreformatted(
     }
   }
 
+  private static SpannerException fromApiException(ApiException exception) {
+    Status.Code code = ((GrpcStatusCode) exception.getStatusCode()).getTransportCode();
+    ErrorCode errorCode = ErrorCode.fromGrpcStatus(Status.fromCode(code));
+    if (exception.getCause() != null) {
+      return SpannerExceptionFactory.newSpannerException(
+          errorCode, exception.getMessage(), exception.getCause());
+    } else {
+      return SpannerExceptionFactory.newSpannerException(errorCode, exception.getMessage());
+    }
+  }
+
   private static boolean isRetryable(ErrorCode code, @Nullable Throwable cause) {
     switch (code) {
       case INTERNAL: