diff --git a/spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java b/spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java index 648d449d49..44794b52b2 100644 --- a/spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java +++ b/spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java @@ -66,7 +66,6 @@ void should_inject_child_context() { assertThat(producerSpan.kind()).isEqualTo(PRODUCER); assertChildOf(producerSpan, parent); assertThat(instrumentedMessage.getAttributesMap()) - .isNotNull() .containsEntry("b3", producerSpan.traceId() + "-" + producerSpan.id() + "-1"); } diff --git a/spring-cloud-gcp-dependencies/pom.xml b/spring-cloud-gcp-dependencies/pom.xml index 1f96ab9f39..6d5f7e9cfc 100644 --- a/spring-cloud-gcp-dependencies/pom.xml +++ b/spring-cloud-gcp-dependencies/pom.xml @@ -34,7 +34,7 @@ - 26.49.0 + 26.51.0 1.21.0 1.0.7.RELEASE 1.3.0 diff --git a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java index 1fc4e7df42..71b94953a1 100644 --- a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java +++ b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java @@ -19,6 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -46,6 +47,7 @@ public void setUp() throws IOException { factory.setCredentialsProvider(NoCredentialsProvider.create()); TransportChannelProvider mockChannelProvider = mock(TransportChannelProvider.class); TransportChannel mockTransportChannel = mock(TransportChannel.class); + when(mockChannelProvider.withUseS2A(anyBoolean())).thenReturn(mockChannelProvider); when(mockChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel); ApiCallContext mockContext = mock(ApiCallContext.class); when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockContext); diff --git a/spring-cloud-previews/README.md b/spring-cloud-previews/README.md index 2e575a1a9a..300c54d82f 100644 --- a/spring-cloud-previews/README.md +++ b/spring-cloud-previews/README.md @@ -16,112 +16,112 @@ add the following dependency to your `pom.xml`: | Client Library | Starter Maven Artifact | |----------------| -----------------------| -|[java/accessapproval](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/accessapproval/README.md)|com.google.cloud:google-cloud-accessapproval-spring-starter| -|[java/accesscontextmanager](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/accesscontextmanager/README.md)|com.google.cloud:google-identity-accesscontextmanager-spring-starter| -|[java/advisorynotifications](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/advisorynotifications/README.md)|com.google.cloud:google-cloud-advisorynotifications-spring-starter| -|[java/aiplatform](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/aiplatform/README.md)|com.google.cloud:google-cloud-aiplatform-spring-starter| -|[java/analyticshub](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/analyticshub/README.md)|com.google.cloud:google-cloud-analyticshub-spring-starter| -|[java/api-gateway](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/api-gateway/README.md)|com.google.cloud:google-cloud-api-gateway-spring-starter| -|[java/apigee-connect](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/apigee-connect/README.md)|com.google.cloud:google-cloud-apigee-connect-spring-starter| -|[java/apikeys](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/apikeys/README.md)|com.google.cloud:google-cloud-apikeys-spring-starter| -|[java/appengine-admin](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/appengine-admin/README.md)|com.google.cloud:google-cloud-appengine-admin-spring-starter| -|[java/artifact-registry](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/artifact-registry/README.md)|com.google.cloud:google-cloud-artifact-registry-spring-starter| -|[java/asset](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/asset/README.md)|com.google.cloud:google-cloud-asset-spring-starter| -|[java/assured-workloads](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/assured-workloads/README.md)|com.google.cloud:google-cloud-assured-workloads-spring-starter| -|[java/automl](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/automl/README.md)|com.google.cloud:google-cloud-automl-spring-starter| -|[java/backupdr](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/backupdr/README.md)|com.google.cloud:google-cloud-backupdr-spring-starter| -|[java/bigqueryconnection](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/bigqueryconnection/README.md)|com.google.cloud:google-cloud-bigqueryconnection-spring-starter| -|[java/bigquerydatatransfer](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/bigquerydatatransfer/README.md)|com.google.cloud:google-cloud-bigquerydatatransfer-spring-starter| -|[java/bigqueryreservation](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/bigqueryreservation/README.md)|com.google.cloud:google-cloud-bigqueryreservation-spring-starter| -|[java/billing](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/billing/README.md)|com.google.cloud:google-cloud-billing-spring-starter| -|[java/billingbudgets](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/billingbudgets/README.md)|com.google.cloud:google-cloud-billingbudgets-spring-starter| -|[java/binary-authorization](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/binary-authorization/README.md)|com.google.cloud:google-cloud-binary-authorization-spring-starter| -|[java/channel](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/channel/README.md)|com.google.cloud:google-cloud-channel-spring-starter| -|[java/cloudbuild](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/cloudbuild/README.md)|com.google.cloud:google-cloud-build-spring-starter| -|[java/cloudcontrolspartner](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/cloudcontrolspartner/README.md)|com.google.cloud:google-cloud-cloudcontrolspartner-spring-starter| -|[java/cloudquotas](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/cloudquotas/README.md)|com.google.cloud:google-cloud-cloudquotas-spring-starter| -|[java/compute](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/compute/README.md)|com.google.cloud:google-cloud-compute-spring-starter| -|[java/contact-center-insights](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/contact-center-insights/README.md)|com.google.cloud:google-cloud-contact-center-insights-spring-starter| -|[java/container](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/container/README.md)|com.google.cloud:google-cloud-container-spring-starter| -|[java/containeranalysis](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/containeranalysis/README.md)|com.google.cloud:google-cloud-containeranalysis-spring-starter| -|[java/data-fusion](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/data-fusion/README.md)|com.google.cloud:google-cloud-data-fusion-spring-starter| -|[java/datacatalog](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/datacatalog/README.md)|com.google.cloud:google-cloud-datacatalog-spring-starter| -|[java/datalineage](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/datalineage/README.md)|com.google.cloud:google-cloud-datalineage-spring-starter| -|[java/dataplex](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/dataplex/README.md)|com.google.cloud:google-cloud-dataplex-spring-starter| -|[java/dataproc-metastore](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/dataproc-metastore/README.md)|com.google.cloud:google-cloud-dataproc-metastore-spring-starter| -|[java/dataproc](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/dataproc/README.md)|com.google.cloud:google-cloud-dataproc-spring-starter| -|[java/datastream](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/datastream/README.md)|com.google.cloud:google-cloud-datastream-spring-starter| -|[java/debugger-client](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/debugger-client/README.md)|com.google.cloud:google-cloud-debugger-client-spring-starter| -|[java/deploy](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/deploy/README.md)|com.google.cloud:google-cloud-deploy-spring-starter| -|[java/dialogflow](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/dialogflow/README.md)|com.google.cloud:google-cloud-dialogflow-spring-starter| -|[java/discoveryengine](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/discoveryengine/README.md)|com.google.cloud:google-cloud-discoveryengine-spring-starter| -|[java/distributedcloudedge](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/distributedcloudedge/README.md)|com.google.cloud:google-cloud-distributedcloudedge-spring-starter| -|[java/dlp](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/dlp/README.md)|com.google.cloud:google-cloud-dlp-spring-starter| -|[java/dms](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/dms/README.md)|com.google.cloud:google-cloud-dms-spring-starter| -|[java/document-ai](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/document-ai/README.md)|com.google.cloud:google-cloud-document-ai-spring-starter| -|[java/domains](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/domains/README.md)|com.google.cloud:google-cloud-domains-spring-starter| -|[java/edgenetwork](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/edgenetwork/README.md)|com.google.cloud:google-cloud-edgenetwork-spring-starter| -|[java/essential-contacts](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/essential-contacts/README.md)|com.google.cloud:google-cloud-essential-contacts-spring-starter| -|[java/eventarc](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/eventarc/README.md)|com.google.cloud:google-cloud-eventarc-spring-starter| -|[java/filestore](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/filestore/README.md)|com.google.cloud:google-cloud-filestore-spring-starter| -|[java/functions](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/functions/README.md)|com.google.cloud:google-cloud-functions-spring-starter| -|[java/gkehub](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/gkehub/README.md)|com.google.cloud:google-cloud-gkehub-spring-starter| -|[java/gsuite-addons](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/gsuite-addons/README.md)|com.google.cloud:google-cloud-gsuite-addons-spring-starter| -|[java/iam-admin](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/iam-admin/README.md)|com.google.cloud:google-iam-admin-spring-starter| -|[java/iam](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/iam/README.md)|com.google.cloud:google-iam-policy-spring-starter| -|[java/iamcredentials](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/iamcredentials/README.md)|com.google.cloud:google-cloud-iamcredentials-spring-starter| -|[java/iap](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/iap/README.md)|com.google.cloud:google-cloud-iap-spring-starter| -|[java/ids](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/ids/README.md)|com.google.cloud:google-cloud-ids-spring-starter| -|[java/infra-manager](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/infra-manager/README.md)|com.google.cloud:google-cloud-infra-manager-spring-starter| -|[java/iot](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/iot/README.md)|com.google.cloud:google-cloud-iot-spring-starter| -|[java/language](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/language/README.md)|com.google.cloud:google-cloud-language-spring-starter| -|[java/managed-identities](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/managed-identities/README.md)|com.google.cloud:google-cloud-managed-identities-spring-starter| -|[java/memcache](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/memcache/README.md)|com.google.cloud:google-cloud-memcache-spring-starter| -|[java/monitoring-dashboards](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/monitoring-dashboards/README.md)|com.google.cloud:google-cloud-monitoring-dashboard-spring-starter| -|[java/network-management](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/network-management/README.md)|com.google.cloud:google-cloud-network-management-spring-starter| -|[java/network-security](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/network-security/README.md)|com.google.cloud:google-cloud-network-security-spring-starter| -|[java/networkconnectivity](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/networkconnectivity/README.md)|com.google.cloud:google-cloud-networkconnectivity-spring-starter| -|[java/notebooks](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/notebooks/README.md)|com.google.cloud:google-cloud-notebooks-spring-starter| -|[java/optimization](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/optimization/README.md)|com.google.cloud:google-cloud-optimization-spring-starter| -|[java/orchestration-airflow](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/orchestration-airflow/README.md)|com.google.cloud:google-cloud-orchestration-airflow-spring-starter| -|[java/orgpolicy](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/orgpolicy/README.md)|com.google.cloud:google-cloud-orgpolicy-spring-starter| -|[java/os-config](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/os-config/README.md)|com.google.cloud:google-cloud-os-config-spring-starter| -|[java/os-login](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/os-login/README.md)|com.google.cloud:google-cloud-os-login-spring-starter| -|[java/policy-troubleshooter](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/policy-troubleshooter/README.md)|com.google.cloud:google-cloud-policy-troubleshooter-spring-starter| -|[java/profiler](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/profiler/README.md)|com.google.cloud:google-cloud-profiler-spring-starter| -|[java/publicca](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/publicca/README.md)|com.google.cloud:google-cloud-publicca-spring-starter| -|[java/recaptchaenterprise](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/recaptchaenterprise/README.md)|com.google.cloud:google-cloud-recaptchaenterprise-spring-starter| -|[java/recommender](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/recommender/README.md)|com.google.cloud:google-cloud-recommender-spring-starter| -|[java/redis](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/redis/README.md)|com.google.cloud:google-cloud-redis-spring-starter| -|[java/resource-settings](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/resource-settings/README.md)|com.google.cloud:google-cloud-resource-settings-spring-starter| -|[java/retail](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/retail/README.md)|com.google.cloud:google-cloud-retail-spring-starter| -|[java/scheduler](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/scheduler/README.md)|com.google.cloud:google-cloud-scheduler-spring-starter| -|[java/securesourcemanager](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/securesourcemanager/README.md)|com.google.cloud:google-cloud-securesourcemanager-spring-starter| -|[java/security-private-ca](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/security-private-ca/README.md)|com.google.cloud:google-cloud-security-private-ca-spring-starter| -|[java/securitycenter](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/securitycenter/README.md)|com.google.cloud:google-cloud-securitycenter-spring-starter| -|[java/securitycentermanagement](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/securitycentermanagement/README.md)|com.google.cloud:google-cloud-securitycentermanagement-spring-starter| -|[java/securityposture](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/securityposture/README.md)|com.google.cloud:google-cloud-securityposture-spring-starter| -|[java/service-control](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/service-control/README.md)|com.google.cloud:google-cloud-service-control-spring-starter| -|[java/service-management](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/service-management/README.md)|com.google.cloud:google-cloud-service-management-spring-starter| -|[java/service-usage](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/service-usage/README.md)|com.google.cloud:google-cloud-service-usage-spring-starter| -|[java/servicedirectory](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/servicedirectory/README.md)|com.google.cloud:google-cloud-servicedirectory-spring-starter| -|[java/shell](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/shell/README.md)|com.google.cloud:google-cloud-shell-spring-starter| -|[java/speech](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/speech/README.md)|com.google.cloud:google-cloud-speech-spring-starter| -|[java/storage-transfer](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/storage-transfer/README.md)|com.google.cloud:google-cloud-storage-transfer-spring-starter| -|[java/talent](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/talent/README.md)|com.google.cloud:google-cloud-talent-spring-starter| -|[java/tasks](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/tasks/README.md)|com.google.cloud:google-cloud-tasks-spring-starter| -|[java/telcoautomation](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/telcoautomation/README.md)|com.google.cloud:google-cloud-telcoautomation-spring-starter| -|[java/texttospeech](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/texttospeech/README.md)|com.google.cloud:google-cloud-texttospeech-spring-starter| -|[java/tpu](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/tpu/README.md)|com.google.cloud:google-cloud-tpu-spring-starter| -|[java/trace](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/trace/README.md)|com.google.cloud:google-cloud-trace-spring-starter| -|[java/translate](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/translate/README.md)|com.google.cloud:google-cloud-translate-spring-starter| -|[java/video-intelligence](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/video-intelligence/README.md)|com.google.cloud:google-cloud-video-intelligence-spring-starter| -|[java/video-stitcher](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/video-stitcher/README.md)|com.google.cloud:google-cloud-video-stitcher-spring-starter| -|[java/video-transcoder](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/video-transcoder/README.md)|com.google.cloud:google-cloud-video-transcoder-spring-starter| -|[java/vmmigration](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/vmmigration/README.md)|com.google.cloud:google-cloud-vmmigration-spring-starter| -|[java/vpcaccess](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/vpcaccess/README.md)|com.google.cloud:google-cloud-vpcaccess-spring-starter| -|[java/webrisk](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/webrisk/README.md)|com.google.cloud:google-cloud-webrisk-spring-starter| -|[java/websecurityscanner](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/websecurityscanner/README.md)|com.google.cloud:google-cloud-websecurityscanner-spring-starter| -|[java/workflow-executions](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/workflow-executions/README.md)|com.google.cloud:google-cloud-workflow-executions-spring-starter| -|[java/workflows](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/workflows/README.md)|com.google.cloud:google-cloud-workflows-spring-starter| -|[java/workstations](https://github.com/googleapis/google-cloud-java/blob/v1.46.0/java/workstations/README.md)|com.google.cloud:google-cloud-workstations-spring-starter| +|[java/accessapproval](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/accessapproval/README.md)|com.google.cloud:google-cloud-accessapproval-spring-starter| +|[java/accesscontextmanager](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/accesscontextmanager/README.md)|com.google.cloud:google-identity-accesscontextmanager-spring-starter| +|[java/advisorynotifications](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/advisorynotifications/README.md)|com.google.cloud:google-cloud-advisorynotifications-spring-starter| +|[java/aiplatform](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/aiplatform/README.md)|com.google.cloud:google-cloud-aiplatform-spring-starter| +|[java/analyticshub](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/analyticshub/README.md)|com.google.cloud:google-cloud-analyticshub-spring-starter| +|[java/api-gateway](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/api-gateway/README.md)|com.google.cloud:google-cloud-api-gateway-spring-starter| +|[java/apigee-connect](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/apigee-connect/README.md)|com.google.cloud:google-cloud-apigee-connect-spring-starter| +|[java/apikeys](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/apikeys/README.md)|com.google.cloud:google-cloud-apikeys-spring-starter| +|[java/appengine-admin](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/appengine-admin/README.md)|com.google.cloud:google-cloud-appengine-admin-spring-starter| +|[java/artifact-registry](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/artifact-registry/README.md)|com.google.cloud:google-cloud-artifact-registry-spring-starter| +|[java/asset](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/asset/README.md)|com.google.cloud:google-cloud-asset-spring-starter| +|[java/assured-workloads](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/assured-workloads/README.md)|com.google.cloud:google-cloud-assured-workloads-spring-starter| +|[java/automl](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/automl/README.md)|com.google.cloud:google-cloud-automl-spring-starter| +|[java/backupdr](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/backupdr/README.md)|com.google.cloud:google-cloud-backupdr-spring-starter| +|[java/bigqueryconnection](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/bigqueryconnection/README.md)|com.google.cloud:google-cloud-bigqueryconnection-spring-starter| +|[java/bigquerydatatransfer](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/bigquerydatatransfer/README.md)|com.google.cloud:google-cloud-bigquerydatatransfer-spring-starter| +|[java/bigqueryreservation](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/bigqueryreservation/README.md)|com.google.cloud:google-cloud-bigqueryreservation-spring-starter| +|[java/billing](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/billing/README.md)|com.google.cloud:google-cloud-billing-spring-starter| +|[java/billingbudgets](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/billingbudgets/README.md)|com.google.cloud:google-cloud-billingbudgets-spring-starter| +|[java/binary-authorization](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/binary-authorization/README.md)|com.google.cloud:google-cloud-binary-authorization-spring-starter| +|[java/channel](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/channel/README.md)|com.google.cloud:google-cloud-channel-spring-starter| +|[java/cloudbuild](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/cloudbuild/README.md)|com.google.cloud:google-cloud-build-spring-starter| +|[java/cloudcontrolspartner](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/cloudcontrolspartner/README.md)|com.google.cloud:google-cloud-cloudcontrolspartner-spring-starter| +|[java/cloudquotas](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/cloudquotas/README.md)|com.google.cloud:google-cloud-cloudquotas-spring-starter| +|[java/compute](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/compute/README.md)|com.google.cloud:google-cloud-compute-spring-starter| +|[java/contact-center-insights](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/contact-center-insights/README.md)|com.google.cloud:google-cloud-contact-center-insights-spring-starter| +|[java/container](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/container/README.md)|com.google.cloud:google-cloud-container-spring-starter| +|[java/containeranalysis](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/containeranalysis/README.md)|com.google.cloud:google-cloud-containeranalysis-spring-starter| +|[java/data-fusion](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/data-fusion/README.md)|com.google.cloud:google-cloud-data-fusion-spring-starter| +|[java/datacatalog](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/datacatalog/README.md)|com.google.cloud:google-cloud-datacatalog-spring-starter| +|[java/datalineage](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/datalineage/README.md)|com.google.cloud:google-cloud-datalineage-spring-starter| +|[java/dataplex](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/dataplex/README.md)|com.google.cloud:google-cloud-dataplex-spring-starter| +|[java/dataproc-metastore](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/dataproc-metastore/README.md)|com.google.cloud:google-cloud-dataproc-metastore-spring-starter| +|[java/dataproc](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/dataproc/README.md)|com.google.cloud:google-cloud-dataproc-spring-starter| +|[java/datastream](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/datastream/README.md)|com.google.cloud:google-cloud-datastream-spring-starter| +|[java/debugger-client](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/debugger-client/README.md)|com.google.cloud:google-cloud-debugger-client-spring-starter| +|[java/deploy](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/deploy/README.md)|com.google.cloud:google-cloud-deploy-spring-starter| +|[java/dialogflow](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/dialogflow/README.md)|com.google.cloud:google-cloud-dialogflow-spring-starter| +|[java/discoveryengine](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/discoveryengine/README.md)|com.google.cloud:google-cloud-discoveryengine-spring-starter| +|[java/distributedcloudedge](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/distributedcloudedge/README.md)|com.google.cloud:google-cloud-distributedcloudedge-spring-starter| +|[java/dlp](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/dlp/README.md)|com.google.cloud:google-cloud-dlp-spring-starter| +|[java/dms](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/dms/README.md)|com.google.cloud:google-cloud-dms-spring-starter| +|[java/document-ai](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/document-ai/README.md)|com.google.cloud:google-cloud-document-ai-spring-starter| +|[java/domains](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/domains/README.md)|com.google.cloud:google-cloud-domains-spring-starter| +|[java/edgenetwork](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/edgenetwork/README.md)|com.google.cloud:google-cloud-edgenetwork-spring-starter| +|[java/essential-contacts](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/essential-contacts/README.md)|com.google.cloud:google-cloud-essential-contacts-spring-starter| +|[java/eventarc](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/eventarc/README.md)|com.google.cloud:google-cloud-eventarc-spring-starter| +|[java/filestore](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/filestore/README.md)|com.google.cloud:google-cloud-filestore-spring-starter| +|[java/functions](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/functions/README.md)|com.google.cloud:google-cloud-functions-spring-starter| +|[java/gkehub](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/gkehub/README.md)|com.google.cloud:google-cloud-gkehub-spring-starter| +|[java/gsuite-addons](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/gsuite-addons/README.md)|com.google.cloud:google-cloud-gsuite-addons-spring-starter| +|[java/iam-admin](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/iam-admin/README.md)|com.google.cloud:google-iam-admin-spring-starter| +|[java/iam](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/iam/README.md)|com.google.cloud:google-iam-policy-spring-starter| +|[java/iamcredentials](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/iamcredentials/README.md)|com.google.cloud:google-cloud-iamcredentials-spring-starter| +|[java/iap](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/iap/README.md)|com.google.cloud:google-cloud-iap-spring-starter| +|[java/ids](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/ids/README.md)|com.google.cloud:google-cloud-ids-spring-starter| +|[java/infra-manager](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/infra-manager/README.md)|com.google.cloud:google-cloud-infra-manager-spring-starter| +|[java/iot](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/iot/README.md)|com.google.cloud:google-cloud-iot-spring-starter| +|[java/language](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/language/README.md)|com.google.cloud:google-cloud-language-spring-starter| +|[java/managed-identities](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/managed-identities/README.md)|com.google.cloud:google-cloud-managed-identities-spring-starter| +|[java/memcache](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/memcache/README.md)|com.google.cloud:google-cloud-memcache-spring-starter| +|[java/monitoring-dashboards](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/monitoring-dashboards/README.md)|com.google.cloud:google-cloud-monitoring-dashboard-spring-starter| +|[java/network-management](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/network-management/README.md)|com.google.cloud:google-cloud-network-management-spring-starter| +|[java/network-security](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/network-security/README.md)|com.google.cloud:google-cloud-network-security-spring-starter| +|[java/networkconnectivity](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/networkconnectivity/README.md)|com.google.cloud:google-cloud-networkconnectivity-spring-starter| +|[java/notebooks](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/notebooks/README.md)|com.google.cloud:google-cloud-notebooks-spring-starter| +|[java/optimization](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/optimization/README.md)|com.google.cloud:google-cloud-optimization-spring-starter| +|[java/orchestration-airflow](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/orchestration-airflow/README.md)|com.google.cloud:google-cloud-orchestration-airflow-spring-starter| +|[java/orgpolicy](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/orgpolicy/README.md)|com.google.cloud:google-cloud-orgpolicy-spring-starter| +|[java/os-config](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/os-config/README.md)|com.google.cloud:google-cloud-os-config-spring-starter| +|[java/os-login](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/os-login/README.md)|com.google.cloud:google-cloud-os-login-spring-starter| +|[java/policy-troubleshooter](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/policy-troubleshooter/README.md)|com.google.cloud:google-cloud-policy-troubleshooter-spring-starter| +|[java/profiler](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/profiler/README.md)|com.google.cloud:google-cloud-profiler-spring-starter| +|[java/publicca](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/publicca/README.md)|com.google.cloud:google-cloud-publicca-spring-starter| +|[java/recaptchaenterprise](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/recaptchaenterprise/README.md)|com.google.cloud:google-cloud-recaptchaenterprise-spring-starter| +|[java/recommender](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/recommender/README.md)|com.google.cloud:google-cloud-recommender-spring-starter| +|[java/redis](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/redis/README.md)|com.google.cloud:google-cloud-redis-spring-starter| +|[java/resource-settings](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/resource-settings/README.md)|com.google.cloud:google-cloud-resource-settings-spring-starter| +|[java/retail](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/retail/README.md)|com.google.cloud:google-cloud-retail-spring-starter| +|[java/scheduler](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/scheduler/README.md)|com.google.cloud:google-cloud-scheduler-spring-starter| +|[java/securesourcemanager](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/securesourcemanager/README.md)|com.google.cloud:google-cloud-securesourcemanager-spring-starter| +|[java/security-private-ca](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/security-private-ca/README.md)|com.google.cloud:google-cloud-security-private-ca-spring-starter| +|[java/securitycenter](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/securitycenter/README.md)|com.google.cloud:google-cloud-securitycenter-spring-starter| +|[java/securitycentermanagement](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/securitycentermanagement/README.md)|com.google.cloud:google-cloud-securitycentermanagement-spring-starter| +|[java/securityposture](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/securityposture/README.md)|com.google.cloud:google-cloud-securityposture-spring-starter| +|[java/service-control](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/service-control/README.md)|com.google.cloud:google-cloud-service-control-spring-starter| +|[java/service-management](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/service-management/README.md)|com.google.cloud:google-cloud-service-management-spring-starter| +|[java/service-usage](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/service-usage/README.md)|com.google.cloud:google-cloud-service-usage-spring-starter| +|[java/servicedirectory](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/servicedirectory/README.md)|com.google.cloud:google-cloud-servicedirectory-spring-starter| +|[java/shell](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/shell/README.md)|com.google.cloud:google-cloud-shell-spring-starter| +|[java/speech](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/speech/README.md)|com.google.cloud:google-cloud-speech-spring-starter| +|[java/storage-transfer](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/storage-transfer/README.md)|com.google.cloud:google-cloud-storage-transfer-spring-starter| +|[java/talent](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/talent/README.md)|com.google.cloud:google-cloud-talent-spring-starter| +|[java/tasks](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/tasks/README.md)|com.google.cloud:google-cloud-tasks-spring-starter| +|[java/telcoautomation](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/telcoautomation/README.md)|com.google.cloud:google-cloud-telcoautomation-spring-starter| +|[java/texttospeech](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/texttospeech/README.md)|com.google.cloud:google-cloud-texttospeech-spring-starter| +|[java/tpu](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/tpu/README.md)|com.google.cloud:google-cloud-tpu-spring-starter| +|[java/trace](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/trace/README.md)|com.google.cloud:google-cloud-trace-spring-starter| +|[java/translate](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/translate/README.md)|com.google.cloud:google-cloud-translate-spring-starter| +|[java/video-intelligence](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/video-intelligence/README.md)|com.google.cloud:google-cloud-video-intelligence-spring-starter| +|[java/video-stitcher](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/video-stitcher/README.md)|com.google.cloud:google-cloud-video-stitcher-spring-starter| +|[java/video-transcoder](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/video-transcoder/README.md)|com.google.cloud:google-cloud-video-transcoder-spring-starter| +|[java/vmmigration](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/vmmigration/README.md)|com.google.cloud:google-cloud-vmmigration-spring-starter| +|[java/vpcaccess](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/vpcaccess/README.md)|com.google.cloud:google-cloud-vpcaccess-spring-starter| +|[java/webrisk](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/webrisk/README.md)|com.google.cloud:google-cloud-webrisk-spring-starter| +|[java/websecurityscanner](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/websecurityscanner/README.md)|com.google.cloud:google-cloud-websecurityscanner-spring-starter| +|[java/workflow-executions](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/workflow-executions/README.md)|com.google.cloud:google-cloud-workflow-executions-spring-starter| +|[java/workflows](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/workflows/README.md)|com.google.cloud:google-cloud-workflows-spring-starter| +|[java/workstations](https://github.com/googleapis/google-cloud-java/blob/v1.48.0/java/workstations/README.md)|com.google.cloud:google-cloud-workstations-spring-starter| diff --git a/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/src/main/java/com/google/devtools/artifactregistry/v1/spring/ArtifactRegistrySpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/src/main/java/com/google/devtools/artifactregistry/v1/spring/ArtifactRegistrySpringAutoConfiguration.java index 6f571264e1..4c453e5064 100644 --- a/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/src/main/java/com/google/devtools/artifactregistry/v1/spring/ArtifactRegistrySpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/src/main/java/com/google/devtools/artifactregistry/v1/spring/ArtifactRegistrySpringAutoConfiguration.java @@ -252,6 +252,11 @@ public ArtifactRegistrySettings artifactRegistrySettings( clientSettingsBuilder.getVersionSettings().getRetrySettings(), serviceRetry); clientSettingsBuilder.getVersionSettings().setRetrySettings(getVersionRetrySettings); + RetrySettings updateVersionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateVersionSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.updateVersionSettings().setRetrySettings(updateVersionRetrySettings); + RetrySettings listFilesRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.listFilesSettings().getRetrySettings(), serviceRetry); @@ -262,6 +267,11 @@ public ArtifactRegistrySettings artifactRegistrySettings( clientSettingsBuilder.getFileSettings().getRetrySettings(), serviceRetry); clientSettingsBuilder.getFileSettings().setRetrySettings(getFileRetrySettings); + RetrySettings updateFileRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateFileSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.updateFileSettings().setRetrySettings(updateFileRetrySettings); + RetrySettings listTagsRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.listTagsSettings().getRetrySettings(), serviceRetry); @@ -287,6 +297,31 @@ public ArtifactRegistrySettings artifactRegistrySettings( clientSettingsBuilder.deleteTagSettings().getRetrySettings(), serviceRetry); clientSettingsBuilder.deleteTagSettings().setRetrySettings(deleteTagRetrySettings); + RetrySettings createRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createRuleSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.createRuleSettings().setRetrySettings(createRuleRetrySettings); + + RetrySettings listRulesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listRulesSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.listRulesSettings().setRetrySettings(listRulesRetrySettings); + + RetrySettings getRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getRuleSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getRuleSettings().setRetrySettings(getRuleRetrySettings); + + RetrySettings updateRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateRuleSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.updateRuleSettings().setRetrySettings(updateRuleRetrySettings); + + RetrySettings deleteRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteRuleSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.deleteRuleSettings().setRetrySettings(deleteRuleRetrySettings); + RetrySettings setIamPolicyRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), serviceRetry); @@ -331,6 +366,23 @@ public ArtifactRegistrySettings artifactRegistrySettings( .updateVPCSCConfigSettings() .setRetrySettings(updateVPCSCConfigRetrySettings); + RetrySettings updatePackageRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updatePackageSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.updatePackageSettings().setRetrySettings(updatePackageRetrySettings); + + RetrySettings listAttachmentsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listAttachmentsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .listAttachmentsSettings() + .setRetrySettings(listAttachmentsRetrySettings); + + RetrySettings getAttachmentRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getAttachmentSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getAttachmentSettings().setRetrySettings(getAttachmentRetrySettings); + RetrySettings listLocationsRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry); @@ -527,6 +579,16 @@ public ArtifactRegistrySettings artifactRegistrySettings( LOGGER.trace("Configured method-level retry settings for getVersion from properties."); } } + Retry updateVersionRetry = clientProperties.getUpdateVersionRetry(); + if (updateVersionRetry != null) { + RetrySettings updateVersionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateVersionSettings().getRetrySettings(), updateVersionRetry); + clientSettingsBuilder.updateVersionSettings().setRetrySettings(updateVersionRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for updateVersion from properties."); + } + } Retry listFilesRetry = clientProperties.getListFilesRetry(); if (listFilesRetry != null) { RetrySettings listFilesRetrySettings = @@ -547,6 +609,16 @@ public ArtifactRegistrySettings artifactRegistrySettings( LOGGER.trace("Configured method-level retry settings for getFile from properties."); } } + Retry updateFileRetry = clientProperties.getUpdateFileRetry(); + if (updateFileRetry != null) { + RetrySettings updateFileRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateFileSettings().getRetrySettings(), updateFileRetry); + clientSettingsBuilder.updateFileSettings().setRetrySettings(updateFileRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for updateFile from properties."); + } + } Retry listTagsRetry = clientProperties.getListTagsRetry(); if (listTagsRetry != null) { RetrySettings listTagsRetrySettings = @@ -597,6 +669,56 @@ public ArtifactRegistrySettings artifactRegistrySettings( LOGGER.trace("Configured method-level retry settings for deleteTag from properties."); } } + Retry createRuleRetry = clientProperties.getCreateRuleRetry(); + if (createRuleRetry != null) { + RetrySettings createRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createRuleSettings().getRetrySettings(), createRuleRetry); + clientSettingsBuilder.createRuleSettings().setRetrySettings(createRuleRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for createRule from properties."); + } + } + Retry listRulesRetry = clientProperties.getListRulesRetry(); + if (listRulesRetry != null) { + RetrySettings listRulesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listRulesSettings().getRetrySettings(), listRulesRetry); + clientSettingsBuilder.listRulesSettings().setRetrySettings(listRulesRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listRules from properties."); + } + } + Retry getRuleRetry = clientProperties.getGetRuleRetry(); + if (getRuleRetry != null) { + RetrySettings getRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getRuleSettings().getRetrySettings(), getRuleRetry); + clientSettingsBuilder.getRuleSettings().setRetrySettings(getRuleRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getRule from properties."); + } + } + Retry updateRuleRetry = clientProperties.getUpdateRuleRetry(); + if (updateRuleRetry != null) { + RetrySettings updateRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateRuleSettings().getRetrySettings(), updateRuleRetry); + clientSettingsBuilder.updateRuleSettings().setRetrySettings(updateRuleRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for updateRule from properties."); + } + } + Retry deleteRuleRetry = clientProperties.getDeleteRuleRetry(); + if (deleteRuleRetry != null) { + RetrySettings deleteRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteRuleSettings().getRetrySettings(), deleteRuleRetry); + clientSettingsBuilder.deleteRuleSettings().setRetrySettings(deleteRuleRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for deleteRule from properties."); + } + } Retry setIamPolicyRetry = clientProperties.getSetIamPolicyRetry(); if (setIamPolicyRetry != null) { RetrySettings setIamPolicyRetrySettings = @@ -684,6 +806,39 @@ public ArtifactRegistrySettings artifactRegistrySettings( "Configured method-level retry settings for updateVPCSCConfig from properties."); } } + Retry updatePackageRetry = clientProperties.getUpdatePackageRetry(); + if (updatePackageRetry != null) { + RetrySettings updatePackageRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updatePackageSettings().getRetrySettings(), updatePackageRetry); + clientSettingsBuilder.updatePackageSettings().setRetrySettings(updatePackageRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for updatePackage from properties."); + } + } + Retry listAttachmentsRetry = clientProperties.getListAttachmentsRetry(); + if (listAttachmentsRetry != null) { + RetrySettings listAttachmentsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listAttachmentsSettings().getRetrySettings(), + listAttachmentsRetry); + clientSettingsBuilder + .listAttachmentsSettings() + .setRetrySettings(listAttachmentsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listAttachments from properties."); + } + } + Retry getAttachmentRetry = clientProperties.getGetAttachmentRetry(); + if (getAttachmentRetry != null) { + RetrySettings getAttachmentRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getAttachmentSettings().getRetrySettings(), getAttachmentRetry); + clientSettingsBuilder.getAttachmentSettings().setRetrySettings(getAttachmentRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getAttachment from properties."); + } + } Retry listLocationsRetry = clientProperties.getListLocationsRetry(); if (listLocationsRetry != null) { RetrySettings listLocationsRetrySettings = diff --git a/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/src/main/java/com/google/devtools/artifactregistry/v1/spring/ArtifactRegistrySpringProperties.java b/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/src/main/java/com/google/devtools/artifactregistry/v1/spring/ArtifactRegistrySpringProperties.java index e7be2709fe..5996debb6d 100644 --- a/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/src/main/java/com/google/devtools/artifactregistry/v1/spring/ArtifactRegistrySpringProperties.java +++ b/spring-cloud-previews/google-cloud-artifact-registry-spring-starter/src/main/java/com/google/devtools/artifactregistry/v1/spring/ArtifactRegistrySpringProperties.java @@ -119,6 +119,11 @@ public class ArtifactRegistrySpringProperties implements CredentialsSupplier { * precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry getVersionRetry; + /** + * Allow override of retry settings at method-level for updateVersion. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry updateVersionRetry; /** * Allow override of retry settings at method-level for listFiles. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -129,6 +134,11 @@ public class ArtifactRegistrySpringProperties implements CredentialsSupplier { * over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry getFileRetry; + /** + * Allow override of retry settings at method-level for updateFile. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry updateFileRetry; /** * Allow override of retry settings at method-level for listTags. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -154,6 +164,31 @@ public class ArtifactRegistrySpringProperties implements CredentialsSupplier { * precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry deleteTagRetry; + /** + * Allow override of retry settings at method-level for createRule. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry createRuleRetry; + /** + * Allow override of retry settings at method-level for listRules. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listRulesRetry; + /** + * Allow override of retry settings at method-level for getRule. If defined, this takes precedence + * over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getRuleRetry; + /** + * Allow override of retry settings at method-level for updateRule. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry updateRuleRetry; + /** + * Allow override of retry settings at method-level for deleteRule. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry deleteRuleRetry; /** * Allow override of retry settings at method-level for setIamPolicy. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -189,6 +224,21 @@ public class ArtifactRegistrySpringProperties implements CredentialsSupplier { * precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry updateVPCSCConfigRetry; + /** + * Allow override of retry settings at method-level for updatePackage. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry updatePackageRetry; + /** + * Allow override of retry settings at method-level for listAttachments. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listAttachmentsRetry; + /** + * Allow override of retry settings at method-level for getAttachment. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getAttachmentRetry; /** * Allow override of retry settings at method-level for listLocations. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -357,6 +407,14 @@ public void setGetVersionRetry(Retry getVersionRetry) { this.getVersionRetry = getVersionRetry; } + public Retry getUpdateVersionRetry() { + return this.updateVersionRetry; + } + + public void setUpdateVersionRetry(Retry updateVersionRetry) { + this.updateVersionRetry = updateVersionRetry; + } + public Retry getListFilesRetry() { return this.listFilesRetry; } @@ -373,6 +431,14 @@ public void setGetFileRetry(Retry getFileRetry) { this.getFileRetry = getFileRetry; } + public Retry getUpdateFileRetry() { + return this.updateFileRetry; + } + + public void setUpdateFileRetry(Retry updateFileRetry) { + this.updateFileRetry = updateFileRetry; + } + public Retry getListTagsRetry() { return this.listTagsRetry; } @@ -413,6 +479,46 @@ public void setDeleteTagRetry(Retry deleteTagRetry) { this.deleteTagRetry = deleteTagRetry; } + public Retry getCreateRuleRetry() { + return this.createRuleRetry; + } + + public void setCreateRuleRetry(Retry createRuleRetry) { + this.createRuleRetry = createRuleRetry; + } + + public Retry getListRulesRetry() { + return this.listRulesRetry; + } + + public void setListRulesRetry(Retry listRulesRetry) { + this.listRulesRetry = listRulesRetry; + } + + public Retry getGetRuleRetry() { + return this.getRuleRetry; + } + + public void setGetRuleRetry(Retry getRuleRetry) { + this.getRuleRetry = getRuleRetry; + } + + public Retry getUpdateRuleRetry() { + return this.updateRuleRetry; + } + + public void setUpdateRuleRetry(Retry updateRuleRetry) { + this.updateRuleRetry = updateRuleRetry; + } + + public Retry getDeleteRuleRetry() { + return this.deleteRuleRetry; + } + + public void setDeleteRuleRetry(Retry deleteRuleRetry) { + this.deleteRuleRetry = deleteRuleRetry; + } + public Retry getSetIamPolicyRetry() { return this.setIamPolicyRetry; } @@ -469,6 +575,30 @@ public void setUpdateVPCSCConfigRetry(Retry updateVPCSCConfigRetry) { this.updateVPCSCConfigRetry = updateVPCSCConfigRetry; } + public Retry getUpdatePackageRetry() { + return this.updatePackageRetry; + } + + public void setUpdatePackageRetry(Retry updatePackageRetry) { + this.updatePackageRetry = updatePackageRetry; + } + + public Retry getListAttachmentsRetry() { + return this.listAttachmentsRetry; + } + + public void setListAttachmentsRetry(Retry listAttachmentsRetry) { + this.listAttachmentsRetry = listAttachmentsRetry; + } + + public Retry getGetAttachmentRetry() { + return this.getAttachmentRetry; + } + + public void setGetAttachmentRetry(Retry getAttachmentRetry) { + this.getAttachmentRetry = getAttachmentRetry; + } + public Retry getListLocationsRetry() { return this.listLocationsRetry; } diff --git a/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/src/main/java/com/google/cloud/contactcenterinsights/v1/spring/ContactCenterInsightsSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/src/main/java/com/google/cloud/contactcenterinsights/v1/spring/ContactCenterInsightsSpringAutoConfiguration.java index 20db2befbf..56bac66623 100644 --- a/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/src/main/java/com/google/cloud/contactcenterinsights/v1/spring/ContactCenterInsightsSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/src/main/java/com/google/cloud/contactcenterinsights/v1/spring/ContactCenterInsightsSpringAutoConfiguration.java @@ -309,6 +309,41 @@ public ContactCenterInsightsSettings contactCenterInsightsSettings( clientSettingsBuilder.updateSettingsSettings().getRetrySettings(), serviceRetry); clientSettingsBuilder.updateSettingsSettings().setRetrySettings(updateSettingsRetrySettings); + RetrySettings createAnalysisRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createAnalysisRuleSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .createAnalysisRuleSettings() + .setRetrySettings(createAnalysisRuleRetrySettings); + + RetrySettings getAnalysisRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getAnalysisRuleSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .getAnalysisRuleSettings() + .setRetrySettings(getAnalysisRuleRetrySettings); + + RetrySettings listAnalysisRulesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listAnalysisRulesSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .listAnalysisRulesSettings() + .setRetrySettings(listAnalysisRulesRetrySettings); + + RetrySettings updateAnalysisRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateAnalysisRuleSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .updateAnalysisRuleSettings() + .setRetrySettings(updateAnalysisRuleRetrySettings); + + RetrySettings deleteAnalysisRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteAnalysisRuleSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .deleteAnalysisRuleSettings() + .setRetrySettings(deleteAnalysisRuleRetrySettings); + RetrySettings getEncryptionSpecRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.getEncryptionSpecSettings().getRetrySettings(), serviceRetry); @@ -341,6 +376,163 @@ public ContactCenterInsightsSettings contactCenterInsightsSettings( clientSettingsBuilder.deleteViewSettings().getRetrySettings(), serviceRetry); clientSettingsBuilder.deleteViewSettings().setRetrySettings(deleteViewRetrySettings); + RetrySettings createQaQuestionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createQaQuestionSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .createQaQuestionSettings() + .setRetrySettings(createQaQuestionRetrySettings); + + RetrySettings getQaQuestionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getQaQuestionSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getQaQuestionSettings().setRetrySettings(getQaQuestionRetrySettings); + + RetrySettings updateQaQuestionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateQaQuestionSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .updateQaQuestionSettings() + .setRetrySettings(updateQaQuestionRetrySettings); + + RetrySettings deleteQaQuestionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteQaQuestionSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .deleteQaQuestionSettings() + .setRetrySettings(deleteQaQuestionRetrySettings); + + RetrySettings listQaQuestionsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listQaQuestionsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .listQaQuestionsSettings() + .setRetrySettings(listQaQuestionsRetrySettings); + + RetrySettings createQaScorecardRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createQaScorecardSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .createQaScorecardSettings() + .setRetrySettings(createQaScorecardRetrySettings); + + RetrySettings getQaScorecardRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getQaScorecardSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getQaScorecardSettings().setRetrySettings(getQaScorecardRetrySettings); + + RetrySettings updateQaScorecardRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateQaScorecardSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .updateQaScorecardSettings() + .setRetrySettings(updateQaScorecardRetrySettings); + + RetrySettings deleteQaScorecardRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteQaScorecardSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .deleteQaScorecardSettings() + .setRetrySettings(deleteQaScorecardRetrySettings); + + RetrySettings listQaScorecardsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listQaScorecardsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .listQaScorecardsSettings() + .setRetrySettings(listQaScorecardsRetrySettings); + + RetrySettings createQaScorecardRevisionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createQaScorecardRevisionSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .createQaScorecardRevisionSettings() + .setRetrySettings(createQaScorecardRevisionRetrySettings); + + RetrySettings getQaScorecardRevisionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getQaScorecardRevisionSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .getQaScorecardRevisionSettings() + .setRetrySettings(getQaScorecardRevisionRetrySettings); + + RetrySettings deployQaScorecardRevisionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deployQaScorecardRevisionSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .deployQaScorecardRevisionSettings() + .setRetrySettings(deployQaScorecardRevisionRetrySettings); + + RetrySettings undeployQaScorecardRevisionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.undeployQaScorecardRevisionSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .undeployQaScorecardRevisionSettings() + .setRetrySettings(undeployQaScorecardRevisionRetrySettings); + + RetrySettings deleteQaScorecardRevisionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteQaScorecardRevisionSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .deleteQaScorecardRevisionSettings() + .setRetrySettings(deleteQaScorecardRevisionRetrySettings); + + RetrySettings listQaScorecardRevisionsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listQaScorecardRevisionsSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .listQaScorecardRevisionsSettings() + .setRetrySettings(listQaScorecardRevisionsRetrySettings); + + RetrySettings createFeedbackLabelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createFeedbackLabelSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .createFeedbackLabelSettings() + .setRetrySettings(createFeedbackLabelRetrySettings); + + RetrySettings listFeedbackLabelsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listFeedbackLabelsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .listFeedbackLabelsSettings() + .setRetrySettings(listFeedbackLabelsRetrySettings); + + RetrySettings getFeedbackLabelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getFeedbackLabelSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .getFeedbackLabelSettings() + .setRetrySettings(getFeedbackLabelRetrySettings); + + RetrySettings updateFeedbackLabelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateFeedbackLabelSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .updateFeedbackLabelSettings() + .setRetrySettings(updateFeedbackLabelRetrySettings); + + RetrySettings deleteFeedbackLabelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteFeedbackLabelSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .deleteFeedbackLabelSettings() + .setRetrySettings(deleteFeedbackLabelRetrySettings); + + RetrySettings listAllFeedbackLabelsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listAllFeedbackLabelsSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .listAllFeedbackLabelsSettings() + .setRetrySettings(listAllFeedbackLabelsRetrySettings); + if (LOGGER.isTraceEnabled()) { LOGGER.trace("Configured service-level retry settings from properties."); } @@ -638,6 +830,75 @@ public ContactCenterInsightsSettings contactCenterInsightsSettings( LOGGER.trace("Configured method-level retry settings for updateSettings from properties."); } } + Retry createAnalysisRuleRetry = clientProperties.getCreateAnalysisRuleRetry(); + if (createAnalysisRuleRetry != null) { + RetrySettings createAnalysisRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createAnalysisRuleSettings().getRetrySettings(), + createAnalysisRuleRetry); + clientSettingsBuilder + .createAnalysisRuleSettings() + .setRetrySettings(createAnalysisRuleRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for createAnalysisRule from properties."); + } + } + Retry getAnalysisRuleRetry = clientProperties.getGetAnalysisRuleRetry(); + if (getAnalysisRuleRetry != null) { + RetrySettings getAnalysisRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getAnalysisRuleSettings().getRetrySettings(), + getAnalysisRuleRetry); + clientSettingsBuilder + .getAnalysisRuleSettings() + .setRetrySettings(getAnalysisRuleRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getAnalysisRule from properties."); + } + } + Retry listAnalysisRulesRetry = clientProperties.getListAnalysisRulesRetry(); + if (listAnalysisRulesRetry != null) { + RetrySettings listAnalysisRulesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listAnalysisRulesSettings().getRetrySettings(), + listAnalysisRulesRetry); + clientSettingsBuilder + .listAnalysisRulesSettings() + .setRetrySettings(listAnalysisRulesRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for listAnalysisRules from properties."); + } + } + Retry updateAnalysisRuleRetry = clientProperties.getUpdateAnalysisRuleRetry(); + if (updateAnalysisRuleRetry != null) { + RetrySettings updateAnalysisRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateAnalysisRuleSettings().getRetrySettings(), + updateAnalysisRuleRetry); + clientSettingsBuilder + .updateAnalysisRuleSettings() + .setRetrySettings(updateAnalysisRuleRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for updateAnalysisRule from properties."); + } + } + Retry deleteAnalysisRuleRetry = clientProperties.getDeleteAnalysisRuleRetry(); + if (deleteAnalysisRuleRetry != null) { + RetrySettings deleteAnalysisRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteAnalysisRuleSettings().getRetrySettings(), + deleteAnalysisRuleRetry); + clientSettingsBuilder + .deleteAnalysisRuleSettings() + .setRetrySettings(deleteAnalysisRuleRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for deleteAnalysisRule from properties."); + } + } Retry getEncryptionSpecRetry = clientProperties.getGetEncryptionSpecRetry(); if (getEncryptionSpecRetry != null) { RetrySettings getEncryptionSpecRetrySettings = @@ -702,6 +963,306 @@ public ContactCenterInsightsSettings contactCenterInsightsSettings( LOGGER.trace("Configured method-level retry settings for deleteView from properties."); } } + Retry createQaQuestionRetry = clientProperties.getCreateQaQuestionRetry(); + if (createQaQuestionRetry != null) { + RetrySettings createQaQuestionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createQaQuestionSettings().getRetrySettings(), + createQaQuestionRetry); + clientSettingsBuilder + .createQaQuestionSettings() + .setRetrySettings(createQaQuestionRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for createQaQuestion from properties."); + } + } + Retry getQaQuestionRetry = clientProperties.getGetQaQuestionRetry(); + if (getQaQuestionRetry != null) { + RetrySettings getQaQuestionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getQaQuestionSettings().getRetrySettings(), getQaQuestionRetry); + clientSettingsBuilder.getQaQuestionSettings().setRetrySettings(getQaQuestionRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getQaQuestion from properties."); + } + } + Retry updateQaQuestionRetry = clientProperties.getUpdateQaQuestionRetry(); + if (updateQaQuestionRetry != null) { + RetrySettings updateQaQuestionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateQaQuestionSettings().getRetrySettings(), + updateQaQuestionRetry); + clientSettingsBuilder + .updateQaQuestionSettings() + .setRetrySettings(updateQaQuestionRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for updateQaQuestion from properties."); + } + } + Retry deleteQaQuestionRetry = clientProperties.getDeleteQaQuestionRetry(); + if (deleteQaQuestionRetry != null) { + RetrySettings deleteQaQuestionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteQaQuestionSettings().getRetrySettings(), + deleteQaQuestionRetry); + clientSettingsBuilder + .deleteQaQuestionSettings() + .setRetrySettings(deleteQaQuestionRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for deleteQaQuestion from properties."); + } + } + Retry listQaQuestionsRetry = clientProperties.getListQaQuestionsRetry(); + if (listQaQuestionsRetry != null) { + RetrySettings listQaQuestionsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listQaQuestionsSettings().getRetrySettings(), + listQaQuestionsRetry); + clientSettingsBuilder + .listQaQuestionsSettings() + .setRetrySettings(listQaQuestionsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listQaQuestions from properties."); + } + } + Retry createQaScorecardRetry = clientProperties.getCreateQaScorecardRetry(); + if (createQaScorecardRetry != null) { + RetrySettings createQaScorecardRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createQaScorecardSettings().getRetrySettings(), + createQaScorecardRetry); + clientSettingsBuilder + .createQaScorecardSettings() + .setRetrySettings(createQaScorecardRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for createQaScorecard from properties."); + } + } + Retry getQaScorecardRetry = clientProperties.getGetQaScorecardRetry(); + if (getQaScorecardRetry != null) { + RetrySettings getQaScorecardRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getQaScorecardSettings().getRetrySettings(), + getQaScorecardRetry); + clientSettingsBuilder.getQaScorecardSettings().setRetrySettings(getQaScorecardRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getQaScorecard from properties."); + } + } + Retry updateQaScorecardRetry = clientProperties.getUpdateQaScorecardRetry(); + if (updateQaScorecardRetry != null) { + RetrySettings updateQaScorecardRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateQaScorecardSettings().getRetrySettings(), + updateQaScorecardRetry); + clientSettingsBuilder + .updateQaScorecardSettings() + .setRetrySettings(updateQaScorecardRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for updateQaScorecard from properties."); + } + } + Retry deleteQaScorecardRetry = clientProperties.getDeleteQaScorecardRetry(); + if (deleteQaScorecardRetry != null) { + RetrySettings deleteQaScorecardRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteQaScorecardSettings().getRetrySettings(), + deleteQaScorecardRetry); + clientSettingsBuilder + .deleteQaScorecardSettings() + .setRetrySettings(deleteQaScorecardRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for deleteQaScorecard from properties."); + } + } + Retry listQaScorecardsRetry = clientProperties.getListQaScorecardsRetry(); + if (listQaScorecardsRetry != null) { + RetrySettings listQaScorecardsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listQaScorecardsSettings().getRetrySettings(), + listQaScorecardsRetry); + clientSettingsBuilder + .listQaScorecardsSettings() + .setRetrySettings(listQaScorecardsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for listQaScorecards from properties."); + } + } + Retry createQaScorecardRevisionRetry = clientProperties.getCreateQaScorecardRevisionRetry(); + if (createQaScorecardRevisionRetry != null) { + RetrySettings createQaScorecardRevisionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createQaScorecardRevisionSettings().getRetrySettings(), + createQaScorecardRevisionRetry); + clientSettingsBuilder + .createQaScorecardRevisionSettings() + .setRetrySettings(createQaScorecardRevisionRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for createQaScorecardRevision from properties."); + } + } + Retry getQaScorecardRevisionRetry = clientProperties.getGetQaScorecardRevisionRetry(); + if (getQaScorecardRevisionRetry != null) { + RetrySettings getQaScorecardRevisionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getQaScorecardRevisionSettings().getRetrySettings(), + getQaScorecardRevisionRetry); + clientSettingsBuilder + .getQaScorecardRevisionSettings() + .setRetrySettings(getQaScorecardRevisionRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for getQaScorecardRevision from properties."); + } + } + Retry deployQaScorecardRevisionRetry = clientProperties.getDeployQaScorecardRevisionRetry(); + if (deployQaScorecardRevisionRetry != null) { + RetrySettings deployQaScorecardRevisionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deployQaScorecardRevisionSettings().getRetrySettings(), + deployQaScorecardRevisionRetry); + clientSettingsBuilder + .deployQaScorecardRevisionSettings() + .setRetrySettings(deployQaScorecardRevisionRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for deployQaScorecardRevision from properties."); + } + } + Retry undeployQaScorecardRevisionRetry = clientProperties.getUndeployQaScorecardRevisionRetry(); + if (undeployQaScorecardRevisionRetry != null) { + RetrySettings undeployQaScorecardRevisionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.undeployQaScorecardRevisionSettings().getRetrySettings(), + undeployQaScorecardRevisionRetry); + clientSettingsBuilder + .undeployQaScorecardRevisionSettings() + .setRetrySettings(undeployQaScorecardRevisionRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for undeployQaScorecardRevision from properties."); + } + } + Retry deleteQaScorecardRevisionRetry = clientProperties.getDeleteQaScorecardRevisionRetry(); + if (deleteQaScorecardRevisionRetry != null) { + RetrySettings deleteQaScorecardRevisionRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteQaScorecardRevisionSettings().getRetrySettings(), + deleteQaScorecardRevisionRetry); + clientSettingsBuilder + .deleteQaScorecardRevisionSettings() + .setRetrySettings(deleteQaScorecardRevisionRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for deleteQaScorecardRevision from properties."); + } + } + Retry listQaScorecardRevisionsRetry = clientProperties.getListQaScorecardRevisionsRetry(); + if (listQaScorecardRevisionsRetry != null) { + RetrySettings listQaScorecardRevisionsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listQaScorecardRevisionsSettings().getRetrySettings(), + listQaScorecardRevisionsRetry); + clientSettingsBuilder + .listQaScorecardRevisionsSettings() + .setRetrySettings(listQaScorecardRevisionsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for listQaScorecardRevisions from properties."); + } + } + Retry createFeedbackLabelRetry = clientProperties.getCreateFeedbackLabelRetry(); + if (createFeedbackLabelRetry != null) { + RetrySettings createFeedbackLabelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.createFeedbackLabelSettings().getRetrySettings(), + createFeedbackLabelRetry); + clientSettingsBuilder + .createFeedbackLabelSettings() + .setRetrySettings(createFeedbackLabelRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for createFeedbackLabel from properties."); + } + } + Retry listFeedbackLabelsRetry = clientProperties.getListFeedbackLabelsRetry(); + if (listFeedbackLabelsRetry != null) { + RetrySettings listFeedbackLabelsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listFeedbackLabelsSettings().getRetrySettings(), + listFeedbackLabelsRetry); + clientSettingsBuilder + .listFeedbackLabelsSettings() + .setRetrySettings(listFeedbackLabelsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for listFeedbackLabels from properties."); + } + } + Retry getFeedbackLabelRetry = clientProperties.getGetFeedbackLabelRetry(); + if (getFeedbackLabelRetry != null) { + RetrySettings getFeedbackLabelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getFeedbackLabelSettings().getRetrySettings(), + getFeedbackLabelRetry); + clientSettingsBuilder + .getFeedbackLabelSettings() + .setRetrySettings(getFeedbackLabelRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for getFeedbackLabel from properties."); + } + } + Retry updateFeedbackLabelRetry = clientProperties.getUpdateFeedbackLabelRetry(); + if (updateFeedbackLabelRetry != null) { + RetrySettings updateFeedbackLabelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateFeedbackLabelSettings().getRetrySettings(), + updateFeedbackLabelRetry); + clientSettingsBuilder + .updateFeedbackLabelSettings() + .setRetrySettings(updateFeedbackLabelRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for updateFeedbackLabel from properties."); + } + } + Retry deleteFeedbackLabelRetry = clientProperties.getDeleteFeedbackLabelRetry(); + if (deleteFeedbackLabelRetry != null) { + RetrySettings deleteFeedbackLabelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteFeedbackLabelSettings().getRetrySettings(), + deleteFeedbackLabelRetry); + clientSettingsBuilder + .deleteFeedbackLabelSettings() + .setRetrySettings(deleteFeedbackLabelRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for deleteFeedbackLabel from properties."); + } + } + Retry listAllFeedbackLabelsRetry = clientProperties.getListAllFeedbackLabelsRetry(); + if (listAllFeedbackLabelsRetry != null) { + RetrySettings listAllFeedbackLabelsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listAllFeedbackLabelsSettings().getRetrySettings(), + listAllFeedbackLabelsRetry); + clientSettingsBuilder + .listAllFeedbackLabelsSettings() + .setRetrySettings(listAllFeedbackLabelsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for listAllFeedbackLabels from properties."); + } + } return clientSettingsBuilder.build(); } diff --git a/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/src/main/java/com/google/cloud/contactcenterinsights/v1/spring/ContactCenterInsightsSpringProperties.java b/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/src/main/java/com/google/cloud/contactcenterinsights/v1/spring/ContactCenterInsightsSpringProperties.java index 1dc77babf8..4a71d02e7f 100644 --- a/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/src/main/java/com/google/cloud/contactcenterinsights/v1/spring/ContactCenterInsightsSpringProperties.java +++ b/spring-cloud-previews/google-cloud-contact-center-insights-spring-starter/src/main/java/com/google/cloud/contactcenterinsights/v1/spring/ContactCenterInsightsSpringProperties.java @@ -162,6 +162,31 @@ public class ContactCenterInsightsSpringProperties implements CredentialsSupplie * precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry updateSettingsRetry; + /** + * Allow override of retry settings at method-level for createAnalysisRule. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry createAnalysisRuleRetry; + /** + * Allow override of retry settings at method-level for getAnalysisRule. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getAnalysisRuleRetry; + /** + * Allow override of retry settings at method-level for listAnalysisRules. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listAnalysisRulesRetry; + /** + * Allow override of retry settings at method-level for updateAnalysisRule. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry updateAnalysisRuleRetry; + /** + * Allow override of retry settings at method-level for deleteAnalysisRule. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry deleteAnalysisRuleRetry; /** * Allow override of retry settings at method-level for getEncryptionSpec. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -192,6 +217,116 @@ public class ContactCenterInsightsSpringProperties implements CredentialsSupplie * precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry deleteViewRetry; + /** + * Allow override of retry settings at method-level for createQaQuestion. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry createQaQuestionRetry; + /** + * Allow override of retry settings at method-level for getQaQuestion. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getQaQuestionRetry; + /** + * Allow override of retry settings at method-level for updateQaQuestion. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry updateQaQuestionRetry; + /** + * Allow override of retry settings at method-level for deleteQaQuestion. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry deleteQaQuestionRetry; + /** + * Allow override of retry settings at method-level for listQaQuestions. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listQaQuestionsRetry; + /** + * Allow override of retry settings at method-level for createQaScorecard. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry createQaScorecardRetry; + /** + * Allow override of retry settings at method-level for getQaScorecard. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getQaScorecardRetry; + /** + * Allow override of retry settings at method-level for updateQaScorecard. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry updateQaScorecardRetry; + /** + * Allow override of retry settings at method-level for deleteQaScorecard. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry deleteQaScorecardRetry; + /** + * Allow override of retry settings at method-level for listQaScorecards. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listQaScorecardsRetry; + /** + * Allow override of retry settings at method-level for createQaScorecardRevision. If defined, + * this takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry createQaScorecardRevisionRetry; + /** + * Allow override of retry settings at method-level for getQaScorecardRevision. If defined, this + * takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getQaScorecardRevisionRetry; + /** + * Allow override of retry settings at method-level for deployQaScorecardRevision. If defined, + * this takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry deployQaScorecardRevisionRetry; + /** + * Allow override of retry settings at method-level for undeployQaScorecardRevision. If defined, + * this takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry undeployQaScorecardRevisionRetry; + /** + * Allow override of retry settings at method-level for deleteQaScorecardRevision. If defined, + * this takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry deleteQaScorecardRevisionRetry; + /** + * Allow override of retry settings at method-level for listQaScorecardRevisions. If defined, this + * takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listQaScorecardRevisionsRetry; + /** + * Allow override of retry settings at method-level for createFeedbackLabel. If defined, this + * takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry createFeedbackLabelRetry; + /** + * Allow override of retry settings at method-level for listFeedbackLabels. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listFeedbackLabelsRetry; + /** + * Allow override of retry settings at method-level for getFeedbackLabel. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getFeedbackLabelRetry; + /** + * Allow override of retry settings at method-level for updateFeedbackLabel. If defined, this + * takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry updateFeedbackLabelRetry; + /** + * Allow override of retry settings at method-level for deleteFeedbackLabel. If defined, this + * takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry deleteFeedbackLabelRetry; + /** + * Allow override of retry settings at method-level for listAllFeedbackLabels. If defined, this + * takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listAllFeedbackLabelsRetry; @Override public Credentials getCredentials() { @@ -422,6 +557,46 @@ public void setUpdateSettingsRetry(Retry updateSettingsRetry) { this.updateSettingsRetry = updateSettingsRetry; } + public Retry getCreateAnalysisRuleRetry() { + return this.createAnalysisRuleRetry; + } + + public void setCreateAnalysisRuleRetry(Retry createAnalysisRuleRetry) { + this.createAnalysisRuleRetry = createAnalysisRuleRetry; + } + + public Retry getGetAnalysisRuleRetry() { + return this.getAnalysisRuleRetry; + } + + public void setGetAnalysisRuleRetry(Retry getAnalysisRuleRetry) { + this.getAnalysisRuleRetry = getAnalysisRuleRetry; + } + + public Retry getListAnalysisRulesRetry() { + return this.listAnalysisRulesRetry; + } + + public void setListAnalysisRulesRetry(Retry listAnalysisRulesRetry) { + this.listAnalysisRulesRetry = listAnalysisRulesRetry; + } + + public Retry getUpdateAnalysisRuleRetry() { + return this.updateAnalysisRuleRetry; + } + + public void setUpdateAnalysisRuleRetry(Retry updateAnalysisRuleRetry) { + this.updateAnalysisRuleRetry = updateAnalysisRuleRetry; + } + + public Retry getDeleteAnalysisRuleRetry() { + return this.deleteAnalysisRuleRetry; + } + + public void setDeleteAnalysisRuleRetry(Retry deleteAnalysisRuleRetry) { + this.deleteAnalysisRuleRetry = deleteAnalysisRuleRetry; + } + public Retry getGetEncryptionSpecRetry() { return this.getEncryptionSpecRetry; } @@ -469,4 +644,180 @@ public Retry getDeleteViewRetry() { public void setDeleteViewRetry(Retry deleteViewRetry) { this.deleteViewRetry = deleteViewRetry; } + + public Retry getCreateQaQuestionRetry() { + return this.createQaQuestionRetry; + } + + public void setCreateQaQuestionRetry(Retry createQaQuestionRetry) { + this.createQaQuestionRetry = createQaQuestionRetry; + } + + public Retry getGetQaQuestionRetry() { + return this.getQaQuestionRetry; + } + + public void setGetQaQuestionRetry(Retry getQaQuestionRetry) { + this.getQaQuestionRetry = getQaQuestionRetry; + } + + public Retry getUpdateQaQuestionRetry() { + return this.updateQaQuestionRetry; + } + + public void setUpdateQaQuestionRetry(Retry updateQaQuestionRetry) { + this.updateQaQuestionRetry = updateQaQuestionRetry; + } + + public Retry getDeleteQaQuestionRetry() { + return this.deleteQaQuestionRetry; + } + + public void setDeleteQaQuestionRetry(Retry deleteQaQuestionRetry) { + this.deleteQaQuestionRetry = deleteQaQuestionRetry; + } + + public Retry getListQaQuestionsRetry() { + return this.listQaQuestionsRetry; + } + + public void setListQaQuestionsRetry(Retry listQaQuestionsRetry) { + this.listQaQuestionsRetry = listQaQuestionsRetry; + } + + public Retry getCreateQaScorecardRetry() { + return this.createQaScorecardRetry; + } + + public void setCreateQaScorecardRetry(Retry createQaScorecardRetry) { + this.createQaScorecardRetry = createQaScorecardRetry; + } + + public Retry getGetQaScorecardRetry() { + return this.getQaScorecardRetry; + } + + public void setGetQaScorecardRetry(Retry getQaScorecardRetry) { + this.getQaScorecardRetry = getQaScorecardRetry; + } + + public Retry getUpdateQaScorecardRetry() { + return this.updateQaScorecardRetry; + } + + public void setUpdateQaScorecardRetry(Retry updateQaScorecardRetry) { + this.updateQaScorecardRetry = updateQaScorecardRetry; + } + + public Retry getDeleteQaScorecardRetry() { + return this.deleteQaScorecardRetry; + } + + public void setDeleteQaScorecardRetry(Retry deleteQaScorecardRetry) { + this.deleteQaScorecardRetry = deleteQaScorecardRetry; + } + + public Retry getListQaScorecardsRetry() { + return this.listQaScorecardsRetry; + } + + public void setListQaScorecardsRetry(Retry listQaScorecardsRetry) { + this.listQaScorecardsRetry = listQaScorecardsRetry; + } + + public Retry getCreateQaScorecardRevisionRetry() { + return this.createQaScorecardRevisionRetry; + } + + public void setCreateQaScorecardRevisionRetry(Retry createQaScorecardRevisionRetry) { + this.createQaScorecardRevisionRetry = createQaScorecardRevisionRetry; + } + + public Retry getGetQaScorecardRevisionRetry() { + return this.getQaScorecardRevisionRetry; + } + + public void setGetQaScorecardRevisionRetry(Retry getQaScorecardRevisionRetry) { + this.getQaScorecardRevisionRetry = getQaScorecardRevisionRetry; + } + + public Retry getDeployQaScorecardRevisionRetry() { + return this.deployQaScorecardRevisionRetry; + } + + public void setDeployQaScorecardRevisionRetry(Retry deployQaScorecardRevisionRetry) { + this.deployQaScorecardRevisionRetry = deployQaScorecardRevisionRetry; + } + + public Retry getUndeployQaScorecardRevisionRetry() { + return this.undeployQaScorecardRevisionRetry; + } + + public void setUndeployQaScorecardRevisionRetry(Retry undeployQaScorecardRevisionRetry) { + this.undeployQaScorecardRevisionRetry = undeployQaScorecardRevisionRetry; + } + + public Retry getDeleteQaScorecardRevisionRetry() { + return this.deleteQaScorecardRevisionRetry; + } + + public void setDeleteQaScorecardRevisionRetry(Retry deleteQaScorecardRevisionRetry) { + this.deleteQaScorecardRevisionRetry = deleteQaScorecardRevisionRetry; + } + + public Retry getListQaScorecardRevisionsRetry() { + return this.listQaScorecardRevisionsRetry; + } + + public void setListQaScorecardRevisionsRetry(Retry listQaScorecardRevisionsRetry) { + this.listQaScorecardRevisionsRetry = listQaScorecardRevisionsRetry; + } + + public Retry getCreateFeedbackLabelRetry() { + return this.createFeedbackLabelRetry; + } + + public void setCreateFeedbackLabelRetry(Retry createFeedbackLabelRetry) { + this.createFeedbackLabelRetry = createFeedbackLabelRetry; + } + + public Retry getListFeedbackLabelsRetry() { + return this.listFeedbackLabelsRetry; + } + + public void setListFeedbackLabelsRetry(Retry listFeedbackLabelsRetry) { + this.listFeedbackLabelsRetry = listFeedbackLabelsRetry; + } + + public Retry getGetFeedbackLabelRetry() { + return this.getFeedbackLabelRetry; + } + + public void setGetFeedbackLabelRetry(Retry getFeedbackLabelRetry) { + this.getFeedbackLabelRetry = getFeedbackLabelRetry; + } + + public Retry getUpdateFeedbackLabelRetry() { + return this.updateFeedbackLabelRetry; + } + + public void setUpdateFeedbackLabelRetry(Retry updateFeedbackLabelRetry) { + this.updateFeedbackLabelRetry = updateFeedbackLabelRetry; + } + + public Retry getDeleteFeedbackLabelRetry() { + return this.deleteFeedbackLabelRetry; + } + + public void setDeleteFeedbackLabelRetry(Retry deleteFeedbackLabelRetry) { + this.deleteFeedbackLabelRetry = deleteFeedbackLabelRetry; + } + + public Retry getListAllFeedbackLabelsRetry() { + return this.listAllFeedbackLabelsRetry; + } + + public void setListAllFeedbackLabelsRetry(Retry listAllFeedbackLabelsRetry) { + this.listAllFeedbackLabelsRetry = listAllFeedbackLabelsRetry; + } } diff --git a/spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/java/com/google/cloud/dataplex/v1/spring/CatalogServiceSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/java/com/google/cloud/dataplex/v1/spring/CatalogServiceSpringAutoConfiguration.java index cb1905def2..7b97b78b08 100644 --- a/spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/java/com/google/cloud/dataplex/v1/spring/CatalogServiceSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/java/com/google/cloud/dataplex/v1/spring/CatalogServiceSpringAutoConfiguration.java @@ -229,6 +229,25 @@ public CatalogServiceSettings catalogServiceSettings( clientSettingsBuilder.searchEntriesSettings().getRetrySettings(), serviceRetry); clientSettingsBuilder.searchEntriesSettings().setRetrySettings(searchEntriesRetrySettings); + RetrySettings getMetadataJobRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getMetadataJobSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getMetadataJobSettings().setRetrySettings(getMetadataJobRetrySettings); + + RetrySettings listMetadataJobsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listMetadataJobsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .listMetadataJobsSettings() + .setRetrySettings(listMetadataJobsRetrySettings); + + RetrySettings cancelMetadataJobRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.cancelMetadataJobSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .cancelMetadataJobSettings() + .setRetrySettings(cancelMetadataJobRetrySettings); + RetrySettings listLocationsRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry); @@ -380,6 +399,45 @@ public CatalogServiceSettings catalogServiceSettings( LOGGER.trace("Configured method-level retry settings for searchEntries from properties."); } } + Retry getMetadataJobRetry = clientProperties.getGetMetadataJobRetry(); + if (getMetadataJobRetry != null) { + RetrySettings getMetadataJobRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getMetadataJobSettings().getRetrySettings(), + getMetadataJobRetry); + clientSettingsBuilder.getMetadataJobSettings().setRetrySettings(getMetadataJobRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getMetadataJob from properties."); + } + } + Retry listMetadataJobsRetry = clientProperties.getListMetadataJobsRetry(); + if (listMetadataJobsRetry != null) { + RetrySettings listMetadataJobsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listMetadataJobsSettings().getRetrySettings(), + listMetadataJobsRetry); + clientSettingsBuilder + .listMetadataJobsSettings() + .setRetrySettings(listMetadataJobsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for listMetadataJobs from properties."); + } + } + Retry cancelMetadataJobRetry = clientProperties.getCancelMetadataJobRetry(); + if (cancelMetadataJobRetry != null) { + RetrySettings cancelMetadataJobRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.cancelMetadataJobSettings().getRetrySettings(), + cancelMetadataJobRetry); + clientSettingsBuilder + .cancelMetadataJobSettings() + .setRetrySettings(cancelMetadataJobRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for cancelMetadataJob from properties."); + } + } Retry listLocationsRetry = clientProperties.getListLocationsRetry(); if (listLocationsRetry != null) { RetrySettings listLocationsRetrySettings = diff --git a/spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/java/com/google/cloud/dataplex/v1/spring/CatalogServiceSpringProperties.java b/spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/java/com/google/cloud/dataplex/v1/spring/CatalogServiceSpringProperties.java index 3fe2410d5c..1e0fbe992a 100644 --- a/spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/java/com/google/cloud/dataplex/v1/spring/CatalogServiceSpringProperties.java +++ b/spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/java/com/google/cloud/dataplex/v1/spring/CatalogServiceSpringProperties.java @@ -107,6 +107,21 @@ public class CatalogServiceSpringProperties implements CredentialsSupplier { * precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry searchEntriesRetry; + /** + * Allow override of retry settings at method-level for getMetadataJob. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getMetadataJobRetry; + /** + * Allow override of retry settings at method-level for listMetadataJobs. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listMetadataJobsRetry; + /** + * Allow override of retry settings at method-level for cancelMetadataJob. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry cancelMetadataJobRetry; /** * Allow override of retry settings at method-level for listLocations. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -259,6 +274,30 @@ public void setSearchEntriesRetry(Retry searchEntriesRetry) { this.searchEntriesRetry = searchEntriesRetry; } + public Retry getGetMetadataJobRetry() { + return this.getMetadataJobRetry; + } + + public void setGetMetadataJobRetry(Retry getMetadataJobRetry) { + this.getMetadataJobRetry = getMetadataJobRetry; + } + + public Retry getListMetadataJobsRetry() { + return this.listMetadataJobsRetry; + } + + public void setListMetadataJobsRetry(Retry listMetadataJobsRetry) { + this.listMetadataJobsRetry = listMetadataJobsRetry; + } + + public Retry getCancelMetadataJobRetry() { + return this.cancelMetadataJobRetry; + } + + public void setCancelMetadataJobRetry(Retry cancelMetadataJobRetry) { + this.cancelMetadataJobRetry = cancelMetadataJobRetry; + } + public Retry getListLocationsRetry() { return this.listLocationsRetry; } diff --git a/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/GroundedGenerationServiceSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/GroundedGenerationServiceSpringAutoConfiguration.java index bc28a91e78..4f0029b2a0 100644 --- a/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/GroundedGenerationServiceSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/GroundedGenerationServiceSpringAutoConfiguration.java @@ -162,6 +162,14 @@ public GroundedGenerationServiceSettings groundedGenerationServiceSettings( } Retry serviceRetry = clientProperties.getRetry(); if (serviceRetry != null) { + RetrySettings generateGroundedContentRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.generateGroundedContentSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .generateGroundedContentSettings() + .setRetrySettings(generateGroundedContentRetrySettings); + RetrySettings checkGroundingRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.checkGroundingSettings().getRetrySettings(), serviceRetry); @@ -171,6 +179,20 @@ public GroundedGenerationServiceSettings groundedGenerationServiceSettings( LOGGER.trace("Configured service-level retry settings from properties."); } } + Retry generateGroundedContentRetry = clientProperties.getGenerateGroundedContentRetry(); + if (generateGroundedContentRetry != null) { + RetrySettings generateGroundedContentRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.generateGroundedContentSettings().getRetrySettings(), + generateGroundedContentRetry); + clientSettingsBuilder + .generateGroundedContentSettings() + .setRetrySettings(generateGroundedContentRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for generateGroundedContent from properties."); + } + } Retry checkGroundingRetry = clientProperties.getCheckGroundingRetry(); if (checkGroundingRetry != null) { RetrySettings checkGroundingRetrySettings = diff --git a/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/GroundedGenerationServiceSpringProperties.java b/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/GroundedGenerationServiceSpringProperties.java index 0b72035afc..3596b60902 100644 --- a/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/GroundedGenerationServiceSpringProperties.java +++ b/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/GroundedGenerationServiceSpringProperties.java @@ -42,6 +42,11 @@ public class GroundedGenerationServiceSpringProperties implements CredentialsSup private boolean useRest = false; /** Allow override of retry settings at service level, applying to all of its RPC methods. */ @NestedConfigurationProperty private Retry retry; + /** + * Allow override of retry settings at method-level for generateGroundedContent. If defined, this + * takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry generateGroundedContentRetry; /** * Allow override of retry settings at method-level for checkGrounding. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -85,6 +90,14 @@ public void setRetry(Retry retry) { this.retry = retry; } + public Retry getGenerateGroundedContentRetry() { + return this.generateGroundedContentRetry; + } + + public void setGenerateGroundedContentRetry(Retry generateGroundedContentRetry) { + this.generateGroundedContentRetry = generateGroundedContentRetry; + } + public Retry getCheckGroundingRetry() { return this.checkGroundingRetry; } diff --git a/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/SearchServiceSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/SearchServiceSpringAutoConfiguration.java index a65c97e214..7860fdaa2b 100644 --- a/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/SearchServiceSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/SearchServiceSpringAutoConfiguration.java @@ -165,6 +165,11 @@ public SearchServiceSettings searchServiceSettings( clientSettingsBuilder.searchSettings().getRetrySettings(), serviceRetry); clientSettingsBuilder.searchSettings().setRetrySettings(searchRetrySettings); + RetrySettings searchLiteRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.searchLiteSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.searchLiteSettings().setRetrySettings(searchLiteRetrySettings); + if (LOGGER.isTraceEnabled()) { LOGGER.trace("Configured service-level retry settings from properties."); } @@ -179,6 +184,16 @@ public SearchServiceSettings searchServiceSettings( LOGGER.trace("Configured method-level retry settings for search from properties."); } } + Retry searchLiteRetry = clientProperties.getSearchLiteRetry(); + if (searchLiteRetry != null) { + RetrySettings searchLiteRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.searchLiteSettings().getRetrySettings(), searchLiteRetry); + clientSettingsBuilder.searchLiteSettings().setRetrySettings(searchLiteRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for searchLite from properties."); + } + } return clientSettingsBuilder.build(); } diff --git a/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/SearchServiceSpringProperties.java b/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/SearchServiceSpringProperties.java index 7eef87f904..7bb430678f 100644 --- a/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/SearchServiceSpringProperties.java +++ b/spring-cloud-previews/google-cloud-discoveryengine-spring-starter/src/main/java/com/google/cloud/discoveryengine/v1/spring/SearchServiceSpringProperties.java @@ -47,6 +47,11 @@ public class SearchServiceSpringProperties implements CredentialsSupplier { * over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry searchRetry; + /** + * Allow override of retry settings at method-level for searchLite. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry searchLiteRetry; @Override public Credentials getCredentials() { @@ -92,4 +97,12 @@ public Retry getSearchRetry() { public void setSearchRetry(Retry searchRetry) { this.searchRetry = searchRetry; } + + public Retry getSearchLiteRetry() { + return this.searchLiteRetry; + } + + public void setSearchLiteRetry(Retry searchLiteRetry) { + this.searchLiteRetry = searchLiteRetry; + } } diff --git a/spring-cloud-previews/google-cloud-eventarc-spring-starter/src/main/java/com/google/cloud/eventarc/v1/spring/EventarcSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-eventarc-spring-starter/src/main/java/com/google/cloud/eventarc/v1/spring/EventarcSpringAutoConfiguration.java index 33b09b7fca..a7b40fb79e 100644 --- a/spring-cloud-previews/google-cloud-eventarc-spring-starter/src/main/java/com/google/cloud/eventarc/v1/spring/EventarcSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-eventarc-spring-starter/src/main/java/com/google/cloud/eventarc/v1/spring/EventarcSpringAutoConfiguration.java @@ -219,6 +219,63 @@ public EventarcSettings eventarcSettings( .updateGoogleChannelConfigSettings() .setRetrySettings(updateGoogleChannelConfigRetrySettings); + RetrySettings getMessageBusRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getMessageBusSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getMessageBusSettings().setRetrySettings(getMessageBusRetrySettings); + + RetrySettings listMessageBusesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listMessageBusesSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .listMessageBusesSettings() + .setRetrySettings(listMessageBusesRetrySettings); + + RetrySettings listMessageBusEnrollmentsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listMessageBusEnrollmentsSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .listMessageBusEnrollmentsSettings() + .setRetrySettings(listMessageBusEnrollmentsRetrySettings); + + RetrySettings getEnrollmentRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getEnrollmentSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getEnrollmentSettings().setRetrySettings(getEnrollmentRetrySettings); + + RetrySettings listEnrollmentsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listEnrollmentsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .listEnrollmentsSettings() + .setRetrySettings(listEnrollmentsRetrySettings); + + RetrySettings getPipelineRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getPipelineSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getPipelineSettings().setRetrySettings(getPipelineRetrySettings); + + RetrySettings listPipelinesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listPipelinesSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.listPipelinesSettings().setRetrySettings(listPipelinesRetrySettings); + + RetrySettings getGoogleApiSourceRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getGoogleApiSourceSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .getGoogleApiSourceSettings() + .setRetrySettings(getGoogleApiSourceRetrySettings); + + RetrySettings listGoogleApiSourcesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listGoogleApiSourcesSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .listGoogleApiSourcesSettings() + .setRetrySettings(listGoogleApiSourcesRetrySettings); + RetrySettings listLocationsRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry); @@ -366,6 +423,115 @@ public EventarcSettings eventarcSettings( "Configured method-level retry settings for updateGoogleChannelConfig from properties."); } } + Retry getMessageBusRetry = clientProperties.getGetMessageBusRetry(); + if (getMessageBusRetry != null) { + RetrySettings getMessageBusRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getMessageBusSettings().getRetrySettings(), getMessageBusRetry); + clientSettingsBuilder.getMessageBusSettings().setRetrySettings(getMessageBusRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getMessageBus from properties."); + } + } + Retry listMessageBusesRetry = clientProperties.getListMessageBusesRetry(); + if (listMessageBusesRetry != null) { + RetrySettings listMessageBusesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listMessageBusesSettings().getRetrySettings(), + listMessageBusesRetry); + clientSettingsBuilder + .listMessageBusesSettings() + .setRetrySettings(listMessageBusesRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for listMessageBuses from properties."); + } + } + Retry listMessageBusEnrollmentsRetry = clientProperties.getListMessageBusEnrollmentsRetry(); + if (listMessageBusEnrollmentsRetry != null) { + RetrySettings listMessageBusEnrollmentsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listMessageBusEnrollmentsSettings().getRetrySettings(), + listMessageBusEnrollmentsRetry); + clientSettingsBuilder + .listMessageBusEnrollmentsSettings() + .setRetrySettings(listMessageBusEnrollmentsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for listMessageBusEnrollments from properties."); + } + } + Retry getEnrollmentRetry = clientProperties.getGetEnrollmentRetry(); + if (getEnrollmentRetry != null) { + RetrySettings getEnrollmentRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getEnrollmentSettings().getRetrySettings(), getEnrollmentRetry); + clientSettingsBuilder.getEnrollmentSettings().setRetrySettings(getEnrollmentRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getEnrollment from properties."); + } + } + Retry listEnrollmentsRetry = clientProperties.getListEnrollmentsRetry(); + if (listEnrollmentsRetry != null) { + RetrySettings listEnrollmentsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listEnrollmentsSettings().getRetrySettings(), + listEnrollmentsRetry); + clientSettingsBuilder + .listEnrollmentsSettings() + .setRetrySettings(listEnrollmentsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listEnrollments from properties."); + } + } + Retry getPipelineRetry = clientProperties.getGetPipelineRetry(); + if (getPipelineRetry != null) { + RetrySettings getPipelineRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getPipelineSettings().getRetrySettings(), getPipelineRetry); + clientSettingsBuilder.getPipelineSettings().setRetrySettings(getPipelineRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getPipeline from properties."); + } + } + Retry listPipelinesRetry = clientProperties.getListPipelinesRetry(); + if (listPipelinesRetry != null) { + RetrySettings listPipelinesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listPipelinesSettings().getRetrySettings(), listPipelinesRetry); + clientSettingsBuilder.listPipelinesSettings().setRetrySettings(listPipelinesRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listPipelines from properties."); + } + } + Retry getGoogleApiSourceRetry = clientProperties.getGetGoogleApiSourceRetry(); + if (getGoogleApiSourceRetry != null) { + RetrySettings getGoogleApiSourceRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getGoogleApiSourceSettings().getRetrySettings(), + getGoogleApiSourceRetry); + clientSettingsBuilder + .getGoogleApiSourceSettings() + .setRetrySettings(getGoogleApiSourceRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for getGoogleApiSource from properties."); + } + } + Retry listGoogleApiSourcesRetry = clientProperties.getListGoogleApiSourcesRetry(); + if (listGoogleApiSourcesRetry != null) { + RetrySettings listGoogleApiSourcesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listGoogleApiSourcesSettings().getRetrySettings(), + listGoogleApiSourcesRetry); + clientSettingsBuilder + .listGoogleApiSourcesSettings() + .setRetrySettings(listGoogleApiSourcesRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for listGoogleApiSources from properties."); + } + } Retry listLocationsRetry = clientProperties.getListLocationsRetry(); if (listLocationsRetry != null) { RetrySettings listLocationsRetrySettings = diff --git a/spring-cloud-previews/google-cloud-eventarc-spring-starter/src/main/java/com/google/cloud/eventarc/v1/spring/EventarcSpringProperties.java b/spring-cloud-previews/google-cloud-eventarc-spring-starter/src/main/java/com/google/cloud/eventarc/v1/spring/EventarcSpringProperties.java index 6dc399d05b..bd5181740f 100644 --- a/spring-cloud-previews/google-cloud-eventarc-spring-starter/src/main/java/com/google/cloud/eventarc/v1/spring/EventarcSpringProperties.java +++ b/spring-cloud-previews/google-cloud-eventarc-spring-starter/src/main/java/com/google/cloud/eventarc/v1/spring/EventarcSpringProperties.java @@ -92,6 +92,51 @@ public class EventarcSpringProperties implements CredentialsSupplier { * this takes precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry updateGoogleChannelConfigRetry; + /** + * Allow override of retry settings at method-level for getMessageBus. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getMessageBusRetry; + /** + * Allow override of retry settings at method-level for listMessageBuses. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listMessageBusesRetry; + /** + * Allow override of retry settings at method-level for listMessageBusEnrollments. If defined, + * this takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listMessageBusEnrollmentsRetry; + /** + * Allow override of retry settings at method-level for getEnrollment. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getEnrollmentRetry; + /** + * Allow override of retry settings at method-level for listEnrollments. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listEnrollmentsRetry; + /** + * Allow override of retry settings at method-level for getPipeline. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getPipelineRetry; + /** + * Allow override of retry settings at method-level for listPipelines. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listPipelinesRetry; + /** + * Allow override of retry settings at method-level for getGoogleApiSource. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getGoogleApiSourceRetry; + /** + * Allow override of retry settings at method-level for listGoogleApiSources. If defined, this + * takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listGoogleApiSourcesRetry; /** * Allow override of retry settings at method-level for listLocations. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -235,6 +280,78 @@ public void setUpdateGoogleChannelConfigRetry(Retry updateGoogleChannelConfigRet this.updateGoogleChannelConfigRetry = updateGoogleChannelConfigRetry; } + public Retry getGetMessageBusRetry() { + return this.getMessageBusRetry; + } + + public void setGetMessageBusRetry(Retry getMessageBusRetry) { + this.getMessageBusRetry = getMessageBusRetry; + } + + public Retry getListMessageBusesRetry() { + return this.listMessageBusesRetry; + } + + public void setListMessageBusesRetry(Retry listMessageBusesRetry) { + this.listMessageBusesRetry = listMessageBusesRetry; + } + + public Retry getListMessageBusEnrollmentsRetry() { + return this.listMessageBusEnrollmentsRetry; + } + + public void setListMessageBusEnrollmentsRetry(Retry listMessageBusEnrollmentsRetry) { + this.listMessageBusEnrollmentsRetry = listMessageBusEnrollmentsRetry; + } + + public Retry getGetEnrollmentRetry() { + return this.getEnrollmentRetry; + } + + public void setGetEnrollmentRetry(Retry getEnrollmentRetry) { + this.getEnrollmentRetry = getEnrollmentRetry; + } + + public Retry getListEnrollmentsRetry() { + return this.listEnrollmentsRetry; + } + + public void setListEnrollmentsRetry(Retry listEnrollmentsRetry) { + this.listEnrollmentsRetry = listEnrollmentsRetry; + } + + public Retry getGetPipelineRetry() { + return this.getPipelineRetry; + } + + public void setGetPipelineRetry(Retry getPipelineRetry) { + this.getPipelineRetry = getPipelineRetry; + } + + public Retry getListPipelinesRetry() { + return this.listPipelinesRetry; + } + + public void setListPipelinesRetry(Retry listPipelinesRetry) { + this.listPipelinesRetry = listPipelinesRetry; + } + + public Retry getGetGoogleApiSourceRetry() { + return this.getGoogleApiSourceRetry; + } + + public void setGetGoogleApiSourceRetry(Retry getGoogleApiSourceRetry) { + this.getGoogleApiSourceRetry = getGoogleApiSourceRetry; + } + + public Retry getListGoogleApiSourcesRetry() { + return this.listGoogleApiSourcesRetry; + } + + public void setListGoogleApiSourcesRetry(Retry listGoogleApiSourcesRetry) { + this.listGoogleApiSourcesRetry = listGoogleApiSourcesRetry; + } + public Retry getListLocationsRetry() { return this.listLocationsRetry; } diff --git a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java index 09c534bf09..fcc1f2af4c 100644 --- a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java +++ b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java @@ -18,6 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.when; import com.google.api.gax.core.CredentialsProvider; @@ -197,6 +198,8 @@ void testExecutorThreadCountFromProperties() { void testCustomTransportChannelProviderUsedWhenProvided() throws IOException { when(mockTransportChannelProvider.getTransportName()).thenReturn("grpc"); when(mockTransportChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel); + when(mockTransportChannelProvider.withUseS2A(anyBoolean())) + .thenReturn(mockTransportChannelProvider); when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockApiCallContext); when(mockApiCallContext.withCredentials(any())).thenReturn(mockApiCallContext); when(mockApiCallContext.withTransportChannel(any())).thenReturn(mockApiCallContext); diff --git a/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/src/main/java/com/google/cloud/recaptchaenterprise/v1/spring/RecaptchaEnterpriseServiceSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/src/main/java/com/google/cloud/recaptchaenterprise/v1/spring/RecaptchaEnterpriseServiceSpringAutoConfiguration.java index 1696a0fd67..12d7f40ff7 100644 --- a/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/src/main/java/com/google/cloud/recaptchaenterprise/v1/spring/RecaptchaEnterpriseServiceSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/src/main/java/com/google/cloud/recaptchaenterprise/v1/spring/RecaptchaEnterpriseServiceSpringAutoConfiguration.java @@ -209,6 +209,20 @@ public RecaptchaEnterpriseServiceSettings recaptchaEnterpriseServiceSettings( clientSettingsBuilder.addIpOverrideSettings().getRetrySettings(), serviceRetry); clientSettingsBuilder.addIpOverrideSettings().setRetrySettings(addIpOverrideRetrySettings); + RetrySettings removeIpOverrideRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.removeIpOverrideSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .removeIpOverrideSettings() + .setRetrySettings(removeIpOverrideRetrySettings); + + RetrySettings listIpOverridesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listIpOverridesSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .listIpOverridesSettings() + .setRetrySettings(listIpOverridesRetrySettings); + RetrySettings getMetricsRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.getMetricsSettings().getRetrySettings(), serviceRetry); @@ -403,6 +417,33 @@ public RecaptchaEnterpriseServiceSettings recaptchaEnterpriseServiceSettings( LOGGER.trace("Configured method-level retry settings for addIpOverride from properties."); } } + Retry removeIpOverrideRetry = clientProperties.getRemoveIpOverrideRetry(); + if (removeIpOverrideRetry != null) { + RetrySettings removeIpOverrideRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.removeIpOverrideSettings().getRetrySettings(), + removeIpOverrideRetry); + clientSettingsBuilder + .removeIpOverrideSettings() + .setRetrySettings(removeIpOverrideRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for removeIpOverride from properties."); + } + } + Retry listIpOverridesRetry = clientProperties.getListIpOverridesRetry(); + if (listIpOverridesRetry != null) { + RetrySettings listIpOverridesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listIpOverridesSettings().getRetrySettings(), + listIpOverridesRetry); + clientSettingsBuilder + .listIpOverridesSettings() + .setRetrySettings(listIpOverridesRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listIpOverrides from properties."); + } + } Retry getMetricsRetry = clientProperties.getGetMetricsRetry(); if (getMetricsRetry != null) { RetrySettings getMetricsRetrySettings = diff --git a/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/src/main/java/com/google/cloud/recaptchaenterprise/v1/spring/RecaptchaEnterpriseServiceSpringProperties.java b/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/src/main/java/com/google/cloud/recaptchaenterprise/v1/spring/RecaptchaEnterpriseServiceSpringProperties.java index 652fc8ae1b..521305681e 100644 --- a/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/src/main/java/com/google/cloud/recaptchaenterprise/v1/spring/RecaptchaEnterpriseServiceSpringProperties.java +++ b/spring-cloud-previews/google-cloud-recaptchaenterprise-spring-starter/src/main/java/com/google/cloud/recaptchaenterprise/v1/spring/RecaptchaEnterpriseServiceSpringProperties.java @@ -90,6 +90,16 @@ public class RecaptchaEnterpriseServiceSpringProperties implements CredentialsSu * precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry addIpOverrideRetry; + /** + * Allow override of retry settings at method-level for removeIpOverride. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry removeIpOverrideRetry; + /** + * Allow override of retry settings at method-level for listIpOverrides. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listIpOverridesRetry; /** * Allow override of retry settings at method-level for getMetrics. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -250,6 +260,22 @@ public void setAddIpOverrideRetry(Retry addIpOverrideRetry) { this.addIpOverrideRetry = addIpOverrideRetry; } + public Retry getRemoveIpOverrideRetry() { + return this.removeIpOverrideRetry; + } + + public void setRemoveIpOverrideRetry(Retry removeIpOverrideRetry) { + this.removeIpOverrideRetry = removeIpOverrideRetry; + } + + public Retry getListIpOverridesRetry() { + return this.listIpOverridesRetry; + } + + public void setListIpOverridesRetry(Retry listIpOverridesRetry) { + this.listIpOverridesRetry = listIpOverridesRetry; + } + public Retry getGetMetricsRetry() { return this.getMetricsRetry; } diff --git a/spring-cloud-previews/google-cloud-securesourcemanager-spring-starter/src/main/java/com/google/cloud/securesourcemanager/v1/spring/SecureSourceManagerSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-securesourcemanager-spring-starter/src/main/java/com/google/cloud/securesourcemanager/v1/spring/SecureSourceManagerSpringAutoConfiguration.java index b7ad51d710..01086b1267 100644 --- a/spring-cloud-previews/google-cloud-securesourcemanager-spring-starter/src/main/java/com/google/cloud/securesourcemanager/v1/spring/SecureSourceManagerSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-securesourcemanager-spring-starter/src/main/java/com/google/cloud/securesourcemanager/v1/spring/SecureSourceManagerSpringAutoConfiguration.java @@ -205,6 +205,18 @@ public SecureSourceManagerSettings secureSourceManagerSettings( .testIamPermissionsRepoSettings() .setRetrySettings(testIamPermissionsRepoRetrySettings); + RetrySettings listBranchRulesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listBranchRulesSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .listBranchRulesSettings() + .setRetrySettings(listBranchRulesRetrySettings); + + RetrySettings getBranchRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getBranchRuleSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getBranchRuleSettings().setRetrySettings(getBranchRuleRetrySettings); + RetrySettings listLocationsRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry); @@ -322,6 +334,29 @@ public SecureSourceManagerSettings secureSourceManagerSettings( "Configured method-level retry settings for testIamPermissionsRepo from properties."); } } + Retry listBranchRulesRetry = clientProperties.getListBranchRulesRetry(); + if (listBranchRulesRetry != null) { + RetrySettings listBranchRulesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listBranchRulesSettings().getRetrySettings(), + listBranchRulesRetry); + clientSettingsBuilder + .listBranchRulesSettings() + .setRetrySettings(listBranchRulesRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listBranchRules from properties."); + } + } + Retry getBranchRuleRetry = clientProperties.getGetBranchRuleRetry(); + if (getBranchRuleRetry != null) { + RetrySettings getBranchRuleRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getBranchRuleSettings().getRetrySettings(), getBranchRuleRetry); + clientSettingsBuilder.getBranchRuleSettings().setRetrySettings(getBranchRuleRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getBranchRule from properties."); + } + } Retry listLocationsRetry = clientProperties.getListLocationsRetry(); if (listLocationsRetry != null) { RetrySettings listLocationsRetrySettings = diff --git a/spring-cloud-previews/google-cloud-securesourcemanager-spring-starter/src/main/java/com/google/cloud/securesourcemanager/v1/spring/SecureSourceManagerSpringProperties.java b/spring-cloud-previews/google-cloud-securesourcemanager-spring-starter/src/main/java/com/google/cloud/securesourcemanager/v1/spring/SecureSourceManagerSpringProperties.java index 80190d340f..c596aa14b1 100644 --- a/spring-cloud-previews/google-cloud-securesourcemanager-spring-starter/src/main/java/com/google/cloud/securesourcemanager/v1/spring/SecureSourceManagerSpringProperties.java +++ b/spring-cloud-previews/google-cloud-securesourcemanager-spring-starter/src/main/java/com/google/cloud/securesourcemanager/v1/spring/SecureSourceManagerSpringProperties.java @@ -77,6 +77,16 @@ public class SecureSourceManagerSpringProperties implements CredentialsSupplier * takes precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry testIamPermissionsRepoRetry; + /** + * Allow override of retry settings at method-level for listBranchRules. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listBranchRulesRetry; + /** + * Allow override of retry settings at method-level for getBranchRule. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getBranchRuleRetry; /** * Allow override of retry settings at method-level for listLocations. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -196,6 +206,22 @@ public void setTestIamPermissionsRepoRetry(Retry testIamPermissionsRepoRetry) { this.testIamPermissionsRepoRetry = testIamPermissionsRepoRetry; } + public Retry getListBranchRulesRetry() { + return this.listBranchRulesRetry; + } + + public void setListBranchRulesRetry(Retry listBranchRulesRetry) { + this.listBranchRulesRetry = listBranchRulesRetry; + } + + public Retry getGetBranchRuleRetry() { + return this.getBranchRuleRetry; + } + + public void setGetBranchRuleRetry(Retry getBranchRuleRetry) { + this.getBranchRuleRetry = getBranchRuleRetry; + } + public Retry getListLocationsRetry() { return this.listLocationsRetry; }