Merge branch 'main' into future-tostring

Author: igorbernstein2

.github/workflows/downstream.yaml

@@ -47,3 +47,20 @@ jobs:
         run: ./.kokoro/presubmit/common_test.sh
       - name: Perform downstream compatibility testing
         run: REPOS_UNDER_TEST="${{ matrix.repo }}" ./.kokoro/presubmit/downstream-compatibility.sh
+  downstream-compatibility-spring-generator:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: temurin
+      - run: mvn -version
+      - name: Install xmllint
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install libxml2-utils
+      - name: Perform downstream compatibility testing
+        run: ./.kokoro/presubmit/downstream-compatibility-spring.sh

.github/workflows/verify_library_generation.yaml

@@ -73,21 +73,11 @@ jobs:
         set -x
         python -m unittest library_generation/test/integration_tests.py
   library-generation-unit-tests:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     needs: should-run-library-generation-tests
     if: needs.should-run-library-generation-tests.outputs.should_run == 'true'
-    strategy:
-      matrix:
-        java: [ 8 ]
-        os: [ ubuntu-22.04, macos-12 ]
     steps:
     - uses: actions/checkout@v4
-    - name: install utils (macos)
-      if: matrix.os == 'macos-12'
-      shell: bash
-      run: |
-        brew update --preinstall
-        brew install coreutils
     - uses: actions/setup-python@v5
       with:
         python-version: 3.11

.kokoro/presubmit/common.sh

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+commonScriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
+
 # In the given directory ($1),
 #   update the pom.xml's dependency on the given artifact ($2) to the given version ($3)
 # ex: update_dependency google-cloud-java/google-cloud-jar-parent google-cloud-shared-dependencies 1.2.3
