Chain cause exception to service exception in translateAndThrow

googleapis · Apr 20, 2016 · 7847bea · 7847bea
1 parent e213176
commit 7847bea
Show file tree

Hide file tree

Showing 10 changed files with 181 additions and 19 deletions.
diff --git a/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java b/gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java
@@ -44,7 +44,12 @@ public class BigQueryException extends BaseServiceException {
   private final BigQueryError error;
 
   public BigQueryException(int code, String message) {
-    this(code, message, null);
+    this(code, message, (Throwable) null);
+  }
+
+  private BigQueryException(int code, String message, Throwable cause) {
+    super(code, message, null, true, cause);
+    this.error = null;
   }
 
   public BigQueryException(int code, String message, BigQueryError error) {
@@ -100,6 +105,6 @@ public int hashCode() {
    */
   static BaseServiceException translateAndThrow(RetryHelperException ex) {
     BaseServiceException.translateAndPropagateIfPossible(ex);
-    throw new BigQueryException(UNKNOWN_CODE, ex.getMessage());
+    throw new BigQueryException(UNKNOWN_CODE, ex.getMessage(), ex.getCause());
   }
 }
diff --git a/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryExceptionTest.java b/gcloud-java-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryExceptionTest.java
@@ -97,7 +97,7 @@ public void testBigqueryException() {
 
   @Test
   public void testTranslateAndThrow() throws Exception {
-    BigQueryException cause = new BigQueryException(503, "message");
+    Exception cause = new BigQueryException(503, "message");
     RetryHelperException exceptionMock = createMock(RetryHelperException.class);
     expect(exceptionMock.getCause()).andReturn(cause).times(2);
     replay(exceptionMock);
@@ -111,5 +111,21 @@ public void testTranslateAndThrow() throws Exception {
     } finally {
       verify(exceptionMock);
     }
+    cause = new IllegalArgumentException("message");
+    exceptionMock = createMock(RetryHelperException.class);
+    expect(exceptionMock.getMessage()).andReturn("message").times(1);
+    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    replay(exceptionMock);
+    try {
+      BigQueryException.translateAndThrow(exceptionMock);
+    } catch (BaseServiceException ex) {
+      assertEquals(BigQueryException.UNKNOWN_CODE, ex.code());
+      assertEquals("message", ex.getMessage());
+      assertFalse(ex.retryable());
+      assertTrue(ex.idempotent());
+      assertEquals(cause, ex.getCause());
+    } finally {
+      verify(exceptionMock);
+    }
   }
 }
diff --git a/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java b/gcloud-java-datastore/src/main/java/com/google/cloud/datastore/DatastoreException.java
@@ -37,12 +37,12 @@ public class DatastoreException extends BaseServiceException {
       new Error(10, "ABORTED"), new Error(4, "DEADLINE_EXCEEDED"), new Error(14, "UNAVAILABLE"));
   private static final long serialVersionUID = 2663750991205874435L;
 
-  public DatastoreException(int code, String message, String reason, Throwable cause) {
-    super(code, message, reason, true, cause);
+  public DatastoreException(int code, String message, String reason) {
+    this(code, message, reason, null);
   }
 
-  public DatastoreException(int code, String message, String reason) {
-    super(code, message, reason, true);
+  public DatastoreException(int code, String message, String reason, Throwable cause) {
+    super(code, message, reason, true, cause);
   }
 
   public DatastoreException(IOException exception) {
@@ -63,7 +63,7 @@ protected Set<Error> retryableErrors() {
    */
   static DatastoreException translateAndThrow(RetryHelperException ex) {
     BaseServiceException.translateAndPropagateIfPossible(ex);
-    throw new DatastoreException(UNKNOWN_CODE, ex.getMessage(), null);
+    throw new DatastoreException(UNKNOWN_CODE, ex.getMessage(), null, ex.getCause());
   }
 
   /**

diff --git a/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java b/gcloud-java-datastore/src/test/java/com/google/cloud/datastore/DatastoreExceptionTest.java
@@ -72,12 +72,11 @@ public void testDatastoreException() throws Exception {
     assertNull(exception.getMessage());
     assertTrue(exception.retryable());
     assertTrue(exception.idempotent());
-
   }
 
   @Test
   public void testTranslateAndThrow() throws Exception {
-    DatastoreException cause = new DatastoreException(14, "message", "UNAVAILABLE");
+    Exception cause = new DatastoreException(14, "message", "UNAVAILABLE");
     RetryHelper.RetryHelperException exceptionMock =
         createMock(RetryHelper.RetryHelperException.class);
     expect(exceptionMock.getCause()).andReturn(cause).times(2);
@@ -92,6 +91,22 @@ public void testTranslateAndThrow() throws Exception {
     } finally {
       verify(exceptionMock);
     }
+    cause = new IllegalArgumentException("message");
+    exceptionMock = createMock(RetryHelper.RetryHelperException.class);
+    expect(exceptionMock.getMessage()).andReturn("message").times(1);
+    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    replay(exceptionMock);
+    try {
+      DatastoreException.translateAndThrow(exceptionMock);
+    } catch (BaseServiceException ex) {
+      assertEquals(DatastoreException.UNKNOWN_CODE, ex.code());
+      assertEquals("message", ex.getMessage());
+      assertFalse(ex.retryable());
+      assertTrue(ex.idempotent());
+      assertEquals(cause, ex.getCause());
+    } finally {
+      verify(exceptionMock);
+    }
   }
 
   @Test

diff --git a/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsException.java b/gcloud-java-dns/src/main/java/com/google/cloud/dns/DnsException.java
@@ -48,8 +48,8 @@ public DnsException(GoogleJsonError error, boolean idempotent) {
     super(error, idempotent);
   }
 
-  private DnsException(int code, String message) {
-    super(code, message, null, true);
+  DnsException(int code, String message, Throwable cause) {
+    super(code, message, null, true, cause);
   }
 
   @Override
@@ -66,6 +66,6 @@ protected Set<Error> retryableErrors() {
    */
   static DnsException translateAndThrow(RetryHelperException ex) {
     BaseServiceException.translateAndPropagateIfPossible(ex);
-    throw new DnsException(UNKNOWN_CODE, ex.getMessage());
+    throw new DnsException(UNKNOWN_CODE, ex.getMessage(), ex.getCause());
   }
 }
diff --git a/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsExceptionTest.java b/gcloud-java-dns/src/test/java/com/google/cloud/dns/DnsExceptionTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.dns;
+
+import com.google.cloud.BaseServiceException;
+import com.google.cloud.RetryHelper.RetryHelperException;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class DnsExceptionTest {
+
+  @Test
+  public void testDnsException() throws Exception {
+    IOException cause = new SocketTimeoutException("message");
+    DnsException exception = new DnsException(cause, true);
+    assertEquals(DnsException.UNKNOWN_CODE, exception.code());
+    assertNull(exception.reason());
+    assertEquals("message", exception.getMessage());
+    assertEquals(cause, exception.getCause());
+    assertTrue(exception.retryable());
+    assertTrue(exception.idempotent());
+  }
+
+  @Test
+  public void testTranslateAndThrow() throws Exception {
+    IOException timeoutException = new SocketTimeoutException("message");
+    Exception cause = new DnsException(timeoutException, true);
+    RetryHelperException exceptionMock = createMock(RetryHelperException.class);
+    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    replay(exceptionMock);
+    try {
+      DnsException.translateAndThrow(exceptionMock);
+    } catch (BaseServiceException ex) {
+      assertEquals(DnsException.UNKNOWN_CODE, ex.code());
+      assertNull(ex.reason());
+      assertEquals("message", ex.getMessage());
+      assertEquals(timeoutException, ex.getCause());
+      assertTrue(ex.retryable());
+      assertTrue(ex.idempotent());
+    } finally {
+      verify(exceptionMock);
+    }
+    cause = new IllegalArgumentException("message");
+    exceptionMock = createMock(RetryHelperException.class);
+    expect(exceptionMock.getMessage()).andReturn("message").times(1);
+    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    replay(exceptionMock);
+    try {
+      DnsException.translateAndThrow(exceptionMock);
+    } catch (BaseServiceException ex) {
+      assertEquals(DnsException.UNKNOWN_CODE, ex.code());
+      assertEquals("message", ex.getMessage());
+      assertFalse(ex.retryable());
+      assertTrue(ex.idempotent());
+      assertEquals(cause, ex.getCause());
+    } finally {
+      verify(exceptionMock);
+    }
+  }
+}
diff --git a/...ourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java b/...ourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java
@@ -48,7 +48,11 @@ public class ResourceManagerException extends BaseServiceException {
   private static final long serialVersionUID = -9207194488966554136L;
 
   public ResourceManagerException(int code, String message) {
-    super(code, message, null, true);
+    this(code, message, null);
+  }
+
+  private ResourceManagerException(int code, String message, Throwable cause) {
+    super(code, message, null, true, cause);
   }
 
   public ResourceManagerException(IOException exception) {
@@ -70,6 +74,6 @@ protected Set<Error> retryableErrors() {
    */
   static ResourceManagerException translateAndThrow(RetryHelperException ex) {
     BaseServiceException.translateAndPropagateIfPossible(ex);
-    throw new ResourceManagerException(UNKNOWN_CODE, ex.getMessage());
+    throw new ResourceManagerException(UNKNOWN_CODE, ex.getMessage(), ex.getCause());
   }
 }
diff --git a/...emanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java b/...emanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerExceptionTest.java
@@ -76,7 +76,7 @@ public void testResourceManagerException() {
 
   @Test
   public void testTranslateAndThrow() throws Exception {
-    ResourceManagerException cause = new ResourceManagerException(503, "message");
+    Exception cause = new ResourceManagerException(503, "message");
     RetryHelperException exceptionMock = createMock(RetryHelperException.class);
     expect(exceptionMock.getCause()).andReturn(cause).times(2);
     replay(exceptionMock);
@@ -90,5 +90,21 @@ public void testTranslateAndThrow() throws Exception {
     } finally {
       verify(exceptionMock);
     }
+    cause = new IllegalArgumentException("message");
+    exceptionMock = createMock(RetryHelperException.class);
+    expect(exceptionMock.getMessage()).andReturn("message").times(1);
+    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    replay(exceptionMock);
+    try {
+      ResourceManagerException.translateAndThrow(exceptionMock);
+    } catch (BaseServiceException ex) {
+      assertEquals(ResourceManagerException.UNKNOWN_CODE, ex.code());
+      assertEquals("message", ex.getMessage());
+      assertFalse(ex.retryable());
+      assertTrue(ex.idempotent());
+      assertEquals(cause, ex.getCause());
+    } finally {
+      verify(exceptionMock);
+    }
   }
 }
diff --git a/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageException.java b/gcloud-java-storage/src/main/java/com/google/cloud/storage/StorageException.java
@@ -46,7 +46,11 @@ public class StorageException extends BaseServiceException {
   private static final long serialVersionUID = -4168430271327813063L;
 
   public StorageException(int code, String message) {
-    super(code, message, null, true);
+    this(code, message, null);
+  }
+
+  private StorageException(int code, String message, Throwable cause) {
+    super(code, message, null, true, cause);
   }
 
   public StorageException(IOException exception) {
@@ -71,6 +75,6 @@ protected Set<Error> retryableErrors() {
    */
   static StorageException translateAndThrow(RetryHelperException ex) {
     BaseServiceException.translateAndPropagateIfPossible(ex);
-    throw new StorageException(UNKNOWN_CODE, ex.getMessage());
+    throw new StorageException(UNKNOWN_CODE, ex.getMessage(), ex.getCause());
   }
 }
diff --git a/gcloud-java-storage/src/test/java/com/google/cloud/storage/StorageExceptionTest.java b/gcloud-java-storage/src/test/java/com/google/cloud/storage/StorageExceptionTest.java
@@ -107,7 +107,7 @@ public void testStorageException() {
 
   @Test
   public void testTranslateAndThrow() throws Exception {
-    StorageException cause = new StorageException(503, "message");
+    Exception cause = new StorageException(503, "message");
     RetryHelperException exceptionMock = createMock(RetryHelperException.class);
     expect(exceptionMock.getCause()).andReturn(cause).times(2);
     replay(exceptionMock);
@@ -121,5 +121,21 @@ public void testTranslateAndThrow() throws Exception {
     } finally {
       verify(exceptionMock);
     }
+    cause = new IllegalArgumentException("message");
+    exceptionMock = createMock(RetryHelperException.class);
+    expect(exceptionMock.getMessage()).andReturn("message").times(1);
+    expect(exceptionMock.getCause()).andReturn(cause).times(2);
+    replay(exceptionMock);
+    try {
+      StorageException.translateAndThrow(exceptionMock);
+    } catch (BaseServiceException ex) {
+      assertEquals(StorageException.UNKNOWN_CODE, ex.code());
+      assertEquals("message", ex.getMessage());
+      assertFalse(ex.retryable());
+      assertTrue(ex.idempotent());
+      assertEquals(cause, ex.getCause());
+    } finally {
+      verify(exceptionMock);
+    }
   }
 }