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

Commit b56b2fb

Browse files
yoshi-automationyoshi-automation
authored
fix: migrate to grpc_service_config (#238)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/ab32bcf0-0b80-4de6-8e9a-805e404915b2/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 318312024 Source-Link: googleapis/googleapis@8f57b47 PiperOrigin-RevId: 318311657 Source-Link: googleapis/googleapis@ed796a1
1 parent 412eceb commit b56b2fb

File tree

12 files changed

+1564
-1518
lines changed

12 files changed

+1564
-1518
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
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>7.0.0</version>
20+
<version>7.0.1</version>
2121
<type>pom</type>
2222
<scope>import</scope>
2323
</dependency>
@@ -38,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies:
3838
<dependency>
3939
<groupId>com.google.cloud</groupId>
4040
<artifactId>google-cloud-datacatalog</artifactId>
41-
<version>0.36.0</version>
41+
<version>1.0.0</version>
4242
</dependency>
4343

4444
```

‎google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/stub/DataCatalogStubSettings.java

Lines changed: 73 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -686,11 +686,11 @@ public static class Builder extends StubSettings.Builder<DataCatalogStubSettings
686686
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
687687
ImmutableMap.builder();
688688
definitions.put(
689-
"idempotent",
690-
ImmutableSet.copyOf(
691-
Lists.<StatusCode.Code>newArrayList(
692-
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
693-
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
689+
"retry_policy_1_codes",
690+
ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
691+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
692+
definitions.put(
693+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
694694
RETRYABLE_CODE_DEFINITIONS = definitions.build();
695695
}
696696

@@ -704,12 +704,22 @@ public static class Builder extends StubSettings.Builder<DataCatalogStubSettings
704704
.setInitialRetryDelay(Duration.ofMillis(100L))
705705
.setRetryDelayMultiplier(1.3)
706706
.setMaxRetryDelay(Duration.ofMillis(60000L))
707-
.setInitialRpcTimeout(Duration.ofMillis(20000L))
707+
.setInitialRpcTimeout(Duration.ofMillis(60000L))
708+
.setRpcTimeoutMultiplier(1.0)
709+
.setMaxRpcTimeout(Duration.ofMillis(60000L))
710+
.setTotalTimeout(Duration.ofMillis(60000L))
711+
.build();
712+
definitions.put("retry_policy_1_params", settings);
713+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
714+
definitions.put("no_retry_params", settings);
715+
settings =
716+
RetrySettings.newBuilder()
717+
.setInitialRpcTimeout(Duration.ofMillis(60000L))
708718
.setRpcTimeoutMultiplier(1.0)
709-
.setMaxRpcTimeout(Duration.ofMillis(20000L))
710-
.setTotalTimeout(Duration.ofMillis(600000L))
719+
.setMaxRpcTimeout(Duration.ofMillis(60000L))
720+
.setTotalTimeout(Duration.ofMillis(60000L))
711721
.build();
712-
definitions.put("default", settings);
722+
definitions.put("no_retry_1_params", settings);
713723
RETRY_PARAM_DEFINITIONS = definitions.build();
714724
}
715725

@@ -820,138 +830,138 @@ private static Builder initDefaults(Builder builder) {
820830

821831
builder
822832
.searchCatalogSettings()
823-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
824-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
833+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
834+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
825835

826836
builder
827837
.createEntryGroupSettings()
828-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
829-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
838+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
839+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
830840

831841
builder
832842
.getEntryGroupSettings()
833-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
834-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
843+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
844+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
835845

836846
builder
837847
.updateEntryGroupSettings()
838-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
839-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
848+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
849+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
840850

841851
builder
842852
.deleteEntryGroupSettings()
843-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
844-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
853+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
854+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
845855

846856
builder
847857
.listEntryGroupsSettings()
848-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
849-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
858+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
859+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
850860

851861
builder
852862
.createEntrySettings()
853-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
854-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
863+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
864+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
855865

856866
builder
857867
.updateEntrySettings()
858-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
859-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
868+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
869+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
860870

861871
builder
862872
.deleteEntrySettings()
863-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
864-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
873+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
874+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
865875

866876
builder
867877
.getEntrySettings()
868-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
869-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
878+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
879+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
870880

871881
builder
872882
.lookupEntrySettings()
873-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
874-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
883+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
884+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
875885

876886
builder
877887
.listEntriesSettings()
878-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
879-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
888+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
889+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
880890

881891
builder
882892
.createTagTemplateSettings()
883-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
884-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
893+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
894+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
885895

886896
builder
887897
.getTagTemplateSettings()
888-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
889-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
898+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
899+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
890900

891901
builder
892902
.updateTagTemplateSettings()
893-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
894-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
903+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
904+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
895905

896906
builder
897907
.deleteTagTemplateSettings()
898-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
899-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
908+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
909+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
900910

901911
builder
902912
.createTagTemplateFieldSettings()
903-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
904-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
913+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
914+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
905915

906916
builder
907917
.updateTagTemplateFieldSettings()
908-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
909-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
918+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
919+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
910920

911921
builder
912922
.renameTagTemplateFieldSettings()
913-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
914-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
923+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
924+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
915925

916926
builder
917927
.deleteTagTemplateFieldSettings()
918-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
919-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
928+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
929+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
920930

921931
builder
922932
.createTagSettings()
923-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
924-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
933+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
934+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
925935

926936
builder
927937
.updateTagSettings()
928-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
929-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
938+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
939+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
930940

931941
builder
932942
.deleteTagSettings()
933-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
934-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
943+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
944+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
935945

936946
builder
937947
.listTagsSettings()
938-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
939-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
948+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
949+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
940950

941951
builder
942952
.setIamPolicySettings()
943-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
944-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
953+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
954+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
945955

946956
builder
947957
.getIamPolicySettings()
948-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
949-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
958+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
959+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
950960

951961
builder
952962
.testIamPermissionsSettings()
953-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
954-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
963+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
964+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
955965

956966
return builder;
957967
}

0 commit comments

Comments
 (0)