Merge remote-tracking branch 'origin/main' into test-spring-cloud-2024

docs/src/main/asciidoc/pubsub.adoc

@@ -237,7 +237,7 @@ So, take care not to configure a subscription that has a business impact, or ins
 | Name | Description | Required | Default value
 | `management.health.pubsub.enabled` | Whether to enable the Pub/Sub health indicator | No | `true` with Spring Boot Actuator, `false` otherwise
 | `spring.cloud.gcp.pubsub.health.subscription` | Subscription to health check against by pulling a message | No | Random non-existent
-| `spring.cloud.gcp.pubsub.health.timeout-millis` | Milliseconds to wait for response from Pub/Sub before timing out | No | `2000`
+| `spring.cloud.gcp.pubsub.health.timeout-millis` | Milliseconds to wait for response from Pub/Sub before timing out | No | `5000`
 | `spring.cloud.gcp.pubsub.health.acknowledge-messages` | Whether to acknowledge messages pulled from the optionally specified subscription | No | `false`
 |===
 

spring-cloud-gcp-autoconfigure/src/main/java/com/google/cloud/spring/autoconfigure/pubsub/health/PubSubHealthIndicatorProperties.java

@@ -26,7 +26,7 @@ public class PubSubHealthIndicatorProperties {
   private String subscription;
 
   /** Milliseconds to wait for response from Pub/Sub before timing out. */
-  private Long timeoutMillis = 2000L;
+  private Long timeoutMillis = 5000L;
 
   /** Whether to acknowledge messages pulled from {@link #subscription}. */
   private boolean acknowledgeMessages = false;

spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/pubsub/health/PubSubHealthIndicatorAutoConfigurationTests.java

@@ -70,7 +70,7 @@ void healthIndicatorPresent_defaults() throws Exception {
               PubSubHealthIndicator healthIndicator = ctx.getBean(PubSubHealthIndicator.class);
               assertThat(healthIndicator).isNotNull();
               assertThat(healthIndicator.getSubscription()).matches(UUID_PATTERN);
-              assertThat(healthIndicator.getTimeoutMillis()).isEqualTo(2000);
+              assertThat(healthIndicator.getTimeoutMillis()).isEqualTo(5000);
               assertThat(healthIndicator.isAcknowledgeMessages()).isFalse();
               assertThat(healthIndicator.isSpecifiedSubscription()).isFalse();
             });

spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java

@@ -19,7 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

spring-cloud-generator/pom.xml

@@ -15,7 +15,7 @@
     <description>Spring Code Generator for Google Cloud</description>
 
     <properties>
-        <gapic-generator-java-bom.version>2.50.0</gapic-generator-java-bom.version>
+        <gapic-generator-java-bom.version>2.51.0</gapic-generator-java-bom.version>
         <!-- [gapic-test]: protobuf.version for compiling protos used in unit testing
              this should be consistent with version in gapic-generator-java-bom -->
         <protobuf.version>3.25.3</protobuf.version>

spring-cloud-generator/scripts/resources/googleapis_modification_string.txt

@@ -6,7 +6,6 @@ maven_install(
       ] +
       IO_GRPC_GRPC_JAVA_ARTIFACTS,
     generate_compat_repositories = True,
