chore: update starter modules in spring-cloud-previews for 26.60.0 (GoogleCloudPlatform#3773)

Author: mpeddada1

spring-cloud-previews/README.md

@@ -210,6 +210,21 @@ public CloudControlsPartnerCoreSettings cloudControlsPartnerCoreSettings(
               clientSettingsBuilder.getPartnerSettings().getRetrySettings(), serviceRetry);
       clientSettingsBuilder.getPartnerSettings().setRetrySettings(getPartnerRetrySettings);
 
+      RetrySettings createCustomerRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.createCustomerSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.createCustomerSettings().setRetrySettings(createCustomerRetrySettings);
+
+      RetrySettings updateCustomerRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.updateCustomerSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.updateCustomerSettings().setRetrySettings(updateCustomerRetrySettings);
+
+      RetrySettings deleteCustomerRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.deleteCustomerSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.deleteCustomerSettings().setRetrySettings(deleteCustomerRetrySettings);
+
       if (LOGGER.isTraceEnabled()) {
         LOGGER.trace("Configured service-level retry settings from properties.");
       }
@@ -306,6 +321,39 @@ public CloudControlsPartnerCoreSettings cloudControlsPartnerCoreSettings(
         LOGGER.trace("Configured method-level retry settings for getPartner from properties.");
       }
     }
+    Retry createCustomerRetry = clientProperties.getCreateCustomerRetry();
+    if (createCustomerRetry != null) {
+      RetrySettings createCustomerRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.createCustomerSettings().getRetrySettings(),
+              createCustomerRetry);
+      clientSettingsBuilder.createCustomerSettings().setRetrySettings(createCustomerRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for createCustomer from properties.");
+      }
+    }
+    Retry updateCustomerRetry = clientProperties.getUpdateCustomerRetry();
+    if (updateCustomerRetry != null) {
+      RetrySettings updateCustomerRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.updateCustomerSettings().getRetrySettings(),
+              updateCustomerRetry);
+      clientSettingsBuilder.updateCustomerSettings().setRetrySettings(updateCustomerRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for updateCustomer from properties.");
+      }
+    }
+    Retry deleteCustomerRetry = clientProperties.getDeleteCustomerRetry();
+    if (deleteCustomerRetry != null) {
+      RetrySettings deleteCustomerRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.deleteCustomerSettings().getRetrySettings(),
+              deleteCustomerRetry);
+      clientSettingsBuilder.deleteCustomerSettings().setRetrySettings(deleteCustomerRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for deleteCustomer from properties.");
+      }
+    }
     return clientSettingsBuilder.build();
   }
 

spring-cloud-previews/google-cloud-cloudcontrolspartner-spring-starter/src/main/java/com/google/cloud/cloudcontrolspartner/v1/spring/CloudControlsPartnerCoreSpringAutoConfiguration.java

@@ -82,6 +82,21 @@ public class CloudControlsPartnerCoreSpringProperties implements CredentialsSupp
    * precedence over service-level retry configurations for that RPC method.
    */
   @NestedConfigurationProperty private Retry getPartnerRetry;
