From 46fb81447a2f1f0fc67af80d4670716a3507a4e0 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Tue, 17 Oct 2023 14:24:40 +0000 Subject: [PATCH] chore: update starter modules in spring-cloud-previews (#2255) Co-authored-by: Cloud Java Bot --- spring-cloud-previews/README.md | 174 ++++++++-------- .../HubServiceSpringAutoConfiguration.java | 191 ++++++++++++++++++ .../v1/spring/HubServiceSpringProperties.java | 156 ++++++++++++++ ...RoutingServiceSpringAutoConfiguration.java | 81 ++++++++ ...cyBasedRoutingServiceSpringProperties.java | 65 ++++++ 5 files changed, 580 insertions(+), 87 deletions(-) diff --git a/spring-cloud-previews/README.md b/spring-cloud-previews/README.md index f1c2c379e8..b651c007eb 100644 --- a/spring-cloud-previews/README.md +++ b/spring-cloud-previews/README.md @@ -16,90 +16,90 @@ add the following dependency to your `pom.xml`: | Client Library | Starter Maven Artifact | |----------------| -----------------------| -|[java-accessapproval](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-accessapproval/README.md)|com.google.cloud:google-cloud-accessapproval-spring-starter| -|[java-accesscontextmanager](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-accesscontextmanager/README.md)|com.google.cloud:google-identity-accesscontextmanager-spring-starter| -|[java-aiplatform](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-aiplatform/README.md)|com.google.cloud:google-cloud-aiplatform-spring-starter| -|[java-api-gateway](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.0/java-apigee-connect/README.md)|com.google.cloud:google-cloud-apigee-connect-spring-starter| -|[java-appengine-admin](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.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.21.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.21.0/java-automl/README.md)|com.google.cloud:google-cloud-automl-spring-starter| -|[java-bigqueryconnection](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-bigqueryconnection/README.md)|com.google.cloud:google-cloud-bigqueryconnection-spring-starter| -|[java-bigquerydatatransfer](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-bigquerydatatransfer/README.md)|com.google.cloud:google-cloud-bigquerydatatransfer-spring-starter| -|[java-bigqueryreservation](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-bigqueryreservation/README.md)|com.google.cloud:google-cloud-bigqueryreservation-spring-starter| -|[java-billing](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-billing/README.md)|com.google.cloud:google-cloud-billing-spring-starter| -|[java-billingbudgets](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.0/java-channel/README.md)|com.google.cloud:google-cloud-channel-spring-starter| -|[java-cloudbuild](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-cloudbuild/README.md)|com.google.cloud:google-cloud-build-spring-starter| -|[java-compute](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.0/java-container/README.md)|com.google.cloud:google-cloud-container-spring-starter| -|[java-containeranalysis](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.0/java-datacatalog/README.md)|com.google.cloud:google-cloud-datacatalog-spring-starter| -|[java-dataplex](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.0/java-dataproc/README.md)|com.google.cloud:google-cloud-dataproc-spring-starter| -|[java-datastream](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.0/java-deploy/README.md)|com.google.cloud:google-cloud-deploy-spring-starter| -|[java-dialogflow](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-dialogflow/README.md)|com.google.cloud:google-cloud-dialogflow-spring-starter| -|[java-dlp](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-dlp/README.md)|com.google.cloud:google-cloud-dlp-spring-starter| -|[java-dms](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.0/java-domains/README.md)|com.google.cloud:google-cloud-domains-spring-starter| -|[java-essential-contacts](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.0/java-eventarc/README.md)|com.google.cloud:google-cloud-eventarc-spring-starter| -|[java-filestore](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-filestore/README.md)|com.google.cloud:google-cloud-filestore-spring-starter| -|[java-functions](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-functions/README.md)|com.google.cloud:google-cloud-functions-spring-starter| -|[java-gkehub](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.0/java-iam-admin/README.md)|com.google.cloud:google-iam-admin-spring-starter| -|[java-iamcredentials](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-iamcredentials/README.md)|com.google.cloud:google-cloud-iamcredentials-spring-starter| -|[java-ids](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-ids/README.md)|com.google.cloud:google-cloud-ids-spring-starter| -|[java-iot](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-iot/README.md)|com.google.cloud:google-cloud-iot-spring-starter| -|[java-language](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.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.21.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.21.0/java-network-management/README.md)|com.google.cloud:google-cloud-network-management-spring-starter| -|[java-networkconnectivity](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-networkconnectivity/README.md)|com.google.cloud:google-cloud-networkconnectivity-spring-starter| -|[java-notebooks](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-notebooks/README.md)|com.google.cloud:google-cloud-notebooks-spring-starter| -|[java-optimization](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.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.21.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.21.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.21.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.21.0/java-profiler/README.md)|com.google.cloud:google-cloud-profiler-spring-starter| -|[java-recaptchaenterprise](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-recaptchaenterprise/README.md)|com.google.cloud:google-cloud-recaptchaenterprise-spring-starter| -|[java-recommender](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-recommender/README.md)|com.google.cloud:google-cloud-recommender-spring-starter| -|[java-redis](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.0/java-retail/README.md)|com.google.cloud:google-cloud-retail-spring-starter| -|[java-scheduler](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-scheduler/README.md)|com.google.cloud:google-cloud-scheduler-spring-starter| -|[java-security-private-ca](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.0/java-securitycenter/README.md)|com.google.cloud:google-cloud-securitycenter-spring-starter| -|[java-service-control](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.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.21.0/java-servicedirectory/README.md)|com.google.cloud:google-cloud-servicedirectory-spring-starter| -|[java-shell](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-shell/README.md)|com.google.cloud:google-cloud-shell-spring-starter| -|[java-speech](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.0/java-talent/README.md)|com.google.cloud:google-cloud-talent-spring-starter| -|[java-tasks](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-tasks/README.md)|com.google.cloud:google-cloud-tasks-spring-starter| -|[java-texttospeech](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-texttospeech/README.md)|com.google.cloud:google-cloud-texttospeech-spring-starter| -|[java-tpu](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-tpu/README.md)|com.google.cloud:google-cloud-tpu-spring-starter| -|[java-trace](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-trace/README.md)|com.google.cloud:google-cloud-trace-spring-starter| -|[java-video-intelligence](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-video-intelligence/README.md)|com.google.cloud:google-cloud-video-intelligence-spring-starter| -|[java-video-transcoder](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.0/java-vmmigration/README.md)|com.google.cloud:google-cloud-vmmigration-spring-starter| -|[java-vpcaccess](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-vpcaccess/README.md)|com.google.cloud:google-cloud-vpcaccess-spring-starter| -|[java-webrisk](https://github.com/googleapis/google-cloud-java/blob/v1.21.0/java-webrisk/README.md)|com.google.cloud:google-cloud-webrisk-spring-starter| -|[java-websecurityscanner](https://github.com/googleapis/google-cloud-java/blob/v1.21.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.21.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.21.0/java-workflows/README.md)|com.google.cloud:google-cloud-workflows-spring-starter| +|[java-accessapproval](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-accessapproval/README.md)|com.google.cloud:google-cloud-accessapproval-spring-starter| +|[java-accesscontextmanager](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-accesscontextmanager/README.md)|com.google.cloud:google-identity-accesscontextmanager-spring-starter| +|[java-aiplatform](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-aiplatform/README.md)|com.google.cloud:google-cloud-aiplatform-spring-starter| +|[java-api-gateway](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.0/java-apigee-connect/README.md)|com.google.cloud:google-cloud-apigee-connect-spring-starter| +|[java-appengine-admin](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.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.22.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.22.0/java-automl/README.md)|com.google.cloud:google-cloud-automl-spring-starter| +|[java-bigqueryconnection](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-bigqueryconnection/README.md)|com.google.cloud:google-cloud-bigqueryconnection-spring-starter| +|[java-bigquerydatatransfer](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-bigquerydatatransfer/README.md)|com.google.cloud:google-cloud-bigquerydatatransfer-spring-starter| +|[java-bigqueryreservation](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-bigqueryreservation/README.md)|com.google.cloud:google-cloud-bigqueryreservation-spring-starter| +|[java-billing](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-billing/README.md)|com.google.cloud:google-cloud-billing-spring-starter| +|[java-billingbudgets](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.0/java-channel/README.md)|com.google.cloud:google-cloud-channel-spring-starter| +|[java-cloudbuild](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-cloudbuild/README.md)|com.google.cloud:google-cloud-build-spring-starter| +|[java-compute](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.0/java-container/README.md)|com.google.cloud:google-cloud-container-spring-starter| +|[java-containeranalysis](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.0/java-datacatalog/README.md)|com.google.cloud:google-cloud-datacatalog-spring-starter| +|[java-dataplex](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.0/java-dataproc/README.md)|com.google.cloud:google-cloud-dataproc-spring-starter| +|[java-datastream](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.0/java-deploy/README.md)|com.google.cloud:google-cloud-deploy-spring-starter| +|[java-dialogflow](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-dialogflow/README.md)|com.google.cloud:google-cloud-dialogflow-spring-starter| +|[java-dlp](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-dlp/README.md)|com.google.cloud:google-cloud-dlp-spring-starter| +|[java-dms](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.0/java-domains/README.md)|com.google.cloud:google-cloud-domains-spring-starter| +|[java-essential-contacts](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.0/java-eventarc/README.md)|com.google.cloud:google-cloud-eventarc-spring-starter| +|[java-filestore](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-filestore/README.md)|com.google.cloud:google-cloud-filestore-spring-starter| +|[java-functions](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-functions/README.md)|com.google.cloud:google-cloud-functions-spring-starter| +|[java-gkehub](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.0/java-iam-admin/README.md)|com.google.cloud:google-iam-admin-spring-starter| +|[java-iamcredentials](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-iamcredentials/README.md)|com.google.cloud:google-cloud-iamcredentials-spring-starter| +|[java-ids](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-ids/README.md)|com.google.cloud:google-cloud-ids-spring-starter| +|[java-iot](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-iot/README.md)|com.google.cloud:google-cloud-iot-spring-starter| +|[java-language](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.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.22.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.22.0/java-network-management/README.md)|com.google.cloud:google-cloud-network-management-spring-starter| +|[java-networkconnectivity](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-networkconnectivity/README.md)|com.google.cloud:google-cloud-networkconnectivity-spring-starter| +|[java-notebooks](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-notebooks/README.md)|com.google.cloud:google-cloud-notebooks-spring-starter| +|[java-optimization](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.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.22.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.22.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.22.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.22.0/java-profiler/README.md)|com.google.cloud:google-cloud-profiler-spring-starter| +|[java-recaptchaenterprise](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-recaptchaenterprise/README.md)|com.google.cloud:google-cloud-recaptchaenterprise-spring-starter| +|[java-recommender](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-recommender/README.md)|com.google.cloud:google-cloud-recommender-spring-starter| +|[java-redis](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.0/java-retail/README.md)|com.google.cloud:google-cloud-retail-spring-starter| +|[java-scheduler](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-scheduler/README.md)|com.google.cloud:google-cloud-scheduler-spring-starter| +|[java-security-private-ca](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.0/java-securitycenter/README.md)|com.google.cloud:google-cloud-securitycenter-spring-starter| +|[java-service-control](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.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.22.0/java-servicedirectory/README.md)|com.google.cloud:google-cloud-servicedirectory-spring-starter| +|[java-shell](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-shell/README.md)|com.google.cloud:google-cloud-shell-spring-starter| +|[java-speech](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.0/java-talent/README.md)|com.google.cloud:google-cloud-talent-spring-starter| +|[java-tasks](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-tasks/README.md)|com.google.cloud:google-cloud-tasks-spring-starter| +|[java-texttospeech](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-texttospeech/README.md)|com.google.cloud:google-cloud-texttospeech-spring-starter| +|[java-tpu](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-tpu/README.md)|com.google.cloud:google-cloud-tpu-spring-starter| +|[java-trace](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-trace/README.md)|com.google.cloud:google-cloud-trace-spring-starter| +|[java-video-intelligence](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-video-intelligence/README.md)|com.google.cloud:google-cloud-video-intelligence-spring-starter| +|[java-video-transcoder](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.0/java-vmmigration/README.md)|com.google.cloud:google-cloud-vmmigration-spring-starter| +|[java-vpcaccess](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-vpcaccess/README.md)|com.google.cloud:google-cloud-vpcaccess-spring-starter| +|[java-webrisk](https://github.com/googleapis/google-cloud-java/blob/v1.22.0/java-webrisk/README.md)|com.google.cloud:google-cloud-webrisk-spring-starter| +|[java-websecurityscanner](https://github.com/googleapis/google-cloud-java/blob/v1.22.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.22.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.22.0/java-workflows/README.md)|com.google.cloud:google-cloud-workflows-spring-starter| diff --git a/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/HubServiceSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/HubServiceSpringAutoConfiguration.java index d831c3981d..61a4655b88 100644 --- a/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/HubServiceSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/HubServiceSpringAutoConfiguration.java @@ -157,6 +157,11 @@ public HubServiceSettings hubServiceSettings( clientSettingsBuilder.getHubSettings().getRetrySettings(), serviceRetry); clientSettingsBuilder.getHubSettings().setRetrySettings(getHubRetrySettings); + RetrySettings listHubSpokesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listHubSpokesSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.listHubSpokesSettings().setRetrySettings(listHubSpokesRetrySettings); + RetrySettings listSpokesRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.listSpokesSettings().getRetrySettings(), serviceRetry); @@ -167,6 +172,65 @@ public HubServiceSettings hubServiceSettings( clientSettingsBuilder.getSpokeSettings().getRetrySettings(), serviceRetry); clientSettingsBuilder.getSpokeSettings().setRetrySettings(getSpokeRetrySettings); + RetrySettings getRouteTableRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getRouteTableSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getRouteTableSettings().setRetrySettings(getRouteTableRetrySettings); + + RetrySettings getRouteRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getRouteSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getRouteSettings().setRetrySettings(getRouteRetrySettings); + + RetrySettings listRoutesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listRoutesSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.listRoutesSettings().setRetrySettings(listRoutesRetrySettings); + + RetrySettings listRouteTablesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listRouteTablesSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .listRouteTablesSettings() + .setRetrySettings(listRouteTablesRetrySettings); + + RetrySettings getGroupRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getGroupSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getGroupSettings().setRetrySettings(getGroupRetrySettings); + + RetrySettings listGroupsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listGroupsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.listGroupsSettings().setRetrySettings(listGroupsRetrySettings); + + RetrySettings listLocationsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings); + + RetrySettings getLocationRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getLocationSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings); + + RetrySettings setIamPolicyRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings); + + RetrySettings getIamPolicyRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings); + + RetrySettings testIamPermissionsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .testIamPermissionsSettings() + .setRetrySettings(testIamPermissionsRetrySettings); + if (LOGGER.isTraceEnabled()) { LOGGER.trace("Configured service-level retry settings from properties."); } @@ -191,6 +255,16 @@ public HubServiceSettings hubServiceSettings( LOGGER.trace("Configured method-level retry settings for getHub from properties."); } } + Retry listHubSpokesRetry = clientProperties.getListHubSpokesRetry(); + if (listHubSpokesRetry != null) { + RetrySettings listHubSpokesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listHubSpokesSettings().getRetrySettings(), listHubSpokesRetry); + clientSettingsBuilder.listHubSpokesSettings().setRetrySettings(listHubSpokesRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listHubSpokes from properties."); + } + } Retry listSpokesRetry = clientProperties.getListSpokesRetry(); if (listSpokesRetry != null) { RetrySettings listSpokesRetrySettings = @@ -211,6 +285,123 @@ public HubServiceSettings hubServiceSettings( LOGGER.trace("Configured method-level retry settings for getSpoke from properties."); } } + Retry getRouteTableRetry = clientProperties.getGetRouteTableRetry(); + if (getRouteTableRetry != null) { + RetrySettings getRouteTableRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getRouteTableSettings().getRetrySettings(), getRouteTableRetry); + clientSettingsBuilder.getRouteTableSettings().setRetrySettings(getRouteTableRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getRouteTable from properties."); + } + } + Retry getRouteRetry = clientProperties.getGetRouteRetry(); + if (getRouteRetry != null) { + RetrySettings getRouteRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getRouteSettings().getRetrySettings(), getRouteRetry); + clientSettingsBuilder.getRouteSettings().setRetrySettings(getRouteRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getRoute from properties."); + } + } + Retry listRoutesRetry = clientProperties.getListRoutesRetry(); + if (listRoutesRetry != null) { + RetrySettings listRoutesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listRoutesSettings().getRetrySettings(), listRoutesRetry); + clientSettingsBuilder.listRoutesSettings().setRetrySettings(listRoutesRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listRoutes from properties."); + } + } + Retry listRouteTablesRetry = clientProperties.getListRouteTablesRetry(); + if (listRouteTablesRetry != null) { + RetrySettings listRouteTablesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listRouteTablesSettings().getRetrySettings(), + listRouteTablesRetry); + clientSettingsBuilder + .listRouteTablesSettings() + .setRetrySettings(listRouteTablesRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listRouteTables from properties."); + } + } + Retry getGroupRetry = clientProperties.getGetGroupRetry(); + if (getGroupRetry != null) { + RetrySettings getGroupRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getGroupSettings().getRetrySettings(), getGroupRetry); + clientSettingsBuilder.getGroupSettings().setRetrySettings(getGroupRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getGroup from properties."); + } + } + Retry listGroupsRetry = clientProperties.getListGroupsRetry(); + if (listGroupsRetry != null) { + RetrySettings listGroupsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listGroupsSettings().getRetrySettings(), listGroupsRetry); + clientSettingsBuilder.listGroupsSettings().setRetrySettings(listGroupsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listGroups from properties."); + } + } + Retry listLocationsRetry = clientProperties.getListLocationsRetry(); + if (listLocationsRetry != null) { + RetrySettings listLocationsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listLocationsSettings().getRetrySettings(), listLocationsRetry); + clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listLocations from properties."); + } + } + Retry getLocationRetry = clientProperties.getGetLocationRetry(); + if (getLocationRetry != null) { + RetrySettings getLocationRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getLocationSettings().getRetrySettings(), getLocationRetry); + clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getLocation from properties."); + } + } + Retry setIamPolicyRetry = clientProperties.getSetIamPolicyRetry(); + if (setIamPolicyRetry != null) { + RetrySettings setIamPolicyRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), setIamPolicyRetry); + clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for setIamPolicy from properties."); + } + } + Retry getIamPolicyRetry = clientProperties.getGetIamPolicyRetry(); + if (getIamPolicyRetry != null) { + RetrySettings getIamPolicyRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), getIamPolicyRetry); + clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getIamPolicy from properties."); + } + } + Retry testIamPermissionsRetry = clientProperties.getTestIamPermissionsRetry(); + if (testIamPermissionsRetry != null) { + RetrySettings testIamPermissionsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(), + testIamPermissionsRetry); + clientSettingsBuilder + .testIamPermissionsSettings() + .setRetrySettings(testIamPermissionsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for testIamPermissions from properties."); + } + } return clientSettingsBuilder.build(); } diff --git a/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/HubServiceSpringProperties.java b/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/HubServiceSpringProperties.java index e8d3295aca..09aedd8e24 100644 --- a/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/HubServiceSpringProperties.java +++ b/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/HubServiceSpringProperties.java @@ -50,6 +50,11 @@ public class HubServiceSpringProperties implements CredentialsSupplier { * over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry getHubRetry; + /** + * Allow override of retry settings at method-level for listHubSpokes. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listHubSpokesRetry; /** * Allow override of retry settings at method-level for listSpokes. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -60,6 +65,61 @@ public class HubServiceSpringProperties implements CredentialsSupplier { * precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry getSpokeRetry; + /** + * Allow override of retry settings at method-level for getRouteTable. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getRouteTableRetry; + /** + * Allow override of retry settings at method-level for getRoute. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getRouteRetry; + /** + * Allow override of retry settings at method-level for listRoutes. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listRoutesRetry; + /** + * Allow override of retry settings at method-level for listRouteTables. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listRouteTablesRetry; + /** + * Allow override of retry settings at method-level for getGroup. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getGroupRetry; + /** + * Allow override of retry settings at method-level for listGroups. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listGroupsRetry; + /** + * Allow override of retry settings at method-level for listLocations. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listLocationsRetry; + /** + * Allow override of retry settings at method-level for getLocation. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getLocationRetry; + /** + * Allow override of retry settings at method-level for setIamPolicy. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry setIamPolicyRetry; + /** + * Allow override of retry settings at method-level for getIamPolicy. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getIamPolicyRetry; + /** + * Allow override of retry settings at method-level for testIamPermissions. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry testIamPermissionsRetry; @Override public Credentials getCredentials() { @@ -106,6 +166,14 @@ public void setGetHubRetry(Retry getHubRetry) { this.getHubRetry = getHubRetry; } + public Retry getListHubSpokesRetry() { + return this.listHubSpokesRetry; + } + + public void setListHubSpokesRetry(Retry listHubSpokesRetry) { + this.listHubSpokesRetry = listHubSpokesRetry; + } + public Retry getListSpokesRetry() { return this.listSpokesRetry; } @@ -121,4 +189,92 @@ public Retry getGetSpokeRetry() { public void setGetSpokeRetry(Retry getSpokeRetry) { this.getSpokeRetry = getSpokeRetry; } + + public Retry getGetRouteTableRetry() { + return this.getRouteTableRetry; + } + + public void setGetRouteTableRetry(Retry getRouteTableRetry) { + this.getRouteTableRetry = getRouteTableRetry; + } + + public Retry getGetRouteRetry() { + return this.getRouteRetry; + } + + public void setGetRouteRetry(Retry getRouteRetry) { + this.getRouteRetry = getRouteRetry; + } + + public Retry getListRoutesRetry() { + return this.listRoutesRetry; + } + + public void setListRoutesRetry(Retry listRoutesRetry) { + this.listRoutesRetry = listRoutesRetry; + } + + public Retry getListRouteTablesRetry() { + return this.listRouteTablesRetry; + } + + public void setListRouteTablesRetry(Retry listRouteTablesRetry) { + this.listRouteTablesRetry = listRouteTablesRetry; + } + + public Retry getGetGroupRetry() { + return this.getGroupRetry; + } + + public void setGetGroupRetry(Retry getGroupRetry) { + this.getGroupRetry = getGroupRetry; + } + + public Retry getListGroupsRetry() { + return this.listGroupsRetry; + } + + public void setListGroupsRetry(Retry listGroupsRetry) { + this.listGroupsRetry = listGroupsRetry; + } + + public Retry getListLocationsRetry() { + return this.listLocationsRetry; + } + + public void setListLocationsRetry(Retry listLocationsRetry) { + this.listLocationsRetry = listLocationsRetry; + } + + public Retry getGetLocationRetry() { + return this.getLocationRetry; + } + + public void setGetLocationRetry(Retry getLocationRetry) { + this.getLocationRetry = getLocationRetry; + } + + public Retry getSetIamPolicyRetry() { + return this.setIamPolicyRetry; + } + + public void setSetIamPolicyRetry(Retry setIamPolicyRetry) { + this.setIamPolicyRetry = setIamPolicyRetry; + } + + public Retry getGetIamPolicyRetry() { + return this.getIamPolicyRetry; + } + + public void setGetIamPolicyRetry(Retry getIamPolicyRetry) { + this.getIamPolicyRetry = getIamPolicyRetry; + } + + public Retry getTestIamPermissionsRetry() { + return this.testIamPermissionsRetry; + } + + public void setTestIamPermissionsRetry(Retry testIamPermissionsRetry) { + this.testIamPermissionsRetry = testIamPermissionsRetry; + } } diff --git a/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/PolicyBasedRoutingServiceSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/PolicyBasedRoutingServiceSpringAutoConfiguration.java index a20e7ad935..4a0032f3ad 100644 --- a/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/PolicyBasedRoutingServiceSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/PolicyBasedRoutingServiceSpringAutoConfiguration.java @@ -166,6 +166,33 @@ public PolicyBasedRoutingServiceSettings policyBasedRoutingServiceSettings( .getPolicyBasedRouteSettings() .setRetrySettings(getPolicyBasedRouteRetrySettings); + RetrySettings listLocationsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings); + + RetrySettings getLocationRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getLocationSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings); + + RetrySettings setIamPolicyRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings); + + RetrySettings getIamPolicyRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings); + + RetrySettings testIamPermissionsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .testIamPermissionsSettings() + .setRetrySettings(testIamPermissionsRetrySettings); + if (LOGGER.isTraceEnabled()) { LOGGER.trace("Configured service-level retry settings from properties."); } @@ -198,6 +225,60 @@ public PolicyBasedRoutingServiceSettings policyBasedRoutingServiceSettings( "Configured method-level retry settings for getPolicyBasedRoute from properties."); } } + Retry listLocationsRetry = clientProperties.getListLocationsRetry(); + if (listLocationsRetry != null) { + RetrySettings listLocationsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listLocationsSettings().getRetrySettings(), listLocationsRetry); + clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listLocations from properties."); + } + } + Retry getLocationRetry = clientProperties.getGetLocationRetry(); + if (getLocationRetry != null) { + RetrySettings getLocationRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getLocationSettings().getRetrySettings(), getLocationRetry); + clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getLocation from properties."); + } + } + Retry setIamPolicyRetry = clientProperties.getSetIamPolicyRetry(); + if (setIamPolicyRetry != null) { + RetrySettings setIamPolicyRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), setIamPolicyRetry); + clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for setIamPolicy from properties."); + } + } + Retry getIamPolicyRetry = clientProperties.getGetIamPolicyRetry(); + if (getIamPolicyRetry != null) { + RetrySettings getIamPolicyRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), getIamPolicyRetry); + clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getIamPolicy from properties."); + } + } + Retry testIamPermissionsRetry = clientProperties.getTestIamPermissionsRetry(); + if (testIamPermissionsRetry != null) { + RetrySettings testIamPermissionsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(), + testIamPermissionsRetry); + clientSettingsBuilder + .testIamPermissionsSettings() + .setRetrySettings(testIamPermissionsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for testIamPermissions from properties."); + } + } return clientSettingsBuilder.build(); } diff --git a/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/PolicyBasedRoutingServiceSpringProperties.java b/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/PolicyBasedRoutingServiceSpringProperties.java index fb5bd141c8..94a69a91a9 100644 --- a/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/PolicyBasedRoutingServiceSpringProperties.java +++ b/spring-cloud-previews/google-cloud-networkconnectivity-spring-starter/src/main/java/com/google/cloud/networkconnectivity/v1/spring/PolicyBasedRoutingServiceSpringProperties.java @@ -50,6 +50,31 @@ public class PolicyBasedRoutingServiceSpringProperties implements CredentialsSup * takes precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry getPolicyBasedRouteRetry; + /** + * Allow override of retry settings at method-level for listLocations. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listLocationsRetry; + /** + * Allow override of retry settings at method-level for getLocation. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getLocationRetry; + /** + * Allow override of retry settings at method-level for setIamPolicy. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry setIamPolicyRetry; + /** + * Allow override of retry settings at method-level for getIamPolicy. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getIamPolicyRetry; + /** + * Allow override of retry settings at method-level for testIamPermissions. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry testIamPermissionsRetry; @Override public Credentials getCredentials() { @@ -95,4 +120,44 @@ public Retry getGetPolicyBasedRouteRetry() { public void setGetPolicyBasedRouteRetry(Retry getPolicyBasedRouteRetry) { this.getPolicyBasedRouteRetry = getPolicyBasedRouteRetry; } + + public Retry getListLocationsRetry() { + return this.listLocationsRetry; + } + + public void setListLocationsRetry(Retry listLocationsRetry) { + this.listLocationsRetry = listLocationsRetry; + } + + public Retry getGetLocationRetry() { + return this.getLocationRetry; + } + + public void setGetLocationRetry(Retry getLocationRetry) { + this.getLocationRetry = getLocationRetry; + } + + public Retry getSetIamPolicyRetry() { + return this.setIamPolicyRetry; + } + + public void setSetIamPolicyRetry(Retry setIamPolicyRetry) { + this.setIamPolicyRetry = setIamPolicyRetry; + } + + public Retry getGetIamPolicyRetry() { + return this.getIamPolicyRetry; + } + + public void setGetIamPolicyRetry(Retry getIamPolicyRetry) { + this.getIamPolicyRetry = getIamPolicyRetry; + } + + public Retry getTestIamPermissionsRetry() { + return this.testIamPermissionsRetry; + } + + public void setTestIamPermissionsRetry(Retry testIamPermissionsRetry) { + this.testIamPermissionsRetry = testIamPermissionsRetry; + } }