-    override_targets = IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS,
     #Update this False for local development
     fail_on_missing_checksum = False,
     repositories = [

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

@@ -0,0 +1,202 @@
+/*
+ * 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.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 VertexRagDataService client bean */
+@Generated("by google-cloud-spring-generator")
+@BetaApi("Autogenerated Spring autoconfiguration is not yet stable")
+@ConfigurationProperties("com.google.cloud.aiplatform.v1.vertex-rag-data-service")
+public class VertexRagDataServiceSpringProperties 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 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 getRagCorpus. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry getRagCorpusRetry;
+  /**
+   * Allow override of retry settings at method-level for listRagCorpora. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry listRagCorporaRetry;
+  /**
+   * Allow override of retry settings at method-level for uploadRagFile. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry uploadRagFileRetry;
+  /**
+   * Allow override of retry settings at method-level for getRagFile. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry getRagFileRetry;
+  /**
+   * Allow override of retry settings at method-level for listRagFiles. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry listRagFilesRetry;
+  /**
+   * Allow override of retry settings at method-level for listLocations. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry listLocationsRetry;
+  /**
+   * Allow override of retry settings at method-level for getLocation. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry getLocationRetry;
+  /**
+   * Allow override of retry settings at method-level for setIamPolicy. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry setIamPolicyRetry;
+  /**
+   * Allow override of retry settings at method-level for getIamPolicy. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry getIamPolicyRetry;
+  /**
+   * Allow override of retry settings at method-level for testIamPermissions. If defined, this takes
+   * precedence over service-level retry configurations for that RPC method.
+   */
+  @NestedConfigurationProperty private Retry testIamPermissionsRetry;
+
+  @Override
+  public Credentials getCredentials() {
+    return this.credentials;
+  }
+
+  public String getQuotaProjectId() {
+    return this.quotaProjectId;
+  }
+
+  public void setQuotaProjectId(String quotaProjectId) {
+    this.quotaProjectId = quotaProjectId;
+  }
+
+  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 getGetRagCorpusRetry() {
+    return this.getRagCorpusRetry;
+  }
+
+  public void setGetRagCorpusRetry(Retry getRagCorpusRetry) {
+    this.getRagCorpusRetry = getRagCorpusRetry;
+  }
+
+  public Retry getListRagCorporaRetry() {
+    return this.listRagCorporaRetry;
+  }
+
+  public void setListRagCorporaRetry(Retry listRagCorporaRetry) {
+    this.listRagCorporaRetry = listRagCorporaRetry;
+  }
+
+  public Retry getUploadRagFileRetry() {
+    return this.uploadRagFileRetry;
+  }
+
+  public void setUploadRagFileRetry(Retry uploadRagFileRetry) {
+    this.uploadRagFileRetry = uploadRagFileRetry;
+  }
+
+  public Retry getGetRagFileRetry() {
+    return this.getRagFileRetry;
+  }
+
+  public void setGetRagFileRetry(Retry getRagFileRetry) {
+    this.getRagFileRetry = getRagFileRetry;
+  }
+
+  public Retry getListRagFilesRetry() {
+    return this.listRagFilesRetry;
+  }
+
+  public void setListRagFilesRetry(Retry listRagFilesRetry) {
+    this.listRagFilesRetry = listRagFilesRetry;
+  }
+
+  public Retry getListLocationsRetry() {
+    return this.listLocationsRetry;
+  }
+
+  public void setListLocationsRetry(Retry listLocationsRetry) {
+    this.listLocationsRetry = listLocationsRetry;
+  }
+
+  public Retry getGetLocationRetry() {
+    return this.getLocationRetry;
+  }
+
+  public void setGetLocationRetry(Retry getLocationRetry) {
+    this.getLocationRetry = getLocationRetry;
+  }
+
+  public Retry getSetIamPolicyRetry() {
+    return this.setIamPolicyRetry;
+  }
+
+  public void setSetIamPolicyRetry(Retry setIamPolicyRetry) {
+    this.setIamPolicyRetry = setIamPolicyRetry;
+  }
+
+  public Retry getGetIamPolicyRetry() {
+    return this.getIamPolicyRetry;
+  }
+
+  public void setGetIamPolicyRetry(Retry getIamPolicyRetry) {
+    this.getIamPolicyRetry = getIamPolicyRetry;
+  }
+
+  public Retry getTestIamPermissionsRetry() {
+    return this.testIamPermissionsRetry;
+  }
+
+  public void setTestIamPermissionsRetry(Retry testIamPermissionsRetry) {
+    this.testIamPermissionsRetry = testIamPermissionsRetry;
+  }
+}