diff --git a/spring-cloud-gcp-dependencies/pom.xml b/spring-cloud-gcp-dependencies/pom.xml index 9ebb917790..7624e0ddf5 100644 --- a/spring-cloud-gcp-dependencies/pom.xml +++ b/spring-cloud-gcp-dependencies/pom.xml @@ -34,7 +34,7 @@ - 26.17.0 + 26.18.0 1.12.0 31.1-jre 1.0.1.RELEASE diff --git a/spring-cloud-previews/README.md b/spring-cloud-previews/README.md index 8a9996f025..3b73070896 100644 --- a/spring-cloud-previews/README.md +++ b/spring-cloud-previews/README.md @@ -16,91 +16,91 @@ add the following dependency to your `pom.xml`. | Client Library | Starter Maven Artifact | |----------------| -----------------------| -|[java-accessapproval](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-accessapproval/README.md)|com.google.cloud:google-cloud-accessapproval-spring-starter| -|[java-accesscontextmanager](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-accesscontextmanager/README.md)|com.google.cloud:google-identity-accesscontextmanager-spring-starter| -|[java-aiplatform](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.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.13.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.13.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.13.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.13.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.13.0/java-automl/README.md)|com.google.cloud:google-cloud-automl-spring-starter| -|[java-bigqueryconnection](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-bigqueryconnection/README.md)|com.google.cloud:google-cloud-bigqueryconnection-spring-starter| -|[java-bigquerydatatransfer](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-bigquerydatatransfer/README.md)|com.google.cloud:google-cloud-bigquerydatatransfer-spring-starter| -|[java-bigqueryreservation](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-bigqueryreservation/README.md)|com.google.cloud:google-cloud-bigqueryreservation-spring-starter| -|[java-billing](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-billing/README.md)|com.google.cloud:google-cloud-billing-spring-starter| -|[java-billingbudgets](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.0/java-channel/README.md)|com.google.cloud:google-cloud-channel-spring-starter| -|[java-cloudbuild](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-cloudbuild/README.md)|com.google.cloud:google-cloud-build-spring-starter| -|[java-compute](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.0/java-container/README.md)|com.google.cloud:google-cloud-container-spring-starter| -|[java-containeranalysis](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.0/java-datacatalog/README.md)|com.google.cloud:google-cloud-datacatalog-spring-starter| -|[java-dataplex](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.0/java-dataproc/README.md)|com.google.cloud:google-cloud-dataproc-spring-starter| -|[java-datastream](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.0/java-deploy/README.md)|com.google.cloud:google-cloud-deploy-spring-starter| -|[java-dialogflow](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-dialogflow/README.md)|com.google.cloud:google-cloud-dialogflow-spring-starter| -|[java-dlp](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-dlp/README.md)|com.google.cloud:google-cloud-dlp-spring-starter| -|[java-dms](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.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.13.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.13.0/java-eventarc/README.md)|com.google.cloud:google-cloud-eventarc-spring-starter| -|[java-filestore](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-filestore/README.md)|com.google.cloud:google-cloud-filestore-spring-starter| -|[java-functions](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-functions/README.md)|com.google.cloud:google-cloud-functions-spring-starter| -|[java-game-servers](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-game-servers/README.md)|com.google.cloud:google-cloud-game-servers-spring-starter| -|[java-gkehub](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.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.13.0/java-iamcredentials/README.md)|com.google.cloud:google-cloud-iamcredentials-spring-starter| -|[java-ids](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-ids/README.md)|com.google.cloud:google-cloud-ids-spring-starter| -|[java-iot](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-iot/README.md)|com.google.cloud:google-cloud-iot-spring-starter| -|[java-language](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.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.13.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.13.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.13.0/java-networkconnectivity/README.md)|com.google.cloud:google-cloud-networkconnectivity-spring-starter| -|[java-notebooks](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-notebooks/README.md)|com.google.cloud:google-cloud-notebooks-spring-starter| -|[java-optimization](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.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.13.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.13.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.13.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.13.0/java-profiler/README.md)|com.google.cloud:google-cloud-profiler-spring-starter| -|[java-recaptchaenterprise](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-recaptchaenterprise/README.md)|com.google.cloud:google-cloud-recaptchaenterprise-spring-starter| -|[java-recommender](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-recommender/README.md)|com.google.cloud:google-cloud-recommender-spring-starter| -|[java-redis](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.0/java-retail/README.md)|com.google.cloud:google-cloud-retail-spring-starter| -|[java-scheduler](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.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.13.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.13.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.13.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.13.0/java-servicedirectory/README.md)|com.google.cloud:google-cloud-servicedirectory-spring-starter| -|[java-shell](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-shell/README.md)|com.google.cloud:google-cloud-shell-spring-starter| -|[java-speech](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.0/java-talent/README.md)|com.google.cloud:google-cloud-talent-spring-starter| -|[java-tasks](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-tasks/README.md)|com.google.cloud:google-cloud-tasks-spring-starter| -|[java-texttospeech](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-texttospeech/README.md)|com.google.cloud:google-cloud-texttospeech-spring-starter| -|[java-tpu](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-tpu/README.md)|com.google.cloud:google-cloud-tpu-spring-starter| -|[java-trace](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.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.13.0/java-vmmigration/README.md)|com.google.cloud:google-cloud-vmmigration-spring-starter| -|[java-vpcaccess](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-vpcaccess/README.md)|com.google.cloud:google-cloud-vpcaccess-spring-starter| -|[java-webrisk](https://github.com/googleapis/google-cloud-java/blob/v1.13.0/java-webrisk/README.md)|com.google.cloud:google-cloud-webrisk-spring-starter| -|[java-websecurityscanner](https://github.com/googleapis/google-cloud-java/blob/v1.13.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.13.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.13.0/java-workflows/README.md)|com.google.cloud:google-cloud-workflows-spring-starter| +|[java-accessapproval](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-accessapproval/README.md)|com.google.cloud:google-cloud-accessapproval-spring-starter| +|[java-accesscontextmanager](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-accesscontextmanager/README.md)|com.google.cloud:google-identity-accesscontextmanager-spring-starter| +|[java-aiplatform](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.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.14.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.14.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.14.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.14.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.14.0/java-automl/README.md)|com.google.cloud:google-cloud-automl-spring-starter| +|[java-bigqueryconnection](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-bigqueryconnection/README.md)|com.google.cloud:google-cloud-bigqueryconnection-spring-starter| +|[java-bigquerydatatransfer](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-bigquerydatatransfer/README.md)|com.google.cloud:google-cloud-bigquerydatatransfer-spring-starter| +|[java-bigqueryreservation](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-bigqueryreservation/README.md)|com.google.cloud:google-cloud-bigqueryreservation-spring-starter| +|[java-billing](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-billing/README.md)|com.google.cloud:google-cloud-billing-spring-starter| +|[java-billingbudgets](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.0/java-channel/README.md)|com.google.cloud:google-cloud-channel-spring-starter| +|[java-cloudbuild](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-cloudbuild/README.md)|com.google.cloud:google-cloud-build-spring-starter| +|[java-compute](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.0/java-container/README.md)|com.google.cloud:google-cloud-container-spring-starter| +|[java-containeranalysis](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.0/java-datacatalog/README.md)|com.google.cloud:google-cloud-datacatalog-spring-starter| +|[java-dataplex](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.0/java-dataproc/README.md)|com.google.cloud:google-cloud-dataproc-spring-starter| +|[java-datastream](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.0/java-deploy/README.md)|com.google.cloud:google-cloud-deploy-spring-starter| +|[java-dialogflow](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-dialogflow/README.md)|com.google.cloud:google-cloud-dialogflow-spring-starter| +|[java-dlp](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-dlp/README.md)|com.google.cloud:google-cloud-dlp-spring-starter| +|[java-dms](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.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.14.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.14.0/java-eventarc/README.md)|com.google.cloud:google-cloud-eventarc-spring-starter| +|[java-filestore](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-filestore/README.md)|com.google.cloud:google-cloud-filestore-spring-starter| +|[java-functions](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-functions/README.md)|com.google.cloud:google-cloud-functions-spring-starter| +|[java-game-servers](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-game-servers/README.md)|com.google.cloud:google-cloud-game-servers-spring-starter| +|[java-gkehub](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.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.14.0/java-iamcredentials/README.md)|com.google.cloud:google-cloud-iamcredentials-spring-starter| +|[java-ids](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-ids/README.md)|com.google.cloud:google-cloud-ids-spring-starter| +|[java-iot](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-iot/README.md)|com.google.cloud:google-cloud-iot-spring-starter| +|[java-language](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.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.14.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.14.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.14.0/java-networkconnectivity/README.md)|com.google.cloud:google-cloud-networkconnectivity-spring-starter| +|[java-notebooks](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-notebooks/README.md)|com.google.cloud:google-cloud-notebooks-spring-starter| +|[java-optimization](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.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.14.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.14.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.14.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.14.0/java-profiler/README.md)|com.google.cloud:google-cloud-profiler-spring-starter| +|[java-recaptchaenterprise](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-recaptchaenterprise/README.md)|com.google.cloud:google-cloud-recaptchaenterprise-spring-starter| +|[java-recommender](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-recommender/README.md)|com.google.cloud:google-cloud-recommender-spring-starter| +|[java-redis](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.0/java-retail/README.md)|com.google.cloud:google-cloud-retail-spring-starter| +|[java-scheduler](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.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.14.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.14.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.14.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.14.0/java-servicedirectory/README.md)|com.google.cloud:google-cloud-servicedirectory-spring-starter| +|[java-shell](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-shell/README.md)|com.google.cloud:google-cloud-shell-spring-starter| +|[java-speech](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.0/java-talent/README.md)|com.google.cloud:google-cloud-talent-spring-starter| +|[java-tasks](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-tasks/README.md)|com.google.cloud:google-cloud-tasks-spring-starter| +|[java-texttospeech](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-texttospeech/README.md)|com.google.cloud:google-cloud-texttospeech-spring-starter| +|[java-tpu](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-tpu/README.md)|com.google.cloud:google-cloud-tpu-spring-starter| +|[java-trace](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.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.14.0/java-vmmigration/README.md)|com.google.cloud:google-cloud-vmmigration-spring-starter| +|[java-vpcaccess](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-vpcaccess/README.md)|com.google.cloud:google-cloud-vpcaccess-spring-starter| +|[java-webrisk](https://github.com/googleapis/google-cloud-java/blob/v1.14.0/java-webrisk/README.md)|com.google.cloud:google-cloud-webrisk-spring-starter| +|[java-websecurityscanner](https://github.com/googleapis/google-cloud-java/blob/v1.14.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.14.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.14.0/java-workflows/README.md)|com.google.cloud:google-cloud-workflows-spring-starter| diff --git a/spring-cloud-previews/google-cloud-channel-spring-starter/src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-channel-spring-starter/src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringAutoConfiguration.java index be0bab37e6..8e7ba0ed4f 100644 --- a/spring-cloud-previews/google-cloud-channel-spring-starter/src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-channel-spring-starter/src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringAutoConfiguration.java @@ -344,6 +344,19 @@ public CloudChannelServiceSettings cloudChannelServiceSettings( .deleteChannelPartnerRepricingConfigSettings() .setRetrySettings(deleteChannelPartnerRepricingConfigRetrySettings); + RetrySettings listSkuGroupsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listSkuGroupsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.listSkuGroupsSettings().setRetrySettings(listSkuGroupsRetrySettings); + + RetrySettings listSkuGroupBillableSkusRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listSkuGroupBillableSkusSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .listSkuGroupBillableSkusSettings() + .setRetrySettings(listSkuGroupBillableSkusRetrySettings); + RetrySettings lookupOfferRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.lookupOfferSettings().getRetrySettings(), serviceRetry); @@ -756,6 +769,30 @@ public CloudChannelServiceSettings cloudChannelServiceSettings( "Configured method-level retry settings for deleteChannelPartnerRepricingConfig from properties."); } } + Retry listSkuGroupsRetry = clientProperties.getListSkuGroupsRetry(); + if (listSkuGroupsRetry != null) { + RetrySettings listSkuGroupsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listSkuGroupsSettings().getRetrySettings(), listSkuGroupsRetry); + clientSettingsBuilder.listSkuGroupsSettings().setRetrySettings(listSkuGroupsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listSkuGroups from properties."); + } + } + Retry listSkuGroupBillableSkusRetry = clientProperties.getListSkuGroupBillableSkusRetry(); + if (listSkuGroupBillableSkusRetry != null) { + RetrySettings listSkuGroupBillableSkusRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listSkuGroupBillableSkusSettings().getRetrySettings(), + listSkuGroupBillableSkusRetry); + clientSettingsBuilder + .listSkuGroupBillableSkusSettings() + .setRetrySettings(listSkuGroupBillableSkusRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for listSkuGroupBillableSkus from properties."); + } + } Retry lookupOfferRetry = clientProperties.getLookupOfferRetry(); if (lookupOfferRetry != null) { RetrySettings lookupOfferRetrySettings = diff --git a/spring-cloud-previews/google-cloud-channel-spring-starter/src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringProperties.java b/spring-cloud-previews/google-cloud-channel-spring-starter/src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringProperties.java index 1719849269..9f29b37482 100644 --- a/spring-cloud-previews/google-cloud-channel-spring-starter/src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringProperties.java +++ b/spring-cloud-previews/google-cloud-channel-spring-starter/src/main/java/com/google/cloud/channel/v1/spring/CloudChannelServiceSpringProperties.java @@ -167,6 +167,16 @@ public class CloudChannelServiceSpringProperties implements CredentialsSupplier * defined, this takes precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry deleteChannelPartnerRepricingConfigRetry; + /** + * Allow override of retry settings at method-level for listSkuGroups. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listSkuGroupsRetry; + /** + * Allow override of retry settings at method-level for listSkuGroupBillableSkus. If defined, this + * takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listSkuGroupBillableSkusRetry; /** * Allow override of retry settings at method-level for lookupOffer. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -460,6 +470,22 @@ public void setDeleteChannelPartnerRepricingConfigRetry( this.deleteChannelPartnerRepricingConfigRetry = deleteChannelPartnerRepricingConfigRetry; } + public Retry getListSkuGroupsRetry() { + return this.listSkuGroupsRetry; + } + + public void setListSkuGroupsRetry(Retry listSkuGroupsRetry) { + this.listSkuGroupsRetry = listSkuGroupsRetry; + } + + public Retry getListSkuGroupBillableSkusRetry() { + return this.listSkuGroupBillableSkusRetry; + } + + public void setListSkuGroupBillableSkusRetry(Retry listSkuGroupBillableSkusRetry) { + this.listSkuGroupBillableSkusRetry = listSkuGroupBillableSkusRetry; + } + public Retry getLookupOfferRetry() { return this.lookupOfferRetry; } diff --git a/spring-cloud-previews/google-cloud-language-spring-starter/src/main/java/com/google/cloud/language/v1/spring/LanguageServiceSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-language-spring-starter/src/main/java/com/google/cloud/language/v1/spring/LanguageServiceSpringAutoConfiguration.java index f65684ef5b..57b6bc6111 100644 --- a/spring-cloud-previews/google-cloud-language-spring-starter/src/main/java/com/google/cloud/language/v1/spring/LanguageServiceSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-language-spring-starter/src/main/java/com/google/cloud/language/v1/spring/LanguageServiceSpringAutoConfiguration.java @@ -191,6 +191,11 @@ public LanguageServiceSettings languageServiceSettings( clientSettingsBuilder.classifyTextSettings().getRetrySettings(), serviceRetry); clientSettingsBuilder.classifyTextSettings().setRetrySettings(classifyTextRetrySettings); + RetrySettings moderateTextRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.moderateTextSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.moderateTextSettings().setRetrySettings(moderateTextRetrySettings); + RetrySettings annotateTextRetrySettings = RetryUtil.updateRetrySettings( clientSettingsBuilder.annotateTextSettings().getRetrySettings(), serviceRetry); @@ -261,6 +266,16 @@ public LanguageServiceSettings languageServiceSettings( LOGGER.trace("Configured method-level retry settings for classifyText from properties."); } } + Retry moderateTextRetry = clientProperties.getModerateTextRetry(); + if (moderateTextRetry != null) { + RetrySettings moderateTextRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.moderateTextSettings().getRetrySettings(), moderateTextRetry); + clientSettingsBuilder.moderateTextSettings().setRetrySettings(moderateTextRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for moderateText from properties."); + } + } Retry annotateTextRetry = clientProperties.getAnnotateTextRetry(); if (annotateTextRetry != null) { RetrySettings annotateTextRetrySettings = diff --git a/spring-cloud-previews/google-cloud-language-spring-starter/src/main/java/com/google/cloud/language/v1/spring/LanguageServiceSpringProperties.java b/spring-cloud-previews/google-cloud-language-spring-starter/src/main/java/com/google/cloud/language/v1/spring/LanguageServiceSpringProperties.java index 3c9dbc58d7..170768f30e 100644 --- a/spring-cloud-previews/google-cloud-language-spring-starter/src/main/java/com/google/cloud/language/v1/spring/LanguageServiceSpringProperties.java +++ b/spring-cloud-previews/google-cloud-language-spring-starter/src/main/java/com/google/cloud/language/v1/spring/LanguageServiceSpringProperties.java @@ -69,6 +69,11 @@ public class LanguageServiceSpringProperties implements CredentialsSupplier { * precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry classifyTextRetry; + /** + * Allow override of retry settings at method-level for moderateText. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry moderateTextRetry; /** * Allow override of retry settings at method-level for annotateText. If defined, this takes * precedence over service-level retry configurations for that RPC method. @@ -152,6 +157,14 @@ public void setClassifyTextRetry(Retry classifyTextRetry) { this.classifyTextRetry = classifyTextRetry; } + public Retry getModerateTextRetry() { + return this.moderateTextRetry; + } + + public void setModerateTextRetry(Retry moderateTextRetry) { + this.moderateTextRetry = moderateTextRetry; + } + public Retry getAnnotateTextRetry() { return this.annotateTextRetry; } diff --git a/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/src/main/java/com/google/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/src/main/java/com/google/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringAutoConfiguration.java index 834ea63926..a213e815f0 100644 --- a/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/src/main/java/com/google/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringAutoConfiguration.java +++ b/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/src/main/java/com/google/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringAutoConfiguration.java @@ -171,6 +171,36 @@ public EnvironmentsSettings environmentsSettings( .listEnvironmentsSettings() .setRetrySettings(listEnvironmentsRetrySettings); + RetrySettings executeAirflowCommandRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.executeAirflowCommandSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .executeAirflowCommandSettings() + .setRetrySettings(executeAirflowCommandRetrySettings); + + RetrySettings stopAirflowCommandRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.stopAirflowCommandSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .stopAirflowCommandSettings() + .setRetrySettings(stopAirflowCommandRetrySettings); + + RetrySettings pollAirflowCommandRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.pollAirflowCommandSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder + .pollAirflowCommandSettings() + .setRetrySettings(pollAirflowCommandRetrySettings); + + RetrySettings fetchDatabasePropertiesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.fetchDatabasePropertiesSettings().getRetrySettings(), + serviceRetry); + clientSettingsBuilder + .fetchDatabasePropertiesSettings() + .setRetrySettings(fetchDatabasePropertiesRetrySettings); + if (LOGGER.isTraceEnabled()) { LOGGER.trace("Configured service-level retry settings from properties."); } @@ -200,6 +230,62 @@ public EnvironmentsSettings environmentsSettings( "Configured method-level retry settings for listEnvironments from properties."); } } + Retry executeAirflowCommandRetry = clientProperties.getExecuteAirflowCommandRetry(); + if (executeAirflowCommandRetry != null) { + RetrySettings executeAirflowCommandRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.executeAirflowCommandSettings().getRetrySettings(), + executeAirflowCommandRetry); + clientSettingsBuilder + .executeAirflowCommandSettings() + .setRetrySettings(executeAirflowCommandRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for executeAirflowCommand from properties."); + } + } + Retry stopAirflowCommandRetry = clientProperties.getStopAirflowCommandRetry(); + if (stopAirflowCommandRetry != null) { + RetrySettings stopAirflowCommandRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.stopAirflowCommandSettings().getRetrySettings(), + stopAirflowCommandRetry); + clientSettingsBuilder + .stopAirflowCommandSettings() + .setRetrySettings(stopAirflowCommandRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for stopAirflowCommand from properties."); + } + } + Retry pollAirflowCommandRetry = clientProperties.getPollAirflowCommandRetry(); + if (pollAirflowCommandRetry != null) { + RetrySettings pollAirflowCommandRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.pollAirflowCommandSettings().getRetrySettings(), + pollAirflowCommandRetry); + clientSettingsBuilder + .pollAirflowCommandSettings() + .setRetrySettings(pollAirflowCommandRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for pollAirflowCommand from properties."); + } + } + Retry fetchDatabasePropertiesRetry = clientProperties.getFetchDatabasePropertiesRetry(); + if (fetchDatabasePropertiesRetry != null) { + RetrySettings fetchDatabasePropertiesRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.fetchDatabasePropertiesSettings().getRetrySettings(), + fetchDatabasePropertiesRetry); + clientSettingsBuilder + .fetchDatabasePropertiesSettings() + .setRetrySettings(fetchDatabasePropertiesRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Configured method-level retry settings for fetchDatabaseProperties from properties."); + } + } return clientSettingsBuilder.build(); } diff --git a/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/src/main/java/com/google/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringProperties.java b/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/src/main/java/com/google/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringProperties.java index 3536b6a9ed..5a54ac3bcd 100644 --- a/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/src/main/java/com/google/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringProperties.java +++ b/spring-cloud-previews/google-cloud-orchestration-airflow-spring-starter/src/main/java/com/google/cloud/orchestration/airflow/service/v1/spring/EnvironmentsSpringProperties.java @@ -52,6 +52,26 @@ public class EnvironmentsSpringProperties implements CredentialsSupplier { * precedence over service-level retry configurations for that RPC method. */ @NestedConfigurationProperty private Retry listEnvironmentsRetry; + /** + * Allow override of retry settings at method-level for executeAirflowCommand. If defined, this + * takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry executeAirflowCommandRetry; + /** + * Allow override of retry settings at method-level for stopAirflowCommand. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry stopAirflowCommandRetry; + /** + * Allow override of retry settings at method-level for pollAirflowCommand. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry pollAirflowCommandRetry; + /** + * Allow override of retry settings at method-level for fetchDatabaseProperties. If defined, this + * takes precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry fetchDatabasePropertiesRetry; @Override public Credentials getCredentials() { @@ -105,4 +125,36 @@ public Retry getListEnvironmentsRetry() { public void setListEnvironmentsRetry(Retry listEnvironmentsRetry) { this.listEnvironmentsRetry = listEnvironmentsRetry; } + + public Retry getExecuteAirflowCommandRetry() { + return this.executeAirflowCommandRetry; + } + + public void setExecuteAirflowCommandRetry(Retry executeAirflowCommandRetry) { + this.executeAirflowCommandRetry = executeAirflowCommandRetry; + } + + public Retry getStopAirflowCommandRetry() { + return this.stopAirflowCommandRetry; + } + + public void setStopAirflowCommandRetry(Retry stopAirflowCommandRetry) { + this.stopAirflowCommandRetry = stopAirflowCommandRetry; + } + + public Retry getPollAirflowCommandRetry() { + return this.pollAirflowCommandRetry; + } + + public void setPollAirflowCommandRetry(Retry pollAirflowCommandRetry) { + this.pollAirflowCommandRetry = pollAirflowCommandRetry; + } + + public Retry getFetchDatabasePropertiesRetry() { + return this.fetchDatabasePropertiesRetry; + } + + public void setFetchDatabasePropertiesRetry(Retry fetchDatabasePropertiesRetry) { + this.fetchDatabasePropertiesRetry = fetchDatabasePropertiesRetry; + } } diff --git a/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/java/com/google/cloud/retail/v2/spring/ModelServiceSpringAutoConfiguration.java b/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/java/com/google/cloud/retail/v2/spring/ModelServiceSpringAutoConfiguration.java new file mode 100644 index 0000000000..75bef072d5 --- /dev/null +++ b/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/java/com/google/cloud/retail/v2/spring/ModelServiceSpringAutoConfiguration.java @@ -0,0 +1,277 @@ +/* + * Copyright 2023 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.retail.v2.spring; + +import com.google.api.core.BetaApi; +import com.google.api.gax.core.CredentialsProvider; +import com.google.api.gax.core.ExecutorProvider; +import com.google.api.gax.retrying.RetrySettings; +import com.google.api.gax.rpc.HeaderProvider; +import com.google.api.gax.rpc.TransportChannelProvider; +import com.google.cloud.retail.v2.ModelServiceClient; +import com.google.cloud.retail.v2.ModelServiceSettings; +import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration; +import com.google.cloud.spring.core.DefaultCredentialsProvider; +import com.google.cloud.spring.core.Retry; +import com.google.cloud.spring.core.util.RetryUtil; +import java.io.IOException; +import java.util.Collections; +import javax.annotation.Generated; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * Auto-configuration for {@link ModelServiceClient}. + * + *

Provides auto-configuration for Spring Boot + * + *

The default instance has everything set to sensible defaults: + * + *

+ */ +@Generated("by google-cloud-spring-generator") +@BetaApi("Autogenerated Spring autoconfiguration is not yet stable") +@AutoConfiguration +@AutoConfigureAfter(GcpContextAutoConfiguration.class) +@ConditionalOnClass(ModelServiceClient.class) +@ConditionalOnProperty( + value = "com.google.cloud.retail.v2.model-service.enabled", + matchIfMissing = true) +@EnableConfigurationProperties(ModelServiceSpringProperties.class) +public class ModelServiceSpringAutoConfiguration { + private final ModelServiceSpringProperties clientProperties; + private final CredentialsProvider credentialsProvider; + private static final Log LOGGER = LogFactory.getLog(ModelServiceSpringAutoConfiguration.class); + + protected ModelServiceSpringAutoConfiguration( + ModelServiceSpringProperties clientProperties, CredentialsProvider credentialsProvider) + throws IOException { + this.clientProperties = clientProperties; + if (this.clientProperties.getCredentials().hasKey()) { + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Using credentials from ModelService-specific configuration"); + } + this.credentialsProvider = + ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties)); + } else { + this.credentialsProvider = credentialsProvider; + } + } + + /** + * Provides a default transport channel provider bean, corresponding to the client library's + * default transport channel provider. If the library supports both GRPC and REST transport, and + * the useRest property is configured, the HTTP/JSON transport provider will be used instead of + * GRPC. + * + * @return a default transport channel provider. + */ + @Bean + @ConditionalOnMissingBean(name = "defaultModelServiceTransportChannelProvider") + public TransportChannelProvider defaultModelServiceTransportChannelProvider() { + if (this.clientProperties.getUseRest()) { + return ModelServiceSettings.defaultHttpJsonTransportProviderBuilder().build(); + } + return ModelServiceSettings.defaultTransportChannelProvider(); + } + + /** + * Provides a ModelServiceSettings bean configured to use a DefaultCredentialsProvider and the + * client library's default transport channel provider + * (defaultModelServiceTransportChannelProvider()). It also configures the quota project ID and + * executor thread count, if provided through properties. + * + *

Retry settings are also configured from service-level and method-level properties specified + * in ModelServiceSpringProperties. Method-level properties will take precedence over + * service-level properties if available, and client library defaults will be used if neither are + * specified. + * + * @param defaultTransportChannelProvider TransportChannelProvider to use in the settings. + * @return a {@link ModelServiceSettings} bean configured with {@link TransportChannelProvider} + * bean. + */ + @Bean + @ConditionalOnMissingBean + public ModelServiceSettings modelServiceSettings( + @Qualifier("defaultModelServiceTransportChannelProvider") + TransportChannelProvider defaultTransportChannelProvider) + throws IOException { + ModelServiceSettings.Builder clientSettingsBuilder; + if (this.clientProperties.getUseRest()) { + clientSettingsBuilder = ModelServiceSettings.newHttpJsonBuilder(); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Using REST (HTTP/JSON) transport."); + } + } else { + clientSettingsBuilder = ModelServiceSettings.newBuilder(); + } + clientSettingsBuilder + .setCredentialsProvider(this.credentialsProvider) + .setTransportChannelProvider(defaultTransportChannelProvider) + .setHeaderProvider(this.userAgentHeaderProvider()); + if (this.clientProperties.getQuotaProjectId() != null) { + clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId()); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Quota project id set to " + + this.clientProperties.getQuotaProjectId() + + ", this overrides project id from credentials."); + } + } + if (this.clientProperties.getExecutorThreadCount() != null) { + ExecutorProvider executorProvider = + ModelServiceSettings.defaultExecutorProviderBuilder() + .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount()) + .build(); + clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace( + "Background executor thread count is " + + this.clientProperties.getExecutorThreadCount()); + } + } + Retry serviceRetry = clientProperties.getRetry(); + if (serviceRetry != null) { + RetrySettings getModelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getModelSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.getModelSettings().setRetrySettings(getModelRetrySettings); + + RetrySettings pauseModelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.pauseModelSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.pauseModelSettings().setRetrySettings(pauseModelRetrySettings); + + RetrySettings resumeModelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.resumeModelSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.resumeModelSettings().setRetrySettings(resumeModelRetrySettings); + + RetrySettings deleteModelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteModelSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.deleteModelSettings().setRetrySettings(deleteModelRetrySettings); + + RetrySettings listModelsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listModelsSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.listModelsSettings().setRetrySettings(listModelsRetrySettings); + + RetrySettings updateModelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateModelSettings().getRetrySettings(), serviceRetry); + clientSettingsBuilder.updateModelSettings().setRetrySettings(updateModelRetrySettings); + + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured service-level retry settings from properties."); + } + } + Retry getModelRetry = clientProperties.getGetModelRetry(); + if (getModelRetry != null) { + RetrySettings getModelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.getModelSettings().getRetrySettings(), getModelRetry); + clientSettingsBuilder.getModelSettings().setRetrySettings(getModelRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for getModel from properties."); + } + } + Retry pauseModelRetry = clientProperties.getPauseModelRetry(); + if (pauseModelRetry != null) { + RetrySettings pauseModelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.pauseModelSettings().getRetrySettings(), pauseModelRetry); + clientSettingsBuilder.pauseModelSettings().setRetrySettings(pauseModelRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for pauseModel from properties."); + } + } + Retry resumeModelRetry = clientProperties.getResumeModelRetry(); + if (resumeModelRetry != null) { + RetrySettings resumeModelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.resumeModelSettings().getRetrySettings(), resumeModelRetry); + clientSettingsBuilder.resumeModelSettings().setRetrySettings(resumeModelRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for resumeModel from properties."); + } + } + Retry deleteModelRetry = clientProperties.getDeleteModelRetry(); + if (deleteModelRetry != null) { + RetrySettings deleteModelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.deleteModelSettings().getRetrySettings(), deleteModelRetry); + clientSettingsBuilder.deleteModelSettings().setRetrySettings(deleteModelRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for deleteModel from properties."); + } + } + Retry listModelsRetry = clientProperties.getListModelsRetry(); + if (listModelsRetry != null) { + RetrySettings listModelsRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.listModelsSettings().getRetrySettings(), listModelsRetry); + clientSettingsBuilder.listModelsSettings().setRetrySettings(listModelsRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for listModels from properties."); + } + } + Retry updateModelRetry = clientProperties.getUpdateModelRetry(); + if (updateModelRetry != null) { + RetrySettings updateModelRetrySettings = + RetryUtil.updateRetrySettings( + clientSettingsBuilder.updateModelSettings().getRetrySettings(), updateModelRetry); + clientSettingsBuilder.updateModelSettings().setRetrySettings(updateModelRetrySettings); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Configured method-level retry settings for updateModel from properties."); + } + } + return clientSettingsBuilder.build(); + } + + /** + * Provides a ModelServiceClient bean configured with ModelServiceSettings. + * + * @param modelServiceSettings settings to configure an instance of client bean. + * @return a {@link ModelServiceClient} bean configured with {@link ModelServiceSettings} + */ + @Bean + @ConditionalOnMissingBean + public ModelServiceClient modelServiceClient(ModelServiceSettings modelServiceSettings) + throws IOException { + return ModelServiceClient.create(modelServiceSettings); + } + + private HeaderProvider userAgentHeaderProvider() { + String springLibrary = "spring-autogen-model-service"; + String version = this.getClass().getPackage().getImplementationVersion(); + return () -> Collections.singletonMap("user-agent", springLibrary + "/" + version); + } +} diff --git a/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/java/com/google/cloud/retail/v2/spring/ModelServiceSpringProperties.java b/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/java/com/google/cloud/retail/v2/spring/ModelServiceSpringProperties.java new file mode 100644 index 0000000000..21e4274bb0 --- /dev/null +++ b/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/java/com/google/cloud/retail/v2/spring/ModelServiceSpringProperties.java @@ -0,0 +1,160 @@ +/* + * Copyright 2023 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.retail.v2.spring; + +import com.google.api.core.BetaApi; +import com.google.cloud.spring.core.Credentials; +import com.google.cloud.spring.core.CredentialsSupplier; +import com.google.cloud.spring.core.Retry; +import javax.annotation.Generated; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** Provides default property values for ModelService client bean */ +@Generated("by google-cloud-spring-generator") +@BetaApi("Autogenerated Spring autoconfiguration is not yet stable") +@ConfigurationProperties("com.google.cloud.retail.v2.model-service") +public class ModelServiceSpringProperties implements CredentialsSupplier { + /** OAuth2 credentials to authenticate and authorize calls to Google Cloud Client Libraries. */ + @NestedConfigurationProperty + private final Credentials credentials = + new Credentials("https://www.googleapis.com/auth/cloud-platform"); + /** Quota project to use for billing. */ + private String quotaProjectId; + /** Number of threads used for executors. */ + private Integer executorThreadCount; + /** Allow override of default transport channel provider to use REST instead of gRPC. */ + 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 getModel. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry getModelRetry; + /** + * Allow override of retry settings at method-level for pauseModel. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry pauseModelRetry; + /** + * Allow override of retry settings at method-level for resumeModel. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry resumeModelRetry; + /** + * Allow override of retry settings at method-level for deleteModel. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry deleteModelRetry; + /** + * Allow override of retry settings at method-level for listModels. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry listModelsRetry; + /** + * Allow override of retry settings at method-level for updateModel. If defined, this takes + * precedence over service-level retry configurations for that RPC method. + */ + @NestedConfigurationProperty private Retry updateModelRetry; + + @Override + public Credentials getCredentials() { + return this.credentials; + } + + public String getQuotaProjectId() { + return this.quotaProjectId; + } + + public void setQuotaProjectId(String quotaProjectId) { + this.quotaProjectId = quotaProjectId; + } + + public boolean getUseRest() { + return this.useRest; + } + + public void setUseRest(boolean useRest) { + this.useRest = useRest; + } + + public Integer getExecutorThreadCount() { + return this.executorThreadCount; + } + + public void setExecutorThreadCount(Integer executorThreadCount) { + this.executorThreadCount = executorThreadCount; + } + + public Retry getRetry() { + return this.retry; + } + + public void setRetry(Retry retry) { + this.retry = retry; + } + + public Retry getGetModelRetry() { + return this.getModelRetry; + } + + public void setGetModelRetry(Retry getModelRetry) { + this.getModelRetry = getModelRetry; + } + + public Retry getPauseModelRetry() { + return this.pauseModelRetry; + } + + public void setPauseModelRetry(Retry pauseModelRetry) { + this.pauseModelRetry = pauseModelRetry; + } + + public Retry getResumeModelRetry() { + return this.resumeModelRetry; + } + + public void setResumeModelRetry(Retry resumeModelRetry) { + this.resumeModelRetry = resumeModelRetry; + } + + public Retry getDeleteModelRetry() { + return this.deleteModelRetry; + } + + public void setDeleteModelRetry(Retry deleteModelRetry) { + this.deleteModelRetry = deleteModelRetry; + } + + public Retry getListModelsRetry() { + return this.listModelsRetry; + } + + public void setListModelsRetry(Retry listModelsRetry) { + this.listModelsRetry = listModelsRetry; + } + + public Retry getUpdateModelRetry() { + return this.updateModelRetry; + } + + public void setUpdateModelRetry(Retry updateModelRetry) { + this.updateModelRetry = updateModelRetry; + } +} diff --git a/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 736ad80b9f..8ec64b74de 100644 --- a/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -18,6 +18,12 @@ "description": "Auto-configure Google Cloud retail/ControlService components.", "defaultValue": true }, + { + "name": "com.google.cloud.retail.v2.model-service.enabled", + "type": "java.lang.Boolean", + "description": "Auto-configure Google Cloud retail/ModelService components.", + "defaultValue": true + }, { "name": "com.google.cloud.retail.v2.prediction-service.enabled", "type": "java.lang.Boolean", diff --git a/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index c6a03edb37..e2e9510803 100644 --- a/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/spring-cloud-previews/google-cloud-retail-spring-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,6 +1,7 @@ com.google.cloud.retail.v2.spring.CatalogServiceSpringAutoConfiguration com.google.cloud.retail.v2.spring.CompletionServiceSpringAutoConfiguration com.google.cloud.retail.v2.spring.ControlServiceSpringAutoConfiguration +com.google.cloud.retail.v2.spring.ModelServiceSpringAutoConfiguration com.google.cloud.retail.v2.spring.PredictionServiceSpringAutoConfiguration com.google.cloud.retail.v2.spring.ProductServiceSpringAutoConfiguration com.google.cloud.retail.v2.spring.SearchServiceSpringAutoConfiguration