Merge branch 'main' of github.com:googleapis/google-cloud-java into bqstorage-keep-alive

Author: lqiu96

.github/workflows/java-bigquerystorage-ci.yaml

@@ -114,6 +114,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      with:
+        fetch-depth: 0
     - uses: actions/setup-java@v2
       with:
         distribution: temurin
@@ -122,3 +124,5 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: lint
+        HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        BASE_SHA: ${{ github.event.pull_request.base.sha }}

.github/workflows/java-datastore-ci.yaml

@@ -137,6 +137,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
     - uses: actions/setup-java@v4
       with:
         distribution: temurin
@@ -145,3 +147,5 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: lint
+        HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        BASE_SHA: ${{ github.event.pull_request.base.sha }}

.github/workflows/java-logging-ci.yaml

@@ -129,6 +129,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
     - uses: actions/setup-java@v4
       with:
         distribution: temurin
@@ -137,3 +139,5 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: lint
+        HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        BASE_SHA: ${{ github.event.pull_request.base.sha }}

.github/workflows/java-logging-logback-ci.yaml

@@ -129,6 +129,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
     - uses: actions/setup-java@v4
       with:
         distribution: temurin
@@ -137,3 +139,5 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: lint
+        HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        BASE_SHA: ${{ github.event.pull_request.base.sha }}

.kokoro/build.sh