@@ -70,20 +72,41 @@ function parse_pom_version {
 # ex: find_last_release_version java-bigtable
 # ex: find_last_release_version java-storage 2.22.x
 function find_last_release_version {
+  repo=$1
   branch=${2-"main"} # Default to using main branch
-  curl -s -o "versions_$1.txt" "https://raw.githubusercontent.com/googleapis/$1/$branch/versions.txt"
+  org=${3-"googleapis"}
+  curl -s -o "versions_${repo}.txt" "https://raw.githubusercontent.com/${org}/${repo}/${branch}/versions.txt"
 
   # First check to see if there's an entry for the overall repo. Used for google-cloud-java.
-  primary_artifact=$(grep -E "^$1" "versions_$1.txt" | head -n 1)
-  if [ -z "$primary_artifact" ]; then
+  primary_artifact=$(grep -E "^${repo}" "versions_${repo}.txt" | head -n 1)
+  if [ -z "${primary_artifact}" ]; then
     # Otherwise, use the first google-cloud-* artifact's version.
     primary_artifact=$(grep -E "^google-cloud-" "versions_$1.txt" | head -n 1)
   fi
-  if [ -z "$primary_artifact" ]; then
+  if [ -z "${primary_artifact}" ]; then
     echo "Unable to identify primary artifact for $1"
     exit 1
   fi
 
   parts=($(echo "$primary_artifact" | tr ":" "\n"))
   echo "${parts[1]}"
 }
+
+# copies settings.xml from the root of sdk-platform-java into Maven's home
+# folder
+function setup_maven_mirror {
+  echo "Setup maven mirror"
+  mkdir -p "${HOME}/.m2"
+  cp "${commonScriptDir}/../../settings.xml" "${HOME}/.m2"
+}
+
+function install_repo_modules {
+  target_projects="$1"
+  projects_arg=""
+  if [ -n "${target_projects}" ]; then
+    projects_arg="--projects ${target_projects}"
+  fi
+  echo "Installing this repo's modules to local maven."
+  mvn -q -B -ntp install ${projects_arg} \
+    -Dcheckstyle.skip -Dfmt.skip -DskipTests -T 1C
+}

.kokoro/presubmit/downstream-compatibility-spring.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+# 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
+#
+#      http://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.
+
+# This script is only meant to test spring-cloud-gpc, specifically on its
+# autoconfig generation workflow
+
+set -eox pipefail
+
+# Get the directory of the build script
+scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
+cd "${scriptDir}/../.." # cd to the root of this repo
+source "$scriptDir/common.sh"
+
+install_repo_modules
+GAPIC_GENERATOR_VERSION=$(parse_pom_version "gapic-generator-java-bom")
+echo "Install complete. gapic-generator-java-bom = $GAPIC_GENERATOR_VERSION"
+
+pushd gapic-generator-java/target
+# Download and configure spring-cloud-gcp for testing
+last_release=$(find_last_release_version "spring-cloud-gcp" "main" "GoogleCloudPlatform")
+git clone "https://github.com/GoogleCloudPlatform/spring-cloud-gcp.git" --depth=1 --branch "v$last_release"
+update_all_poms_dependency "spring-cloud-gcp" "gapic-generator-java-bom" "${GAPIC_GENERATOR_VERSION}"
+
+# Install spring-cloud-gcp modules
+pushd spring-cloud-gcp/spring-cloud-generator
+../mvnw \
+  -U \
+  --batch-mode \
+  --no-transfer-progress \
+  --show-version \
+  --threads 1.5C \
+  --define maven.test.skip=true \
+  --define maven.javadoc.skip=true \
+  install
+
+
+# Generate showcase autoconfig
+./scripts/generate-showcase.sh
+pushd showcase/showcase-spring-starter
+mvn verify
+popd # showcase/showcase-spring-starter
+
+popd # spring-cloud-gcp/spring-cloud-generator
+popd # gapic-generator-java/target

.kokoro/presubmit/downstream-compatibility.sh

@@ -21,18 +21,15 @@ if [ -z "${REPOS_UNDER_TEST}" ]; then
   exit 1
 fi
 
+
 # Get the directory of the build script
 scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 cd "${scriptDir}/../.." # cd to the root of this repo
 source "$scriptDir/common.sh"
 
-echo "Setup maven mirror"
-mkdir -p "${HOME}/.m2"
-cp settings.xml "${HOME}/.m2"
+setup_maven_mirror
 
-echo "Installing this repo's modules to local maven."
-mvn -q -B -ntp install --projects '!gapic-generator-java' \
-  -Dcheckstyle.skip -Dfmt.skip -DskipTests -T 1C
+install_repo_modules '!gapic-generator-java'
 SHARED_DEPS_VERSION=$(parse_pom_version java-shared-dependencies)
 echo "Install complete. java-shared-dependencies = $SHARED_DEPS_VERSION"
 

gapic-generator-java/DEVELOPMENT.md

@@ -99,19 +99,7 @@ To generate a production GAPIC API:
 
    Replace the following section in googleapis
    ```
-    _gapic_generator_java_version = "2.13.0"
-
-    maven_install(
-        artifacts = [
-            "com.google.api:gapic-generator-java:" + _gapic_generator_java_version,
-        ],
-        #Update this False for local development
-        fail_on_missing_checksum = True,
-        repositories = [
-            "m2Local",
-            "https://repo.maven.apache.org/maven2/",
-        ]
-    )
+    _gapic_generator_java_version = "2.43.0"
     
     http_archive(
         name = "gapic_generator_java",
@@ -129,20 +117,8 @@ To generate a production GAPIC API:
 
    to
    ```
-    _gapic_generator_java_version = "2.15.4-SNAPSHOT"
-    
-    maven_install(
-        artifacts = [
-            "com.google.api:gapic-generator-java:" + _gapic_generator_java_version,
-        ],
-        #Update this False for local development
-        fail_on_missing_checksum = False,
-        repositories = [
-            "m2Local",
-            "https://repo.maven.apache.org/maven2/",
-        ]
-    )
-    
+    _gapic_generator_java_version = "2.43.1-SNAPSHOT"
+
     local_repository(
         name = "gapic_generator_java",
         path = "/absolute/path/to/your/local/sdk-platform-java",
@@ -155,7 +131,26 @@ To generate a production GAPIC API:
     )
    ```
 
-   Note: At the time of writing, the gapic-generator version was `2.13.0`. Update the version to the latest version in the pom.xml
+   Note: At the time of writing, the gapic-generator version was `2.43.0`. Update the version to the latest version in the pom.xml
+ 
+   Then update `fail_on_missing_checksum = False` in this `maven_install` target:
+
+   ```
+    maven_install(
+        artifacts = [
+          "com.google.api:gapic-generator-java:" + _gapic_generator_java_version,
+          ] + PROTOBUF_MAVEN_ARTIFACTS +
+          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 = True,
+        repositories = [
+            "m2Local",
+            "https://repo.maven.apache.org/maven2/",
+        ]
+    )
+   ```
 
 3. Build the new target.
 

gax-java/gax/src/main/java/com/google/api/gax/util/TimeConversionUtils.java

@@ -35,27 +35,27 @@ public static java.time.Duration toJavaTimeDuration(org.threeten.bp.Duration sou
     if (source == null) {
       return null;
     }
-    return java.time.Duration.ofNanos(source.toNanos());
+    return java.time.Duration.ofSeconds(source.getSeconds(), source.getNano());
   }
 
   public static org.threeten.bp.Duration toThreetenDuration(java.time.Duration source) {
     if (source == null) {
       return null;
     }
-    return org.threeten.bp.Duration.ofNanos(source.toNanos());
+    return org.threeten.bp.Duration.ofSeconds(source.getSeconds(), source.getNano());
   }
 
   public static java.time.Instant toJavaTimeInstant(org.threeten.bp.Instant source) {
     if (source == null) {
       return null;
     }
-    return java.time.Instant.ofEpochMilli(source.toEpochMilli());
+    return java.time.Instant.ofEpochSecond(source.getEpochSecond(), source.getNano());
   }
 
   public static org.threeten.bp.Instant toThreetenInstant(java.time.Instant source) {
     if (source == null) {
       return null;
     }
-    return org.threeten.bp.Instant.ofEpochMilli(source.toEpochMilli());
+    return org.threeten.bp.Instant.ofEpochSecond(source.getEpochSecond(), source.getNano());
   }
 }

gax-java/gax/src/test/java/com/google/api/gax/util/TimeConversionUtilsTest.java

@@ -37,6 +37,12 @@
 
 public class TimeConversionUtilsTest {
 
+  // 0.999999999 seconds (1 second - 1 nano) - we need to subtract the nano or the Duration would
+  // overflow otherwise
+  final long MAX_DURATION_NANOS =
+      1 * 1000 /*=1 micro*/ * 1000 /*=1 milli*/ * 1000 /*=1 second*/ - 1;
+
+  // Arbitrary durations/instants to confirm conversion works as expected
   final org.threeten.bp.Duration ttDuration = org.threeten.bp.Duration.ofMillis(123);
   final org.threeten.bp.Instant ttInstant = org.threeten.bp.Instant.ofEpochMilli(123);
   final java.time.Duration jtDuration = java.time.Duration.ofMillis(345);
@@ -69,4 +75,44 @@ void testToThreetenTimeInstant_validInput_succeeds() {
         jtInstant.toEpochMilli(), TimeConversionUtils.toThreetenInstant(jtInstant).toEpochMilli());
     assertNull(TimeConversionUtils.toThreetenInstant(null));
   }
+
+  @Test
+  void testToThreeteenInstant_bigInput_doesNotOverflow() {
+    // defaults to MAX_SECONDS plus the max value of long for the nanos part
+    java.time.Instant jtInstant = java.time.Instant.MAX;
+    org.threeten.bp.Instant ttInstant = TimeConversionUtils.toThreetenInstant(jtInstant);
+    assertEquals(jtInstant.getEpochSecond(), ttInstant.getEpochSecond());
+    assertEquals(jtInstant.getNano(), ttInstant.getNano());
+  }
+
+  @Test
+  void testToJavaTimeInstant_bigInput_doesNotOverflow() {
+    // defaults to MAX_SECONDS plus the max value of long for the nanos part
+    org.threeten.bp.Instant ttInstant = org.threeten.bp.Instant.MAX;
+    java.time.Instant jtInstant = TimeConversionUtils.toJavaTimeInstant(ttInstant);
+    assertEquals(jtInstant.getEpochSecond(), ttInstant.getEpochSecond());
+    assertEquals(jtInstant.getNano(), ttInstant.getNano());
+  }
+
+  @Test
+  void testToThreeteenDuration_bigInput_doesNotOverflow() {
+    // we use the max long value for the seconds part and an arbitrary int for the nanos part, so we
+    // can confirm that both components are preserved
+    java.time.Duration jtDuration =
+        java.time.Duration.ofSeconds(Long.MAX_VALUE, MAX_DURATION_NANOS);
+    org.threeten.bp.Duration ttDuration = TimeConversionUtils.toThreetenDuration(jtDuration);
+    assertEquals(jtDuration.getSeconds(), ttDuration.getSeconds());
+    assertEquals(jtDuration.getNano(), ttDuration.getNano());
+  }
+
+  @Test
+  void testToJavaTimeDuration_bigInput_doesNotOverflow() {
+    // we use the max long value for the seconds part and an arbitrary int for the nanos part, so we
+    // can confirm that both components are preserved
+    org.threeten.bp.Duration ttDuration =
+        org.threeten.bp.Duration.ofSeconds(Long.MAX_VALUE, MAX_DURATION_NANOS);
+    java.time.Duration jtDuration = TimeConversionUtils.toJavaTimeDuration(ttDuration);
+    assertEquals(jtDuration.getSeconds(), ttDuration.getSeconds());
+    assertEquals(jtDuration.getNano(), ttDuration.getNano());
+  }
 }