Skip to content

Commit 2d1e836

Browse files
author
Ajay Kannan
committed
Set default retry strategy
1 parent 5a23e57 commit 2d1e836

9 files changed

Lines changed: 13 additions & 8 deletions

File tree

‎gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ public void setUp() {
262262
options = BigQueryOptions.builder()
263263
.projectId(PROJECT)
264264
.serviceRpcFactory(rpcFactoryMock)
265+
.retryParams(RetryParams.noRetries())
265266
.build();
266267
}
267268

‎gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,8 @@ public B authCredentials(AuthCredentials authCredentials) {
264264

265265
/**
266266
* Sets configuration parameters for request retries. If no configuration is set
267-
* {@link RetryParams#noRetries()} is used.
267+
* {@link RetryParams#defaultInstance()} is used. To disable retries, supply
268+
* {@link RetryParams#noRetries()} here.
268269
*
269270
* @return the builder
270271
*/
@@ -325,7 +326,7 @@ protected ServiceOptions(Class<? extends ServiceFactory<ServiceT, OptionsT>> ser
325326
authCredentials =
326327
builder.authCredentials != null ? builder.authCredentials : defaultAuthCredentials();
327328
authCredentialsState = authCredentials != null ? authCredentials.capture() : null;
328-
retryParams = builder.retryParams;
329+
retryParams = firstNonNull(builder.retryParams, RetryParams.defaultInstance());
329330
serviceFactory = firstNonNull(builder.serviceFactory,
330331
getFromServiceLoader(serviceFactoryClass, defaultServiceFactory()));
331332
serviceFactoryClassName = serviceFactory.getClass().getName();

‎gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ public void setUp() {
125125
options = DatastoreOptions.builder()
126126
.projectId(PROJECT_ID)
127127
.host("http://localhost:" + PORT)
128+
.retryParams(RetryParams.noRetries())
128129
.build();
129130
datastore = options.service();
130131
StructuredQuery<Key> query = Query.keyQueryBuilder().build();

‎gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.google.gcloud.AuthCredentials;
2020
import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
21-
import com.google.gcloud.RetryParams;
2221
import com.google.gcloud.spi.StorageRpc.Tuple;
2322
import com.google.gcloud.storage.Blob;
2423
import com.google.gcloud.storage.BlobId;
@@ -549,8 +548,7 @@ public static void main(String... args) throws Exception {
549548
printUsage();
550549
return;
551550
}
552-
StorageOptions.Builder optionsBuilder =
553-
StorageOptions.builder().retryParams(RetryParams.defaultInstance());
551+
StorageOptions.Builder optionsBuilder = StorageOptions.builder();
554552
StorageAction action;
555553
String actionName;
556554
if (args.length >= 2 && !ACTIONS.containsKey(args[0])) {

‎gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import com.google.common.collect.ImmutableMap;
2727
import com.google.gcloud.Page;
28-
import com.google.gcloud.RetryParams;
2928
import com.google.gcloud.resourcemanager.ProjectInfo.ResourceId;
3029
import com.google.gcloud.resourcemanager.ResourceManager.ProjectField;
3130
import com.google.gcloud.resourcemanager.ResourceManager.ProjectGetOption;
@@ -271,7 +270,6 @@ public void testRetryableException() {
271270
EasyMock.replay(rpcFactoryMock);
272271
ResourceManager resourceManagerMock = ResourceManagerOptions.builder()
273272
.serviceRpcFactory(rpcFactoryMock)
274-
.retryParams(RetryParams.defaultInstance())
275273
.build()
276274
.service();
277275
EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.projectId(), EMPTY_RPC_OPTIONS))
@@ -291,7 +289,6 @@ public void testNonRetryableException() {
291289
EasyMock.replay(rpcFactoryMock);
292290
ResourceManager resourceManagerMock = ResourceManagerOptions.builder()
293291
.serviceRpcFactory(rpcFactoryMock)
294-
.retryParams(RetryParams.defaultInstance())
295292
.build()
296293
.service();
297294
EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.projectId(), EMPTY_RPC_OPTIONS))

‎gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobReadChannelImplTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import com.google.common.collect.ImmutableMap;
3030
import com.google.gcloud.RestorableState;
31+
import com.google.gcloud.RetryParams;
3132
import com.google.gcloud.spi.StorageRpc;
3233
import com.google.gcloud.spi.StorageRpcFactory;
3334

@@ -65,6 +66,7 @@ public void setUp() {
6566
options = StorageOptions.builder()
6667
.projectId("projectId")
6768
.serviceRpcFactory(rpcFactoryMock)
69+
.retryParams(RetryParams.noRetries())
6870
.build();
6971
}
7072

‎gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobWriteChannelImplTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
import com.google.common.collect.ImmutableMap;
3434
import com.google.gcloud.RestorableState;
35+
import com.google.gcloud.RetryParams;
3536
import com.google.gcloud.spi.StorageRpc;
3637
import com.google.gcloud.spi.StorageRpcFactory;
3738

@@ -74,6 +75,7 @@ public void setUp() {
7475
options = StorageOptions.builder()
7576
.projectId("projectid")
7677
.serviceRpcFactory(rpcFactoryMock)
78+
.retryParams(RetryParams.noRetries())
7779
.build();
7880
}
7981

‎gcloud-java-storage/src/test/java/com/google/gcloud/storage/CopyWriterTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import com.google.common.collect.ImmutableMap;
2828
import com.google.gcloud.RestorableState;
29+
import com.google.gcloud.RetryParams;
2930
import com.google.gcloud.spi.StorageRpc;
3031
import com.google.gcloud.spi.StorageRpc.RewriteRequest;
3132
import com.google.gcloud.spi.StorageRpc.RewriteResponse;
@@ -72,6 +73,7 @@ public void setUp() {
7273
options = StorageOptions.builder()
7374
.projectId("projectid")
7475
.serviceRpcFactory(rpcFactoryMock)
76+
.retryParams(RetryParams.noRetries())
7577
.build();
7678
}
7779

‎gcloud-java-storage/src/test/java/com/google/gcloud/storage/StorageImplTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ public void setUp() {
261261
.projectId("projectId")
262262
.clock(TIME_SOURCE)
263263
.serviceRpcFactory(rpcFactoryMock)
264+
.retryParams(RetryParams.noRetries())
264265
.build();
265266
}
266267

0 commit comments

Comments
 (0)