@@ -71,13 +71,18 @@ case ${JOB_TYPE} in
     if [[ "$(release_please_snapshot_pull_request)" == "true" ]]; then
       echo "Skipping integration tests as this is Release Please SNAPSHOT pull request."
     elif [[ ${#modified_module_list[@]} -gt 0 ]]; then
-      module_list=$(
-        IFS=,
-        echo "${modified_module_list[*]}"
-      )
-      setup_cloud "$module_list"
-      install_modules "$module_list"
-      run_integration_tests "$module_list"
+      filter_modules_with_integration_tests
+      if [[ ${#filtered_it_module_list[@]} -eq 0 ]]; then
+        echo "No modified modules contain integration tests. Skipping."
+      else
+        module_list=$(
+          IFS=,
+          echo "${filtered_it_module_list[*]}"
+        )
+        setup_cloud "$module_list"
+        install_modules "$module_list"
+        run_integration_tests "$module_list"
+      fi
     else
       echo "No Integration Tests to run"
     fi
@@ -157,7 +162,7 @@ case ${JOB_TYPE} in
     fi
     ;;
   graalvm-single)
-    generate_modified_modules_list false    
+    generate_modified_modules_list false
     if [[ "$(release_please_snapshot_pull_request)" == "true" ]]; then
       echo "Not running GraalVM checks -- this is Release Please SNAPSHOT pull request."
     elif [[ ! " ${modified_module_list[*]} " =~ " ${BUILD_SUBDIR} " ]]; then
@@ -194,12 +199,19 @@ case ${JOB_TYPE} in
       echo "Running in subdir: ${BUILD_SUBDIR}"
       pushd "${BUILD_SUBDIR}"
     fi
+
+    MODULE_FILTER=""
+
     if [ -n "${BASE_SHA}" ] && [ -n "${HEAD_SHA}" ]; then
-        changed_file_list=$(git diff --name-only "${BASE_SHA}" "${HEAD_SHA}")
+        # Optimize the build by identifying ONLY the Maven modules that contain changed Java source files.
+        # Format those specific modules instead of the entire codebase, reducing format check time.
+        # The --relative flag is when building in the submodule as only files modified in the module
+        # should be accounted for.
+        changed_file_list=$(git diff --name-only "${BASE_SHA}" "${HEAD_SHA}" --relative)
         echo "${changed_file_list}"
-        
+
         has_code_change="false"
-        
+
         while IFS= read -r changed_file; do
             # Checks if the line is not empty AND if it matches a .java file
             if [ -n "${changed_file}" ] && [[ "${changed_file}" == *.java ]]; then
@@ -208,19 +220,60 @@ case ${JOB_TYPE} in
                 break
             fi
         done <<< "${changed_file_list}"
-        
+
         if [ "${has_code_change}" == "false" ]; then
             echo "No java modules affected. Skipping linter check."
             exit 0
         fi
+
+        # Compute list of changed Maven modules from changed Java files.
+        # We walk each changed .java file up to its nearest pom.xml to find the correct module.
+        # e.g., if "java-asset/google-cloud-asset/src/main/java/Foo.java" is changed,
+        # it traverses upward until finding "java-asset/google-cloud-asset/pom.xml" and adds that module.
+        changed_modules=()
+        while IFS= read -r changed_file; do
+            if [ -n "${changed_file}" ] && [[ "${changed_file}" == *.java ]]; then
+                dir=$(dirname "${changed_file}")
+                while [ "${dir}" != "." ] && [ ! -f "${dir}/pom.xml" ]; do
+                    dir=$(dirname "${dir}")
+                done
+                if [ -f "${dir}/pom.xml" ] && [ "${dir}" != "." ]; then
+                    # Filter out directories not participating in the default formatting reactor:
+                    # - samples are handwritten by developers
+                    # - proto-*/grpc-* are generated code and should use the compiler format
+                    # - *-bom/parents are POM-only and contain no Java source
+                    if [[ "${dir}" != *"samples"* ]] && \
+                       [[ "$(basename "${dir}")" != "proto-google-"* ]] && \
+                       [[ "$(basename "${dir}")" != "grpc-google-"* ]] && \
+                       [[ "$(basename "${dir}")" != *"-bom" ]] && \
+                       [[ "$(basename "${dir}")" != "google-cloud-pom-parent" ]] && \
+                       [[ "$(basename "${dir}")" != "google-cloud-jar-parent" ]]; then
+
+                        changed_modules+=("${dir}")
+                    fi
+                fi
+            fi
+        done <<< "${changed_file_list}"
+
+        echo "Changed Modules: ${changed_modules[*]}"
+
+        # Deduplicate the modules using sort -u to pass a concise list of unique modules
+        # via the Maven `-pl` argument.
+        if [ ${#changed_modules[@]} -gt 0 ]; then
+            unique_modules=$(printf '%s\n' "${changed_modules[@]}" | sort -u | paste -sd ',' -)
+            MODULE_FILTER="-pl ${unique_modules}"
+            echo "Formatting only changed modules: ${unique_modules}"
+        fi
     else
-        echo "BASE_SHA or HEAD_SHA is empty. Skipping file difference check."
+        echo "BASE_SHA or HEAD_SHA is empty. Cannot continue linting."
+        exit 1
     fi
-    
+
     mvn -B -ntp \
-      -T 1.5C \
+      -T 1C \
+      ${MODULE_FILTER} \
       com.spotify.fmt:fmt-maven-plugin:check
-    mvn -B -ntp checkstyle:check@checkstyle
+    mvn -B -ntp ${MODULE_FILTER} checkstyle:check@checkstyle
 
     if [[ -n "${BUILD_SUBDIR}" ]]
     then
@@ -245,4 +298,4 @@ if [[ "${ENABLE_FLAKYBOT}" == "true" ]]; then
 fi
 
 echo "exiting with ${RETURN_CODE}"
-exit ${RETURN_CODE}
+exit ${RETURN_CODE}

.kokoro/common.sh

@@ -62,20 +62,69 @@ function retry_with_backoff {
   return $exit_code
 }
 
+# Helper function to reliably extract the text between <module> tags strictly
+# within the default <modules> block, natively ignoring <profiles>.
+# Uses a pure Bash loop to avoid spawning slower external processes like awk or sed,
+# and naturally survives single-module components without throwing exit signals.
+function extract_pom_modules() {
+  local pom_file="$1"
+  local modules_list=""
+  local in_profiles=false
+  local in_modules=false
+  
+  while IFS= read -r line || [ -n "$line" ]; do
+    if [[ "$line" == *"<profiles>"* ]]; then
+      in_profiles=true
+    elif [[ "$line" == *"</profiles>"* ]]; then
+      in_profiles=false
+    elif [[ "$line" == *"<modules>"* ]] && [ "$in_profiles" = false ]; then
+      in_modules=true
+    elif [[ "$line" == *"</modules>"* ]] && [ "$in_profiles" = false ]; then
+      in_modules=false
+      break
+    elif [ "$in_modules" = true ] && [[ "$line" == *"<module>"* ]]; then
+      # Extract text between tags
+      local module="${line#*<module>}"
+      module="${module%</module>*}"
+      
+      # Trim whitespace natively
+      module="${module#"${module%%[![:space:]]*}"}"
+      module="${module%"${module##*[![:space:]]}"}"
+      
+      if [ -z "$modules_list" ]; then
+        modules_list="$module"
+      else
+        modules_list="${modules_list} ${module}"
+      fi
+    fi
+  done < "$pom_file"
+  
+  echo "$modules_list"
+}
+
 # Given a folder containing a maven multi-module, assign the variable 'submodules' to a
 # comma-delimited list of <folder>/<submodule>.
 function parse_submodules() {
   submodules_array=()
-  mvn_submodules=$(mvn help:evaluate -Dexpression=project.modules -pl "$1")
-  if mvn_submodules=$(grep '<.*>.*</.*>' <<< "$mvn_submodules"); then
-    mvn_submodules=$(sed -e 's/<.*>\(.*\)<\/.*>/\1/g' <<< "$mvn_submodules")
-    for submodule in $mvn_submodules; do
-      # Each entry = <folder>/<submodule>
-      submodules_array+=("$1/${submodule}");
-    done
+  if [ -f "$1/pom.xml" ]; then
+    local modules
+
+    # Use pure Bash extraction to find the modules in the aggregator pom file.
+    # Faster than invoking mvn help:evaluate to list all the project modules,
+    # cleanly ignores optional <profiles>, and gracefully skips flat POMs.
+    modules=$(extract_pom_modules "$1/pom.xml")
+    if [ -n "$modules" ]; then
+      for submodule in $modules; do
+        # Each entry = <folder>/<submodule>
+        submodules_array+=("$1/${submodule}")
+      done
+    else
+      # If this module contains no submodules, select the module itself.
+      submodules_array+=("$1")
+    fi
   else
-    # If this module contains no submodules, select the module itself.
-    submodules_array+=("$1");
+    echo "Module does not have a pom.xml file: $1"
+    exit 1
   fi
 
   # Convert from array to comma-delimited string
@@ -216,6 +265,25 @@ function generate_modified_modules_list() {
   fi
 }
 
+# Filters the modified_module_list to only include modules that contain
+# integration test files (matching IT*.java or *IT.java in src/test/java).
+# Not all modules will have ITs written and there is not need to test
+# modules without ITs.
+function filter_modules_with_integration_tests() {
+  filtered_it_module_list=()
+  for module in "${modified_module_list[@]}"; do
+    # 1. Search for files in the Java test directory (*/src/test/java/*)
+    # 2. Filter for ITs that match the typical file name (IT prefix or suffix)
+    # 3. Stop searching when a single file match has been found
+    if find "$module" -path '*/src/test/java/*' \( -name 'IT*.java' -o -name '*IT.java' \) -print -quit 2>/dev/null | grep -q .; then
+      filtered_it_module_list+=("$module")
+    fi
+  done
+  printf "Modules with integration tests:\n"
+  printf "  %s\n" "${filtered_it_module_list[@]}"
+  echo "Found ${#filtered_it_module_list[@]} modules with integration tests (out of ${#modified_module_list[@]} modified modules)"
+}
+
 function run_integration_tests() {
   printf "Running integration tests for modules:\n%s\n" "$1"
   parse_all_submodules "$1"

generation_config.yaml

@@ -1,5 +1,5 @@
 gapic_generator_version: 2.67.0
-googleapis_commitish: c662840a94dbdf708caa44893a2d49119cdd391c
+googleapis_commitish: c83d354f79b02e3dc98f22248e22851fcf9b961d
 libraries_bom_version: 26.76.0
 libraries:
 - api_shortname: accessapproval

java-aiplatform/README.md

@@ -42,20 +42,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-aiplatform</artifactId>
-  <version>3.86.0</version>
+  <version>3.87.0</version>
 </dependency>
 ```
 
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-aiplatform:3.86.0'
+implementation 'com.google.cloud:google-cloud-aiplatform:3.87.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-aiplatform" % "3.86.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-aiplatform" % "3.87.0"
 ```
 
 ## Authentication
@@ -175,7 +175,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-aiplatform/latest/overview
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-aiplatform.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-aiplatform/3.86.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-aiplatform/3.87.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles