chore: update starter modules in spring-cloud-previews (#2756)

Co-authored-by: Cloud Java Bot <cloud-java-bot@google.com>

spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/java/com/google/cloud/dataplex/v1/spring/CatalogServiceSpringProperties.java

@@ -0,0 +1,277 @@
+/*
+ * Copyright 2024 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.dataplex.v1.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 CatalogService client bean */
+@Generated("by google-cloud-spring-generator")
+@BetaApi("Autogenerated Spring autoconfiguration is not yet stable")
+@ConfigurationProperties("com.google.cloud.dataplex.v1.catalog-service")
+public class CatalogServiceSpringProperties 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 listEntryTypes. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry listEntryTypesRetry;
+  /**
+   * Allow override of retry settings at method-level for getEntryType. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry getEntryTypeRetry;
+  /**
+   * Allow override of retry settings at method-level for listAspectTypes. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry listAspectTypesRetry;
+  /**
+   * Allow override of retry settings at method-level for getAspectType. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry getAspectTypeRetry;
+  /**
+   * Allow override of retry settings at method-level for listEntryGroups. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry listEntryGroupsRetry;
+  /**
+   * Allow override of retry settings at method-level for getEntryGroup. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry getEntryGroupRetry;
+  /**
+   * Allow override of retry settings at method-level for createEntry. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry createEntryRetry;
+  /**
+   * Allow override of retry settings at method-level for updateEntry. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry updateEntryRetry;
+  /**
+   * Allow override of retry settings at method-level for deleteEntry. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry deleteEntryRetry;
+  /**
+   * Allow override of retry settings at method-level for listEntries. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry listEntriesRetry;
+  /**
+   * Allow override of retry settings at method-level for getEntry. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry getEntryRetry;
+  /**
+   * Allow override of retry settings at method-level for lookupEntry. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry lookupEntryRetry;
+  /**
+   * Allow override of retry settings at method-level for searchEntries. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry searchEntriesRetry;
+  /**
+   * 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;
+
+  @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 getListEntryTypesRetry() {
+    return this.listEntryTypesRetry;
+  }
+
+  public void setListEntryTypesRetry(Retry listEntryTypesRetry) {
+    this.listEntryTypesRetry = listEntryTypesRetry;
+  }
+
+  public Retry getGetEntryTypeRetry() {
+    return this.getEntryTypeRetry;
+  }
+
+  public void setGetEntryTypeRetry(Retry getEntryTypeRetry) {
+    this.getEntryTypeRetry = getEntryTypeRetry;
+  }
+
+  public Retry getListAspectTypesRetry() {
+    return this.listAspectTypesRetry;
+  }
+
+  public void setListAspectTypesRetry(Retry listAspectTypesRetry) {
+    this.listAspectTypesRetry = listAspectTypesRetry;
+  }
+
+  public Retry getGetAspectTypeRetry() {
+    return this.getAspectTypeRetry;
+  }
+
+  public void setGetAspectTypeRetry(Retry getAspectTypeRetry) {
+    this.getAspectTypeRetry = getAspectTypeRetry;
+  }
+
+  public Retry getListEntryGroupsRetry() {
+    return this.listEntryGroupsRetry;
+  }
+
+  public void setListEntryGroupsRetry(Retry listEntryGroupsRetry) {
+    this.listEntryGroupsRetry = listEntryGroupsRetry;
+  }
+
+  public Retry getGetEntryGroupRetry() {
+    return this.getEntryGroupRetry;
+  }
+
+  public void setGetEntryGroupRetry(Retry getEntryGroupRetry) {
+    this.getEntryGroupRetry = getEntryGroupRetry;
+  }
+
+  public Retry getCreateEntryRetry() {
+    return this.createEntryRetry;
+  }
+
+  public void setCreateEntryRetry(Retry createEntryRetry) {
+    this.createEntryRetry = createEntryRetry;
+  }
+
+  public Retry getUpdateEntryRetry() {
+    return this.updateEntryRetry;
+  }
+
+  public void setUpdateEntryRetry(Retry updateEntryRetry) {
+    this.updateEntryRetry = updateEntryRetry;
+  }
+
+  public Retry getDeleteEntryRetry() {
+    return this.deleteEntryRetry;
+  }
+
+  public void setDeleteEntryRetry(Retry deleteEntryRetry) {
+    this.deleteEntryRetry = deleteEntryRetry;
+  }
+
+  public Retry getListEntriesRetry() {
+    return this.listEntriesRetry;
+  }
+
+  public void setListEntriesRetry(Retry listEntriesRetry) {
+    this.listEntriesRetry = listEntriesRetry;
+  }
+
+  public Retry getGetEntryRetry() {
+    return this.getEntryRetry;
+  }
+
+  public void setGetEntryRetry(Retry getEntryRetry) {
+    this.getEntryRetry = getEntryRetry;
+  }
+
+  public Retry getLookupEntryRetry() {
+    return this.lookupEntryRetry;
+  }
+
+  public void setLookupEntryRetry(Retry lookupEntryRetry) {
+    this.lookupEntryRetry = lookupEntryRetry;
+  }
+
+  public Retry getSearchEntriesRetry() {
+    return this.searchEntriesRetry;
+  }
+
+  public void setSearchEntriesRetry(Retry searchEntriesRetry) {
+    this.searchEntriesRetry = searchEntriesRetry;
+  }
+
+  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;
+  }
+}

spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/java/com/google/cloud/dataplex/v1/spring/DataScanServiceSpringAutoConfiguration.java

@@ -186,6 +186,14 @@ public DataScanServiceSettings dataScanServiceSettings(
           .listDataScanJobsSettings()
           .setRetrySettings(listDataScanJobsRetrySettings);
 
+      RetrySettings generateDataQualityRulesRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.generateDataQualityRulesSettings().getRetrySettings(),
+              serviceRetry);
+      clientSettingsBuilder
+          .generateDataQualityRulesSettings()
+          .setRetrySettings(generateDataQualityRulesRetrySettings);
+
       RetrySettings listLocationsRetrySettings =
           RetryUtil.updateRetrySettings(
               clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry);
@@ -255,6 +263,20 @@ public DataScanServiceSettings dataScanServiceSettings(
             "Configured method-level retry settings for listDataScanJobs from properties.");
       }
     }
+    Retry generateDataQualityRulesRetry = clientProperties.getGenerateDataQualityRulesRetry();
+    if (generateDataQualityRulesRetry != null) {
+      RetrySettings generateDataQualityRulesRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.generateDataQualityRulesSettings().getRetrySettings(),
+              generateDataQualityRulesRetry);
+      clientSettingsBuilder
+          .generateDataQualityRulesSettings()
+          .setRetrySettings(generateDataQualityRulesRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for generateDataQualityRules from properties.");
+      }
+    }
     Retry listLocationsRetry = clientProperties.getListLocationsRetry();
     if (listLocationsRetry != null) {
       RetrySettings listLocationsRetrySettings =

spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/java/com/google/cloud/dataplex/v1/spring/DataScanServiceSpringProperties.java

@@ -67,6 +67,11 @@ public class DataScanServiceSpringProperties implements CredentialsSupplier {
    * precedence over service-level retry configurations for that RPC method.
    */
   @NestedConfigurationProperty private Retry listDataScanJobsRetry;
+  /**
+   * Allow override of retry settings at method-level for generateDataQualityRules. If defined, this
+   * takes precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry generateDataQualityRulesRetry;
   /**
    * Allow override of retry settings at method-level for listLocations. If defined, this takes
    * precedence over service-level retry configurations for that RPC method.
@@ -155,6 +160,14 @@ public void setListDataScanJobsRetry(Retry listDataScanJobsRetry) {
     this.listDataScanJobsRetry = listDataScanJobsRetry;
   }
 
+  public Retry getGenerateDataQualityRulesRetry() {
+    return this.generateDataQualityRulesRetry;
+  }
+
+  public void setGenerateDataQualityRulesRetry(Retry generateDataQualityRulesRetry) {
+    this.generateDataQualityRulesRetry = generateDataQualityRulesRetry;
+  }
+
   public Retry getListLocationsRetry() {
     return this.listLocationsRetry;
   }

spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,5 +1,11 @@
 {
   "properties": [
+    {
+      "name": "com.google.cloud.dataplex.v1.catalog-service.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Auto-configure Google Cloud dataplex/CatalogService components.",
+      "defaultValue": true
+    },
     {
       "name": "com.google.cloud.dataplex.v1.content-service.enabled",
       "type": "java.lang.Boolean",

spring-cloud-previews/google-cloud-dataplex-spring-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,4 @@
+com.google.cloud.dataplex.v1.spring.CatalogServiceSpringAutoConfiguration
 com.google.cloud.dataplex.v1.spring.ContentServiceSpringAutoConfiguration
 com.google.cloud.dataplex.v1.spring.DataTaxonomyServiceSpringAutoConfiguration
 com.google.cloud.dataplex.v1.spring.DataScanServiceSpringAutoConfiguration