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

File tree

5 files changed

+166
-130
lines changed

5 files changed

+166
-130
lines changed
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
1717
<dependency>
1818
<groupId>com.google.cloud</groupId>
1919
<artifactId>libraries-bom</artifactId>
20-
<version>5.7.0</version>
20+
<version>7.0.0</version>
2121
<type>pom</type>
2222
<scope>import</scope>
2323
</dependency>
Original file line numberDiff line numberDiff line change
@@ -439,11 +439,13 @@ public static class Builder extends StubSettings.Builder<CloudTasksStubSettings,
439439
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
440440
ImmutableMap.builder();
441441
definitions.put(
442-
"idempotent",
442+
"retry_policy_1_codes",
443443
ImmutableSet.copyOf(
444444
Lists.<StatusCode.Code>newArrayList(
445445
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
446-
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
446+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
447+
definitions.put(
448+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
447449
RETRYABLE_CODE_DEFINITIONS = definitions.build();
448450
}
449451

@@ -456,13 +458,23 @@ public static class Builder extends StubSettings.Builder<CloudTasksStubSettings,
456458
RetrySettings.newBuilder()
457459
.setInitialRetryDelay(Duration.ofMillis(100L))
458460
.setRetryDelayMultiplier(1.3)
459-
.setMaxRetryDelay(Duration.ofMillis(60000L))
460-
.setInitialRpcTimeout(Duration.ofMillis(20000L))
461+
.setMaxRetryDelay(Duration.ofMillis(10000L))
462+
.setInitialRpcTimeout(Duration.ofMillis(10000L))
463+
.setRpcTimeoutMultiplier(1.0)
464+
.setMaxRpcTimeout(Duration.ofMillis(10000L))
465+
.setTotalTimeout(Duration.ofMillis(10000L))
466+
.build();
467+
definitions.put("retry_policy_1_params", settings);
468+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
469+
definitions.put("no_retry_params", settings);
470+
settings =
471+
RetrySettings.newBuilder()
472+
.setInitialRpcTimeout(Duration.ofMillis(10000L))
461473
.setRpcTimeoutMultiplier(1.0)
462-
.setMaxRpcTimeout(Duration.ofMillis(20000L))
463-
.setTotalTimeout(Duration.ofMillis(600000L))
474+
.setMaxRpcTimeout(Duration.ofMillis(10000L))
475+
.setTotalTimeout(Duration.ofMillis(10000L))
464476
.build();
465-
definitions.put("default", settings);
477+
definitions.put("no_retry_1_params", settings);
466478
RETRY_PARAM_DEFINITIONS = definitions.build();
467479
}
468480

@@ -540,83 +552,83 @@ private static Builder initDefaults(Builder builder) {
540552

541553
builder
542554
.listQueuesSettings()
543-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
544-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
555+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
556+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
545557

546558
builder
547559
.getQueueSettings()
548-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
549-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
560+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
561+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
550562

551563
builder
552564
.createQueueSettings()
553-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
554-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
565+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
566+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
555567

556568
builder
557569
.updateQueueSettings()
558-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
559-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
570+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
571+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
560572

561573
builder
562574
.deleteQueueSettings()
563-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
564-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
575+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
576+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
565577

566578
builder
567579
.purgeQueueSettings()
568-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
569-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
580+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
581+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
570582

571583
builder
572584
.pauseQueueSettings()
573-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
574-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
585+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
586+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
575587

576588
builder
577589
.resumeQueueSettings()
578-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
579-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
590+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
591+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
580592

581593
builder
582594
.getIamPolicySettings()
583-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
584-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
595+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
596+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
585597

586598
builder
587599
.setIamPolicySettings()
588-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
589-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
600+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
601+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
590602

591603
builder
592604
.testIamPermissionsSettings()
593-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
594-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
605+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
606+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
595607

596608
builder
597609
.listTasksSettings()
598-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
599-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
610+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
611+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
600612

601613
builder
602614
.getTaskSettings()
603-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
604-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
615+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
616+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
605617

606618
builder
607619
.createTaskSettings()
608-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
609-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
620+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
621+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
610622

611623
builder
612624
.deleteTaskSettings()
613-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
614-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
625+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
626+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
615627

616628
builder
617629
.runTaskSettings()
618-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
619-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
630+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
631+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
620632

621633
return builder;
622634
}
Original file line numberDiff line numberDiff line change
@@ -477,11 +477,13 @@ public static class Builder extends StubSettings.Builder<CloudTasksStubSettings,
477477
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
478478
ImmutableMap.builder();
479479
definitions.put(
480-
"idempotent",
480+
"retry_policy_1_codes",
481481
ImmutableSet.copyOf(
482482
Lists.<StatusCode.Code>newArrayList(
483-
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
484-
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
483+
StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
484+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
485+
definitions.put(
486+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
485487
RETRYABLE_CODE_DEFINITIONS = definitions.build();
486488
}
487489

@@ -494,13 +496,23 @@ public static class Builder extends StubSettings.Builder<CloudTasksStubSettings,
494496
RetrySettings.newBuilder()
495497
.setInitialRetryDelay(Duration.ofMillis(100L))
496498
.setRetryDelayMultiplier(1.3)
497-
.setMaxRetryDelay(Duration.ofMillis(60000L))
498-
.setInitialRpcTimeout(Duration.ofMillis(20000L))
499+
.setMaxRetryDelay(Duration.ofMillis(10000L))
500+
.setInitialRpcTimeout(Duration.ofMillis(10000L))
501+
.setRpcTimeoutMultiplier(1.0)
502+
.setMaxRpcTimeout(Duration.ofMillis(10000L))
503+
.setTotalTimeout(Duration.ofMillis(10000L))
504+
.build();
505+
definitions.put("retry_policy_1_params", settings);
506+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
507+
definitions.put("no_retry_params", settings);
508+
settings =
509+
RetrySettings.newBuilder()
510+
.setInitialRpcTimeout(Duration.ofMillis(10000L))
499511
.setRpcTimeoutMultiplier(1.0)
500-
.setMaxRpcTimeout(Duration.ofMillis(20000L))
501-
.setTotalTimeout(Duration.ofMillis(600000L))
512+
.setMaxRpcTimeout(Duration.ofMillis(10000L))
513+
.setTotalTimeout(Duration.ofMillis(10000L))
502514
.build();
503-
definitions.put("default", settings);
515+
definitions.put("no_retry_1_params", settings);
504516
RETRY_PARAM_DEFINITIONS = definitions.build();
505517
}
506518

@@ -590,103 +602,103 @@ private static Builder initDefaults(Builder builder) {
590602

591603
builder
592604
.listQueuesSettings()
593-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
594-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
605+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
606+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
595607

596608
builder
597609
.getQueueSettings()
598-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
599-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
610+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
611+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
600612

601613
builder
602614
.createQueueSettings()
603-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
604-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
615+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
616+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
605617

606618
builder
607619
.updateQueueSettings()
608-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
609-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
620+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
621+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
610622

611623
builder
612624
.deleteQueueSettings()
613-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
614-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
625+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
626+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
615627

616628
builder
617629
.purgeQueueSettings()
618-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
619-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
630+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
631+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
620632

621633
builder
622634
.pauseQueueSettings()
623-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
624-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
635+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
636+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
625637

626638
builder
627639
.resumeQueueSettings()
628-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
629-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
640+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
641+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
630642

631643
builder
632644
.getIamPolicySettings()
633-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
634-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
645+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
646+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
635647

636648
builder
637649
.setIamPolicySettings()
638-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
639-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
650+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
651+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
640652

641653
builder
642654
.testIamPermissionsSettings()
643-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
644-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
655+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
656+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
645657

646658
builder
647659
.listTasksSettings()
648-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
649-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
660+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
661+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
650662

651663
builder
652664
.getTaskSettings()
653-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
654-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
665+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
666+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
655667

656668
builder
657669
.createTaskSettings()
658-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
659-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
670+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
671+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
660672

661673
builder
662674
.deleteTaskSettings()
663-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
664-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
675+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
676+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
665677

666678
builder
667679
.leaseTasksSettings()
668-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
669-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
680+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
681+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
670682

671683
builder
672684
.acknowledgeTaskSettings()
673-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
674-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
685+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
686+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
675687

676688
builder
677689
.renewLeaseSettings()
678-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
679-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
690+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
691+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
680692

681693
builder
682694
.cancelLeaseSettings()
683-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
684-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
695+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
696+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
685697

686698
builder
687699
.runTaskSettings()
688-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
689-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
700+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
701+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
690702

691703
return builder;
692704
}

0 commit comments

Comments
 (0)