Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit b311cec

Browse files
yoshi-automationyoshi-automation
authored
fix: migrate memcache/v1beta2 to grpc_service_config (#97)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/1a5efa2b-7082-489a-87a2-7d303da2cd98/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 316512618 Source-Link: googleapis/googleapis@9ba904b
1 parent 8f553af commit b311cec

File tree

2 files changed

+34
-38
lines changed

2 files changed

+34
-38
lines changed

‎google-cloud-memcache/src/main/java/com/google/cloud/memcache/v1beta2/stub/CloudMemcacheStubSettings.java

+32-36
Original file line numberDiff line numberDiff line change
@@ -365,12 +365,9 @@ public static class Builder extends StubSettings.Builder<CloudMemcacheStubSettin
365365
static {
366366
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
367367
ImmutableMap.builder();
368+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
368369
definitions.put(
369-
"idempotent",
370-
ImmutableSet.copyOf(
371-
Lists.<StatusCode.Code>newArrayList(
372-
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
373-
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
370+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
374371
RETRYABLE_CODE_DEFINITIONS = definitions.build();
375372
}
376373

@@ -379,17 +376,16 @@ public static class Builder extends StubSettings.Builder<CloudMemcacheStubSettin
379376
static {
380377
ImmutableMap.Builder<String, RetrySettings> definitions = ImmutableMap.builder();
381378
RetrySettings settings = null;
379+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
380+
definitions.put("no_retry_params", settings);
382381
settings =
383382
RetrySettings.newBuilder()
384-
.setInitialRetryDelay(Duration.ofMillis(100L))
385-
.setRetryDelayMultiplier(1.3)
386-
.setMaxRetryDelay(Duration.ofMillis(60000L))
387-
.setInitialRpcTimeout(Duration.ofMillis(20000L))
383+
.setInitialRpcTimeout(Duration.ofMillis(1200000L))
388384
.setRpcTimeoutMultiplier(1.0)
389-
.setMaxRpcTimeout(Duration.ofMillis(20000L))
390-
.setTotalTimeout(Duration.ofMillis(600000L))
385+
.setMaxRpcTimeout(Duration.ofMillis(1200000L))
386+
.setTotalTimeout(Duration.ofMillis(1200000L))
391387
.build();
392-
definitions.put("default", settings);
388+
definitions.put("no_retry_1_params", settings);
393389
RETRY_PARAM_DEFINITIONS = definitions.build();
394390
}
395391

@@ -450,45 +446,45 @@ private static Builder initDefaults(Builder builder) {
450446

451447
builder
452448
.listInstancesSettings()
453-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
454-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
449+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
450+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
455451

456452
builder
457453
.getInstanceSettings()
458-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
459-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
454+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
455+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
460456

461457
builder
462458
.createInstanceSettings()
463-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
464-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
459+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
460+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
465461

466462
builder
467463
.updateInstanceSettings()
468-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
469-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
464+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
465+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
470466

471467
builder
472468
.updateParametersSettings()
473-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
474-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
469+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
470+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
475471

476472
builder
477473
.deleteInstanceSettings()
478-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
479-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
474+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
475+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
480476

481477
builder
482478
.applyParametersSettings()
483-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
484-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
479+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
480+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
485481
builder
486482
.createInstanceOperationSettings()
487483
.setInitialCallSettings(
488484
UnaryCallSettings
489485
.<CreateInstanceRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
490-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
491-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
486+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
487+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
492488
.build())
493489
.setResponseTransformer(
494490
ProtoOperationTransformers.ResponseTransformer.create(Instance.class))
@@ -510,8 +506,8 @@ private static Builder initDefaults(Builder builder) {
510506
.setInitialCallSettings(
511507
UnaryCallSettings
512508
.<UpdateInstanceRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
513-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
514-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
509+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
510+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
515511
.build())
516512
.setResponseTransformer(
517513
ProtoOperationTransformers.ResponseTransformer.create(Instance.class))
@@ -533,8 +529,8 @@ private static Builder initDefaults(Builder builder) {
533529
.setInitialCallSettings(
534530
UnaryCallSettings
535531
.<UpdateParametersRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
536-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
537-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
532+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
533+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
538534
.build())
539535
.setResponseTransformer(
540536
ProtoOperationTransformers.ResponseTransformer.create(Instance.class))
@@ -556,8 +552,8 @@ private static Builder initDefaults(Builder builder) {
556552
.setInitialCallSettings(
557553
UnaryCallSettings
558554
.<DeleteInstanceRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
559-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
560-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
555+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
556+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
561557
.build())
562558
.setResponseTransformer(
563559
ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
@@ -579,8 +575,8 @@ private static Builder initDefaults(Builder builder) {
579575
.setInitialCallSettings(
580576
UnaryCallSettings
581577
.<ApplyParametersRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
582-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
583-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
578+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
579+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
584580
.build())
585581
.setResponseTransformer(
586582
ProtoOperationTransformers.ResponseTransformer.create(Instance.class))

‎synth.metadata

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"git": {
1212
"name": "googleapis",
1313
"remote": "https://github.com/googleapis/googleapis.git",
14-
"sha": "81226871ce438cdeec241dd81f33f796e37e1c03",
15-
"internalRef": "315786558"
14+
"sha": "9ba904b233179c23dc57a836f554135a6d62248e",
15+
"internalRef": "316512618"
1616
}
1717
},
1818
{

0 commit comments

Comments
 (0)