Skip to content

Commit 54521ca

Browse files
Regenerate spanner client
1 parent eb9fae5 commit 54521ca

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,9 @@ public String extractNextToken(ListDatabasesResponse payload) {
297297

298298
@Override
299299
public Iterable<Database> extractResources(ListDatabasesResponse payload) {
300-
return payload.getDatabasesList();
300+
return payload.getDatabasesList() != null
301+
? payload.getDatabasesList()
302+
: ImmutableList.<Database>of();
301303
}
302304
};
303305

google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,9 @@ public String extractNextToken(ListInstanceConfigsResponse payload) {
314314

315315
@Override
316316
public Iterable<InstanceConfig> extractResources(ListInstanceConfigsResponse payload) {
317-
return payload.getInstanceConfigsList();
317+
return payload.getInstanceConfigsList() != null
318+
? payload.getInstanceConfigsList()
319+
: ImmutableList.<InstanceConfig>of();
318320
}
319321
};
320322

@@ -348,7 +350,9 @@ public String extractNextToken(ListInstancesResponse payload) {
348350

349351
@Override
350352
public Iterable<Instance> extractResources(ListInstancesResponse payload) {
351-
return payload.getInstancesList();
353+
return payload.getInstancesList() != null
354+
? payload.getInstancesList()
355+
: ImmutableList.<Instance>of();
352356
}
353357
};
354358

google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,9 @@ public String extractNextToken(ListSessionsResponse payload) {
300300

301301
@Override
302302
public Iterable<Session> extractResources(ListSessionsResponse payload) {
303-
return payload.getSessionsList();
303+
return payload.getSessionsList() != null
304+
? payload.getSessionsList()
305+
: ImmutableList.<Session>of();
304306
}
305307
};
306308

@@ -380,6 +382,17 @@ public static class Builder extends StubSettings.Builder<SpannerStubSettings, Bu
380382
.setTotalTimeout(Duration.ofMillis(600000L))
381383
.build();
382384
definitions.put("default", settings);
385+
settings =
386+
RetrySettings.newBuilder()
387+
.setInitialRetryDelay(Duration.ofMillis(1000L))
388+
.setRetryDelayMultiplier(1.3)
389+
.setMaxRetryDelay(Duration.ofMillis(32000L))
390+
.setInitialRpcTimeout(Duration.ofMillis(120000L))
391+
.setRpcTimeoutMultiplier(1.0)
392+
.setMaxRpcTimeout(Duration.ofMillis(120000L))
393+
.setTotalTimeout(Duration.ofMillis(1200000L))
394+
.build();
395+
definitions.put("streaming", settings);
383396
settings =
384397
RetrySettings.newBuilder()
385398
.setInitialRetryDelay(Duration.ofMillis(1000L))
@@ -483,7 +496,7 @@ private static Builder initDefaults(Builder builder) {
483496
builder
484497
.executeStreamingSqlSettings()
485498
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
486-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
499+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("streaming"));
487500

488501
builder
489502
.readSettings()
@@ -493,7 +506,7 @@ private static Builder initDefaults(Builder builder) {
493506
builder
494507
.streamingReadSettings()
495508
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
496-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
509+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("streaming"));
497510

498511
builder
499512
.beginTransactionSettings()

0 commit comments

Comments
 (0)