---

mziccard · mziccard · commit 0b33a68b3c9d · 2015-11-11T21:55:39.000+01:00
yaml --- r: 2445 b: refs/heads/update-datastore c: b28b307 h: refs/heads/master i: 2443: 11944b9
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: d0265406392a9c30f96903c5647874e82f92117b
+refs/heads/update-datastore: b28b3079539e2c1635da8a2e795055c05f2f5a07
 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-core/src/main/java/com/google/gcloud/ExceptionHandler.java b/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/ExceptionHandler.java
@@ -231,11 +231,11 @@ void verifyCaller(Callable<?> callable) {
     }
   }
 
-  public Set<Class<? extends Exception>> getRetriableExceptions() {
+  public Set<Class<? extends Exception>> retriableExceptions() {
     return retriableExceptions;
   }
 
-  public Set<Class<? extends Exception>> getNonRetriableExceptions() {
+  public Set<Class<? extends Exception>> nonRetriableExceptions() {
     return nonRetriableExceptions;
   }
 
@@ -262,7 +262,7 @@ boolean shouldRetry(Exception ex) {
   /**
    * Returns an instance which retry any checked exception and abort on any runtime exception.
    */
-  public static ExceptionHandler getDefaultInstance() {
+  public static ExceptionHandler defaultInstance() {
     return DEFAULT_INSTANCE;
   }
 
diff --git a/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/RetryHelper.java b/branches/update-datastore/gcloud-java-core/src/main/java/com/google/gcloud/RetryHelper.java
@@ -229,7 +229,7 @@ private static long getExponentialValue(long initialDelay, double backoffFactor,
 
   public static <V> V runWithRetries(Callable<V> callable) throws RetryHelperException {
     return runWithRetries(callable, RetryParams.defaultInstance(),
-        ExceptionHandler.getDefaultInstance());
+        ExceptionHandler.defaultInstance());
   }
 
   public static <V> V runWithRetries(Callable<V> callable, RetryParams params,
diff --git a/branches/update-datastore/gcloud-java-core/src/test/java/com/google/gcloud/ExceptionHandlerTest.java b/branches/update-datastore/gcloud-java-core/src/test/java/com/google/gcloud/ExceptionHandlerTest.java
@@ -82,7 +82,7 @@ public Object call() throws Error {
     }
 
     // using default exception handler (retry upon any non-runtime exceptions)
-    ExceptionHandler handler = ExceptionHandler.getDefaultInstance();
+    ExceptionHandler handler = ExceptionHandler.defaultInstance();
     assertValidCallable(new A(), handler);
     assertValidCallable(new B(), handler);
     assertValidCallable(new C(), handler);
diff --git a/branches/update-datastore/gcloud-java-core/src/test/java/com/google/gcloud/RetryHelperTest.java b/branches/update-datastore/gcloud-java-core/src/test/java/com/google/gcloud/RetryHelperTest.java
@@ -124,7 +124,7 @@ public void testTriesAtLeastMinTimes() {
         }
         return timesCalled;
       }
-    }, params, ExceptionHandler.getDefaultInstance());
+    }, params, ExceptionHandler.defaultInstance());
     assertEquals(timesToFail + 1, attempted);
     assertNull(RetryHelper.getContext());
   }

Original file line number	Diff line number	Diff line change
`@@ -231,11 +231,11 @@ void verifyCaller(Callable<?> callable) {`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`
`234`		`- public Set<Class<? extends Exception>> getRetriableExceptions() {`
	`234`	`+ public Set<Class<? extends Exception>> retriableExceptions() {`
`235`	`235`	`return retriableExceptions;`
`236`	`236`	`}`
`237`	`237`
`238`		`- public Set<Class<? extends Exception>> getNonRetriableExceptions() {`
	`238`	`+ public Set<Class<? extends Exception>> nonRetriableExceptions() {`
`239`	`239`	`return nonRetriableExceptions;`
`240`	`240`	`}`
`241`	`241`
`@@ -262,7 +262,7 @@ boolean shouldRetry(Exception ex) {`
`262`	`262`	`/**`
`263`	`263`	`* Returns an instance which retry any checked exception and abort on any runtime exception.`
`264`	`264`	`*/`
`265`		`- public static ExceptionHandler getDefaultInstance() {`
	`265`	`+ public static ExceptionHandler defaultInstance() {`
`266`	`266`	`return DEFAULT_INSTANCE;`
`267`	`267`	`}`
`268`	`268`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ private static long getExponentialValue(long initialDelay, double backoffFactor,`
`229`	`229`
`230`	`230`	`public static <V> V runWithRetries(Callable<V> callable) throws RetryHelperException {`
`231`	`231`	`return runWithRetries(callable, RetryParams.defaultInstance(),`
`232`		`- ExceptionHandler.getDefaultInstance());`
	`232`	`+ ExceptionHandler.defaultInstance());`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`public static <V> V runWithRetries(Callable<V> callable, RetryParams params,`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public Object call() throws Error {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`// using default exception handler (retry upon any non-runtime exceptions)`
`85`		`- ExceptionHandler handler = ExceptionHandler.getDefaultInstance();`
	`85`	`+ ExceptionHandler handler = ExceptionHandler.defaultInstance();`
`86`	`86`	`assertValidCallable(new A(), handler);`
`87`	`87`	`assertValidCallable(new B(), handler);`
`88`	`88`	`assertValidCallable(new C(), handler);`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public void testTriesAtLeastMinTimes() {`
`124`	`124`	`}`
`125`	`125`	`return timesCalled;`
`126`	`126`	`}`
`127`		`- }, params, ExceptionHandler.getDefaultInstance());`
	`127`	`+ }, params, ExceptionHandler.defaultInstance());`
`128`	`128`	`assertEquals(timesToFail + 1, attempted);`
`129`	`129`	`assertNull(RetryHelper.getContext());`
`130`	`130`	`}`