Reconcile RetrySettings & Clock (google-cloud-java part) (#1738)

Reconcile RetrySettings & Clock (google-cloud-java part)

Reconcile RetrySettings in GAX with RetryParams in google-cloud-java
googleapis/google-cloud-java#1574
Reconcile NanoClock in GAX with Clock in google-cloud-java
googleapis/google-cloud-java#1575

google-cloud-core/src/main/java/com/google/cloud/BaseServiceException.java

@@ -295,12 +295,9 @@ private static String message(IOException exception) {
     return exception.getMessage();
   }
 
-  protected static void translateAndPropagateIfPossible(RetryHelper.RetryHelperException ex) {
+  protected static void translate(RetryHelper.RetryHelperException ex) {
     if (ex.getCause() instanceof BaseServiceException) {
       throw (BaseServiceException) ex.getCause();
     }
-    if (ex instanceof RetryHelper.RetryInterruptedException) {
-      RetryHelper.RetryInterruptedException.propagate();
-    }
   }
 }

google-cloud-core/src/main/java/com/google/cloud/ExceptionHandler.java

@@ -18,6 +18,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.gax.retrying.ExceptionRetryAlgorithm;
+import com.google.api.gax.retrying.TimedAttemptSettings;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -31,9 +33,9 @@
 import java.util.concurrent.Callable;
 
 /**
- * Exception handling used by {@link RetryHelper}.
+ * Exception retry algorithm implementation used by {@link RetryHelper}.
  */
-public final class ExceptionHandler implements Serializable {
+public final class ExceptionHandler implements ExceptionRetryAlgorithm, Serializable {
 
   private static final long serialVersionUID = -2460707015779532919L;
 
@@ -233,17 +235,12 @@ void verifyCaller(Callable<?> callable) {
     }
   }
 
-
-  public Set<Class<? extends Exception>> getRetriableExceptions() {
-    return retriableExceptions;
-  }
-
-
-  public Set<Class<? extends Exception>> getNonRetriableExceptions() {
-    return nonRetriableExceptions;
-  }
-
-  boolean shouldRetry(Exception ex) {
+  @Override
+  public boolean accept(Throwable prevThrowable) {
+    if(!(prevThrowable instanceof Exception)) {
+      return false;
+    }
+    Exception ex = (Exception) prevThrowable;
     for (Interceptor interceptor : interceptors) {
       Interceptor.RetryResult retryResult = checkNotNull(interceptor.beforeEval(ex));
       if (retryResult != Interceptor.RetryResult.CONTINUE_EVALUATION) {
@@ -263,6 +260,14 @@ boolean shouldRetry(Exception ex) {
     return retryResult == Interceptor.RetryResult.RETRY;
   }
 
+  @Override
+  public TimedAttemptSettings createNextAttempt(Throwable prevThrowable,
+      TimedAttemptSettings prevSettings) {
+    // Return null to indicate that this implementaiton does not provide any specific attempt
+    // settings, so by default the TimedRetryAlgorithm options can be used instead.
+    return null;
+  }
+
   @Override
   public int hashCode() {
     return Objects.hash(interceptors, retriableExceptions, nonRetriableExceptions, retryInfo);

google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java

@@ -36,7 +36,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import org.joda.time.Duration;
 
 /**
  * Class representing service options for those services that use gRPC as the transport
@@ -206,18 +205,8 @@ public ExecutorFactory<ScheduledExecutorService> getExecutorFactory() {
   /**
    * Returns a builder for API call settings.
    */
-  public UnaryCallSettings.Builder getApiCallSettings(RetryParams retryParams) {
-    // todo(mziccard): specify timeout these settings:
-    // retryParams().retryMaxAttempts(), retryParams().retryMinAttempts()
-    final RetrySettings.Builder builder = RetrySettings.newBuilder()
-        .setTotalTimeout(Duration.millis(retryParams.getTotalRetryPeriodMillis()))
-        .setInitialRpcTimeout(Duration.millis(getInitialTimeout()))
-        .setRpcTimeoutMultiplier(getTimeoutMultiplier())
-        .setMaxRpcTimeout(Duration.millis(getMaxTimeout()))
-        .setInitialRetryDelay(Duration.millis(retryParams.getInitialRetryDelayMillis()))
-        .setRetryDelayMultiplier(retryParams.getRetryDelayBackoffFactor())
-        .setMaxRetryDelay(Duration.millis(retryParams.getMaxRetryDelayMillis()));
-    return UnaryCallSettings.newBuilder().setRetrySettingsBuilder(builder);
+  public UnaryCallSettings.Builder getApiCallSettings(RetrySettings retrySettings) {
+    return UnaryCallSettings.newBuilder().setRetrySettingsBuilder(retrySettings.toBuilder());
   }
 
   /**