+  /**
+   * Allow override of retry settings at method-level for createCustomer. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry createCustomerRetry;
+  /**
+   * Allow override of retry settings at method-level for updateCustomer. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry updateCustomerRetry;
+  /**
+   * Allow override of retry settings at method-level for deleteCustomer. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry deleteCustomerRetry;
 
   @Override
   public Credentials getCredentials() {
@@ -183,4 +198,28 @@ public Retry getGetPartnerRetry() {
   public void setGetPartnerRetry(Retry getPartnerRetry) {
     this.getPartnerRetry = getPartnerRetry;
   }
+
+  public Retry getCreateCustomerRetry() {
+    return this.createCustomerRetry;
+  }
+
+  public void setCreateCustomerRetry(Retry createCustomerRetry) {
+    this.createCustomerRetry = createCustomerRetry;
+  }
+
+  public Retry getUpdateCustomerRetry() {
+    return this.updateCustomerRetry;
+  }
+
+  public void setUpdateCustomerRetry(Retry updateCustomerRetry) {
+    this.updateCustomerRetry = updateCustomerRetry;
+  }
+
+  public Retry getDeleteCustomerRetry() {
+    return this.deleteCustomerRetry;
+  }
+
+  public void setDeleteCustomerRetry(Retry deleteCustomerRetry) {
+    this.deleteCustomerRetry = deleteCustomerRetry;
+  }
 }

spring-cloud-previews/google-cloud-cloudcontrolspartner-spring-starter/src/main/java/com/google/cloud/cloudcontrolspartner/v1/spring/CloudControlsPartnerCoreSpringProperties.java

@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package com.google.iam.v2.spring;
+package com.google.cloud.compute.v1.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.compute.v1.ReservationBlocksClient;
+import com.google.cloud.compute.v1.ReservationBlocksSettings;
 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 com.google.iam.v2.PoliciesClient;
-import com.google.iam.v2.PoliciesSettings;
 import java.io.IOException;
 import java.util.Collections;
 import javax.annotation.Generated;
@@ -44,7 +44,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS.
 /**
- * Auto-configuration for {@link PoliciesClient}.
+ * Auto-configuration for {@link ReservationBlocksClient}.
  *
  * <p>Provides auto-configuration for Spring Boot
  *
@@ -60,21 +60,24 @@
 @BetaApi("Autogenerated Spring autoconfiguration is not yet stable")
 @AutoConfiguration
 @AutoConfigureAfter(GcpContextAutoConfiguration.class)
-@ConditionalOnClass(PoliciesClient.class)
-@ConditionalOnProperty(value = "com.google.iam.v2.policies.enabled", matchIfMissing = true)
-@EnableConfigurationProperties(PoliciesSpringProperties.class)
-public class PoliciesSpringAutoConfiguration {
-  private final PoliciesSpringProperties clientProperties;
+@ConditionalOnClass(ReservationBlocksClient.class)
+@ConditionalOnProperty(
+    value = "com.google.cloud.compute.v1.reservation-blocks.enabled",
+    matchIfMissing = true)
+@EnableConfigurationProperties(ReservationBlocksSpringProperties.class)
+public class ReservationBlocksSpringAutoConfiguration {
+  private final ReservationBlocksSpringProperties clientProperties;
   private final CredentialsProvider credentialsProvider;
-  private static final Log LOGGER = LogFactory.getLog(PoliciesSpringAutoConfiguration.class);
+  private static final Log LOGGER =
+      LogFactory.getLog(ReservationBlocksSpringAutoConfiguration.class);
 
-  protected PoliciesSpringAutoConfiguration(
-      PoliciesSpringProperties clientProperties, CredentialsProvider credentialsProvider)
+  protected ReservationBlocksSpringAutoConfiguration(
+      ReservationBlocksSpringProperties clientProperties, CredentialsProvider credentialsProvider)
       throws IOException {
     this.clientProperties = clientProperties;
     if (this.clientProperties.getCredentials().hasKey()) {
       if (LOGGER.isTraceEnabled()) {
-        LOGGER.trace("Using credentials from Policies-specific configuration");
+        LOGGER.trace("Using credentials from ReservationBlocks-specific configuration");
       }
       this.credentialsProvider =
           ((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties));
@@ -92,45 +95,38 @@ protected PoliciesSpringAutoConfiguration(
    * @return a default transport channel provider.
    */
   @Bean
