Skip to content

Commit 7dbff4a

Browse files
yoshi-automationsduskis
yoshi-automation
authored and
sduskis
committed
---
yaml --- r: 12345 b: refs/heads/autosynth-spanner c: 0d3bfaa h: refs/heads/master i: 12343: 543c863
1 parent c3fba02 commit 7dbff4a

5 files changed

Lines changed: 19 additions & 30 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ refs/heads/autosynth-os-login: daa910328b954bbe87068f684a3088ed910f1ddf
140140
refs/heads/autosynth-redis: 4c68cb0fbc599124e717ab3f24bd8a8a5d085ca9
141141
refs/heads/autosynth-scheduler: efd0edcd8fc21ccea9b4ffb0e0c4949ee04115aa
142142
refs/heads/autosynth-securitycenter: 80dc94847b954c97a641519177c98dc8e9e9fbe1
143-
refs/heads/autosynth-spanner: 54521ca9d598aa2a8778ee11d153da558a38834e
143+
refs/heads/autosynth-spanner: 0d3bfaa60ed4bbd01c3184f25004bfcce9552b0b
144144
refs/heads/autosynth-speech: 60c3d2d3d3ad49800884d6ef6eb4be1e09c0c020
145145
refs/heads/autosynth-tasks: 69be7c7aa2f85dd651c7ec2120d9227096fe11b0
146146
refs/heads/autosynth-texttospeech: 14a1e3455c7b78a9558ab1bb74934b3f7b705f11

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

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

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

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

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

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

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

351349
@Override
352350
public Iterable<Instance> extractResources(ListInstancesResponse payload) {
353-
return payload.getInstancesList() != null
354-
? payload.getInstancesList()
355-
: ImmutableList.<Instance>of();
351+
return payload.getInstancesList();
356352
}
357353
};
358354

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

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

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

@@ -382,17 +380,6 @@ public static class Builder extends StubSettings.Builder<SpannerStubSettings, Bu
382380
.setTotalTimeout(Duration.ofMillis(600000L))
383381
.build();
384382
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);
396383
settings =
397384
RetrySettings.newBuilder()
398385
.setInitialRetryDelay(Duration.ofMillis(1000L))
@@ -496,7 +483,7 @@ private static Builder initDefaults(Builder builder) {
496483
builder
497484
.executeStreamingSqlSettings()
498485
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
499-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("streaming"));
486+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
500487

501488
builder
502489
.readSettings()
@@ -506,7 +493,7 @@ private static Builder initDefaults(Builder builder) {
506493
builder
507494
.streamingReadSettings()
508495
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
509-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("streaming"));
496+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
510497

511498
builder
512499
.beginTransactionSettings()

‎branches/autosynth-spanner/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/stub/WebSecurityScannerStubSettings.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,9 @@ public String extractNextToken(ListScanConfigsResponse payload) {
319319

320320
@Override
321321
public Iterable<ScanConfig> extractResources(ListScanConfigsResponse payload) {
322-
return payload.getScanConfigsList();
322+
return payload.getScanConfigsList() != null
323+
? payload.getScanConfigsList()
324+
: ImmutableList.<ScanConfig>of();
323325
}
324326
};
325327

@@ -353,7 +355,9 @@ public String extractNextToken(ListScanRunsResponse payload) {
353355

354356
@Override
355357
public Iterable<ScanRun> extractResources(ListScanRunsResponse payload) {
356-
return payload.getScanRunsList();
358+
return payload.getScanRunsList() != null
359+
? payload.getScanRunsList()
360+
: ImmutableList.<ScanRun>of();
357361
}
358362
};
359363

@@ -390,7 +394,9 @@ public String extractNextToken(ListCrawledUrlsResponse payload) {
390394

391395
@Override
392396
public Iterable<CrawledUrl> extractResources(ListCrawledUrlsResponse payload) {
393-
return payload.getCrawledUrlsList();
397+
return payload.getCrawledUrlsList() != null
398+
? payload.getCrawledUrlsList()
399+
: ImmutableList.<CrawledUrl>of();
394400
}
395401
};
396402

@@ -424,7 +430,9 @@ public String extractNextToken(ListFindingsResponse payload) {
424430

425431
@Override
426432
public Iterable<Finding> extractResources(ListFindingsResponse payload) {
427-
return payload.getFindingsList();
433+
return payload.getFindingsList() != null
434+
? payload.getFindingsList()
435+
: ImmutableList.<Finding>of();
428436
}
429437
};
430438

0 commit comments

Comments
 (0)