Add default retry strategy

Ajay Kannan · Ajay Kannan · commit 396a12497e25 · 2016-01-11T15:53:45.000-08:00
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryOptions.java
@@ -17,6 +17,7 @@
 package com.google.gcloud.bigquery;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.gcloud.RetryParams;
 import com.google.gcloud.ServiceOptions;
 import com.google.gcloud.spi.BigQueryRpc;
 import com.google.gcloud.spi.BigQueryRpcFactory;
@@ -104,8 +105,17 @@ public boolean equals(Object obj) {
     return baseEquals(other);
   }
 
+  /**
+   * Returns a default {@code BigQueryOptions} instance with the retry strategy defined by
+   * {@link RetryParams#defaultInstance}. To disable retries, supply {@link RetryParams#noRetries}
+   * to the {@code BigQueryOptions} builder, like so:
+   * <pre> {@code
+   * BigQueryOptions options =
+   *     BigQueryOptions.builder().retryParams(RetryParams.noRetries()).build();
+   * }
+   */
   public static BigQueryOptions defaultInstance() {
-    return builder().build();
+    return builder().retryParams(RetryParams.defaultInstance()).build();
   }
 
   public static Builder builder() {
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreOptions.java
@@ -23,6 +23,7 @@
 import com.google.api.services.datastore.DatastoreV1.LookupResponse;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.gcloud.RetryParams;
 import com.google.gcloud.ServiceOptions;
 import com.google.gcloud.spi.DatastoreRpc;
 import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException;
@@ -174,10 +175,16 @@ public String namespace() {
   }
 
   /**
-   * Returns a default {@code DatastoreOptions} instance.
+   * Returns a default {@code DatastoreOptions} instance with the retry strategy defined by
+   * {@link RetryParams#defaultInstance}. To disable retries, supply {@link RetryParams#noRetries}
+   * to the {@code DatastoreOptions} builder, like so:
+   * <pre> {@code
+   * DatastoreOptions options =
+   *     DatastoreOptions.builder().retryParams(RetryParams.noRetries()).build();
+   * }
    */
   public static DatastoreOptions defaultInstance() {
-    return builder().build();
+    return builder().retryParams(RetryParams.defaultInstance()).build();
   }
 
   private static String defaultNamespace() {
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
@@ -17,6 +17,7 @@
 package com.google.gcloud.resourcemanager;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.gcloud.RetryParams;
 import com.google.gcloud.ServiceOptions;
 import com.google.gcloud.spi.DefaultResourceManagerRpc;
 import com.google.gcloud.spi.ResourceManagerRpc;
@@ -42,10 +43,16 @@ public ResourceManager create(ResourceManagerOptions options) {
   }
 
   /**
-   * Returns a default {@code ResourceManagerOptions} instance.
+   * Returns a default {@code ResourceManagerOptions} instance with the retry strategy defined
+   * by {@link RetryParams#defaultInstance}. To disable retries, supply
+   * {@link RetryParams#noRetries} to the {@code ResourceManagerOptions} builder, like so:
+   * <pre> {@code
+   * ResourceManagerOptions options =
+   *     ResourceManagerOptions.builder().retryParams(RetryParams.noRetries()).build();
+   * }
    */
   public static ResourceManagerOptions defaultInstance() {
-    return builder().build();
+    return builder().retryParams(RetryParams.defaultInstance()).build();
   }
 
   public static class DefaultResourceManagerRpcFactory implements ResourceManagerRpcFactory {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageOptions.java
@@ -18,6 +18,7 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
+import com.google.gcloud.RetryParams;
 import com.google.gcloud.ServiceOptions;
 import com.google.gcloud.spi.DefaultStorageRpc;
 import com.google.gcloud.spi.StorageRpc;
@@ -114,10 +115,16 @@ public String pathDelimiter() {
   }
 
   /**
-   * Returns a default {@code StorageOptions} instance.
+   * Returns a default {@code StorageOptions} instance with the retry strategy defined by
+   * {@link RetryParams#defaultInstance}. To disable retries, supply {@link RetryParams#noRetries}
+   * to the {@code StorageOptions} builder, like so:
+   * <pre> {@code
+   * StorageOptions options =
+   *     StorageOptions.builder().retryParams(RetryParams.noRetries()).build();
+   * }
    */
   public static StorageOptions defaultInstance() {
-    return builder().build();
+    return builder().retryParams(RetryParams.defaultInstance()).build();
   }
 
   @SuppressWarnings("unchecked")