-  @ConditionalOnMissingBean(name = "defaultPoliciesTransportChannelProvider")
-  public TransportChannelProvider defaultPoliciesTransportChannelProvider() {
-    if (this.clientProperties.getUseRest()) {
-      return PoliciesSettings.defaultHttpJsonTransportProviderBuilder().build();
-    }
-    return PoliciesSettings.defaultTransportChannelProvider();
+  @ConditionalOnMissingBean(name = "defaultReservationBlocksTransportChannelProvider")
+  public TransportChannelProvider defaultReservationBlocksTransportChannelProvider() {
+    return ReservationBlocksSettings.defaultTransportChannelProvider();
   }
 
   /**
-   * Provides a PoliciesSettings bean configured to use a DefaultCredentialsProvider and the client
-   * library's default transport channel provider (defaultPoliciesTransportChannelProvider()). It
-   * also configures the quota project ID and executor thread count, if provided through properties.
+   * Provides a ReservationBlocksSettings bean configured to use a DefaultCredentialsProvider and
+   * the client library's default transport channel provider
+   * (defaultReservationBlocksTransportChannelProvider()). It also configures the quota project ID
+   * and executor thread count, if provided through properties.
    *
    * <p>Retry settings are also configured from service-level and method-level properties specified
-   * in PoliciesSpringProperties. Method-level properties will take precedence over service-level
-   * properties if available, and client library defaults will be used if neither are specified.
+   * in ReservationBlocksSpringProperties. 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 PoliciesSettings} bean configured with {@link TransportChannelProvider} bean.
+   * @return a {@link ReservationBlocksSettings} bean configured with {@link
+   *     TransportChannelProvider} bean.
    */
   @Bean
   @ConditionalOnMissingBean
-  public PoliciesSettings policiesSettings(
-      @Qualifier("defaultPoliciesTransportChannelProvider")
+  public ReservationBlocksSettings reservationBlocksSettings(
+      @Qualifier("defaultReservationBlocksTransportChannelProvider")
           TransportChannelProvider defaultTransportChannelProvider)
       throws IOException {
-    PoliciesSettings.Builder clientSettingsBuilder;
-    if (this.clientProperties.getUseRest()) {
-      clientSettingsBuilder = PoliciesSettings.newHttpJsonBuilder();
-      if (LOGGER.isTraceEnabled()) {
-        LOGGER.trace("Using REST (HTTP/JSON) transport.");
-      }
-    } else {
-      clientSettingsBuilder = PoliciesSettings.newBuilder();
-    }
+    ReservationBlocksSettings.Builder clientSettingsBuilder =
+        ReservationBlocksSettings.newBuilder();
     clientSettingsBuilder
         .setCredentialsProvider(this.credentialsProvider)
         .setTransportChannelProvider(defaultTransportChannelProvider)
-        .setEndpoint(PoliciesSettings.getDefaultEndpoint())
+        .setEndpoint(ReservationBlocksSettings.getDefaultEndpoint())
         .setHeaderProvider(this.userAgentHeaderProvider());
     if (this.clientProperties.getQuotaProjectId() != null) {
       clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
@@ -143,7 +139,7 @@ public PoliciesSettings policiesSettings(
     }
     if (this.clientProperties.getExecutorThreadCount() != null) {
       ExecutorProvider executorProvider =
-          PoliciesSettings.defaultExecutorProviderBuilder()
+          ReservationBlocksSettings.defaultExecutorProviderBuilder()
               .setExecutorThreadCount(this.clientProperties.getExecutorThreadCount())
               .build();
       clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider);
@@ -155,57 +151,59 @@ public PoliciesSettings policiesSettings(
     }
     Retry serviceRetry = clientProperties.getRetry();
     if (serviceRetry != null) {
-      RetrySettings listPoliciesRetrySettings =
+      RetrySettings getRetrySettings =
           RetryUtil.updateRetrySettings(
-              clientSettingsBuilder.listPoliciesSettings().getRetrySettings(), serviceRetry);
-      clientSettingsBuilder.listPoliciesSettings().setRetrySettings(listPoliciesRetrySettings);
+              clientSettingsBuilder.getSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.getSettings().setRetrySettings(getRetrySettings);
 
-      RetrySettings getPolicyRetrySettings =
+      RetrySettings listRetrySettings =
           RetryUtil.updateRetrySettings(
-              clientSettingsBuilder.getPolicySettings().getRetrySettings(), serviceRetry);
-      clientSettingsBuilder.getPolicySettings().setRetrySettings(getPolicyRetrySettings);
+              clientSettingsBuilder.listSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.listSettings().setRetrySettings(listRetrySettings);
 
       if (LOGGER.isTraceEnabled()) {
         LOGGER.trace("Configured service-level retry settings from properties.");
       }
     }
-    Retry listPoliciesRetry = clientProperties.getListPoliciesRetry();
-    if (listPoliciesRetry != null) {
-      RetrySettings listPoliciesRetrySettings =
+    Retry getRetry = clientProperties.getGetRetry();
+    if (getRetry != null) {
+      RetrySettings getRetrySettings =
           RetryUtil.updateRetrySettings(
-              clientSettingsBuilder.listPoliciesSettings().getRetrySettings(), listPoliciesRetry);
-      clientSettingsBuilder.listPoliciesSettings().setRetrySettings(listPoliciesRetrySettings);
+              clientSettingsBuilder.getSettings().getRetrySettings(), getRetry);
+      clientSettingsBuilder.getSettings().setRetrySettings(getRetrySettings);
       if (LOGGER.isTraceEnabled()) {
-        LOGGER.trace("Configured method-level retry settings for listPolicies from properties.");
+        LOGGER.trace("Configured method-level retry settings for get from properties.");
       }
     }
-    Retry getPolicyRetry = clientProperties.getGetPolicyRetry();
-    if (getPolicyRetry != null) {
-      RetrySettings getPolicyRetrySettings =
+    Retry listRetry = clientProperties.getListRetry();
+    if (listRetry != null) {
+      RetrySettings listRetrySettings =
           RetryUtil.updateRetrySettings(
-              clientSettingsBuilder.getPolicySettings().getRetrySettings(), getPolicyRetry);
-      clientSettingsBuilder.getPolicySettings().setRetrySettings(getPolicyRetrySettings);
+              clientSettingsBuilder.listSettings().getRetrySettings(), listRetry);
+      clientSettingsBuilder.listSettings().setRetrySettings(listRetrySettings);
       if (LOGGER.isTraceEnabled()) {
-        LOGGER.trace("Configured method-level retry settings for getPolicy from properties.");
+        LOGGER.trace("Configured method-level retry settings for list from properties.");
       }
     }
     return clientSettingsBuilder.build();
   }
 
   /**
-   * Provides a PoliciesClient bean configured with PoliciesSettings.
+   * Provides a ReservationBlocksClient bean configured with ReservationBlocksSettings.
    *
-   * @param policiesSettings settings to configure an instance of client bean.
-   * @return a {@link PoliciesClient} bean configured with {@link PoliciesSettings}
+   * @param reservationBlocksSettings settings to configure an instance of client bean.
+   * @return a {@link ReservationBlocksClient} bean configured with {@link
+   *     ReservationBlocksSettings}
    */
   @Bean
   @ConditionalOnMissingBean
-  public PoliciesClient policiesClient(PoliciesSettings policiesSettings) throws IOException {
-    return PoliciesClient.create(policiesSettings);
+  public ReservationBlocksClient reservationBlocksClient(
+      ReservationBlocksSettings reservationBlocksSettings) throws IOException {
+    return ReservationBlocksClient.create(reservationBlocksSettings);
   }
 
   private HeaderProvider userAgentHeaderProvider() {
-    String springLibrary = "spring-autogen-policies";
+    String springLibrary = "spring-autogen-reservation-blocks";
     String version = this.getClass().getPackage().getImplementationVersion();
     return () -> Collections.singletonMap("user-agent", springLibrary + "/" + version);
   }