Merge pull request googleapis#546 from mderka/exception-cause

ajkannan · ajkannan · commit b62017c855a5 · 2016-01-11T16:02:56.000-08:00
Fixed googleapis#478 - Make DatastoreException informative.
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DatastoreRpc.java
@@ -79,12 +79,12 @@ public int httpStatus() {
     private final int httpStatus;
     private final boolean retryable;
 
-    public DatastoreRpcException(Reason reason) {
-      this(reason.name(), reason.httpStatus, reason.retryable, reason.description);
+    public DatastoreRpcException(Reason reason, Throwable cause) {
+      this(reason.name(), reason.httpStatus, reason.retryable, reason.description, cause);
     }
 
-    public DatastoreRpcException(String reason, int httpStatus, boolean retryable, String message) {
-      super(message);
+    public DatastoreRpcException(String reason, int httpStatus, boolean retryable, String message, Throwable cause) {
+      super(message, cause);
       this.reason = reason;
       this.httpStatus = httpStatus;
       this.retryable = retryable;
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -124,15 +124,15 @@ private static DatastoreRpcException translate(DatastoreException exception) {
       reason = HTTP_STATUS_TO_REASON.get(exception.getCode());
     }
     if (reason != null) {
-      return new DatastoreRpcException(reason);
+      return new DatastoreRpcException(reason, exception);
     } else {
       boolean retryable = false;
       reasonStr = "Unknown";
       if (exception.getCause() instanceof SocketTimeoutException) {
         retryable = true;
         reasonStr = "Request timeout";
       }
-      return new DatastoreRpcException(reasonStr, exception.getCode(), retryable, message);
+      return new DatastoreRpcException(reasonStr, exception.getCode(), retryable, message, exception);
     }
   }
 
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
@@ -42,12 +42,15 @@ public void testDatastoreError() throws Exception {
 
   @Test
   public void testTranslateAndThrow() throws Exception {
+    DatastoreRpcException toTranslate = null; // should be preserved as a cause
     for (Reason reason : Reason.values()) {
       try {
-        DatastoreException.translateAndThrow(new DatastoreRpcException(reason));
+        toTranslate = new DatastoreRpcException(reason, null);
+        DatastoreException.translateAndThrow(toTranslate);
         fail("Exception expected");
       } catch (DatastoreException ex) {
         assertEquals(reason.name(), ex.datastoreError().name());
+        assertEquals(toTranslate, ex.getCause());
       }
     }
   }
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -734,7 +734,7 @@ public void testRetryableException() throws Exception {
     EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreOptions.class)))
         .andReturn(rpcMock);
     EasyMock.expect(rpcMock.lookup(requestPb))
-        .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.UNAVAILABLE))
+        .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.UNAVAILABLE, null))
         .andReturn(responsePb);
     EasyMock.replay(rpcFactoryMock, rpcMock);
     DatastoreOptions options = this.options.toBuilder()
@@ -756,7 +756,7 @@ public void testNonRetryableException() throws Exception {
     EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreOptions.class)))
         .andReturn(rpcMock);
     EasyMock.expect(rpcMock.lookup(requestPb))
-        .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.PERMISSION_DENIED))
+        .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.PERMISSION_DENIED, null))
         .times(1);
     EasyMock.replay(rpcFactoryMock, rpcMock);
     RetryParams retryParams = RetryParams.builder().retryMinAttempts(2).build();

Original file line number	Diff line number	Diff line change
`@@ -124,15 +124,15 @@ private static DatastoreRpcException translate(DatastoreException exception) {`
`124`	`124`	`reason = HTTP_STATUS_TO_REASON.get(exception.getCode());`
`125`	`125`	`}`
`126`	`126`	`if (reason != null) {`
`127`		`- return new DatastoreRpcException(reason);`
	`127`	`+ return new DatastoreRpcException(reason, exception);`
`128`	`128`	`} else {`
`129`	`129`	`boolean retryable = false;`
`130`	`130`	`reasonStr = "Unknown";`
`131`	`131`	`if (exception.getCause() instanceof SocketTimeoutException) {`
`132`	`132`	`retryable = true;`
`133`	`133`	`reasonStr = "Request timeout";`
`134`	`134`	`}`
`135`		`- return new DatastoreRpcException(reasonStr, exception.getCode(), retryable, message);`
	`135`	`+ return new DatastoreRpcException(reasonStr, exception.getCode(), retryable, message, exception);`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,15 @@ public void testDatastoreError() throws Exception {`
`42`	`42`
`43`	`43`	`@Test`
`44`	`44`	`public void testTranslateAndThrow() throws Exception {`
	`45`	`+ DatastoreRpcException toTranslate = null; // should be preserved as a cause`
`45`	`46`	`for (Reason reason : Reason.values()) {`
`46`	`47`	`try {`
`47`		`- DatastoreException.translateAndThrow(new DatastoreRpcException(reason));`
	`48`	`+ toTranslate = new DatastoreRpcException(reason, null);`
	`49`	`+ DatastoreException.translateAndThrow(toTranslate);`
`48`	`50`	`fail("Exception expected");`
`49`	`51`	`} catch (DatastoreException ex) {`
`50`	`52`	`assertEquals(reason.name(), ex.datastoreError().name());`
	`53`	`+ assertEquals(toTranslate, ex.getCause());`
`51`	`54`	`}`
`52`	`55`	`}`
`53`	`56`	`}`