chore: fix formatting and tests

Author: olavloite

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

@@ -17,7 +17,6 @@
 package com.google.cloud.spanner;
 
 import static com.google.cloud.spanner.SpannerExceptionFactory.asSpannerException;
-import static com.google.cloud.spanner.SpannerExceptionFactory.newSpannerException;
 import static com.google.common.base.Preconditions.checkState;
 
 import com.google.api.core.InternalApi;

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

@@ -114,7 +114,10 @@ public ErrorCode getErrorCode() {
     return code;
   }
 
-  /** Returns the PostgreSQL SQLState error code that is encoded in this exception, or null if this {@link SpannerException} does not include a PostgreSQL error code. */
+  /**
+   * Returns the PostgreSQL SQLState error code that is encoded in this exception, or null if this
+   * {@link SpannerException} does not include a PostgreSQL error code.
+   */
   public String getPostgreSQLErrorCode() {
     ErrorDetails details = getErrorDetails();
     if (details == null || details.getErrorInfo() == null) {

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

@@ -297,7 +297,10 @@ private static ResourceInfo extractResourceInfo(Throwable cause) {
     return null;
   }
 
-  private static ErrorInfo extractErrorInfo(Throwable cause) {
+  private static ErrorInfo extractErrorInfo(Throwable cause, ApiException apiException) {
+    if (apiException != null && apiException.getErrorDetails() != null) {
+      return apiException.getErrorDetails().getErrorInfo();
+    }
     if (cause != null) {
       Metadata trailers = Status.trailersFromThrowable(cause);
       if (trailers != null) {
@@ -307,7 +310,11 @@ private static ErrorInfo extractErrorInfo(Throwable cause) {
     return null;
   }
 
-  static ErrorDetails extractErrorDetails(Throwable cause) {
+  static ErrorDetails extractErrorDetails(Throwable cause, ApiException apiException) {
+    if (apiException != null && apiException.getErrorDetails() != null) {
+      return apiException.getErrorDetails();
+    }
+
     Throwable prevCause = null;
     while (cause != null && cause != prevCause) {
       if (cause instanceof ApiException) {
@@ -356,7 +363,7 @@ static SpannerException newSpannerExceptionPreformatted(
       case ABORTED:
         return new AbortedException(token, message, cause, apiException, reqId);
       case RESOURCE_EXHAUSTED:
-        ErrorInfo info = extractErrorInfo(cause);
+        ErrorInfo info = extractErrorInfo(cause, apiException);
         if (info != null
             && info.getMetadataMap()
                 .containsKey(AdminRequestsPerMinuteExceededException.ADMIN_REQUESTS_LIMIT_KEY)
@@ -382,7 +389,7 @@ static SpannerException newSpannerExceptionPreformatted(
           }
         }
       case INVALID_ARGUMENT:
-        if (isTransactionMutationLimitException(cause)) {
+        if (isTransactionMutationLimitException(cause, apiException)) {
           return new TransactionMutationLimitExceededException(
               token, code, message, cause, apiException, reqId);
         }

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

@@ -43,7 +43,7 @@ static boolean isTransactionMutationLimitException(ErrorCode code, String messag
     return code == ErrorCode.INVALID_ARGUMENT && message != null && message.contains(ERROR_MESSAGE);
   }
 
-  static boolean isTransactionMutationLimitException(Throwable cause) {
+  static boolean isTransactionMutationLimitException(Throwable cause, ApiException apiException) {
     if (cause == null
         || cause.getMessage() == null
         || !cause.getMessage().contains(ERROR_MESSAGE)) {
@@ -53,7 +53,7 @@ static boolean isTransactionMutationLimitException(Throwable cause) {
     // was that the transaction mutation limit was exceeded. We use that here to identify the error,
     // as there is no other specific metadata in the error that identifies it (other than the error
     // message).
-    ErrorDetails errorDetails = extractErrorDetails(cause);
+    ErrorDetails errorDetails = extractErrorDetails(cause, apiException);
     if (errorDetails != null && errorDetails.getHelp() != null) {
       return errorDetails.getHelp().getLinksCount() == 1
           && errorDetails

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java

@@ -132,15 +132,21 @@ public void simple() {
 
   @Test
   public void badQuery() {
-    SpannerException exception = assertThrows(SpannerException.class, () -> execute(Statement.of("SELECT Apples AND Oranges"), Type.int64()));
+    SpannerException exception =
+        assertThrows(
+            SpannerException.class,
+            () -> execute(Statement.of("SELECT Apples AND Oranges"), Type.int64()));
     assertEquals(ErrorCode.INVALID_ARGUMENT, exception.getErrorCode());
     if (dialect.dialect == Dialect.POSTGRESQL) {
-      assertTrue(exception.getMessage(), exception.getMessage().contains("column \"apples\" does not exist"));
+      assertTrue(
+          exception.getMessage(),
+          exception.getMessage().contains("column \"apples\" does not exist"));
       // See https://www.postgresql.org/docs/current/errcodes-appendix.html
       // '42703' == undefined_column
       assertEquals("42703", exception.getPostgreSQLErrorCode());
     } else {
-      assertTrue(exception.getMessage(), exception.getMessage().contains("Unrecognized name: Apples"));
+      assertTrue(
+          exception.getMessage(), exception.getMessage().contains("Unrecognized name: Apples"));
     }
   }