---

yihanzhen · web-flow · commit d01dfdcab1cd · 2019-03-01T11:25:01.000-08:00
yaml --- r: 21629 b: refs/heads/autosynth-container c: 692a530 h: refs/heads/master i: 21627: 1005422
diff --git a/[refs] b/[refs]
@@ -112,7 +112,7 @@ refs/tags/v0.65.0: 10939381ffe0b8da32db4fe3087c86e3aa7f3e55
 refs/tags/v0.66.0: ed6a3f57cbdaa20339a1995f7d7d53b172a5b8ef
 refs/tags/v0.67.0: 30b56f02092efc6f3c3667650ea8b8825003e0b7
 refs/heads/autosynth-compute: 026cea73fde22ec0b40866ac5a7dc144dc465b9b
-refs/heads/autosynth-container: e0d4cdd7e6b914551b9afdabc240a01044bad7b0
+refs/heads/autosynth-container: 692a530970f114fd8b2a6976d79af41d4fc8e4dd
 refs/heads/autosynth-monitoring: 832528c131ac32b115fd7a369701d9e6e4ec62e5
 refs/heads/autosynth-pubsub: 7a327eaed5fb2a5d6c1691feb73c3e0194dd805e
 refs/heads/autosynth-video-intelligence: 53ca56e5d077bf67065b730f3fe621f40689fb4c
diff --git a/branches/autosynth-container/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java b/branches/autosynth-container/google-cloud-clients/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,28 @@ public static SpannerException propagateInterrupt(InterruptedException e) {
     return SpannerExceptionFactory.newSpannerException(ErrorCode.CANCELLED, "Interrupted", e);
   }
 
+  /**
+   * Transforms a {@code TimeoutException} to a {@code SpannerException}.
+   *
+   * <pre>
+   * <code>
+   * try {
+   *   Spanner spanner = SpannerOptions.getDefaultInstance();
+   *   spanner
+   *       .getDatabaseAdminClient()
+   *       .createDatabase("[INSTANCE_ID]", "[DATABASE_ID]", [STATEMENTS])
+   *       .get();
+   * } catch (TimeoutException e) {
+   *   propagateTimeout(e);
+   * }
+   * </code>
+   * </pre>
+   */
+  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 +95,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 +146,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:
