deps: bump com.google.cloud:libraries-bom from 26.44.0 to 26.45.0

spring-cloud-gcp-dependencies/pom.xml

@@ -34,7 +34,7 @@
 	</distributionManagement>
 
 	<properties>
-		<gcp-libraries-bom.version>26.44.0</gcp-libraries-bom.version>
+		<gcp-libraries-bom.version>26.45.0</gcp-libraries-bom.version>
 		<cloud-sql-socket-factory.version>1.20.0</cloud-sql-socket-factory.version>
 		<r2dbc-postgres-driver.version>1.0.5.RELEASE</r2dbc-postgres-driver.version>
 		<cloud-spanner-r2dbc.version>1.3.0</cloud-spanner-r2dbc.version>

spring-cloud-previews/google-cloud-aiplatform-spring-starter/src/main/java/com/google/cloud/aiplatform/v1/spring/EvaluationServiceSpringAutoConfiguration.java

@@ -0,0 +1,282 @@
+/*
+ * 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.aiplatform.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.aiplatform.v1.EvaluationServiceClient;
+import com.google.cloud.aiplatform.v1.EvaluationServiceSettings;
+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 EvaluationServiceClient}.
+ *
+ * <p>Provides auto-configuration for Spring Boot
+ *
+ * <p>The default instance has everything set to sensible defaults:
+ *
+ * <ul>
+ *   <li>The default transport provider is used.
+ *   <li>Credentials are acquired automatically through Application Default Credentials.
+ *   <li>Retries are configured for idempotent methods but not for non-idempotent methods.
+ * </ul>
+ */
+@Generated("by google-cloud-spring-generator")
+@BetaApi("Autogenerated Spring autoconfiguration is not yet stable")
+@AutoConfiguration
+@AutoConfigureAfter(GcpContextAutoConfiguration.class)
+@ConditionalOnClass(EvaluationServiceClient.class)
+@ConditionalOnProperty(
+    value = "com.google.cloud.aiplatform.v1.evaluation-service.enabled",
+    matchIfMissing = true)
+@EnableConfigurationProperties(EvaluationServiceSpringProperties.class)
+public class EvaluationServiceSpringAutoConfiguration {
+  private final EvaluationServiceSpringProperties clientProperties;
+  private final CredentialsProvider credentialsProvider;
+  private static final Log LOGGER =
+      LogFactory.getLog(EvaluationServiceSpringAutoConfiguration.class);
+
+  protected EvaluationServiceSpringAutoConfiguration(
+      EvaluationServiceSpringProperties clientProperties, CredentialsProvider credentialsProvider)
+      throws IOException {
+    this.clientProperties = clientProperties;
+    if (this.clientProperties.getCredentials().hasKey()) {
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Using credentials from EvaluationService-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 = "defaultEvaluationServiceTransportChannelProvider")
+  public TransportChannelProvider defaultEvaluationServiceTransportChannelProvider() {
+    return EvaluationServiceSettings.defaultTransportChannelProvider();
+  }
+
+  /**
+   * Provides a EvaluationServiceSettings bean configured to use a DefaultCredentialsProvider and
+   * the client library's default transport channel provider
+   * (defaultEvaluationServiceTransportChannelProvider()). 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 EvaluationServiceSpringProperties. 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 EvaluationServiceSettings} bean configured with {@link
+   *     TransportChannelProvider} bean.
+   */
+  @Bean
+  @ConditionalOnMissingBean
+  public EvaluationServiceSettings evaluationServiceSettings(
+      @Qualifier("defaultEvaluationServiceTransportChannelProvider")
+          TransportChannelProvider defaultTransportChannelProvider)
+      throws IOException {
+    EvaluationServiceSettings.Builder clientSettingsBuilder =
+        EvaluationServiceSettings.newBuilder();
+    clientSettingsBuilder
+        .setCredentialsProvider(this.credentialsProvider)
+        .setTransportChannelProvider(defaultTransportChannelProvider)
+        .setEndpoint(EvaluationServiceSettings.getDefaultEndpoint())
+        .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 =
+          EvaluationServiceSettings.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 evaluateInstancesRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.evaluateInstancesSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder
+          .evaluateInstancesSettings()
+          .setRetrySettings(evaluateInstancesRetrySettings);
+
+      RetrySettings listLocationsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings);
+
+      RetrySettings getLocationRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getLocationSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings);
+
+      RetrySettings setIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);
+
+      RetrySettings getIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);
+
+      RetrySettings testIamPermissionsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(), serviceRetry);
+      clientSettingsBuilder
+          .testIamPermissionsSettings()
+          .setRetrySettings(testIamPermissionsRetrySettings);
+
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured service-level retry settings from properties.");
+      }
+    }
+    Retry evaluateInstancesRetry = clientProperties.getEvaluateInstancesRetry();
+    if (evaluateInstancesRetry != null) {
+      RetrySettings evaluateInstancesRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.evaluateInstancesSettings().getRetrySettings(),
+              evaluateInstancesRetry);
+      clientSettingsBuilder
+          .evaluateInstancesSettings()
+          .setRetrySettings(evaluateInstancesRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for evaluateInstances from properties.");
+      }
+    }
+    Retry listLocationsRetry = clientProperties.getListLocationsRetry();
+    if (listLocationsRetry != null) {
+      RetrySettings listLocationsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.listLocationsSettings().getRetrySettings(), listLocationsRetry);
+      clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for listLocations from properties.");
+      }
+    }
+    Retry getLocationRetry = clientProperties.getGetLocationRetry();
+    if (getLocationRetry != null) {
+      RetrySettings getLocationRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getLocationSettings().getRetrySettings(), getLocationRetry);
+      clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for getLocation from properties.");
+      }
+    }
+    Retry setIamPolicyRetry = clientProperties.getSetIamPolicyRetry();
+    if (setIamPolicyRetry != null) {
+      RetrySettings setIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), setIamPolicyRetry);
+      clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for setIamPolicy from properties.");
+      }
+    }
+    Retry getIamPolicyRetry = clientProperties.getGetIamPolicyRetry();
+    if (getIamPolicyRetry != null) {
+      RetrySettings getIamPolicyRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), getIamPolicyRetry);
+      clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace("Configured method-level retry settings for getIamPolicy from properties.");
+      }
+    }
+    Retry testIamPermissionsRetry = clientProperties.getTestIamPermissionsRetry();
+    if (testIamPermissionsRetry != null) {
+      RetrySettings testIamPermissionsRetrySettings =
+          RetryUtil.updateRetrySettings(
+              clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(),
+              testIamPermissionsRetry);
+      clientSettingsBuilder
+          .testIamPermissionsSettings()
+          .setRetrySettings(testIamPermissionsRetrySettings);
+      if (LOGGER.isTraceEnabled()) {
+        LOGGER.trace(
+            "Configured method-level retry settings for testIamPermissions from properties.");
+      }
+    }
+    return clientSettingsBuilder.build();
+  }
+
+  /**
+   * Provides a EvaluationServiceClient bean configured with EvaluationServiceSettings.
+   *
+   * @param evaluationServiceSettings settings to configure an instance of client bean.
+   * @return a {@link EvaluationServiceClient} bean configured with {@link
+   *     EvaluationServiceSettings}
+   */
+  @Bean
+  @ConditionalOnMissingBean
+  public EvaluationServiceClient evaluationServiceClient(
+      EvaluationServiceSettings evaluationServiceSettings) throws IOException {
+    return EvaluationServiceClient.create(evaluationServiceSettings);
+  }
+
+  private HeaderProvider userAgentHeaderProvider() {
+    String springLibrary = "spring-autogen-evaluation-service";
+    String version = this.getClass().getPackage().getImplementationVersion();
+    return () -> Collections.singletonMap("user-agent", springLibrary + "/" + version);
+  }
+}