---

mziccard · mziccard · commit cb97c072e6b0 · 2016-01-20T23:19:38.000+01:00
yaml --- r: 2709 b: refs/heads/update-datastore c: 67e5dfc h: refs/heads/master i: 2707: 00b1a13
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: acf260ce07f7fdd0729682d74c15c5c88abf7c84
+refs/heads/update-datastore: 67e5dfce1f7d6903fc75a67d472c85ebb900258e
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
 refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2
diff --git a/branches/update-datastore/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java b/branches/update-datastore/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
@@ -76,8 +76,8 @@ protected Set<Error> retryableErrors() {
    * @throws BigQueryException when {@code ex} was caused by a {@code BigQueryException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  public static BigQueryException translateAndThrow(RetryHelperException ex) {
-    BaseServiceException.translateAndThrow(ex);
+  static BaseServiceException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndPropagateIfPossible(ex);
     throw new BigQueryException(UNKNOWN_CODE, ex.getMessage());
   }
 }
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java b/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
@@ -184,14 +184,12 @@ protected static String message(IOException exception) {
     return exception.getMessage();
   }
 
-  protected static BaseServiceException translateAndThrow(
-      RetryHelper.RetryHelperException ex) {
+  protected static void translateAndPropagateIfPossible(RetryHelper.RetryHelperException ex) {
     if (ex.getCause() instanceof BaseServiceException) {
       throw (BaseServiceException) ex.getCause();
     }
     if (ex instanceof RetryHelper.RetryInterruptedException) {
       RetryHelper.RetryInterruptedException.propagate();
     }
-    return null;
   }
 }
diff --git a/branches/update-datastore/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java b/branches/update-datastore/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java
@@ -137,14 +137,12 @@ public void testBaseServiceException() {
   @Test
   public void testTranslateAndThrow() throws Exception {
     BaseServiceException cause = new BaseServiceException(CODE, MESSAGE, REASON, IDEMPOTENT);
-    RetryHelper.RetryHelperException exceptionMock = createMock(RetryHelper.RetryHelperException.class);
+    RetryHelper.RetryHelperException exceptionMock =
+        createMock(RetryHelper.RetryHelperException.class);
     expect(exceptionMock.getCause()).andReturn(cause).times(2);
     replay(exceptionMock);
     try {
-      BaseServiceException ex = BaseServiceException.translateAndThrow(exceptionMock);
-      if (ex != null) {
-        throw ex;
-      }
+      BaseServiceException.translateAndPropagateIfPossible(exceptionMock);
     } catch (BaseServiceException ex) {
       assertEquals(CODE, ex.code());
       assertEquals(MESSAGE, ex.getMessage());
diff --git a/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java b/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
@@ -63,8 +63,8 @@ protected Set<Error> retryableErrors() {
    * @throws DatastoreException when {@code ex} was caused by a {@code DatastoreException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  public static DatastoreException translateAndThrow(RetryHelperException ex) {
-    BaseServiceException.translateAndThrow(ex);
+  static DatastoreException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndPropagateIfPossible(ex);
     throw new DatastoreException(UNKNOWN_CODE, ex.getMessage(), null);
   }
 
diff --git a/branches/update-datastore/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java b/branches/update-datastore/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerException.java
@@ -68,8 +68,8 @@ protected Set<Error> retryableErrors() {
    * ResourceManagerException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  public static ResourceManagerException translateAndThrow(RetryHelperException ex) {
-    BaseServiceException.translateAndThrow(ex);
+  static ResourceManagerException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndPropagateIfPossible(ex);
     throw new ResourceManagerException(UNKNOWN_CODE, ex.getMessage());
   }
 }
diff --git a/branches/update-datastore/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java b/branches/update-datastore/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
@@ -69,8 +69,8 @@ protected Set<Error> retryableErrors() {
    * @throws StorageException when {@code ex} was caused by a {@code StorageException}
    * @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}
    */
-  public static StorageException translateAndThrow(RetryHelperException ex) {
-    BaseServiceException.translateAndThrow(ex);
+  static StorageException translateAndThrow(RetryHelperException ex) {
+    BaseServiceException.translateAndPropagateIfPossible(ex);
     throw new StorageException(UNKNOWN_CODE, ex.getMessage());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ protected Set<Error> retryableErrors() {`
`76`	`76`	`* @throws BigQueryException when {@code ex} was caused by a {@code BigQueryException}`
`77`	`77`	`* @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}`
`78`	`78`	`*/`
`79`		`- public static BigQueryException translateAndThrow(RetryHelperException ex) {`
`80`		`- BaseServiceException.translateAndThrow(ex);`
	`79`	`+ static BaseServiceException translateAndThrow(RetryHelperException ex) {`
	`80`	`+ BaseServiceException.translateAndPropagateIfPossible(ex);`
`81`	`81`	`throw new BigQueryException(UNKNOWN_CODE, ex.getMessage());`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,14 +184,12 @@ protected static String message(IOException exception) {`
`184`	`184`	`return exception.getMessage();`
`185`	`185`	`}`
`186`	`186`
`187`		`- protected static BaseServiceException translateAndThrow(`
`188`		`- RetryHelper.RetryHelperException ex) {`
	`187`	`+ protected static void translateAndPropagateIfPossible(RetryHelper.RetryHelperException ex) {`
`189`	`188`	`if (ex.getCause() instanceof BaseServiceException) {`
`190`	`189`	`throw (BaseServiceException) ex.getCause();`
`191`	`190`	`}`
`192`	`191`	`if (ex instanceof RetryHelper.RetryInterruptedException) {`
`193`	`192`	`RetryHelper.RetryInterruptedException.propagate();`
`194`	`193`	`}`
`195`		`- return null;`
`196`	`194`	`}`
`197`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ protected Set<Error> retryableErrors() {`
`68`	`68`	`* ResourceManagerException}`
`69`	`69`	`* @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}`
`70`	`70`	`*/`
`71`		`- public static ResourceManagerException translateAndThrow(RetryHelperException ex) {`
`72`		`- BaseServiceException.translateAndThrow(ex);`
	`71`	`+ static ResourceManagerException translateAndThrow(RetryHelperException ex) {`
	`72`	`+ BaseServiceException.translateAndPropagateIfPossible(ex);`
`73`	`73`	`throw new ResourceManagerException(UNKNOWN_CODE, ex.getMessage());`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ protected Set<Error> retryableErrors() {`
`69`	`69`	`* @throws StorageException when {@code ex} was caused by a {@code StorageException}`
`70`	`70`	`* @throws RetryInterruptedException when {@code ex} is a {@code RetryInterruptedException}`
`71`	`71`	`*/`
`72`		`- public static StorageException translateAndThrow(RetryHelperException ex) {`
`73`		`- BaseServiceException.translateAndThrow(ex);`
	`72`	`+ static StorageException translateAndThrow(RetryHelperException ex) {`
	`73`	`+ BaseServiceException.translateAndPropagateIfPossible(ex);`
`74`	`74`	`throw new StorageException(UNKNOWN_CODE, ex.getMessage());`
`75`	`75`	`}`
`76`	`76`	`}`