From 7fff34ab3a8e6e0a77b638be81d67fcb4f061686 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 13 Feb 2024 21:53:23 +0100 Subject: [PATCH 01/20] deps: update googleapis/java-cloud-bom digest to ac9893c (#2472) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | googleapis/java-cloud-bom | action | digest | `8bc17e9` -> `ac9893c` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/sdk-platform-java). --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 64b648607d..5344f99886 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -295,7 +295,7 @@ jobs: run: | mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip - name: Validate gapic-generator-java-bom - uses: googleapis/java-cloud-bom/tests/validate-bom@8bc17e9ae3c6354f04df2fdf2d57aeafa63add66 + uses: googleapis/java-cloud-bom/tests/validate-bom@ac9893c4ba759cda192b11c2e8bac0d5a6bd60a5 with: bom-path: gapic-generator-java-bom/pom.xml From 8b58126d016047bde9aaaafc94d43be100263a9d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 21:31:57 +0000 Subject: [PATCH 02/20] chore(main): release 2.35.0 (#2448) :robot: I have created a release *beep* *boop* ---
2.35.0 ## [2.35.0](https://github.com/googleapis/sdk-platform-java/compare/v2.34.0...v2.35.0) (2024-02-13) ### Features * add `generate_repo.py` ([#2431](https://github.com/googleapis/sdk-platform-java/issues/2431)) ([47b632a](https://github.com/googleapis/sdk-platform-java/commit/47b632aa011874abe04212168ccc74dae50f5fbe)) * move synthtool templates to `library_generation/owlbot` ([#2443](https://github.com/googleapis/sdk-platform-java/issues/2443)) ([5c95472](https://github.com/googleapis/sdk-platform-java/commit/5c95472ffd9085a6eac3d227f96c0b25097c60ec)) ### Bug Fixes * Apiary Host returns user set host if set ([#2455](https://github.com/googleapis/sdk-platform-java/issues/2455)) ([5f17e62](https://github.com/googleapis/sdk-platform-java/commit/5f17e62a7b0f10035205ec4197b8f77388b059f8)) * Cancel the Timeout Task for HttpJson ([#2360](https://github.com/googleapis/sdk-platform-java/issues/2360)) ([b177d9e](https://github.com/googleapis/sdk-platform-java/commit/b177d9e40fd7107bbed67506da0acb021c8f346d)) ### Dependencies * update dependency commons-codec:commons-codec to v1.16.1 ([#2473](https://github.com/googleapis/sdk-platform-java/issues/2473)) ([8c6e91d](https://github.com/googleapis/sdk-platform-java/commit/8c6e91df765b4e42d0d4de77eaf73936fa43895a)) * update google api dependencies ([#2469](https://github.com/googleapis/sdk-platform-java/issues/2469)) ([ad4d4e6](https://github.com/googleapis/sdk-platform-java/commit/ad4d4e65c0afae0e13905fe78b8ea711253dcab3)) * update google auth library dependencies to v1.23.0 ([#2466](https://github.com/googleapis/sdk-platform-java/issues/2466)) ([349a5d3](https://github.com/googleapis/sdk-platform-java/commit/349a5d3b6e31e6184f71d3470a406b2e78eb0775)) * update google auth library dependencies to v1.23.0 ([#2476](https://github.com/googleapis/sdk-platform-java/issues/2476)) ([6c9127c](https://github.com/googleapis/sdk-platform-java/commit/6c9127cf177ed1965ac2d7823808c9f4a835a44f)) * update google http client dependencies to v1.44.1 ([#2467](https://github.com/googleapis/sdk-platform-java/issues/2467)) ([87d1435](https://github.com/googleapis/sdk-platform-java/commit/87d143569e3e2fee5050a905b1841995fc20c528)) * update googleapis/java-cloud-bom digest to ac9893c ([#2472](https://github.com/googleapis/sdk-platform-java/issues/2472)) ([7fff34a](https://github.com/googleapis/sdk-platform-java/commit/7fff34ab3a8e6e0a77b638be81d67fcb4f061686)) * update grpc dependencies to v1.61.1 ([#2463](https://github.com/googleapis/sdk-platform-java/issues/2463)) ([9ec575b](https://github.com/googleapis/sdk-platform-java/commit/9ec575bae059a96ed3d68af4abc372031d9c4dc7))
--- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .cloudbuild/cloudbuild-test-a.yaml | 2 +- .cloudbuild/cloudbuild-test-b.yaml | 2 +- .cloudbuild/cloudbuild.yaml | 2 +- .release-please-manifest.json | 2 +- CHANGELOG.md | 25 +++++++++++++++ WORKSPACE | 2 +- api-common-java/pom.xml | 4 +-- coverage-report/pom.xml | 8 ++--- gapic-generator-java-bom/pom.xml | 26 +++++++-------- gapic-generator-java-pom-parent/pom.xml | 2 +- gapic-generator-java/pom.xml | 6 ++-- gax-java/README.md | 12 +++---- gax-java/dependencies.properties | 8 ++--- gax-java/gax-bom/pom.xml | 20 ++++++------ gax-java/gax-grpc/pom.xml | 4 +-- gax-java/gax-httpjson/pom.xml | 4 +-- gax-java/gax/pom.xml | 4 +-- gax-java/pom.xml | 14 ++++---- .../grpc-google-common-protos/pom.xml | 4 +-- java-common-protos/pom.xml | 10 +++--- .../proto-google-common-protos/pom.xml | 4 +-- java-core/google-cloud-core-bom/pom.xml | 10 +++--- java-core/google-cloud-core-grpc/pom.xml | 4 +-- java-core/google-cloud-core-http/pom.xml | 4 +-- java-core/google-cloud-core/pom.xml | 4 +-- java-core/pom.xml | 6 ++-- java-iam/grpc-google-iam-v1/pom.xml | 4 +-- java-iam/grpc-google-iam-v2/pom.xml | 4 +-- java-iam/grpc-google-iam-v2beta/pom.xml | 4 +-- java-iam/pom.xml | 22 ++++++------- java-iam/proto-google-iam-v1/pom.xml | 4 +-- java-iam/proto-google-iam-v2/pom.xml | 4 +-- java-iam/proto-google-iam-v2beta/pom.xml | 4 +-- java-shared-dependencies/README.md | 2 +- .../dependency-convergence-check/pom.xml | 2 +- .../first-party-dependencies/pom.xml | 10 +++--- java-shared-dependencies/pom.xml | 8 ++--- .../third-party-dependencies/pom.xml | 2 +- .../upper-bound-check/pom.xml | 4 +-- sdk-platform-java-config/pom.xml | 4 +-- showcase/pom.xml | 2 +- versions.txt | 32 +++++++++---------- 42 files changed, 165 insertions(+), 140 deletions(-) diff --git a/.cloudbuild/cloudbuild-test-a.yaml b/.cloudbuild/cloudbuild-test-a.yaml index dd83a6fcd1..143d1effdc 100644 --- a/.cloudbuild/cloudbuild-test-a.yaml +++ b/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.24.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.25.0' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.7.1' steps: diff --git a/.cloudbuild/cloudbuild-test-b.yaml b/.cloudbuild/cloudbuild-test-b.yaml index 7f36959540..c37b81706a 100644 --- a/.cloudbuild/cloudbuild-test-b.yaml +++ b/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.24.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.25.0' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.7.1' steps: diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml index 1686b8a5c3..a6950f885e 100644 --- a/.cloudbuild/cloudbuild.yaml +++ b/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.24.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.25.0' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.7.1' steps: # GraalVM A build diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 7a1c4674e4..517b0cf98a 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "2.34.0" + ".": "2.35.0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 96c80a2b00..a034a206c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,30 @@ # Changelog +## [2.35.0](https://github.com/googleapis/sdk-platform-java/compare/v2.34.0...v2.35.0) (2024-02-13) + + +### Features + +* add `generate_repo.py` ([#2431](https://github.com/googleapis/sdk-platform-java/issues/2431)) ([47b632a](https://github.com/googleapis/sdk-platform-java/commit/47b632aa011874abe04212168ccc74dae50f5fbe)) +* move synthtool templates to `library_generation/owlbot` ([#2443](https://github.com/googleapis/sdk-platform-java/issues/2443)) ([5c95472](https://github.com/googleapis/sdk-platform-java/commit/5c95472ffd9085a6eac3d227f96c0b25097c60ec)) + + +### Bug Fixes + +* Apiary Host returns user set host if set ([#2455](https://github.com/googleapis/sdk-platform-java/issues/2455)) ([5f17e62](https://github.com/googleapis/sdk-platform-java/commit/5f17e62a7b0f10035205ec4197b8f77388b059f8)) +* Cancel the Timeout Task for HttpJson ([#2360](https://github.com/googleapis/sdk-platform-java/issues/2360)) ([b177d9e](https://github.com/googleapis/sdk-platform-java/commit/b177d9e40fd7107bbed67506da0acb021c8f346d)) + + +### Dependencies + +* update dependency commons-codec:commons-codec to v1.16.1 ([#2473](https://github.com/googleapis/sdk-platform-java/issues/2473)) ([8c6e91d](https://github.com/googleapis/sdk-platform-java/commit/8c6e91df765b4e42d0d4de77eaf73936fa43895a)) +* update google api dependencies ([#2469](https://github.com/googleapis/sdk-platform-java/issues/2469)) ([ad4d4e6](https://github.com/googleapis/sdk-platform-java/commit/ad4d4e65c0afae0e13905fe78b8ea711253dcab3)) +* update google auth library dependencies to v1.23.0 ([#2466](https://github.com/googleapis/sdk-platform-java/issues/2466)) ([349a5d3](https://github.com/googleapis/sdk-platform-java/commit/349a5d3b6e31e6184f71d3470a406b2e78eb0775)) +* update google auth library dependencies to v1.23.0 ([#2476](https://github.com/googleapis/sdk-platform-java/issues/2476)) ([6c9127c](https://github.com/googleapis/sdk-platform-java/commit/6c9127cf177ed1965ac2d7823808c9f4a835a44f)) +* update google http client dependencies to v1.44.1 ([#2467](https://github.com/googleapis/sdk-platform-java/issues/2467)) ([87d1435](https://github.com/googleapis/sdk-platform-java/commit/87d143569e3e2fee5050a905b1841995fc20c528)) +* update googleapis/java-cloud-bom digest to ac9893c ([#2472](https://github.com/googleapis/sdk-platform-java/issues/2472)) ([7fff34a](https://github.com/googleapis/sdk-platform-java/commit/7fff34ab3a8e6e0a77b638be81d67fcb4f061686)) +* update grpc dependencies to v1.61.1 ([#2463](https://github.com/googleapis/sdk-platform-java/issues/2463)) ([9ec575b](https://github.com/googleapis/sdk-platform-java/commit/9ec575bae059a96ed3d68af4abc372031d9c4dc7)) + ## [2.34.0](https://github.com/googleapis/sdk-platform-java/compare/v2.33.0...v2.34.0) (2024-01-31) diff --git a/WORKSPACE b/WORKSPACE index 3bc5237b0e..7026f3e523 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -60,7 +60,7 @@ maven_install( repositories = ["https://repo.maven.apache.org/maven2/"], ) -_gapic_generator_java_version = "2.34.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current} +_gapic_generator_java_version = "2.35.0" # {x-version-update:gapic-generator-java:current} maven_install( artifacts = [ diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index 8b7b11722d..34714dc9b8 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -5,14 +5,14 @@ com.google.api api-common jar - 2.25.1-SNAPSHOT + 2.26.0 API Common Common utilities for Google APIs in Java com.google.api gapic-generator-java-pom-parent - 2.34.1-SNAPSHOT + 2.35.0 ../gapic-generator-java-pom-parent diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index 717360b8e8..5ba57aae75 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -31,22 +31,22 @@ com.google.api gax - 2.42.1-SNAPSHOT + 2.43.0 com.google.api gax-grpc - 2.42.1-SNAPSHOT + 2.43.0 com.google.api gax-httpjson - 2.42.1-SNAPSHOT + 2.43.0 com.google.api api-common - 2.25.1-SNAPSHOT + 2.26.0 diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index fa770432a2..626f1675d3 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -4,7 +4,7 @@ com.google.api gapic-generator-java-bom pom - 2.34.1-SNAPSHOT + 2.35.0 GAPIC Generator Java BOM BOM for the libraries in gapic-generator-java repository. Users should not @@ -15,7 +15,7 @@ com.google.api gapic-generator-java-pom-parent - 2.34.1-SNAPSHOT + 2.35.0 ../gapic-generator-java-pom-parent @@ -75,61 +75,61 @@ com.google.api api-common - 2.25.1-SNAPSHOT + 2.26.0 com.google.api gax-bom - 2.42.1-SNAPSHOT + 2.43.0 pom import com.google.api gapic-generator-java - 2.34.1-SNAPSHOT + 2.35.0 com.google.api.grpc grpc-google-common-protos - 2.33.1-SNAPSHOT + 2.34.0 com.google.api.grpc proto-google-common-protos - 2.33.1-SNAPSHOT + 2.34.0 com.google.api.grpc proto-google-iam-v1 - 1.28.1-SNAPSHOT + 1.29.0 com.google.api.grpc proto-google-iam-v2 - 1.28.1-SNAPSHOT + 1.29.0 com.google.api.grpc proto-google-iam-v2beta - 1.28.1-SNAPSHOT + 1.29.0 com.google.api.grpc grpc-google-iam-v1 - 1.28.1-SNAPSHOT + 1.29.0 com.google.api.grpc grpc-google-iam-v2 - 1.28.1-SNAPSHOT + 1.29.0 com.google.api.grpc grpc-google-iam-v2beta - 1.28.1-SNAPSHOT + 1.29.0 diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 0869c4338c..52fba6eda1 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.google.api gapic-generator-java-pom-parent - 2.34.1-SNAPSHOT + 2.35.0 pom GAPIC Generator Java POM Parent https://github.com/googleapis/sdk-platform-java diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index f32331b7a7..38e50d83f3 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api gapic-generator-java - 2.34.1-SNAPSHOT + 2.35.0 GAPIC Generator Java GAPIC generator Java @@ -22,7 +22,7 @@ com.google.api gapic-generator-java-pom-parent - 2.34.1-SNAPSHOT + 2.35.0 ../gapic-generator-java-pom-parent @@ -31,7 +31,7 @@ com.google.api gapic-generator-java-bom - 2.34.1-SNAPSHOT + 2.35.0 pom import diff --git a/gax-java/README.md b/gax-java/README.md index 88df3f9977..4414ab4722 100644 --- a/gax-java/README.md +++ b/gax-java/README.md @@ -34,27 +34,27 @@ If you are using Maven, add this to your pom.xml file com.google.api gax - 2.42.0 + 2.43.0 com.google.api gax-grpc - 2.42.0 + 2.43.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.api:gax:2.42.0', - 'com.google.api:gax-grpc:2.42.0' +compile 'com.google.api:gax:2.43.0', + 'com.google.api:gax-grpc:2.43.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.api" % "gax" % "2.42.0" -libraryDependencies += "com.google.api" % "gax-grpc" % "2.42.0" +libraryDependencies += "com.google.api" % "gax" % "2.43.0" +libraryDependencies += "com.google.api" % "gax-grpc" % "2.43.0" ``` [//]: # ({x-version-update-end}) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index c2ead48d71..9f56719942 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.42.1-SNAPSHOT +version.gax=2.43.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.42.1-SNAPSHOT +version.gax_grpc=2.43.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.42.1-SNAPSHOT +version.gax_bom=2.43.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_httpjson=2.42.1-SNAPSHOT +version.gax_httpjson=2.43.0 # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml index 900b2e48ef..7c9b882227 100644 --- a/gax-java/gax-bom/pom.xml +++ b/gax-java/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.42.1-SNAPSHOT + 2.43.0 pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -43,55 +43,55 @@ com.google.api gax - 2.42.1-SNAPSHOT + 2.43.0 com.google.api gax - 2.42.1-SNAPSHOT + 2.43.0 test-jar testlib com.google.api gax - 2.42.1-SNAPSHOT + 2.43.0 testlib com.google.api gax-grpc - 2.42.1-SNAPSHOT + 2.43.0 com.google.api gax-grpc - 2.42.1-SNAPSHOT + 2.43.0 test-jar testlib com.google.api gax-grpc - 2.42.1-SNAPSHOT + 2.43.0 testlib com.google.api gax-httpjson - 2.42.1-SNAPSHOT + 2.43.0 com.google.api gax-httpjson - 2.42.1-SNAPSHOT + 2.43.0 test-jar testlib com.google.api gax-httpjson - 2.42.1-SNAPSHOT + 2.43.0 testlib diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml index 7a3aa9e96a..a92f621943 100644 --- a/gax-java/gax-grpc/pom.xml +++ b/gax-java/gax-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-grpc - 2.42.1-SNAPSHOT + 2.43.0 jar GAX (Google Api eXtensions) for Java (gRPC) Google Api eXtensions for Java (gRPC) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.42.1-SNAPSHOT + 2.43.0 diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index ca317d124d..925603a52c 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 2.42.1-SNAPSHOT + 2.43.0 jar GAX (Google Api eXtensions) for Java (HTTP JSON) Google Api eXtensions for Java (HTTP JSON) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.42.1-SNAPSHOT + 2.43.0 diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index f6cdaa789a..a1be5abaa4 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.42.1-SNAPSHOT + 2.43.0 jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.42.1-SNAPSHOT + 2.43.0 diff --git a/gax-java/pom.xml b/gax-java/pom.xml index 19bee169a3..96e4ad5826 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -4,14 +4,14 @@ com.google.api gax-parent pom - 2.42.1-SNAPSHOT + 2.43.0 GAX (Google Api eXtensions) for Java (Parent) Google Api eXtensions for Java (Parent) com.google.api gapic-generator-java-pom-parent - 2.34.1-SNAPSHOT + 2.35.0 ../gapic-generator-java-pom-parent @@ -50,7 +50,7 @@ com.google.api api-common - 2.25.1-SNAPSHOT + 2.26.0 com.google.auth @@ -108,24 +108,24 @@ com.google.api gax - 2.42.1-SNAPSHOT + 2.43.0 com.google.api gax - 2.42.1-SNAPSHOT + 2.43.0 test-jar testlib com.google.api.grpc proto-google-common-protos - 2.33.1-SNAPSHOT + 2.34.0 com.google.api.grpc grpc-google-common-protos - 2.33.1-SNAPSHOT + 2.34.0 io.grpc diff --git a/java-common-protos/grpc-google-common-protos/pom.xml b/java-common-protos/grpc-google-common-protos/pom.xml index fcf837943c..6862555832 100644 --- a/java-common-protos/grpc-google-common-protos/pom.xml +++ b/java-common-protos/grpc-google-common-protos/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-common-protos - 2.33.1-SNAPSHOT + 2.34.0 grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.33.1-SNAPSHOT + 2.34.0 diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index f4586f0184..55d32926d9 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -4,7 +4,7 @@ com.google.api.grpc google-common-protos-parent pom - 2.33.1-SNAPSHOT + 2.34.0 Google Common Protos Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.34.1-SNAPSHOT + 2.35.0 ../gapic-generator-java-pom-parent @@ -61,7 +61,7 @@ com.google.cloud third-party-dependencies - 3.24.1-SNAPSHOT + 3.25.0 pom import @@ -75,7 +75,7 @@ com.google.api.grpc grpc-google-common-protos - 2.33.1-SNAPSHOT + 2.34.0 io.grpc @@ -87,7 +87,7 @@ com.google.api.grpc proto-google-common-protos - 2.33.1-SNAPSHOT + 2.34.0 com.google.guava diff --git a/java-common-protos/proto-google-common-protos/pom.xml b/java-common-protos/proto-google-common-protos/pom.xml index 91baefe127..064557d433 100644 --- a/java-common-protos/proto-google-common-protos/pom.xml +++ b/java-common-protos/proto-google-common-protos/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-common-protos - 2.33.1-SNAPSHOT + 2.34.0 proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.33.1-SNAPSHOT + 2.34.0 diff --git a/java-core/google-cloud-core-bom/pom.xml b/java-core/google-cloud-core-bom/pom.xml index b9ee988026..2b963c658e 100644 --- a/java-core/google-cloud-core-bom/pom.xml +++ b/java-core/google-cloud-core-bom/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.cloud google-cloud-core-bom - 2.32.1-SNAPSHOT + 2.33.0 pom com.google.api gapic-generator-java-pom-parent - 2.34.1-SNAPSHOT + 2.35.0 ../../gapic-generator-java-pom-parent @@ -23,17 +23,17 @@ com.google.cloud google-cloud-core - 2.32.1-SNAPSHOT + 2.33.0 com.google.cloud google-cloud-core-grpc - 2.32.1-SNAPSHOT + 2.33.0 com.google.cloud google-cloud-core-http - 2.32.1-SNAPSHOT + 2.33.0 diff --git a/java-core/google-cloud-core-grpc/pom.xml b/java-core/google-cloud-core-grpc/pom.xml index 88436370a1..cde38d394c 100644 --- a/java-core/google-cloud-core-grpc/pom.xml +++ b/java-core/google-cloud-core-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-grpc - 2.32.1-SNAPSHOT + 2.33.0 jar Google Cloud Core gRPC @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.32.1-SNAPSHOT + 2.33.0 google-cloud-core-grpc diff --git a/java-core/google-cloud-core-http/pom.xml b/java-core/google-cloud-core-http/pom.xml index fd9b3d18de..54dde4993d 100644 --- a/java-core/google-cloud-core-http/pom.xml +++ b/java-core/google-cloud-core-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-http - 2.32.1-SNAPSHOT + 2.33.0 jar Google Cloud Core HTTP @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.32.1-SNAPSHOT + 2.33.0 google-cloud-core-http diff --git a/java-core/google-cloud-core/pom.xml b/java-core/google-cloud-core/pom.xml index bfddf4bfb6..246acf25e3 100644 --- a/java-core/google-cloud-core/pom.xml +++ b/java-core/google-cloud-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core - 2.32.1-SNAPSHOT + 2.33.0 jar Google Cloud Core @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.32.1-SNAPSHOT + 2.33.0 google-cloud-core diff --git a/java-core/pom.xml b/java-core/pom.xml index 786e096955..1296d7c7b9 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 2.32.1-SNAPSHOT + 2.33.0 Google Cloud Core Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.34.1-SNAPSHOT + 2.35.0 ../gapic-generator-java-pom-parent @@ -33,7 +33,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.24.1-SNAPSHOT + 3.25.0 pom import diff --git a/java-iam/grpc-google-iam-v1/pom.xml b/java-iam/grpc-google-iam-v1/pom.xml index f4b2be64bd..f6d8f13f63 100644 --- a/java-iam/grpc-google-iam-v1/pom.xml +++ b/java-iam/grpc-google-iam-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v1 - 1.28.1-SNAPSHOT + 1.29.0 grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.28.1-SNAPSHOT + 1.29.0 diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index 4f62666294..cc1c9ab10a 100644 --- a/java-iam/grpc-google-iam-v2/pom.xml +++ b/java-iam/grpc-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2 - 1.28.1-SNAPSHOT + 1.29.0 grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.28.1-SNAPSHOT + 1.29.0 diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index 5d0052905f..0042f346b4 100644 --- a/java-iam/grpc-google-iam-v2beta/pom.xml +++ b/java-iam/grpc-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2beta - 1.28.1-SNAPSHOT + 1.29.0 grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.28.1-SNAPSHOT + 1.29.0 diff --git a/java-iam/pom.xml b/java-iam/pom.xml index 57afa87c0c..56276b4d79 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.28.1-SNAPSHOT + 1.29.0 Google IAM Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.34.1-SNAPSHOT + 2.35.0 ../gapic-generator-java-pom-parent @@ -60,7 +60,7 @@ com.google.cloud third-party-dependencies - 3.24.1-SNAPSHOT + 3.25.0 pom import @@ -88,44 +88,44 @@ com.google.api gax-bom - 2.42.1-SNAPSHOT + 2.43.0 pom import com.google.api.grpc proto-google-iam-v2 - 1.28.1-SNAPSHOT + 1.29.0 com.google.api.grpc grpc-google-iam-v2 - 1.28.1-SNAPSHOT + 1.29.0 com.google.api.grpc proto-google-common-protos - 2.33.1-SNAPSHOT + 2.34.0 com.google.api.grpc proto-google-iam-v2beta - 1.28.1-SNAPSHOT + 1.29.0 com.google.api.grpc grpc-google-iam-v1 - 1.28.1-SNAPSHOT + 1.29.0 com.google.api.grpc grpc-google-iam-v2beta - 1.28.1-SNAPSHOT + 1.29.0 com.google.api.grpc proto-google-iam-v1 - 1.28.1-SNAPSHOT + 1.29.0 javax.annotation diff --git a/java-iam/proto-google-iam-v1/pom.xml b/java-iam/proto-google-iam-v1/pom.xml index c770f57004..dd2b177a92 100644 --- a/java-iam/proto-google-iam-v1/pom.xml +++ b/java-iam/proto-google-iam-v1/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v1 - 1.28.1-SNAPSHOT + 1.29.0 proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.28.1-SNAPSHOT + 1.29.0 diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index 182fe2cab3..263ab1137b 100644 --- a/java-iam/proto-google-iam-v2/pom.xml +++ b/java-iam/proto-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2 - 1.28.1-SNAPSHOT + 1.29.0 proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.28.1-SNAPSHOT + 1.29.0 diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index e3643e6e54..a24f01807a 100644 --- a/java-iam/proto-google-iam-v2beta/pom.xml +++ b/java-iam/proto-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2beta - 1.28.1-SNAPSHOT + 1.29.0 proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.28.1-SNAPSHOT + 1.29.0 diff --git a/java-shared-dependencies/README.md b/java-shared-dependencies/README.md index 3199dad83a..4c0e79e467 100644 --- a/java-shared-dependencies/README.md +++ b/java-shared-dependencies/README.md @@ -14,7 +14,7 @@ If you are using Maven, add this to the `dependencyManagement` section. com.google.cloud google-cloud-shared-dependencies - 3.24.0 + 3.25.0 pom import diff --git a/java-shared-dependencies/dependency-convergence-check/pom.xml b/java-shared-dependencies/dependency-convergence-check/pom.xml index 84f876e295..a6c44356bf 100644 --- a/java-shared-dependencies/dependency-convergence-check/pom.xml +++ b/java-shared-dependencies/dependency-convergence-check/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud shared-dependencies-dependency-convergence-test - 3.24.1-SNAPSHOT + 3.25.0 Dependency convergence test for certain artifacts in Google Cloud Shared Dependencies An dependency convergence test case for the shared dependencies BOM. A failure of this test case means diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index 9417419b51..11d8b0c6bb 100644 --- a/java-shared-dependencies/first-party-dependencies/pom.xml +++ b/java-shared-dependencies/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 3.24.1-SNAPSHOT + 3.25.0 Google Cloud First-party Shared Dependencies Shared first-party dependencies for Google Cloud Java libraries. @@ -33,7 +33,7 @@ com.google.api gapic-generator-java-bom - 2.34.1-SNAPSHOT + 2.35.0 pom import @@ -45,7 +45,7 @@ com.google.cloud google-cloud-core-bom - 2.32.1-SNAPSHOT + 2.33.0 pom import @@ -69,13 +69,13 @@ com.google.cloud google-cloud-core - 2.32.1-SNAPSHOT + 2.33.0 test-jar com.google.cloud google-cloud-core - 2.32.1-SNAPSHOT + 2.33.0 tests diff --git a/java-shared-dependencies/pom.xml b/java-shared-dependencies/pom.xml index db364746c7..0176a9d98a 100644 --- a/java-shared-dependencies/pom.xml +++ b/java-shared-dependencies/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 3.24.1-SNAPSHOT + 3.25.0 first-party-dependencies third-party-dependencies @@ -17,7 +17,7 @@ com.google.api gapic-generator-java-pom-parent - 2.34.1-SNAPSHOT + 2.35.0 ../gapic-generator-java-pom-parent @@ -31,14 +31,14 @@ com.google.cloud first-party-dependencies - 3.24.1-SNAPSHOT + 3.25.0 pom import com.google.cloud third-party-dependencies - 3.24.1-SNAPSHOT + 3.25.0 pom import diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index c0d53349fe..2850a8cd09 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 3.24.1-SNAPSHOT + 3.25.0 Google Cloud Third-party Shared Dependencies Shared third-party dependencies for Google Cloud Java libraries. diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml index c009d3c484..7c317c5385 100644 --- a/java-shared-dependencies/upper-bound-check/pom.xml +++ b/java-shared-dependencies/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 3.24.1-SNAPSHOT + 3.25.0 Upper bound test for Google Cloud Shared Dependencies An upper bound test case for the shared dependencies BOM. A failure of this test case means @@ -30,7 +30,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.24.1-SNAPSHOT + 3.25.0 pom import diff --git a/sdk-platform-java-config/pom.xml b/sdk-platform-java-config/pom.xml index 2b809b9e2a..72146826d5 100644 --- a/sdk-platform-java-config/pom.xml +++ b/sdk-platform-java-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud sdk-platform-java-config pom - 3.24.1-SNAPSHOT + 3.25.0 SDK Platform For Java Configurations Shared build configuration for Google Cloud Java libraries. @@ -17,6 +17,6 @@ - 3.24.1-SNAPSHOT + 3.25.0 \ No newline at end of file diff --git a/showcase/pom.xml b/showcase/pom.xml index 2183baff10..a8965144c2 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -34,7 +34,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.24.1-SNAPSHOT + 3.25.0 pom import diff --git a/versions.txt b/versions.txt index 4dfce48e72..fd529571e3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,19 +1,19 @@ # Format: # module:released-version:current-version -gapic-generator-java:2.34.0:2.34.1-SNAPSHOT -api-common:2.25.0:2.25.1-SNAPSHOT -gax:2.42.0:2.42.1-SNAPSHOT -gax-grpc:2.42.0:2.42.1-SNAPSHOT -gax-httpjson:0.127.0:0.127.1-SNAPSHOT -proto-google-common-protos:2.33.0:2.33.1-SNAPSHOT -grpc-google-common-protos:2.33.0:2.33.1-SNAPSHOT -proto-google-iam-v1:1.28.0:1.28.1-SNAPSHOT -grpc-google-iam-v1:1.28.0:1.28.1-SNAPSHOT -proto-google-iam-v2beta:1.28.0:1.28.1-SNAPSHOT -grpc-google-iam-v2beta:1.28.0:1.28.1-SNAPSHOT -google-iam-policy:1.28.0:1.28.1-SNAPSHOT -proto-google-iam-v2:1.28.0:1.28.1-SNAPSHOT -grpc-google-iam-v2:1.28.0:1.28.1-SNAPSHOT -google-cloud-core:2.32.0:2.32.1-SNAPSHOT -google-cloud-shared-dependencies:3.24.0:3.24.1-SNAPSHOT +gapic-generator-java:2.35.0:2.35.0 +api-common:2.26.0:2.26.0 +gax:2.43.0:2.43.0 +gax-grpc:2.43.0:2.43.0 +gax-httpjson:0.128.0:0.128.0 +proto-google-common-protos:2.34.0:2.34.0 +grpc-google-common-protos:2.34.0:2.34.0 +proto-google-iam-v1:1.29.0:1.29.0 +grpc-google-iam-v1:1.29.0:1.29.0 +proto-google-iam-v2beta:1.29.0:1.29.0 +grpc-google-iam-v2beta:1.29.0:1.29.0 +google-iam-policy:1.29.0:1.29.0 +proto-google-iam-v2:1.29.0:1.29.0 +grpc-google-iam-v2:1.29.0:1.29.0 +google-cloud-core:2.33.0:2.33.0 +google-cloud-shared-dependencies:3.25.0:3.25.0 From 5b44e1df43de7100774dfe931870da12ece29553 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 23:10:46 +0000 Subject: [PATCH 03/20] chore(main): release 2.35.1-SNAPSHOT (#2482) :robot: I have created a release *beep* *boop* ---
2.35.1-SNAPSHOT ### Updating meta-information for bleeding-edge SNAPSHOT release.
--- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .cloudbuild/cloudbuild-test-a.yaml | 2 +- .cloudbuild/cloudbuild-test-b.yaml | 2 +- .cloudbuild/cloudbuild.yaml | 2 +- WORKSPACE | 2 +- api-common-java/pom.xml | 4 +-- coverage-report/pom.xml | 8 ++--- gapic-generator-java-bom/pom.xml | 26 +++++++-------- gapic-generator-java-pom-parent/pom.xml | 2 +- gapic-generator-java/pom.xml | 6 ++-- gax-java/dependencies.properties | 8 ++--- gax-java/gax-bom/pom.xml | 20 ++++++------ gax-java/gax-grpc/pom.xml | 4 +-- gax-java/gax-httpjson/pom.xml | 4 +-- gax-java/gax/pom.xml | 4 +-- gax-java/pom.xml | 14 ++++---- .../grpc-google-common-protos/pom.xml | 4 +-- java-common-protos/pom.xml | 10 +++--- .../proto-google-common-protos/pom.xml | 4 +-- java-core/google-cloud-core-bom/pom.xml | 10 +++--- java-core/google-cloud-core-grpc/pom.xml | 4 +-- java-core/google-cloud-core-http/pom.xml | 4 +-- java-core/google-cloud-core/pom.xml | 4 +-- java-core/pom.xml | 6 ++-- java-iam/grpc-google-iam-v1/pom.xml | 4 +-- java-iam/grpc-google-iam-v2/pom.xml | 4 +-- java-iam/grpc-google-iam-v2beta/pom.xml | 4 +-- java-iam/pom.xml | 22 ++++++------- java-iam/proto-google-iam-v1/pom.xml | 4 +-- java-iam/proto-google-iam-v2/pom.xml | 4 +-- java-iam/proto-google-iam-v2beta/pom.xml | 4 +-- .../dependency-convergence-check/pom.xml | 2 +- .../first-party-dependencies/pom.xml | 10 +++--- java-shared-dependencies/pom.xml | 8 ++--- .../third-party-dependencies/pom.xml | 2 +- .../upper-bound-check/pom.xml | 4 +-- sdk-platform-java-config/pom.xml | 4 +-- showcase/pom.xml | 2 +- versions.txt | 32 +++++++++---------- 38 files changed, 132 insertions(+), 132 deletions(-) diff --git a/.cloudbuild/cloudbuild-test-a.yaml b/.cloudbuild/cloudbuild-test-a.yaml index 143d1effdc..6727039eb0 100644 --- a/.cloudbuild/cloudbuild-test-a.yaml +++ b/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.25.0' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.25.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.7.1' steps: diff --git a/.cloudbuild/cloudbuild-test-b.yaml b/.cloudbuild/cloudbuild-test-b.yaml index c37b81706a..219aacc491 100644 --- a/.cloudbuild/cloudbuild-test-b.yaml +++ b/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.25.0' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.25.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.7.1' steps: diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml index a6950f885e..0f26b79b23 100644 --- a/.cloudbuild/cloudbuild.yaml +++ b/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _SHARED_DEPENDENCIES_VERSION: '3.25.0' # {x-version-update:google-cloud-shared-dependencies:current} + _SHARED_DEPENDENCIES_VERSION: '3.25.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current} _JAVA_SHARED_CONFIG_VERSION: '1.7.1' steps: # GraalVM A build diff --git a/WORKSPACE b/WORKSPACE index 7026f3e523..9d178ad9a8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -60,7 +60,7 @@ maven_install( repositories = ["https://repo.maven.apache.org/maven2/"], ) -_gapic_generator_java_version = "2.35.0" # {x-version-update:gapic-generator-java:current} +_gapic_generator_java_version = "2.35.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current} maven_install( artifacts = [ diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index 34714dc9b8..1cee861f26 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -5,14 +5,14 @@ com.google.api api-common jar - 2.26.0 + 2.26.1-SNAPSHOT API Common Common utilities for Google APIs in Java com.google.api gapic-generator-java-pom-parent - 2.35.0 + 2.35.1-SNAPSHOT ../gapic-generator-java-pom-parent diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index 5ba57aae75..72b712ed06 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -31,22 +31,22 @@ com.google.api gax - 2.43.0 + 2.43.1-SNAPSHOT com.google.api gax-grpc - 2.43.0 + 2.43.1-SNAPSHOT com.google.api gax-httpjson - 2.43.0 + 2.43.1-SNAPSHOT com.google.api api-common - 2.26.0 + 2.26.1-SNAPSHOT diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index 626f1675d3..e0f21fb910 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -4,7 +4,7 @@ com.google.api gapic-generator-java-bom pom - 2.35.0 + 2.35.1-SNAPSHOT GAPIC Generator Java BOM BOM for the libraries in gapic-generator-java repository. Users should not @@ -15,7 +15,7 @@ com.google.api gapic-generator-java-pom-parent - 2.35.0 + 2.35.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -75,61 +75,61 @@ com.google.api api-common - 2.26.0 + 2.26.1-SNAPSHOT com.google.api gax-bom - 2.43.0 + 2.43.1-SNAPSHOT pom import com.google.api gapic-generator-java - 2.35.0 + 2.35.1-SNAPSHOT com.google.api.grpc grpc-google-common-protos - 2.34.0 + 2.34.1-SNAPSHOT com.google.api.grpc proto-google-common-protos - 2.34.0 + 2.34.1-SNAPSHOT com.google.api.grpc proto-google-iam-v1 - 1.29.0 + 1.29.1-SNAPSHOT com.google.api.grpc proto-google-iam-v2 - 1.29.0 + 1.29.1-SNAPSHOT com.google.api.grpc proto-google-iam-v2beta - 1.29.0 + 1.29.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v1 - 1.29.0 + 1.29.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2 - 1.29.0 + 1.29.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2beta - 1.29.0 + 1.29.1-SNAPSHOT diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 52fba6eda1..5154540493 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.google.api gapic-generator-java-pom-parent - 2.35.0 + 2.35.1-SNAPSHOT pom GAPIC Generator Java POM Parent https://github.com/googleapis/sdk-platform-java diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index 38e50d83f3..757862fa37 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api gapic-generator-java - 2.35.0 + 2.35.1-SNAPSHOT GAPIC Generator Java GAPIC generator Java @@ -22,7 +22,7 @@ com.google.api gapic-generator-java-pom-parent - 2.35.0 + 2.35.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -31,7 +31,7 @@ com.google.api gapic-generator-java-bom - 2.35.0 + 2.35.1-SNAPSHOT pom import diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 9f56719942..f869063376 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.43.0 +version.gax=2.43.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.43.0 +version.gax_grpc=2.43.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.43.0 +version.gax_bom=2.43.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_httpjson=2.43.0 +version.gax_httpjson=2.43.1-SNAPSHOT # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml index 7c9b882227..fad06ff2cf 100644 --- a/gax-java/gax-bom/pom.xml +++ b/gax-java/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.43.0 + 2.43.1-SNAPSHOT pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -43,55 +43,55 @@ com.google.api gax - 2.43.0 + 2.43.1-SNAPSHOT com.google.api gax - 2.43.0 + 2.43.1-SNAPSHOT test-jar testlib com.google.api gax - 2.43.0 + 2.43.1-SNAPSHOT testlib com.google.api gax-grpc - 2.43.0 + 2.43.1-SNAPSHOT com.google.api gax-grpc - 2.43.0 + 2.43.1-SNAPSHOT test-jar testlib com.google.api gax-grpc - 2.43.0 + 2.43.1-SNAPSHOT testlib com.google.api gax-httpjson - 2.43.0 + 2.43.1-SNAPSHOT com.google.api gax-httpjson - 2.43.0 + 2.43.1-SNAPSHOT test-jar testlib com.google.api gax-httpjson - 2.43.0 + 2.43.1-SNAPSHOT testlib diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml index a92f621943..cabf96e9bf 100644 --- a/gax-java/gax-grpc/pom.xml +++ b/gax-java/gax-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-grpc - 2.43.0 + 2.43.1-SNAPSHOT jar GAX (Google Api eXtensions) for Java (gRPC) Google Api eXtensions for Java (gRPC) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.43.0 + 2.43.1-SNAPSHOT diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index 925603a52c..b4504dcfcb 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 2.43.0 + 2.43.1-SNAPSHOT jar GAX (Google Api eXtensions) for Java (HTTP JSON) Google Api eXtensions for Java (HTTP JSON) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.43.0 + 2.43.1-SNAPSHOT diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index a1be5abaa4..57fb6f5799 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.43.0 + 2.43.1-SNAPSHOT jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.43.0 + 2.43.1-SNAPSHOT diff --git a/gax-java/pom.xml b/gax-java/pom.xml index 96e4ad5826..5e98463187 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -4,14 +4,14 @@ com.google.api gax-parent pom - 2.43.0 + 2.43.1-SNAPSHOT GAX (Google Api eXtensions) for Java (Parent) Google Api eXtensions for Java (Parent) com.google.api gapic-generator-java-pom-parent - 2.35.0 + 2.35.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -50,7 +50,7 @@ com.google.api api-common - 2.26.0 + 2.26.1-SNAPSHOT com.google.auth @@ -108,24 +108,24 @@ com.google.api gax - 2.43.0 + 2.43.1-SNAPSHOT com.google.api gax - 2.43.0 + 2.43.1-SNAPSHOT test-jar testlib com.google.api.grpc proto-google-common-protos - 2.34.0 + 2.34.1-SNAPSHOT com.google.api.grpc grpc-google-common-protos - 2.34.0 + 2.34.1-SNAPSHOT io.grpc diff --git a/java-common-protos/grpc-google-common-protos/pom.xml b/java-common-protos/grpc-google-common-protos/pom.xml index 6862555832..2f650fa397 100644 --- a/java-common-protos/grpc-google-common-protos/pom.xml +++ b/java-common-protos/grpc-google-common-protos/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-common-protos - 2.34.0 + 2.34.1-SNAPSHOT grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.34.0 + 2.34.1-SNAPSHOT diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index 55d32926d9..041ea3589c 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -4,7 +4,7 @@ com.google.api.grpc google-common-protos-parent pom - 2.34.0 + 2.34.1-SNAPSHOT Google Common Protos Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.35.0 + 2.35.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -61,7 +61,7 @@ com.google.cloud third-party-dependencies - 3.25.0 + 3.25.1-SNAPSHOT pom import @@ -75,7 +75,7 @@ com.google.api.grpc grpc-google-common-protos - 2.34.0 + 2.34.1-SNAPSHOT io.grpc @@ -87,7 +87,7 @@ com.google.api.grpc proto-google-common-protos - 2.34.0 + 2.34.1-SNAPSHOT com.google.guava diff --git a/java-common-protos/proto-google-common-protos/pom.xml b/java-common-protos/proto-google-common-protos/pom.xml index 064557d433..2b9e21566f 100644 --- a/java-common-protos/proto-google-common-protos/pom.xml +++ b/java-common-protos/proto-google-common-protos/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-common-protos - 2.34.0 + 2.34.1-SNAPSHOT proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.34.0 + 2.34.1-SNAPSHOT diff --git a/java-core/google-cloud-core-bom/pom.xml b/java-core/google-cloud-core-bom/pom.xml index 2b963c658e..f1ae640cc7 100644 --- a/java-core/google-cloud-core-bom/pom.xml +++ b/java-core/google-cloud-core-bom/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.cloud google-cloud-core-bom - 2.33.0 + 2.33.1-SNAPSHOT pom com.google.api gapic-generator-java-pom-parent - 2.35.0 + 2.35.1-SNAPSHOT ../../gapic-generator-java-pom-parent @@ -23,17 +23,17 @@ com.google.cloud google-cloud-core - 2.33.0 + 2.33.1-SNAPSHOT com.google.cloud google-cloud-core-grpc - 2.33.0 + 2.33.1-SNAPSHOT com.google.cloud google-cloud-core-http - 2.33.0 + 2.33.1-SNAPSHOT diff --git a/java-core/google-cloud-core-grpc/pom.xml b/java-core/google-cloud-core-grpc/pom.xml index cde38d394c..6cc246f188 100644 --- a/java-core/google-cloud-core-grpc/pom.xml +++ b/java-core/google-cloud-core-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-grpc - 2.33.0 + 2.33.1-SNAPSHOT jar Google Cloud Core gRPC @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.33.0 + 2.33.1-SNAPSHOT google-cloud-core-grpc diff --git a/java-core/google-cloud-core-http/pom.xml b/java-core/google-cloud-core-http/pom.xml index 54dde4993d..e8f580f411 100644 --- a/java-core/google-cloud-core-http/pom.xml +++ b/java-core/google-cloud-core-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-http - 2.33.0 + 2.33.1-SNAPSHOT jar Google Cloud Core HTTP @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.33.0 + 2.33.1-SNAPSHOT google-cloud-core-http diff --git a/java-core/google-cloud-core/pom.xml b/java-core/google-cloud-core/pom.xml index 246acf25e3..06a83e5170 100644 --- a/java-core/google-cloud-core/pom.xml +++ b/java-core/google-cloud-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core - 2.33.0 + 2.33.1-SNAPSHOT jar Google Cloud Core @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.33.0 + 2.33.1-SNAPSHOT google-cloud-core diff --git a/java-core/pom.xml b/java-core/pom.xml index 1296d7c7b9..95715809d0 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 2.33.0 + 2.33.1-SNAPSHOT Google Cloud Core Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.35.0 + 2.35.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -33,7 +33,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.25.0 + 3.25.1-SNAPSHOT pom import diff --git a/java-iam/grpc-google-iam-v1/pom.xml b/java-iam/grpc-google-iam-v1/pom.xml index f6d8f13f63..dec5af5f8c 100644 --- a/java-iam/grpc-google-iam-v1/pom.xml +++ b/java-iam/grpc-google-iam-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v1 - 1.29.0 + 1.29.1-SNAPSHOT grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.29.0 + 1.29.1-SNAPSHOT diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index cc1c9ab10a..a5ef2d9d33 100644 --- a/java-iam/grpc-google-iam-v2/pom.xml +++ b/java-iam/grpc-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2 - 1.29.0 + 1.29.1-SNAPSHOT grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.29.0 + 1.29.1-SNAPSHOT diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index 0042f346b4..908fc382e7 100644 --- a/java-iam/grpc-google-iam-v2beta/pom.xml +++ b/java-iam/grpc-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2beta - 1.29.0 + 1.29.1-SNAPSHOT grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.29.0 + 1.29.1-SNAPSHOT diff --git a/java-iam/pom.xml b/java-iam/pom.xml index 56276b4d79..471c24acc7 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.29.0 + 1.29.1-SNAPSHOT Google IAM Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.35.0 + 2.35.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -60,7 +60,7 @@ com.google.cloud third-party-dependencies - 3.25.0 + 3.25.1-SNAPSHOT pom import @@ -88,44 +88,44 @@ com.google.api gax-bom - 2.43.0 + 2.43.1-SNAPSHOT pom import com.google.api.grpc proto-google-iam-v2 - 1.29.0 + 1.29.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2 - 1.29.0 + 1.29.1-SNAPSHOT com.google.api.grpc proto-google-common-protos - 2.34.0 + 2.34.1-SNAPSHOT com.google.api.grpc proto-google-iam-v2beta - 1.29.0 + 1.29.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v1 - 1.29.0 + 1.29.1-SNAPSHOT com.google.api.grpc grpc-google-iam-v2beta - 1.29.0 + 1.29.1-SNAPSHOT com.google.api.grpc proto-google-iam-v1 - 1.29.0 + 1.29.1-SNAPSHOT javax.annotation diff --git a/java-iam/proto-google-iam-v1/pom.xml b/java-iam/proto-google-iam-v1/pom.xml index dd2b177a92..9d0686668d 100644 --- a/java-iam/proto-google-iam-v1/pom.xml +++ b/java-iam/proto-google-iam-v1/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v1 - 1.29.0 + 1.29.1-SNAPSHOT proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.29.0 + 1.29.1-SNAPSHOT diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index 263ab1137b..5d4c8340d0 100644 --- a/java-iam/proto-google-iam-v2/pom.xml +++ b/java-iam/proto-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2 - 1.29.0 + 1.29.1-SNAPSHOT proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.29.0 + 1.29.1-SNAPSHOT diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index a24f01807a..ef7bda3be4 100644 --- a/java-iam/proto-google-iam-v2beta/pom.xml +++ b/java-iam/proto-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2beta - 1.29.0 + 1.29.1-SNAPSHOT proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.29.0 + 1.29.1-SNAPSHOT diff --git a/java-shared-dependencies/dependency-convergence-check/pom.xml b/java-shared-dependencies/dependency-convergence-check/pom.xml index a6c44356bf..f599b9ddcc 100644 --- a/java-shared-dependencies/dependency-convergence-check/pom.xml +++ b/java-shared-dependencies/dependency-convergence-check/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud shared-dependencies-dependency-convergence-test - 3.25.0 + 3.25.1-SNAPSHOT Dependency convergence test for certain artifacts in Google Cloud Shared Dependencies An dependency convergence test case for the shared dependencies BOM. A failure of this test case means diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index 11d8b0c6bb..ca857100ff 100644 --- a/java-shared-dependencies/first-party-dependencies/pom.xml +++ b/java-shared-dependencies/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 3.25.0 + 3.25.1-SNAPSHOT Google Cloud First-party Shared Dependencies Shared first-party dependencies for Google Cloud Java libraries. @@ -33,7 +33,7 @@ com.google.api gapic-generator-java-bom - 2.35.0 + 2.35.1-SNAPSHOT pom import @@ -45,7 +45,7 @@ com.google.cloud google-cloud-core-bom - 2.33.0 + 2.33.1-SNAPSHOT pom import @@ -69,13 +69,13 @@ com.google.cloud google-cloud-core - 2.33.0 + 2.33.1-SNAPSHOT test-jar com.google.cloud google-cloud-core - 2.33.0 + 2.33.1-SNAPSHOT tests diff --git a/java-shared-dependencies/pom.xml b/java-shared-dependencies/pom.xml index 0176a9d98a..c29010084b 100644 --- a/java-shared-dependencies/pom.xml +++ b/java-shared-dependencies/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 3.25.0 + 3.25.1-SNAPSHOT first-party-dependencies third-party-dependencies @@ -17,7 +17,7 @@ com.google.api gapic-generator-java-pom-parent - 2.35.0 + 2.35.1-SNAPSHOT ../gapic-generator-java-pom-parent @@ -31,14 +31,14 @@ com.google.cloud first-party-dependencies - 3.25.0 + 3.25.1-SNAPSHOT pom import com.google.cloud third-party-dependencies - 3.25.0 + 3.25.1-SNAPSHOT pom import diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 2850a8cd09..3eb48c6852 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 3.25.0 + 3.25.1-SNAPSHOT Google Cloud Third-party Shared Dependencies Shared third-party dependencies for Google Cloud Java libraries. diff --git a/java-shared-dependencies/upper-bound-check/pom.xml b/java-shared-dependencies/upper-bound-check/pom.xml index 7c317c5385..9c9f00a1ef 100644 --- a/java-shared-dependencies/upper-bound-check/pom.xml +++ b/java-shared-dependencies/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 3.25.0 + 3.25.1-SNAPSHOT Upper bound test for Google Cloud Shared Dependencies An upper bound test case for the shared dependencies BOM. A failure of this test case means @@ -30,7 +30,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.25.0 + 3.25.1-SNAPSHOT pom import diff --git a/sdk-platform-java-config/pom.xml b/sdk-platform-java-config/pom.xml index 72146826d5..709c17b9f3 100644 --- a/sdk-platform-java-config/pom.xml +++ b/sdk-platform-java-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud sdk-platform-java-config pom - 3.25.0 + 3.25.1-SNAPSHOT SDK Platform For Java Configurations Shared build configuration for Google Cloud Java libraries. @@ -17,6 +17,6 @@ - 3.25.0 + 3.25.1-SNAPSHOT \ No newline at end of file diff --git a/showcase/pom.xml b/showcase/pom.xml index a8965144c2..13fbf1e1ea 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -34,7 +34,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.25.0 + 3.25.1-SNAPSHOT pom import diff --git a/versions.txt b/versions.txt index fd529571e3..dd4ea0a207 100644 --- a/versions.txt +++ b/versions.txt @@ -1,19 +1,19 @@ # Format: # module:released-version:current-version -gapic-generator-java:2.35.0:2.35.0 -api-common:2.26.0:2.26.0 -gax:2.43.0:2.43.0 -gax-grpc:2.43.0:2.43.0 -gax-httpjson:0.128.0:0.128.0 -proto-google-common-protos:2.34.0:2.34.0 -grpc-google-common-protos:2.34.0:2.34.0 -proto-google-iam-v1:1.29.0:1.29.0 -grpc-google-iam-v1:1.29.0:1.29.0 -proto-google-iam-v2beta:1.29.0:1.29.0 -grpc-google-iam-v2beta:1.29.0:1.29.0 -google-iam-policy:1.29.0:1.29.0 -proto-google-iam-v2:1.29.0:1.29.0 -grpc-google-iam-v2:1.29.0:1.29.0 -google-cloud-core:2.33.0:2.33.0 -google-cloud-shared-dependencies:3.25.0:3.25.0 +gapic-generator-java:2.35.0:2.35.1-SNAPSHOT +api-common:2.26.0:2.26.1-SNAPSHOT +gax:2.43.0:2.43.1-SNAPSHOT +gax-grpc:2.43.0:2.43.1-SNAPSHOT +gax-httpjson:0.128.0:0.128.1-SNAPSHOT +proto-google-common-protos:2.34.0:2.34.1-SNAPSHOT +grpc-google-common-protos:2.34.0:2.34.1-SNAPSHOT +proto-google-iam-v1:1.29.0:1.29.1-SNAPSHOT +grpc-google-iam-v1:1.29.0:1.29.1-SNAPSHOT +proto-google-iam-v2beta:1.29.0:1.29.1-SNAPSHOT +grpc-google-iam-v2beta:1.29.0:1.29.1-SNAPSHOT +google-iam-policy:1.29.0:1.29.1-SNAPSHOT +proto-google-iam-v2:1.29.0:1.29.1-SNAPSHOT +grpc-google-iam-v2:1.29.0:1.29.1-SNAPSHOT +google-cloud-core:2.33.0:2.33.1-SNAPSHOT +google-cloud-shared-dependencies:3.25.0:3.25.1-SNAPSHOT From f92e19ed3347c66c16183f21bb7a863d0daa85b7 Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Wed, 14 Feb 2024 15:45:37 +0000 Subject: [PATCH 04/20] chore: add library params (#2457) In this PR: - Add parameters to `LibraryConfig' - `codeowner_team`, found in java-analytics-admin - `excluded_poms`, found in java-iam, java-compute - `excluded_dependencies` found in java-iam, java-compute --- library_generation/model/generation_config.py | 3 +++ library_generation/model/library_config.py | 6 ++++++ .../test/resources/test-config/generation_config.yaml | 3 +++ library_generation/test/unit_tests.py | 6 ++++++ library_generation/utilities.py | 6 ++++++ 5 files changed, 24 insertions(+) diff --git a/library_generation/model/generation_config.py b/library_generation/model/generation_config.py index b6c82f6e26..3a59958a63 100644 --- a/library_generation/model/generation_config.py +++ b/library_generation/model/generation_config.py @@ -79,6 +79,9 @@ def from_yaml(path_to_yaml: str) -> GenerationConfig: release_level=__optional(library, "release_level", "preview"), api_id=__optional(library, "api_id", None), api_reference=__optional(library, "api_reference", None), + codeowner_team=__optional(library, "codeowner_team", None), + excluded_poms=__optional(library, "excluded_poms", None), + excluded_dependencies=__optional(library, "excluded_dependencies", None), client_documentation=__optional(library, "client_documentation", None), distribution_name=__optional(library, "distribution_name", None), googleapis_commitish=__optional(library, "googleapis_commitish", None), diff --git a/library_generation/model/library_config.py b/library_generation/model/library_config.py index 9e3f9c9c61..9d281b912c 100644 --- a/library_generation/model/library_config.py +++ b/library_generation/model/library_config.py @@ -33,8 +33,11 @@ def __init__( release_level: Optional[str] = None, api_id: Optional[str] = None, api_reference: Optional[str] = None, + codeowner_team: Optional[str] = None, client_documentation: Optional[str] = None, distribution_name: Optional[str] = None, + excluded_dependencies: Optional[str] = None, + excluded_poms: Optional[str] = None, googleapis_commitish: Optional[str] = None, group_id: Optional[str] = "com.google.cloud", issue_tracker: Optional[str] = None, @@ -53,6 +56,9 @@ def __init__( self.release_level = release_level if release_level else "preview" self.api_id = api_id self.api_reference = api_reference + self.codeowner_team = codeowner_team + self.excluded_dependencies = excluded_dependencies + self.excluded_poms = excluded_poms self.client_documentation = client_documentation self.distribution_name = distribution_name self.googleapis_commitish = googleapis_commitish diff --git a/library_generation/test/resources/test-config/generation_config.yaml b/library_generation/test/resources/test-config/generation_config.yaml index b73fa4d65d..d84ed3afd2 100644 --- a/library_generation/test/resources/test-config/generation_config.yaml +++ b/library_generation/test/resources/test-config/generation_config.yaml @@ -26,6 +26,9 @@ libraries: release_level: "stable" issue_tracker: "https://issuetracker.google.com/issues/new?component=187210&template=0" api_reference: "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview" + codeowner_team: "@googleapis/analytics-dpe" + excluded_poms: proto-google-iam-v1-bom,google-iam-policy,proto-google-iam-v1 + excluded_dependencies: google-iam-policy GAPICs: - proto_path: google/cloud/asset/v1 - proto_path: google/cloud/asset/v1p1beta1 diff --git a/library_generation/test/unit_tests.py b/library_generation/test/unit_tests.py index 04bcd46ccb..a55cf7f6b5 100644 --- a/library_generation/test/unit_tests.py +++ b/library_generation/test/unit_tests.py @@ -192,6 +192,12 @@ def test_from_yaml_succeeds(self): library.api_description, ) self.assertEqual("asset", library.library_name) + self.assertEqual("@googleapis/analytics-dpe", library.codeowner_team) + self.assertEqual( + "proto-google-iam-v1-bom,google-iam-policy,proto-google-iam-v1", + library.excluded_poms, + ) + self.assertEqual("google-iam-policy", library.excluded_dependencies) gapics = library.gapic_configs self.assertEqual(5, len(gapics)) self.assertEqual("google/cloud/asset/v1", gapics[0].proto_path) diff --git a/library_generation/utilities.py b/library_generation/utilities.py index 014b95ae8e..d899dd1773 100755 --- a/library_generation/utilities.py +++ b/library_generation/utilities.py @@ -390,6 +390,12 @@ def generate_prerequisite_files( if library.api_reference: repo_metadata["api_reference"] = library.api_reference + if library.codeowner_team: + repo_metadata["codeowner_team"] = library.codeowner_team + if library.excluded_dependencies: + repo_metadata["excluded_dependencies"] = library.excluded_dependencies + if library.excluded_poms: + repo_metadata["excluded_poms"] = library.excluded_poms if library.issue_tracker: repo_metadata["issue_tracker"] = library.issue_tracker if library.rest_documentation: From 5a821c5578ef9a64699aa1bec2bb2b00dc60128a Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Thu, 15 Feb 2024 20:26:07 +0000 Subject: [PATCH 05/20] chore: fix workflow to create additional tags (#2487) The workflow to create additional tags when releasing is failing: https://github.com/googleapis/sdk-platform-java/actions/runs/7893005878/job/21540707818. Delete the local tag before creating one. --- .github/workflows/create_additional_release_tag.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/create_additional_release_tag.yaml b/.github/workflows/create_additional_release_tag.yaml index 892a821788..0bc731c127 100644 --- a/.github/workflows/create_additional_release_tag.yaml +++ b/.github/workflows/create_additional_release_tag.yaml @@ -38,6 +38,8 @@ jobs: # Use fixed tag so that checks in handwritten libraries do not need to # update the version. CHECK_LATEST_TAG="unmanaged-dependencies-check-latest" + # delete and create the tag locally. + git tag --delete ${CHECK_LATEST_TAG} git tag ${CHECK_LATEST_TAG} # delete the tag in remote repo and push again. git push --delete origin ${CHECK_LATEST_TAG} From 7da92b1b9726a57e78c92772071b642d677b4529 Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Thu, 15 Feb 2024 20:40:32 +0000 Subject: [PATCH 06/20] chore: remove beta httpjson (#2358) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #2101 ☕️ --- .../grpcrest/ServiceSettingsClassComposer.java | 15 ++------------- .../rest/HttpJsonServiceStubClassComposer.java | 13 ------------- .../composer/grpcrest/goldens/EchoSettings.golden | 2 -- .../HttpJsonAutoPopulateFieldTestingStub.golden | 2 -- .../goldens/HttpJsonRoutingHeadersStub.golden | 2 -- .../showcase/v1beta1/ComplianceSettings.java | 2 -- .../com/google/showcase/v1beta1/EchoSettings.java | 2 -- .../google/showcase/v1beta1/IdentitySettings.java | 2 -- .../showcase/v1beta1/MessagingSettings.java | 2 -- .../showcase/v1beta1/SequenceServiceSettings.java | 2 -- .../google/showcase/v1beta1/TestingSettings.java | 2 -- .../v1/ConnectionServiceSettings.java | 2 -- .../v1/stub/HttpJsonConnectionServiceStub.java | 2 -- .../cloud/asset/v1/AssetServiceSettings.java | 2 -- .../asset/v1/stub/HttpJsonAssetServiceStub.java | 2 -- .../v1small/stub/HttpJsonAddressesStub.java | 2 -- .../stub/HttpJsonRegionOperationsStub.java | 2 -- .../credentials/v1/IamCredentialsSettings.java | 2 -- .../v1/stub/HttpJsonIamCredentialsStub.java | 2 -- .../library/v1/LibraryServiceSettings.java | 2 -- .../v1/stub/HttpJsonLibraryServiceStub.java | 2 -- .../cloud/redis/v1beta1/CloudRedisSettings.java | 2 -- 22 files changed, 2 insertions(+), 66 deletions(-) diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java index c597be4c8a..c5a735acad 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java @@ -45,8 +45,6 @@ protected List createNestedBuilderCreatorMethods( String newBuilderMethodName, String createDefaultMethodName, List annotations) { - AnnotationNode betaApiAnnotaiton = - AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build(); List methods = new ArrayList<>(); methods.addAll( @@ -59,10 +57,7 @@ protected List createNestedBuilderCreatorMethods( typeStore, "newHttpJsonBuilder", "createHttpJsonDefault", - ImmutableList.builder() - .addAll(annotations) - .add(betaApiAnnotaiton) - .build())); + ImmutableList.builder().addAll(annotations).build())); } return methods; } @@ -77,9 +72,6 @@ protected List createNewBuilderMethods( CommentStatement comment) { List methods = new ArrayList<>(); - AnnotationNode betaApiAnnotaiton = - AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build(); - Iterator transportNames = getTransportContext().transportNames().iterator(); methods.addAll( @@ -98,10 +90,7 @@ protected List createNewBuilderMethods( typeStore, "newHttpJsonBuilder", "createHttpJsonDefault", - ImmutableList.builder() - .addAll(annotations) - .add(betaApiAnnotaiton) - .build(), + ImmutableList.builder().addAll(annotations).build(), new SettingsCommentComposer(transportNames.next()) .getNewTransportBuilderMethodComment())); } diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java index 19e7cfbcbb..e631dce36d 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java @@ -210,19 +210,6 @@ protected List createOperationsStubGetterMethod( return super.createOperationsStubGetterMethod(service, operationsStubVarExpr); } - @Override - protected List createClassAnnotations(Service service) { - List annotations = super.createClassAnnotations(service); - - TypeNode betaApiType = FIXED_TYPESTORE.get("BetaApi"); - - if (annotations.stream().noneMatch(a -> betaApiType.equals(a.type()))) { - annotations.add(AnnotationNode.builder().setType(betaApiType).build()); - } - - return annotations; - } - @Override protected List createGetMethodDescriptorsMethod( Service service, diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden index 0abf62baec..2456b6cb0c 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden @@ -177,7 +177,6 @@ public class EchoSettings extends ClientSettings { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -219,7 +218,6 @@ public class EchoSettings extends ClientSettings { return new Builder(EchoStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(EchoStubSettings.newHttpJsonBuilder()); } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonAutoPopulateFieldTestingStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonAutoPopulateFieldTestingStub.golden index 9b5d7c3b8f..6b390feb69 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonAutoPopulateFieldTestingStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonAutoPopulateFieldTestingStub.golden @@ -1,6 +1,5 @@ package com.google.auto.populate.field.stub; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -36,7 +35,6 @@ import javax.annotation.Generated; *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonAutoPopulateFieldTestingStub extends AutoPopulateFieldTestingStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonRoutingHeadersStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonRoutingHeadersStub.golden index 1987cbc592..b377fe3a18 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonRoutingHeadersStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonRoutingHeadersStub.golden @@ -1,6 +1,5 @@ package com.google.explicit.dynamic.routing.header.stub; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -35,7 +34,6 @@ import javax.annotation.Generated; *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonExplicitDynamicRoutingHeaderTestingStub extends ExplicitDynamicRoutingHeaderTestingStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceSettings.java index 823f9ccb10..f07f55a8c7 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceSettings.java @@ -212,7 +212,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -254,7 +253,6 @@ private static Builder createDefault() { return new Builder(ComplianceStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(ComplianceStubSettings.newHttpJsonBuilder()); } diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoSettings.java index 360d136fff..aed2c2ea70 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoSettings.java @@ -228,7 +228,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -270,7 +269,6 @@ private static Builder createDefault() { return new Builder(EchoStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(EchoStubSettings.newHttpJsonBuilder()); } diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentitySettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentitySettings.java index 5b425ed700..252c9aba3e 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentitySettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentitySettings.java @@ -190,7 +190,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -232,7 +231,6 @@ private static Builder createDefault() { return new Builder(IdentityStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(IdentityStubSettings.newHttpJsonBuilder()); } diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingSettings.java index a28bd4806a..22670dcd5d 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingSettings.java @@ -248,7 +248,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -290,7 +289,6 @@ private static Builder createDefault() { return new Builder(MessagingStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(MessagingStubSettings.newHttpJsonBuilder()); } diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceSettings.java index 111119b942..a323894e08 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceSettings.java @@ -200,7 +200,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -242,7 +241,6 @@ private static Builder createDefault() { return new Builder(SequenceServiceStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(SequenceServiceStubSettings.newHttpJsonBuilder()); } diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingSettings.java index 13d6defe57..8d49238eb6 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingSettings.java @@ -207,7 +207,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -249,7 +248,6 @@ private static Builder createDefault() { return new Builder(TestingStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(TestingStubSettings.newHttpJsonBuilder()); } diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceSettings.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceSettings.java index 6127ea2ae3..4e26180f91 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceSettings.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceSettings.java @@ -134,7 +134,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -176,7 +175,6 @@ private static Builder createDefault() { return new Builder(ConnectionServiceStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(ConnectionServiceStubSettings.newHttpJsonBuilder()); } diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceStub.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceStub.java index 434cecd957..8077e81100 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceStub.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceStub.java @@ -18,7 +18,6 @@ import static com.google.cloud.apigeeconnect.v1.ConnectionServiceClient.ListConnectionsPagedResponse; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -49,7 +48,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonConnectionServiceStub extends ConnectionServiceStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceSettings.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceSettings.java index d490f6d679..81a6e9bae3 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceSettings.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceSettings.java @@ -262,7 +262,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -304,7 +303,6 @@ private static Builder createDefault() { return new Builder(AssetServiceStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(AssetServiceStubSettings.newHttpJsonBuilder()); } diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceStub.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceStub.java index fde890bd68..d4825f9180 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceStub.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceStub.java @@ -21,7 +21,6 @@ import static com.google.cloud.asset.v1.AssetServiceClient.SearchAllIamPoliciesPagedResponse; import static com.google.cloud.asset.v1.AssetServiceClient.SearchAllResourcesPagedResponse; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -91,7 +90,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonAssetServiceStub extends AssetServiceStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder() diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java index a0caf3d274..3eac03ac83 100644 --- a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java +++ b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java @@ -19,7 +19,6 @@ import static com.google.cloud.compute.v1small.AddressesClient.AggregatedListPagedResponse; import static com.google.cloud.compute.v1small.AddressesClient.ListPagedResponse; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -59,7 +58,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonAddressesStub extends AddressesStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().add(Operation.getDescriptor()).build(); diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java index 81f0e4838b..3eb2ee3c21 100644 --- a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java +++ b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java @@ -16,7 +16,6 @@ package com.google.cloud.compute.v1small.stub; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -54,7 +53,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonRegionOperationsStub extends RegionOperationsStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsSettings.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsSettings.java index 221ee9c4b8..421e040501 100644 --- a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsSettings.java +++ b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsSettings.java @@ -147,7 +147,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -189,7 +188,6 @@ private static Builder createDefault() { return new Builder(IamCredentialsStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(IamCredentialsStubSettings.newHttpJsonBuilder()); } diff --git a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsStub.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsStub.java index 5cb18810cf..4e0a28aa06 100644 --- a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsStub.java +++ b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsStub.java @@ -16,7 +16,6 @@ package com.google.cloud.iam.credentials.v1.stub; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -53,7 +52,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonIamCredentialsStub extends IamCredentialsStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceSettings.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceSettings.java index 410830a7fe..d6e3b5a5bf 100644 --- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceSettings.java +++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceSettings.java @@ -202,7 +202,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -244,7 +243,6 @@ private static Builder createDefault() { return new Builder(LibraryServiceStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(LibraryServiceStubSettings.newHttpJsonBuilder()); } diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceStub.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceStub.java index 7c2e501087..116e6b7614 100644 --- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceStub.java +++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceStub.java @@ -19,7 +19,6 @@ import static com.google.cloud.example.library.v1.LibraryServiceClient.ListBooksPagedResponse; import static com.google.cloud.example.library.v1.LibraryServiceClient.ListShelvesPagedResponse; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.BackgroundResourceAggregation; @@ -64,7 +63,6 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonLibraryServiceStub extends LibraryServiceStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisSettings.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisSettings.java index f3045607b8..089c7c5a26 100644 --- a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisSettings.java +++ b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisSettings.java @@ -236,7 +236,6 @@ public static Builder newBuilder() { } /** Returns a new REST builder for this class. */ - @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -278,7 +277,6 @@ private static Builder createDefault() { return new Builder(CloudRedisStubSettings.newBuilder()); } - @BetaApi private static Builder createHttpJsonDefault() { return new Builder(CloudRedisStubSettings.newHttpJsonBuilder()); } From 9939b43dce041c75405cea66a0dde171d991d3eb Mon Sep 17 00:00:00 2001 From: Blake Li Date: Thu, 15 Feb 2024 18:13:52 -0500 Subject: [PATCH 07/20] docs: Add contribution guidelines. (#2045) Following b/323273911 and the guidance in the ticket. --------- Co-authored-by: Lawrence Qiu --- CONTRIBUTING.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 22b241cb73..f2b357f2ab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,11 @@ # How to Contribute -We'd love to accept your patches and contributions to this project. There are -just a few small guidelines you need to follow. +We'd love to accept your patches and contributions to this project. There are just a few small guidelines you need to follow before opening an issue or a PR: +1. Ensure the issue was not already reported. +2. Open a new issue if you are unable to find an existing issue addressing your problem. Make sure to include a title and clear description, as much relevant information as possible, and a code sample or an executable test case demonstrating the expected behavior that is not occurring. +3. Discuss the priority and potential solutions with the maintainers in the issue. The maintainers would review the issue and add a label "Accepting Contributions" once the issue is ready for accepting contributions. +4. Open a PR only if the issue is labeled with "Accepting Contributions", ensure the PR description clearly describes the problem and solution. Note that an open PR without an issue labeled with "Accepting Contributions" will not be accepted. + ## Contributor License Agreement From 8123f0b15970c76b08086d8988de14e1ed58a77e Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:31:30 +0000 Subject: [PATCH 08/20] feat: check library_name is unique among libraries (#2490) In this PR: - check whether `library_name` is unique among all libraries in configuration file. --- library_generation/README.md | 43 ++++++++++++++------------- library_generation/test/unit_tests.py | 27 +++++++++++++++-- library_generation/utilities.py | 5 ++++ 3 files changed, 52 insertions(+), 23 deletions(-) diff --git a/library_generation/README.md b/library_generation/README.md index 8381422982..75fc32695d 100644 --- a/library_generation/README.md +++ b/library_generation/README.md @@ -101,26 +101,29 @@ The library level parameters define how to generate a (multi-versions) GAPIC library. They are shared by all GAPICs of a library. -| Name | Required | Notes | -|:---------------------|:--------:|:------------------------------------------------------------------| -| api_shortname | Yes | | -| api_description | Yes | | -| name_pretty | Yes | | -| product_docs | Yes | | -| library_type | No | `GAPIC_AUTO` if not specified | -| release_level | No | `preview` if not specified | -| api_id | No | `{api_shortname}.googleapis.com` if not specified | -| api_reference | No | | -| client_documentation | No | | -| distribution_name | No | `{group_id}:google-{cloud_prefix}{library_name}` if not specified | -| googleapis_commitish | No | use repository level `googleapis_commitish` if not specified. | -| group_id | No | `com.google.cloud` if not specified | -| issue_tracker | No | | -| library_name | No | `api_shortname` is not specified | -| rest_documentation | No | | -| rpc_documentation | No | | -| cloud_api | No | `true` if not specified | -| requires-billing | No | `true` if not specified | +| Name | Required | Notes | +|:----------------------|:--------:|:-----------------------------------------------------------------------------------| +| api_shortname | Yes | | +| api_description | Yes | | +| name_pretty | Yes | | +| product_docs | Yes | | +| library_type | No | `GAPIC_AUTO` if not specified | +| release_level | No | `preview` if not specified | +| api_id | No | `{api_shortname}.googleapis.com` if not specified | +| api_reference | No | | +| codeowner_team | No | | +| client_documentation | No | | +| distribution_name | No | `{group_id}:google-{cloud_prefix}{library_name}` if not specified | +| excluded_poms | No | | +| excluded_dependencies | No | | +| googleapis_commitish | No | use repository level `googleapis_commitish` if not specified. | +| group_id | No | `com.google.cloud` if not specified | +| issue_tracker | No | | +| library_name | No | `api_shortname` is not specified. This value should be unique among all libraries. | +| rest_documentation | No | | +| rpc_documentation | No | | +| cloud_api | No | `true` if not specified | +| requires-billing | No | `true` if not specified | Note that `cloud_prefix` is `cloud-` if `cloud_api` is `true`; empty otherwise. diff --git a/library_generation/test/unit_tests.py b/library_generation/test/unit_tests.py index a55cf7f6b5..fc251e2472 100644 --- a/library_generation/test/unit_tests.py +++ b/library_generation/test/unit_tests.py @@ -52,6 +52,14 @@ api_description="allows you to encrypt, store, manage, and audit infrastructure and application-level secrets.", gapic_configs=list(), ) +library_3 = LibraryConfig( + api_shortname="secret", + name_pretty="Secret Management Example", + product_documentation="https://cloud.google.com/solutions/", + api_description="allows you to encrypt, store, and audit infrastructure and application-level secrets.", + library_name="secretmanager", + gapic_configs=list(), +) class UtilitiesTest(unittest.TestCase): @@ -389,6 +397,17 @@ def test_prepare_repo_monorepo_success(self): ["java-bare-metal-solution", "java-secretmanager"], library_path ) + def test_prepare_repo_monorepo_duplicated_library_name_failed(self): + gen_config = self.__get_a_gen_config(3) + self.assertRaisesRegex( + ValueError, + "secretmanager", + util.prepare_repo, + gen_config, + gen_config.libraries, + f"{resources_dir}/misc", + ) + def test_prepare_repo_monorepo_failed(self): gen_config = self.__get_a_gen_config(2) self.assertRaises( @@ -444,15 +463,17 @@ def __compare_files(self, expect: str, actual: str): @staticmethod def __get_a_gen_config(num: int): """ - Returns an object of GenerationConfig with one or two of + Returns an object of GenerationConfig with one to three of LibraryConfig objects. Other attributes are set to empty str. :param num: the number of LibraryConfig objects associated with - the GenerationConfig. Only support one or two. + the GenerationConfig. Only support 1, 2 or 3. :return: an object of GenerationConfig """ - if num > 1: + if num == 2: libraries = [library_1, library_2] + elif num == 3: + libraries = [library_1, library_2, library_3] else: libraries = [library_1] diff --git a/library_generation/utilities.py b/library_generation/utilities.py index d899dd1773..8af797b792 100755 --- a/library_generation/utilities.py +++ b/library_generation/utilities.py @@ -251,6 +251,7 @@ def prepare_repo( :param language: programming language of the library :return: a RepoConfig object contained repository information :raise FileNotFoundError if there's no versions.txt in repo_path + :raise ValueError if two libraries have the same library_name """ output_folder = sh_util("get_output_folder") print(f"output_folder: {output_folder}") @@ -267,6 +268,10 @@ def prepare_repo( # use absolute path because docker requires absolute path # in volume name. absolute_library_path = str(Path(library_path).resolve()) + if absolute_library_path in libraries: + # check whether the java_library is unique among all libraries + # because two libraries should not go to the same destination. + raise ValueError(f"{absolute_library_path} already exists.") libraries[absolute_library_path] = library # remove existing .repo-metadata.json json_name = ".repo-metadata.json" From 6e8d09845610401665556118cd78c7229c46d426 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Fri, 16 Feb 2024 11:38:54 -0500 Subject: [PATCH 09/20] fix: cleanup @BetaApi from Resource Name Builder Methods (#2450) fixes #2099 --- .../ResourceNameHelperClassComposer.java | 37 +------------------ .../resourcename/goldens/AgentName.golden | 8 ---- .../resourcename/goldens/FoobarName.golden | 16 -------- .../google/showcase/v1beta1/BlurbName.java | 16 -------- .../com/google/cloud/asset/v1/FeedName.java | 12 ------ .../google/cloud/asset/v1/SavedQueryName.java | 12 ------ .../google/logging/v2/CmekSettingsName.java | 16 -------- .../com/google/logging/v2/LogBucketName.java | 16 -------- .../google/logging/v2/LogExclusionName.java | 16 -------- .../src/com/google/logging/v2/LogName.java | 16 -------- .../com/google/logging/v2/LogSinkName.java | 16 -------- .../com/google/logging/v2/LogViewName.java | 16 -------- .../com/google/logging/v2/SettingsName.java | 16 -------- .../src/com/google/pubsub/v1/TopicName.java | 6 --- 14 files changed, 1 insertion(+), 218 deletions(-) diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java index b558a9d715..73529ab21c 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java @@ -14,7 +14,6 @@ package com.google.api.generator.gapic.composer.resourcename; -import com.google.api.core.BetaApi; import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.AssignmentOperationExpr; @@ -60,7 +59,6 @@ import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashSet; @@ -503,13 +501,6 @@ private static List createBuilderCreatorMethods( ResourceName resourceName, List> tokenHierarchies, TypeStore typeStore) { List javaMethods = new ArrayList<>(); String newMethodNameFormat = "new%s"; - AnnotationNode betaAnnotation = - AnnotationNode.builder() - .setType(FIXED_TYPESTORE.get("BetaApi")) - .setDescription( - "The per-pattern Builders are not stable yet and may be changed in the future.") - .build(); - List annotations = Arrays.asList(betaAnnotation); // Create the newBuilder and variation methods here. // Variation example: newProjectLocationAutoscalingPolicyBuilder(). @@ -533,17 +524,13 @@ private static List createBuilderCreatorMethods( String variantName = getBuilderTypeName(tokenHierarchies, i); javaMethods.add( - methodDefStarterFn - .apply(String.format(newMethodNameFormat, variantName)) - .setAnnotations(i == 0 ? Collections.emptyList() : annotations) - .build()); + methodDefStarterFn.apply(String.format(newMethodNameFormat, variantName)).build()); if (i == 0 && tokenHierarchies.size() > 1) { // Create another builder creator method, but with the per-variant name. javaMethods.add( methodDefStarterFn .apply( String.format(newMethodNameFormat, getBuilderTypeName(tokenHierarchies.get(i)))) - .setAnnotations(annotations) .build()); } } @@ -597,15 +584,6 @@ private static List createOfOrFormatMethodHelper( String setMethodNameFormat = "set%s"; String buildMethodName = "build"; String toStringMethodName = "toString"; - AnnotationNode betaAnnotation = - AnnotationNode.builder() - .setType(FIXED_TYPESTORE.get("BetaApi")) - .setDescription( - String.format( - "The static %s methods are not stable yet and may be changed in the future.", - isFormatMethod ? "format" : "create")) - .build(); - List annotations = Arrays.asList(betaAnnotation); TypeNode thisClassType = typeStore.get(getThisClassName(resourceName)); TypeNode returnType = isFormatMethod ? TypeNode.STRING : thisClassType; @@ -624,7 +602,6 @@ private static List createOfOrFormatMethodHelper( MethodDefinition.builder() .setScope(ScopeNode.PUBLIC) .setIsStatic(true) - .setAnnotations(annotations) .setReturnType(returnType) .setName( String.format(methodNameFormat, concatToUpperCamelCaseName(tokens) + "Name")) @@ -682,7 +659,6 @@ private static List createOfOrFormatMethodHelper( MethodDefinition.builder() .setScope(ScopeNode.PUBLIC) .setIsStatic(true) - .setAnnotations(i == 0 ? Collections.emptyList() : annotations) .setReturnType(returnType) .setName( String.format( @@ -696,7 +672,6 @@ private static List createOfOrFormatMethodHelper( MethodDefinition.builder() .setScope(ScopeNode.PUBLIC) .setIsStatic(true) - .setAnnotations(annotations) .setReturnType(returnType) .setName( String.format( @@ -1701,21 +1676,12 @@ private static ClassDefinition createNestedBuilderClass( nestedClassMethods.add(buildMethod); // Return the class. - AnnotationNode betaAnnotation = - AnnotationNode.builder() - .setType(FIXED_TYPESTORE.get("BetaApi")) - .setDescription( - "The per-pattern Builders are not stable yet and may be changed in the future.") - .build(); - List classAnnotations = - isDefaultClass ? Collections.emptyList() : Arrays.asList(betaAnnotation); return ClassDefinition.builder() .setHeaderCommentStatements( CommentStatement.withComment( JavaDocComment.withComment( String.format(BUILDER_CLASS_HEADER_PATTERN, resourceNamePattern)))) - .setAnnotations(classAnnotations) .setIsNested(true) .setScope(ScopeNode.PUBLIC) .setIsStatic(true) @@ -1729,7 +1695,6 @@ private static TypeStore createStaticTypes() { List> concreteClazzes = Arrays.asList( ArrayList.class, - BetaApi.class, Generated.class, ImmutableMap.class, List.class, diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden index 7b73d8c9c4..2eb43f4f39 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden @@ -1,6 +1,5 @@ package com.google.cloud.dialogflow.v2beta1; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -55,12 +54,10 @@ public class AgentName implements ResourceName { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectLocationBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static ProjectBuilder newProjectBuilder() { return new ProjectBuilder(); } @@ -73,12 +70,10 @@ public class AgentName implements ResourceName { return newBuilder().setProject(project).setLocation(location).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static AgentName ofProjectLocationName(String project, String location) { return newBuilder().setProject(project).setLocation(location).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static AgentName ofProjectName(String project) { return newProjectBuilder().setProject(project).build(); } @@ -87,12 +82,10 @@ public class AgentName implements ResourceName { return newBuilder().setProject(project).setLocation(location).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectLocationName(String project, String location) { return newBuilder().setProject(project).setLocation(location).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectName(String project) { return newProjectBuilder().setProject(project).build().toString(); } @@ -227,7 +220,6 @@ public class AgentName implements ResourceName { } /** Builder for projects/{project}/agent. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class ProjectBuilder { private String project; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden index 7a96c37d77..4dcf36186a 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden @@ -1,6 +1,5 @@ package com.google.showcase.v1beta1; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -92,22 +91,18 @@ public class FoobarName implements ResourceName { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectFoobarBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static ProjectVariantFoobarBuilder newProjectVariantFoobarBuilder() { return new ProjectVariantFoobarBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FoobarBuilder newFoobarBuilder() { return new FoobarBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BarFooFoobarBuilder newBarFooFoobarBuilder() { return new BarFooFoobarBuilder(); } @@ -120,12 +115,10 @@ public class FoobarName implements ResourceName { return newBuilder().setProject(project).setFoobar(foobar).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FoobarName ofProjectFoobarName(String project, String foobar) { return newBuilder().setProject(project).setFoobar(foobar).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FoobarName ofProjectVariantFoobarName( String project, String variant, String foobar) { return newProjectVariantFoobarBuilder() @@ -135,12 +128,10 @@ public class FoobarName implements ResourceName { .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FoobarName ofFoobarName(String foobar) { return newFoobarBuilder().setFoobar(foobar).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FoobarName ofBarFooFoobarName(String barFoo, String foobar) { return newBarFooFoobarBuilder().setBarFoo(barFoo).setFoobar(foobar).build(); } @@ -149,12 +140,10 @@ public class FoobarName implements ResourceName { return newBuilder().setProject(project).setFoobar(foobar).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectFoobarName(String project, String foobar) { return newBuilder().setProject(project).setFoobar(foobar).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectVariantFoobarName( String project, String variant, String foobar) { return newProjectVariantFoobarBuilder() @@ -165,12 +154,10 @@ public class FoobarName implements ResourceName { .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFoobarName(String foobar) { return newFoobarBuilder().setFoobar(foobar).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBarFooFoobarName(String barFoo, String foobar) { return newBarFooFoobarBuilder().setBarFoo(barFoo).setFoobar(foobar).build().toString(); } @@ -327,7 +314,6 @@ public class FoobarName implements ResourceName { } /** Builder for projects/{project}/chocolate/variants/{variant}/foobars/{foobar}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class ProjectVariantFoobarBuilder { private String project; private String variant; @@ -368,7 +354,6 @@ public class FoobarName implements ResourceName { } /** Builder for foobars/{foobar}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class FoobarBuilder { private String foobar; @@ -389,7 +374,6 @@ public class FoobarName implements ResourceName { } /** Builder for bar_foos/{bar_foo}/foobars/{foobar}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class BarFooFoobarBuilder { private String barFoo; private String foobar; diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java index 843613d8c4..d676d00566 100644 --- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java +++ b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java @@ -16,7 +16,6 @@ package com.google.showcase.v1beta1; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -118,22 +117,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newUserLegacyUserBlurbBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static UserBlurbBuilder newUserBlurbBuilder() { return new UserBlurbBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static RoomBlurbBuilder newRoomBlurbBuilder() { return new RoomBlurbBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static RoomLegacyRoomBlurbBuilder newRoomLegacyRoomBlurbBuilder() { return new RoomLegacyRoomBlurbBuilder(); } @@ -146,22 +141,18 @@ public static BlurbName of(String user, String legacyUser, String blurb) { return newBuilder().setUser(user).setLegacyUser(legacyUser).setBlurb(blurb).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static BlurbName ofUserLegacyUserBlurbName(String user, String legacyUser, String blurb) { return newBuilder().setUser(user).setLegacyUser(legacyUser).setBlurb(blurb).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static BlurbName ofUserBlurbName(String user, String blurb) { return newUserBlurbBuilder().setUser(user).setBlurb(blurb).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static BlurbName ofRoomBlurbName(String room, String blurb) { return newRoomBlurbBuilder().setRoom(room).setBlurb(blurb).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static BlurbName ofRoomLegacyRoomBlurbName(String room, String legacyRoom, String blurb) { return newRoomLegacyRoomBlurbBuilder() .setRoom(room) @@ -174,22 +165,18 @@ public static String format(String user, String legacyUser, String blurb) { return newBuilder().setUser(user).setLegacyUser(legacyUser).setBlurb(blurb).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatUserLegacyUserBlurbName(String user, String legacyUser, String blurb) { return newBuilder().setUser(user).setLegacyUser(legacyUser).setBlurb(blurb).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatUserBlurbName(String user, String blurb) { return newUserBlurbBuilder().setUser(user).setBlurb(blurb).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatRoomBlurbName(String room, String blurb) { return newRoomBlurbBuilder().setRoom(room).setBlurb(blurb).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatRoomLegacyRoomBlurbName(String room, String legacyRoom, String blurb) { return newRoomLegacyRoomBlurbBuilder() .setRoom(room) @@ -369,7 +356,6 @@ public BlurbName build() { } /** Builder for users/{user}/profile/blurbs/{blurb}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class UserBlurbBuilder { private String user; private String blurb; @@ -400,7 +386,6 @@ public BlurbName build() { } /** Builder for rooms/{room}/blurbs/{blurb}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class RoomBlurbBuilder { private String room; private String blurb; @@ -431,7 +416,6 @@ public BlurbName build() { } /** Builder for rooms/{room}/blurbs/legacy/{legacy_room}.{blurb}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class RoomLegacyRoomBlurbBuilder { private String room; private String legacyRoom; diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java index 7278bc364b..4dfc13d2e6 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java @@ -16,7 +16,6 @@ package com.google.cloud.asset.v1; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -97,17 +96,14 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectFeedBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderFeedBuilder newFolderFeedBuilder() { return new FolderFeedBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationFeedBuilder newOrganizationFeedBuilder() { return new OrganizationFeedBuilder(); } @@ -120,17 +116,14 @@ public static FeedName of(String project, String feed) { return newBuilder().setProject(project).setFeed(feed).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FeedName ofProjectFeedName(String project, String feed) { return newBuilder().setProject(project).setFeed(feed).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FeedName ofFolderFeedName(String folder, String feed) { return newFolderFeedBuilder().setFolder(folder).setFeed(feed).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FeedName ofOrganizationFeedName(String organization, String feed) { return newOrganizationFeedBuilder().setOrganization(organization).setFeed(feed).build(); } @@ -139,17 +132,14 @@ public static String format(String project, String feed) { return newBuilder().setProject(project).setFeed(feed).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectFeedName(String project, String feed) { return newBuilder().setProject(project).setFeed(feed).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderFeedName(String folder, String feed) { return newFolderFeedBuilder().setFolder(folder).setFeed(feed).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationFeedName(String organization, String feed) { return newOrganizationFeedBuilder() .setOrganization(organization) @@ -305,7 +295,6 @@ public FeedName build() { } /** Builder for folders/{folder}/feeds/{feed}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class FolderFeedBuilder { private String folder; private String feed; @@ -336,7 +325,6 @@ public FeedName build() { } /** Builder for organizations/{organization}/feeds/{feed}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class OrganizationFeedBuilder { private String organization; private String feed; diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java index af70ae9f77..1e525a4843 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java @@ -16,7 +16,6 @@ package com.google.cloud.asset.v1; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -98,17 +97,14 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectSavedQueryBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderSavedQueryBuilder newFolderSavedQueryBuilder() { return new FolderSavedQueryBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationSavedQueryBuilder newOrganizationSavedQueryBuilder() { return new OrganizationSavedQueryBuilder(); } @@ -121,17 +117,14 @@ public static SavedQueryName of(String project, String savedQuery) { return newBuilder().setProject(project).setSavedQuery(savedQuery).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SavedQueryName ofProjectSavedQueryName(String project, String savedQuery) { return newBuilder().setProject(project).setSavedQuery(savedQuery).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SavedQueryName ofFolderSavedQueryName(String folder, String savedQuery) { return newFolderSavedQueryBuilder().setFolder(folder).setSavedQuery(savedQuery).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SavedQueryName ofOrganizationSavedQueryName( String organization, String savedQuery) { return newOrganizationSavedQueryBuilder() @@ -144,12 +137,10 @@ public static String format(String project, String savedQuery) { return newBuilder().setProject(project).setSavedQuery(savedQuery).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectSavedQueryName(String project, String savedQuery) { return newBuilder().setProject(project).setSavedQuery(savedQuery).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderSavedQueryName(String folder, String savedQuery) { return newFolderSavedQueryBuilder() .setFolder(folder) @@ -158,7 +149,6 @@ public static String formatFolderSavedQueryName(String folder, String savedQuery .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationSavedQueryName(String organization, String savedQuery) { return newOrganizationSavedQueryBuilder() .setOrganization(organization) @@ -315,7 +305,6 @@ public SavedQueryName build() { } /** Builder for folders/{folder}/savedQueries/{saved_query}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class FolderSavedQueryBuilder { private String folder; private String savedQuery; @@ -346,7 +335,6 @@ public SavedQueryName build() { } /** Builder for organizations/{organization}/savedQueries/{saved_query}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class OrganizationSavedQueryBuilder { private String organization; private String savedQuery; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java b/test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java index 63c0183a11..4695948530 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java +++ b/test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java @@ -16,7 +16,6 @@ package com.google.logging.v2; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -107,22 +106,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationBuilder newOrganizationBuilder() { return new OrganizationBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderBuilder newFolderBuilder() { return new FolderBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountBuilder newBillingAccountBuilder() { return new BillingAccountBuilder(); } @@ -135,22 +130,18 @@ public static CmekSettingsName of(String project) { return newBuilder().setProject(project).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static CmekSettingsName ofProjectName(String project) { return newBuilder().setProject(project).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static CmekSettingsName ofOrganizationName(String organization) { return newOrganizationBuilder().setOrganization(organization).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static CmekSettingsName ofFolderName(String folder) { return newFolderBuilder().setFolder(folder).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static CmekSettingsName ofBillingAccountName(String billingAccount) { return newBillingAccountBuilder().setBillingAccount(billingAccount).build(); } @@ -159,22 +150,18 @@ public static String format(String project) { return newBuilder().setProject(project).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectName(String project) { return newBuilder().setProject(project).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationName(String organization) { return newOrganizationBuilder().setOrganization(organization).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderName(String folder) { return newFolderBuilder().setFolder(folder).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountName(String billingAccount) { return newBillingAccountBuilder().setBillingAccount(billingAccount).build().toString(); } @@ -319,7 +306,6 @@ public CmekSettingsName build() { } /** Builder for organizations/{organization}/cmekSettings. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class OrganizationBuilder { private String organization; @@ -340,7 +326,6 @@ public CmekSettingsName build() { } /** Builder for folders/{folder}/cmekSettings. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class FolderBuilder { private String folder; @@ -361,7 +346,6 @@ public CmekSettingsName build() { } /** Builder for billingAccounts/{billing_account}/cmekSettings. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class BillingAccountBuilder { private String billingAccount; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java b/test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java index 0f77e30267..9b94f46faf 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java +++ b/test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java @@ -16,7 +16,6 @@ package com.google.logging.v2; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -131,22 +130,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectLocationBucketBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationLocationBucketBuilder newOrganizationLocationBucketBuilder() { return new OrganizationLocationBucketBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderLocationBucketBuilder newFolderLocationBucketBuilder() { return new FolderLocationBucketBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountLocationBucketBuilder newBillingAccountLocationBucketBuilder() { return new BillingAccountLocationBucketBuilder(); } @@ -159,13 +154,11 @@ public static LogBucketName of(String project, String location, String bucket) { return newBuilder().setProject(project).setLocation(location).setBucket(bucket).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogBucketName ofProjectLocationBucketName( String project, String location, String bucket) { return newBuilder().setProject(project).setLocation(location).setBucket(bucket).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogBucketName ofOrganizationLocationBucketName( String organization, String location, String bucket) { return newOrganizationLocationBucketBuilder() @@ -175,7 +168,6 @@ public static LogBucketName ofOrganizationLocationBucketName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogBucketName ofFolderLocationBucketName( String folder, String location, String bucket) { return newFolderLocationBucketBuilder() @@ -185,7 +177,6 @@ public static LogBucketName ofFolderLocationBucketName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogBucketName ofBillingAccountLocationBucketName( String billingAccount, String location, String bucket) { return newBillingAccountLocationBucketBuilder() @@ -204,7 +195,6 @@ public static String format(String project, String location, String bucket) { .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectLocationBucketName( String project, String location, String bucket) { return newBuilder() @@ -215,7 +205,6 @@ public static String formatProjectLocationBucketName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationLocationBucketName( String organization, String location, String bucket) { return newOrganizationLocationBucketBuilder() @@ -226,7 +215,6 @@ public static String formatOrganizationLocationBucketName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderLocationBucketName( String folder, String location, String bucket) { return newFolderLocationBucketBuilder() @@ -237,7 +225,6 @@ public static String formatFolderLocationBucketName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountLocationBucketName( String billingAccount, String location, String bucket) { return newBillingAccountLocationBucketBuilder() @@ -426,7 +413,6 @@ public LogBucketName build() { } /** Builder for organizations/{organization}/locations/{location}/buckets/{bucket}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class OrganizationLocationBucketBuilder { private String organization; private String location; @@ -467,7 +453,6 @@ public LogBucketName build() { } /** Builder for folders/{folder}/locations/{location}/buckets/{bucket}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class FolderLocationBucketBuilder { private String folder; private String location; @@ -508,7 +493,6 @@ public LogBucketName build() { } /** Builder for billingAccounts/{billing_account}/locations/{location}/buckets/{bucket}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class BillingAccountLocationBucketBuilder { private String billingAccount; private String location; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java b/test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java index 2fa6913c62..c074cd4773 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java +++ b/test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java @@ -16,7 +16,6 @@ package com.google.logging.v2; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -118,22 +117,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectExclusionBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationExclusionBuilder newOrganizationExclusionBuilder() { return new OrganizationExclusionBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderExclusionBuilder newFolderExclusionBuilder() { return new FolderExclusionBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountExclusionBuilder newBillingAccountExclusionBuilder() { return new BillingAccountExclusionBuilder(); } @@ -146,12 +141,10 @@ public static LogExclusionName of(String project, String exclusion) { return newBuilder().setProject(project).setExclusion(exclusion).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogExclusionName ofProjectExclusionName(String project, String exclusion) { return newBuilder().setProject(project).setExclusion(exclusion).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogExclusionName ofOrganizationExclusionName( String organization, String exclusion) { return newOrganizationExclusionBuilder() @@ -160,12 +153,10 @@ public static LogExclusionName ofOrganizationExclusionName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogExclusionName ofFolderExclusionName(String folder, String exclusion) { return newFolderExclusionBuilder().setFolder(folder).setExclusion(exclusion).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogExclusionName ofBillingAccountExclusionName( String billingAccount, String exclusion) { return newBillingAccountExclusionBuilder() @@ -178,12 +169,10 @@ public static String format(String project, String exclusion) { return newBuilder().setProject(project).setExclusion(exclusion).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectExclusionName(String project, String exclusion) { return newBuilder().setProject(project).setExclusion(exclusion).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationExclusionName(String organization, String exclusion) { return newOrganizationExclusionBuilder() .setOrganization(organization) @@ -192,12 +181,10 @@ public static String formatOrganizationExclusionName(String organization, String .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderExclusionName(String folder, String exclusion) { return newFolderExclusionBuilder().setFolder(folder).setExclusion(exclusion).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountExclusionName(String billingAccount, String exclusion) { return newBillingAccountExclusionBuilder() .setBillingAccount(billingAccount) @@ -364,7 +351,6 @@ public LogExclusionName build() { } /** Builder for organizations/{organization}/exclusions/{exclusion}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class OrganizationExclusionBuilder { private String organization; private String exclusion; @@ -395,7 +381,6 @@ public LogExclusionName build() { } /** Builder for folders/{folder}/exclusions/{exclusion}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class FolderExclusionBuilder { private String folder; private String exclusion; @@ -426,7 +411,6 @@ public LogExclusionName build() { } /** Builder for billingAccounts/{billing_account}/exclusions/{exclusion}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class BillingAccountExclusionBuilder { private String billingAccount; private String exclusion; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/LogName.java b/test/integration/goldens/logging/src/com/google/logging/v2/LogName.java index 21c790f861..69ad97a73e 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/LogName.java +++ b/test/integration/goldens/logging/src/com/google/logging/v2/LogName.java @@ -16,7 +16,6 @@ package com.google.logging.v2; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -117,22 +116,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectLogBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationLogBuilder newOrganizationLogBuilder() { return new OrganizationLogBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderLogBuilder newFolderLogBuilder() { return new FolderLogBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountLogBuilder newBillingAccountLogBuilder() { return new BillingAccountLogBuilder(); } @@ -145,22 +140,18 @@ public static LogName of(String project, String log) { return newBuilder().setProject(project).setLog(log).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogName ofProjectLogName(String project, String log) { return newBuilder().setProject(project).setLog(log).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogName ofOrganizationLogName(String organization, String log) { return newOrganizationLogBuilder().setOrganization(organization).setLog(log).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogName ofFolderLogName(String folder, String log) { return newFolderLogBuilder().setFolder(folder).setLog(log).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogName ofBillingAccountLogName(String billingAccount, String log) { return newBillingAccountLogBuilder().setBillingAccount(billingAccount).setLog(log).build(); } @@ -169,22 +160,18 @@ public static String format(String project, String log) { return newBuilder().setProject(project).setLog(log).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectLogName(String project, String log) { return newBuilder().setProject(project).setLog(log).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationLogName(String organization, String log) { return newOrganizationLogBuilder().setOrganization(organization).setLog(log).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderLogName(String folder, String log) { return newFolderLogBuilder().setFolder(folder).setLog(log).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountLogName(String billingAccount, String log) { return newBillingAccountLogBuilder() .setBillingAccount(billingAccount) @@ -350,7 +337,6 @@ public LogName build() { } /** Builder for organizations/{organization}/logs/{log}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class OrganizationLogBuilder { private String organization; private String log; @@ -381,7 +367,6 @@ public LogName build() { } /** Builder for folders/{folder}/logs/{log}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class FolderLogBuilder { private String folder; private String log; @@ -412,7 +397,6 @@ public LogName build() { } /** Builder for billingAccounts/{billing_account}/logs/{log}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class BillingAccountLogBuilder { private String billingAccount; private String log; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java b/test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java index 030992a76f..257e07444b 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java +++ b/test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java @@ -16,7 +16,6 @@ package com.google.logging.v2; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -117,22 +116,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectSinkBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationSinkBuilder newOrganizationSinkBuilder() { return new OrganizationSinkBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderSinkBuilder newFolderSinkBuilder() { return new FolderSinkBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountSinkBuilder newBillingAccountSinkBuilder() { return new BillingAccountSinkBuilder(); } @@ -145,22 +140,18 @@ public static LogSinkName of(String project, String sink) { return newBuilder().setProject(project).setSink(sink).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogSinkName ofProjectSinkName(String project, String sink) { return newBuilder().setProject(project).setSink(sink).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogSinkName ofOrganizationSinkName(String organization, String sink) { return newOrganizationSinkBuilder().setOrganization(organization).setSink(sink).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogSinkName ofFolderSinkName(String folder, String sink) { return newFolderSinkBuilder().setFolder(folder).setSink(sink).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogSinkName ofBillingAccountSinkName(String billingAccount, String sink) { return newBillingAccountSinkBuilder().setBillingAccount(billingAccount).setSink(sink).build(); } @@ -169,12 +160,10 @@ public static String format(String project, String sink) { return newBuilder().setProject(project).setSink(sink).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectSinkName(String project, String sink) { return newBuilder().setProject(project).setSink(sink).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationSinkName(String organization, String sink) { return newOrganizationSinkBuilder() .setOrganization(organization) @@ -183,12 +172,10 @@ public static String formatOrganizationSinkName(String organization, String sink .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderSinkName(String folder, String sink) { return newFolderSinkBuilder().setFolder(folder).setSink(sink).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountSinkName(String billingAccount, String sink) { return newBillingAccountSinkBuilder() .setBillingAccount(billingAccount) @@ -354,7 +341,6 @@ public LogSinkName build() { } /** Builder for organizations/{organization}/sinks/{sink}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class OrganizationSinkBuilder { private String organization; private String sink; @@ -385,7 +371,6 @@ public LogSinkName build() { } /** Builder for folders/{folder}/sinks/{sink}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class FolderSinkBuilder { private String folder; private String sink; @@ -416,7 +401,6 @@ public LogSinkName build() { } /** Builder for billingAccounts/{billing_account}/sinks/{sink}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class BillingAccountSinkBuilder { private String billingAccount; private String sink; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java b/test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java index 92b3a1ad75..75f36ab113 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java +++ b/test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java @@ -16,7 +16,6 @@ package com.google.logging.v2; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -141,22 +140,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectLocationBucketViewBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationLocationBucketViewBuilder newOrganizationLocationBucketViewBuilder() { return new OrganizationLocationBucketViewBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderLocationBucketViewBuilder newFolderLocationBucketViewBuilder() { return new FolderLocationBucketViewBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountLocationBucketViewBuilder newBillingAccountLocationBucketViewBuilder() { return new BillingAccountLocationBucketViewBuilder(); @@ -175,7 +170,6 @@ public static LogViewName of(String project, String location, String bucket, Str .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogViewName ofProjectLocationBucketViewName( String project, String location, String bucket, String view) { return newBuilder() @@ -186,7 +180,6 @@ public static LogViewName ofProjectLocationBucketViewName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogViewName ofOrganizationLocationBucketViewName( String organization, String location, String bucket, String view) { return newOrganizationLocationBucketViewBuilder() @@ -197,7 +190,6 @@ public static LogViewName ofOrganizationLocationBucketViewName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogViewName ofFolderLocationBucketViewName( String folder, String location, String bucket, String view) { return newFolderLocationBucketViewBuilder() @@ -208,7 +200,6 @@ public static LogViewName ofFolderLocationBucketViewName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogViewName ofBillingAccountLocationBucketViewName( String billingAccount, String location, String bucket, String view) { return newBillingAccountLocationBucketViewBuilder() @@ -229,7 +220,6 @@ public static String format(String project, String location, String bucket, Stri .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectLocationBucketViewName( String project, String location, String bucket, String view) { return newBuilder() @@ -241,7 +231,6 @@ public static String formatProjectLocationBucketViewName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationLocationBucketViewName( String organization, String location, String bucket, String view) { return newOrganizationLocationBucketViewBuilder() @@ -253,7 +242,6 @@ public static String formatOrganizationLocationBucketViewName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderLocationBucketViewName( String folder, String location, String bucket, String view) { return newFolderLocationBucketViewBuilder() @@ -265,7 +253,6 @@ public static String formatFolderLocationBucketViewName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountLocationBucketViewName( String billingAccount, String location, String bucket, String view) { return newBillingAccountLocationBucketViewBuilder() @@ -486,7 +473,6 @@ public LogViewName build() { /** * Builder for organizations/{organization}/locations/{location}/buckets/{bucket}/views/{view}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class OrganizationLocationBucketViewBuilder { private String organization; private String location; @@ -537,7 +523,6 @@ public LogViewName build() { } /** Builder for folders/{folder}/locations/{location}/buckets/{bucket}/views/{view}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class FolderLocationBucketViewBuilder { private String folder; private String location; @@ -591,7 +576,6 @@ public LogViewName build() { * Builder for * billingAccounts/{billing_account}/locations/{location}/buckets/{bucket}/views/{view}. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class BillingAccountLocationBucketViewBuilder { private String billingAccount; private String location; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java b/test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java index 86322c9321..ab9e462544 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java +++ b/test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java @@ -16,7 +16,6 @@ package com.google.logging.v2; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -107,22 +106,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationBuilder newOrganizationBuilder() { return new OrganizationBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderBuilder newFolderBuilder() { return new FolderBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountBuilder newBillingAccountBuilder() { return new BillingAccountBuilder(); } @@ -135,22 +130,18 @@ public static SettingsName of(String project) { return newBuilder().setProject(project).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SettingsName ofProjectName(String project) { return newBuilder().setProject(project).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SettingsName ofOrganizationName(String organization) { return newOrganizationBuilder().setOrganization(organization).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SettingsName ofFolderName(String folder) { return newFolderBuilder().setFolder(folder).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SettingsName ofBillingAccountName(String billingAccount) { return newBillingAccountBuilder().setBillingAccount(billingAccount).build(); } @@ -159,22 +150,18 @@ public static String format(String project) { return newBuilder().setProject(project).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectName(String project) { return newBuilder().setProject(project).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationName(String organization) { return newOrganizationBuilder().setOrganization(organization).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderName(String folder) { return newFolderBuilder().setFolder(folder).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountName(String billingAccount) { return newBillingAccountBuilder().setBillingAccount(billingAccount).build().toString(); } @@ -319,7 +306,6 @@ public SettingsName build() { } /** Builder for organizations/{organization}/settings. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class OrganizationBuilder { private String organization; @@ -340,7 +326,6 @@ public SettingsName build() { } /** Builder for folders/{folder}/settings. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class FolderBuilder { private String folder; @@ -361,7 +346,6 @@ public SettingsName build() { } /** Builder for billingAccounts/{billing_account}/settings. */ - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static class BillingAccountBuilder { private String billingAccount; diff --git a/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java b/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java index abae4f0317..8fe96fcb8d 100644 --- a/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java +++ b/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java @@ -16,7 +16,6 @@ package com.google.pubsub.v1; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import com.google.api.pathtemplate.ValidationException; import com.google.api.resourcenames.ResourceName; @@ -71,7 +70,6 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectTopicBuilder() { return new Builder(); } @@ -84,12 +82,10 @@ public static TopicName of(String project, String topic) { return newBuilder().setProject(project).setTopic(topic).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static TopicName ofProjectTopicName(String project, String topic) { return newBuilder().setProject(project).setTopic(topic).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static TopicName ofDeletedTopicName() { return new TopicName("_deleted-topic_"); } @@ -98,12 +94,10 @@ public static String format(String project, String topic) { return newBuilder().setProject(project).setTopic(topic).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectTopicName(String project, String topic) { return newBuilder().setProject(project).setTopic(topic).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatDeletedTopicName() { return "_deleted-topic_"; } From 6ca20e529a86561cdc935d0d44dd971de3b9e4b2 Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Tue, 20 Feb 2024 15:28:24 +0000 Subject: [PATCH 10/20] fix: ignore comment in BUILD (#2492) In this PR: - Ignore comment (leading with `#`) when parsing BUILD.bazel - Add unit tests Context: There's a [BUILD](https://github.com/googleapis/googleapis/blob/master/google/cloud/resourcemanager/v3/BUILD.bazel#L52C10-L52C50) in googleapis has common_resources.proto comment out. We need to adjust the regex pattern to adjust this case. --- library_generation/model/gapic_inputs.py | 30 ++++++++++++------- .../misc/BUILD_comment_common_resources.bazel | 5 ++++ .../misc/BUILD_comment_iam_policy.bazel | 5 ++++ .../misc/BUILD_comment_locations.bazel | 5 ++++ .../misc/BUILD_common_resources.bazel | 5 ++++ .../BUILD_iam_locations.bazel | 4 +-- .../resources/misc/BUILD_iam_policy.bazel | 5 ++++ .../test/resources/misc/BUILD_locations.bazel | 5 ++++ .../misc/BUILD_no_additional_protos.bazel | 4 +++ .../BUILD_common_resources.bazel | 6 ---- .../BUILD_iam_policy.bazel | 7 ----- .../BUILD_locations.bazel | 7 ----- library_generation/test/unit_tests.py | 22 ++++++++++++++ 13 files changed, 77 insertions(+), 33 deletions(-) create mode 100644 library_generation/test/resources/misc/BUILD_comment_common_resources.bazel create mode 100644 library_generation/test/resources/misc/BUILD_comment_iam_policy.bazel create mode 100644 library_generation/test/resources/misc/BUILD_comment_locations.bazel create mode 100644 library_generation/test/resources/misc/BUILD_common_resources.bazel rename library_generation/test/resources/{search_additional_protos => misc}/BUILD_iam_locations.bazel (57%) create mode 100644 library_generation/test/resources/misc/BUILD_iam_policy.bazel create mode 100644 library_generation/test/resources/misc/BUILD_locations.bazel create mode 100644 library_generation/test/resources/misc/BUILD_no_additional_protos.bazel delete mode 100644 library_generation/test/resources/search_additional_protos/BUILD_common_resources.bazel delete mode 100644 library_generation/test/resources/search_additional_protos/BUILD_iam_policy.bazel delete mode 100644 library_generation/test/resources/search_additional_protos/BUILD_locations.bazel diff --git a/library_generation/model/gapic_inputs.py b/library_generation/model/gapic_inputs.py index b6500a6f3d..4bb9ce64f4 100644 --- a/library_generation/model/gapic_inputs.py +++ b/library_generation/model/gapic_inputs.py @@ -31,9 +31,13 @@ (.*?) \) """ -resource_pattern = r"//google/cloud:common_resources_proto" -location_pattern = r"//google/cloud/location:location_proto" -iam_pattern = r"//google/iam/v1:iam_policy_proto" +# match a line which the first character is "#". +comment_pattern = r"^\s*\#+" +pattern_to_proto = { + r"//google/cloud:common_resources_proto": "google/cloud/common_resources.proto", + r"//google/cloud/location:location_proto": "google/cloud/location/locations.proto", + r"//google/iam/v1:iam_policy_proto": "google/iam/v1/iam_policy.proto", +} transport_pattern = r"transport = \"(.*?)\"" rest_pattern = r"rest_numeric_enums = True" gapic_yaml_pattern = r"gapic_yaml = \"(.*?)\"" @@ -97,7 +101,9 @@ def parse( if len(assembly_target) > 0: include_samples = __parse_include_samples(assembly_target[0]) if len(gapic_target) == 0: - return GapicInputs(include_samples=include_samples) + return GapicInputs( + additional_protos=additional_protos, include_samples=include_samples + ) transport = __parse_transport(gapic_target[0]) rest_numeric_enum = __parse_rest_numeric_enums(gapic_target[0]) @@ -119,12 +125,16 @@ def parse( def __parse_additional_protos(proto_library_target: str) -> str: res = [" "] - if len(re.findall(resource_pattern, proto_library_target)) != 0: - res.append("google/cloud/common_resources.proto") - if len(re.findall(location_pattern, proto_library_target)) != 0: - res.append("google/cloud/location/locations.proto") - if len(re.findall(iam_pattern, proto_library_target)) != 0: - res.append("google/iam/v1/iam_policy.proto") + lines = proto_library_target.split("\n") + for line in lines: + if len(re.findall(comment_pattern, line)) != 0: + # skip a line which the first charactor is "#" since it's + # a comment. + continue + for pattern in pattern_to_proto: + if len(re.findall(pattern, line)) == 0: + continue + res.append(pattern_to_proto[pattern]) return " ".join(res) diff --git a/library_generation/test/resources/misc/BUILD_comment_common_resources.bazel b/library_generation/test/resources/misc/BUILD_comment_common_resources.bazel new file mode 100644 index 0000000000..126ffdb7ca --- /dev/null +++ b/library_generation/test/resources/misc/BUILD_comment_common_resources.bazel @@ -0,0 +1,5 @@ +proto_library_with_info( + deps = [ + #"//google/cloud:common_resources_proto", + ] +) \ No newline at end of file diff --git a/library_generation/test/resources/misc/BUILD_comment_iam_policy.bazel b/library_generation/test/resources/misc/BUILD_comment_iam_policy.bazel new file mode 100644 index 0000000000..a9a2c1ca75 --- /dev/null +++ b/library_generation/test/resources/misc/BUILD_comment_iam_policy.bazel @@ -0,0 +1,5 @@ +proto_library_with_info( + deps = [ + # "//google/iam/v1:iam_policy_proto", + ] +) \ No newline at end of file diff --git a/library_generation/test/resources/misc/BUILD_comment_locations.bazel b/library_generation/test/resources/misc/BUILD_comment_locations.bazel new file mode 100644 index 0000000000..8b96e3ab81 --- /dev/null +++ b/library_generation/test/resources/misc/BUILD_comment_locations.bazel @@ -0,0 +1,5 @@ +proto_library_with_info( + deps = [ + # "//google/cloud/location:location_proto", + ] +) \ No newline at end of file diff --git a/library_generation/test/resources/misc/BUILD_common_resources.bazel b/library_generation/test/resources/misc/BUILD_common_resources.bazel new file mode 100644 index 0000000000..9b749e6ad5 --- /dev/null +++ b/library_generation/test/resources/misc/BUILD_common_resources.bazel @@ -0,0 +1,5 @@ +proto_library_with_info( + deps = [ + "//google/cloud:common_resources_proto", + ] +) \ No newline at end of file diff --git a/library_generation/test/resources/search_additional_protos/BUILD_iam_locations.bazel b/library_generation/test/resources/misc/BUILD_iam_locations.bazel similarity index 57% rename from library_generation/test/resources/search_additional_protos/BUILD_iam_locations.bazel rename to library_generation/test/resources/misc/BUILD_iam_locations.bazel index e8241995e2..d0c971da7c 100644 --- a/library_generation/test/resources/search_additional_protos/BUILD_iam_locations.bazel +++ b/library_generation/test/resources/misc/BUILD_iam_locations.bazel @@ -1,8 +1,6 @@ -# this file is only used in testing `get_gapic_additional_protos_from_BUILD` in utilities.sh - proto_library_with_info( deps = [ - "//google/iam/v1:iam_policy_proto", "//google/cloud/location:location_proto", + "//google/iam/v1:iam_policy_proto", ] ) \ No newline at end of file diff --git a/library_generation/test/resources/misc/BUILD_iam_policy.bazel b/library_generation/test/resources/misc/BUILD_iam_policy.bazel new file mode 100644 index 0000000000..af5d4a32f8 --- /dev/null +++ b/library_generation/test/resources/misc/BUILD_iam_policy.bazel @@ -0,0 +1,5 @@ +proto_library_with_info( + deps = [ + "//google/iam/v1:iam_policy_proto", + ] +) \ No newline at end of file diff --git a/library_generation/test/resources/misc/BUILD_locations.bazel b/library_generation/test/resources/misc/BUILD_locations.bazel new file mode 100644 index 0000000000..29ee14fdba --- /dev/null +++ b/library_generation/test/resources/misc/BUILD_locations.bazel @@ -0,0 +1,5 @@ +proto_library_with_info( + deps = [ + "//google/cloud/location:location_proto", + ] +) \ No newline at end of file diff --git a/library_generation/test/resources/misc/BUILD_no_additional_protos.bazel b/library_generation/test/resources/misc/BUILD_no_additional_protos.bazel new file mode 100644 index 0000000000..a22257cad4 --- /dev/null +++ b/library_generation/test/resources/misc/BUILD_no_additional_protos.bazel @@ -0,0 +1,4 @@ +proto_library_with_info( + deps = [ + ] +) \ No newline at end of file diff --git a/library_generation/test/resources/search_additional_protos/BUILD_common_resources.bazel b/library_generation/test/resources/search_additional_protos/BUILD_common_resources.bazel deleted file mode 100644 index 45e3987adb..0000000000 --- a/library_generation/test/resources/search_additional_protos/BUILD_common_resources.bazel +++ /dev/null @@ -1,6 +0,0 @@ -# this file is only used in testing `get_gapic_additional_protos_from_BUILD` in utilities.sh - -proto_library_with_info( - deps = [ - ] -) \ No newline at end of file diff --git a/library_generation/test/resources/search_additional_protos/BUILD_iam_policy.bazel b/library_generation/test/resources/search_additional_protos/BUILD_iam_policy.bazel deleted file mode 100644 index 81064a7eb4..0000000000 --- a/library_generation/test/resources/search_additional_protos/BUILD_iam_policy.bazel +++ /dev/null @@ -1,7 +0,0 @@ -# this file is only used in testing `get_gapic_additional_protos_from_BUILD` in utilities.sh - -proto_library_with_info( - deps = [ - "//google/iam/v1:iam_policy_proto", - ] -) \ No newline at end of file diff --git a/library_generation/test/resources/search_additional_protos/BUILD_locations.bazel b/library_generation/test/resources/search_additional_protos/BUILD_locations.bazel deleted file mode 100644 index 07faa4ac95..0000000000 --- a/library_generation/test/resources/search_additional_protos/BUILD_locations.bazel +++ /dev/null @@ -1,7 +0,0 @@ -# this file is only used in testing `get_gapic_additional_protos_from_BUILD` in utilities.sh - -proto_library_with_info( - deps = [ - "//google/cloud/location:location_proto", - ] -) \ No newline at end of file diff --git a/library_generation/test/unit_tests.py b/library_generation/test/unit_tests.py index fc251e2472..625aaf8ffd 100644 --- a/library_generation/test/unit_tests.py +++ b/library_generation/test/unit_tests.py @@ -214,6 +214,28 @@ def test_from_yaml_succeeds(self): self.assertEqual("google/cloud/asset/v1p5beta1", gapics[3].proto_path) self.assertEqual("google/cloud/asset/v1p7beta1", gapics[4].proto_path) + @parameterized.expand( + [ + ("BUILD_no_additional_protos.bazel", " "), + ("BUILD_common_resources.bazel", " google/cloud/common_resources.proto"), + ("BUILD_comment_common_resources.bazel", " "), + ("BUILD_locations.bazel", " google/cloud/location/locations.proto"), + ("BUILD_comment_locations.bazel", " "), + ("BUILD_iam_policy.bazel", " google/iam/v1/iam_policy.proto"), + ("BUILD_comment_iam_policy.bazel", " "), + ( + "BUILD_iam_locations.bazel", + " google/cloud/location/locations.proto google/iam/v1/iam_policy.proto", + ), + ] + ) + def test_gapic_inputs_parse_additional_protos(self, build_name, expected): + parsed = parse_build_file(build_file, "", build_name) + self.assertEqual( + expected, + parsed.additional_protos, + ) + def test_gapic_inputs_parse_grpc_only_succeeds(self): parsed = parse_build_file(build_file, "", "BUILD_grpc.bazel") self.assertEqual("grpc", parsed.transport) From 05d1bb9567c3904fc147db761cc41b89b2299c22 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 21 Feb 2024 12:14:10 -0500 Subject: [PATCH 11/20] chore: use library_name to compute destination folder of generate_repo (#2489) fixes https://github.com/googleapis/sdk-platform-java/issues/2494 --- .../generate_composed_library.py | 4 +- library_generation/owlbot/bin/entrypoint.sh | 4 +- .../owlbot/src/apply_repo_templates.py | 2 +- library_generation/postprocess_library.sh | 2 +- library_generation/setup.py | 5 ++- library_generation/test/integration_tests.py | 9 +++-- .../google-cloud-java/generation_config.yaml | 37 +++++++++++-------- 7 files changed, 39 insertions(+), 24 deletions(-) diff --git a/library_generation/generate_composed_library.py b/library_generation/generate_composed_library.py index 37a1e75e75..78c5c0e34a 100755 --- a/library_generation/generate_composed_library.py +++ b/library_generation/generate_composed_library.py @@ -81,7 +81,9 @@ def generate_composed_library( library_path=library_path, ) service_version = gapic.proto_path.split("/")[-1] - temp_destination_path = f"java-{library.api_shortname}-{service_version}" + temp_destination_path = ( + f"java-{util.get_library_name(library)}-{service_version}" + ) effective_arguments = __construct_effective_arg( base_arguments=base_arguments, gapic=gapic, diff --git a/library_generation/owlbot/bin/entrypoint.sh b/library_generation/owlbot/bin/entrypoint.sh index a8d5a730e3..34fbd2573c 100755 --- a/library_generation/owlbot/bin/entrypoint.sh +++ b/library_generation/owlbot/bin/entrypoint.sh @@ -46,7 +46,6 @@ fi # Runs template and etc in current working directory -monorepo=$1 # apply repo templates echo "Rendering templates" @@ -56,8 +55,11 @@ python3 "${scripts_root}/owlbot/src/apply_repo_templates.py" "${configuration_ya echo "Retrieving files from owl-bot-staging directory..." if [ -f "owlbot.py" ] then + # we use an empty synthtool folder to prevent cached templates from being used + export SYNTHTOOL_TEMPLATES=$(mktemp -d) # defaults to run owlbot.py python3 owlbot.py + export SYNTHTOOL_TEMPLATES="" fi echo "...done" diff --git a/library_generation/owlbot/src/apply_repo_templates.py b/library_generation/owlbot/src/apply_repo_templates.py index 929ffb66f2..26e9c3509d 100644 --- a/library_generation/owlbot/src/apply_repo_templates.py +++ b/library_generation/owlbot/src/apply_repo_templates.py @@ -13,7 +13,7 @@ from library_generation.model.generation_config import from_yaml script_dir = os.path.dirname(os.path.realpath(__file__)) -repo_templates_path = os.path.join(script_dir, "..", "templates", "java_library") +repo_templates_path = os.path.normpath(os.path.join(script_dir, "..", "templates")) def apply_repo_templates(configuration_yaml_path: str, monorepo: bool) -> None: diff --git a/library_generation/postprocess_library.sh b/library_generation/postprocess_library.sh index b4f4d11dbc..2951a8e9a4 100755 --- a/library_generation/postprocess_library.sh +++ b/library_generation/postprocess_library.sh @@ -22,7 +22,7 @@ # different logic # 8 - configuration_yaml_path: path to the configuration yaml containing library # generation information for this library -set -eo pipefail +set -exo pipefail scripts_root=$(dirname "$(readlink -f "$0")") postprocessing_target=$1 diff --git a/library_generation/setup.py b/library_generation/setup.py index c8b3418cf4..477346e711 100644 --- a/library_generation/setup.py +++ b/library_generation/setup.py @@ -16,9 +16,10 @@ "templates/*.j2", "gapic-generator-java-wrapper", "requirements.*", - "owlbot/src/requirements.*", "owlbot/bin/*.sh", - "owlbot/templates/**/*.j2", + "owlbot/templates/clirr/*.j2", + "owlbot/templates/poms/*.j2", + "owlbot/templates/java_library/**/*", ], }, ) diff --git a/library_generation/test/integration_tests.py b/library_generation/test/integration_tests.py index 2380e15452..4f806cf17f 100644 --- a/library_generation/test/integration_tests.py +++ b/library_generation/test/integration_tests.py @@ -27,6 +27,7 @@ from library_generation.model.generation_config import from_yaml from library_generation.test.compare_poms import compare_xml from library_generation.utilities import get_library_name +from library_generation.utilities import sh_util as shell_call config_name = "generation_config.yaml" script_dir = os.path.dirname(os.path.realpath(__file__)) @@ -37,6 +38,7 @@ golden_dir = f"{config_dir}/golden" repo_prefix = "https://github.com/googleapis" committish_list = ["chore/test-hermetic-build"] # google-cloud-java +output_folder = shell_call("get_output_folder") class IntegrationTest(unittest.TestCase): @@ -46,7 +48,7 @@ def test_generate_repo(self): config_files = self.__get_config_files(config_dir) i = 0 for repo, config_file in config_files.items(): - repo_dest = f"{golden_dir}/{repo}" + repo_dest = f"{output_folder}/{repo}" self.__pull_repo_to(Path(repo_dest), repo, committish_list[i]) library_names = self.__get_library_names_from_config(config_file) # prepare golden files @@ -62,9 +64,10 @@ def test_generate_repo(self): # compare result for library_name in library_names: print( + f"Generation finished. Will now compare " + f"the expected library in {golden_dir}/{library_name}, " + f"with the actual library in {repo_dest}/{library_name}. " f"Compare generation result: " - f"expected library in {golden_dir}/{library_name}, " - f"actual library in {repo_dest}/{library_name}." ) compare_result = dircmp( f"{golden_dir}/{library_name}", diff --git a/library_generation/test/resources/integration/google-cloud-java/generation_config.yaml b/library_generation/test/resources/integration/google-cloud-java/generation_config.yaml index 349c10385c..a13860a8ca 100644 --- a/library_generation/test/resources/integration/google-cloud-java/generation_config.yaml +++ b/library_generation/test/resources/integration/google-cloud-java/generation_config.yaml @@ -25,19 +25,26 @@ libraries: GAPICs: - proto_path: google/cloud/apigeeconnect/v1 - - api_shortname: cloudasset - name_pretty: Cloud Asset Inventory - product_documentation: "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview" - api_description: "provides inventory services based on a time series database. This database keeps a five week history of Google Cloud asset metadata. The Cloud Asset Inventory export service allows you to export all asset metadata at a certain timestamp or export event change history during a timeframe." - library_name: "asset" - client_documentation: "https://cloud.google.com/java/docs/reference/google-cloud-asset/latest/overview" - distribution_name: "com.google.cloud:google-cloud-asset" - release_level: "stable" - issue_tracker: "https://issuetracker.google.com/issues/new?component=187210&template=0" - api_reference: "https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview" + - api_shortname: alloydb + name_pretty: AlloyDB + product_documentation: https://cloud.google.com/alloydb/ + api_description: AlloyDB is a fully managed, PostgreSQL-compatible database service + with industry-leading performance, availability, and scale. + rest_documentation: https://cloud.google.com/alloydb/docs/reference/rest + GAPICs: + - proto_path: google/cloud/alloydb/v1 + - proto_path: google/cloud/alloydb/v1alpha + - proto_path: google/cloud/alloydb/v1beta + + - api_shortname: alloydb + name_pretty: AlloyDB connectors + product_documentation: https://cloud.google.com/alloydb/docs + api_description: AlloyDB is a fully-managed, PostgreSQL-compatible database for + demanding transactional workloads. It provides enterprise-grade performance and + availability while maintaining 100% compatibility with open-source PostgreSQL. + library_name: alloydb-connectors + rest_documentation: https://cloud.google.com/alloydb/docs/reference/rest GAPICs: - - proto_path: google/cloud/asset/v1 - - proto_path: google/cloud/asset/v1p1beta1 - - proto_path: google/cloud/asset/v1p2beta1 - - proto_path: google/cloud/asset/v1p5beta1 - - proto_path: google/cloud/asset/v1p7beta1 + - proto_path: google/cloud/alloydb/connectors/v1 + - proto_path: google/cloud/alloydb/connectors/v1alpha + - proto_path: google/cloud/alloydb/connectors/v1beta From 49e4eb034d4c870446a571ae0930883ba123eac4 Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Wed, 21 Feb 2024 23:22:19 +0000 Subject: [PATCH 12/20] chore: suppress download progress (#2496) In this PR: - Suppress logs of download progress when running `fmt` plugin. --- library_generation/owlbot/bin/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library_generation/owlbot/bin/entrypoint.sh b/library_generation/owlbot/bin/entrypoint.sh index 34fbd2573c..c36f7cf5ff 100755 --- a/library_generation/owlbot/bin/entrypoint.sh +++ b/library_generation/owlbot/bin/entrypoint.sh @@ -86,7 +86,7 @@ echo "...done" # ensure formatting on all .java files in the repository echo "Reformatting source..." -mvn fmt:format +mvn fmt:format -V --batch-mode --no-transfer-progress echo "...done" From fc18449438acb529718a75e5e7146b1437a6427d Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Thu, 22 Feb 2024 18:20:18 +0000 Subject: [PATCH 13/20] chore: remove beta client LRO (#2497) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #2103 ☕️ --- .../AbstractServiceClientClassComposer.java | 7 ----- .../AbstractServiceStubClassComposer.java | 2 +- ...tractServiceStubSettingsClassComposer.java | 13 --------- ...onServiceCallableFactoryClassComposer.java | 28 ++----------------- .../grpc/goldens/EchoStubSettings.golden | 2 -- .../grpcrest/goldens/EchoStubSettings.golden | 2 -- .../HttpJsonEchoCallableFactory.golden | 2 -- .../HttpJsonComplianceCallableFactory.golden | 2 -- .../v1beta1/stub/EchoStubSettings.java | 2 -- .../HttpJsonComplianceCallableFactory.java | 2 -- .../stub/HttpJsonEchoCallableFactory.java | 2 -- .../stub/HttpJsonIdentityCallableFactory.java | 2 -- .../HttpJsonMessagingCallableFactory.java | 2 -- ...ttpJsonSequenceServiceCallableFactory.java | 2 -- .../stub/HttpJsonTestingCallableFactory.java | 2 -- .../v1beta1/stub/MessagingStubSettings.java | 2 -- ...pJsonConnectionServiceCallableFactory.java | 4 --- .../v1/stub/AssetServiceStubSettings.java | 4 --- .../HttpJsonAssetServiceCallableFactory.java | 4 --- .../compute/v1small/AddressesClient.java | 5 ---- .../v1small/stub/AddressesStubSettings.java | 5 ---- .../HttpJsonAddressesCallableFactory.java | 4 --- ...tpJsonRegionOperationsCallableFactory.java | 4 --- .../v1small/stub/RegionOperationsStub.java | 2 -- ...HttpJsonIamCredentialsCallableFactory.java | 4 --- ...HttpJsonLibraryServiceCallableFactory.java | 4 --- .../v2/stub/ConfigServiceV2StubSettings.java | 3 -- .../v1beta1/stub/CloudRedisStubSettings.java | 16 ----------- .../HttpJsonCloudRedisCallableFactory.java | 2 -- 29 files changed, 3 insertions(+), 132 deletions(-) diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java index 987cd9adc8..5f8456aa97 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java @@ -839,13 +839,6 @@ private static MethodDefinition createMethodDefaultMethod( .copyAndSetGenerics( Arrays.asList( lro.responseType().reference(), lro.metadataType().reference()))); - if (method.lro().operationServiceStubType() != null) { - annotations.add( - AnnotationNode.withTypeAndDescription( - typeStore.get("BetaApi"), - "The surface for long-running operations is not stable yet and may change in the" - + " future.")); - } } // Construct the method that accepts a request proto. diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java index c9835c69e4..cb06d34303 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubClassComposer.java @@ -235,7 +235,7 @@ private List createLongRunningClientGetters(TypeStore typeStor createCallableGetterMethodDefinition( TypeNode.withReference(ConcreteReference.withClazz(LongRunningClient.class)), "longRunningClient", - ImmutableList.of(AnnotationNode.withType(typeStore.get("BetaApi"))), + Collections.emptyList(), typeStore)); } diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java index 4c7bf86f8c..a64992df89 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java @@ -2023,13 +2023,6 @@ private static List createNestedClassSettingsBuilderGetterMeth t.reference() .copyAndSetGenerics(ImmutableList.of()) .equals(operationCallSettingsBuilderRef); - AnnotationNode lroBetaAnnotation = - AnnotationNode.builder() - .setType(FIXED_TYPESTORE.get("BetaApi")) - .setDescription( - "The surface for use by generated code is not stable yet and may change in the" - + " future.") - .build(); AnnotationNode deprecatedAnnotation = AnnotationNode.withType(TypeNode.DEPRECATED); List javaMethods = new ArrayList<>(); @@ -2037,13 +2030,7 @@ private static List createNestedClassSettingsBuilderGetterMeth nestedMethodSettingsMemberVarExprs.entrySet()) { String varName = settingsVarEntry.getKey(); VariableExpr settingsVarExpr = settingsVarEntry.getValue(); - boolean isOperationCallSettings = - isOperationCallSettingsBuilderFn.apply(settingsVarExpr.type()); - List annotations = new ArrayList<>(); - if (isOperationCallSettings) { - annotations.add(lroBetaAnnotation); - } boolean isDeprecated = nestedDeprecatedSettingVarNames.contains(varName); if (isDeprecated) { diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java index 9a973a2b76..af70ab9208 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceCallableFactoryClassComposer.java @@ -18,7 +18,6 @@ import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable; import com.google.api.gax.rpc.OperationCallable; import com.google.api.gax.rpc.UnaryCallable; -import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.ConcreteReference; import com.google.api.generator.engine.ast.ExprStatement; @@ -36,6 +35,7 @@ import com.google.longrunning.Operation; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -55,20 +55,6 @@ public static HttpJsonServiceCallableFactoryClassComposer instance() { return INSTANCE; } - @Override - protected List createClassAnnotations(Service service, TypeStore typeStore) { - List annotations = super.createClassAnnotations(service, typeStore); - // Always add @BetaApi annotation to the generated CallableFactory for now. It is a public class - // for technical reasons, end users are not expected to interact with it, but it may change - // when we add LRO support, that is why making it @BetaApi for now. - // - // Remove the @BetaApi annotation once the LRO feature is fully implemented and stabilized. - if (annotations.stream().noneMatch(a -> a.type().equals(typeStore.get("BetaApi")))) { - annotations.add(AnnotationNode.withType(typeStore.get("BetaApi"))); - } - return annotations; - } - @Override protected List createClassImplements(Service service, TypeStore typeStore) { TypeNode operationsStubType = getOperationsStubType(service); @@ -104,16 +90,6 @@ protected MethodDefinition createOperationCallableMethod(Service service, TypeSt List methodTemplateNames = Arrays.asList(requestTemplateName, responseTemplateName, "MetadataT"); - // Always add @BetaApi annotation to the generated createOperationCallable() method for now, - // until LRO is fully implemented. - // - // Remove the @BetaApi annotation once the LRO feature is fully implemented and stabilized. - AnnotationNode betaAnnotation = - AnnotationNode.withTypeAndDescription( - typeStore.get("BetaApi"), - "The surface for long-running operations is not stable yet and may change in the" - + " future."); - // Generate generic method without the body TypeNode operationType = service.operationType(); if (operationType == null) { @@ -133,7 +109,7 @@ protected MethodDefinition createOperationCallableMethod(Service service, TypeSt /*callSettingsTemplateObjects=*/ methodTemplateNames.stream() .map(n -> (Object) n) .collect(Collectors.toList()), - Arrays.asList(betaAnnotation)); + Collections.emptyList()); List createOperationCallableBody = new ArrayList<>(); List arguments = new ArrayList<>(method.arguments()); diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden index 597ed4d3ba..aea2307b7f 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden @@ -620,8 +620,6 @@ public class EchoStubSettings extends StubSettings { } /** Returns the builder for the settings used for calls to wait. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder waitOperationSettings() { return waitOperationSettings; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden index 5cade6cd1b..6b8181e8a0 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden @@ -659,8 +659,6 @@ public class EchoStubSettings extends StubSettings { } /** Returns the builder for the settings used for calls to wait. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder waitOperationSettings() { return waitOperationSettings; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoCallableFactory.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoCallableFactory.golden index 3996e0747e..5da8337d63 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoCallableFactory.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoCallableFactory.golden @@ -57,8 +57,6 @@ public class HttpJsonEchoCallableFactory httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceCallableFactory.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceCallableFactory.golden index 6e9ff65f91..25f9086a13 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceCallableFactory.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceCallableFactory.golden @@ -57,8 +57,6 @@ public class HttpJsonComplianceCallableFactory httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java index f7ea1b5540..07a8e93d6b 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java @@ -882,8 +882,6 @@ public UnaryCallSettings.Builder waitSettings() { } /** Returns the builder for the settings used for calls to wait. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder waitOperationSettings() { return waitOperationSettings; diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonComplianceCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonComplianceCallableFactory.java index 1679175660..4f527ca0c3 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonComplianceCallableFactory.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonComplianceCallableFactory.java @@ -73,8 +73,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonEchoCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonEchoCallableFactory.java index 544410bc98..26eb5522ef 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonEchoCallableFactory.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonEchoCallableFactory.java @@ -73,8 +73,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonIdentityCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonIdentityCallableFactory.java index f6ace1ac12..3a0b12dc9d 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonIdentityCallableFactory.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonIdentityCallableFactory.java @@ -73,8 +73,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonMessagingCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonMessagingCallableFactory.java index 842da74456..4daa029395 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonMessagingCallableFactory.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonMessagingCallableFactory.java @@ -73,8 +73,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonSequenceServiceCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonSequenceServiceCallableFactory.java index 44f207f84b..3eb91b55f7 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonSequenceServiceCallableFactory.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonSequenceServiceCallableFactory.java @@ -73,8 +73,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonTestingCallableFactory.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonTestingCallableFactory.java index a6654a9840..bdd3ad0b54 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonTestingCallableFactory.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/HttpJsonTestingCallableFactory.java @@ -73,8 +73,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java index a45a6edc8d..529e1365af 100644 --- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java +++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java @@ -943,8 +943,6 @@ public UnaryCallSettings.Builder searchBlurbsSet } /** Returns the builder for the settings used for calls to searchBlurbs. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder< SearchBlurbsRequest, SearchBlurbsResponse, SearchBlurbsMetadata> searchBlurbsOperationSettings() { diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceCallableFactory.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceCallableFactory.java index ebca0f676e..becaad2844 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceCallableFactory.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceCallableFactory.java @@ -16,7 +16,6 @@ package com.google.cloud.apigeeconnect.v1.stub; -import com.google.api.core.BetaApi; import com.google.api.gax.httpjson.HttpJsonCallSettings; import com.google.api.gax.httpjson.HttpJsonCallableFactory; import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable; @@ -41,7 +40,6 @@ *

This class is for advanced usage. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonConnectionServiceCallableFactory implements HttpJsonStubCallableFactory { @@ -73,8 +71,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java index 9d413c58cd..576f6ec1a2 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java @@ -1164,8 +1164,6 @@ public UnaryCallSettings.Builder exportAssetsSet } /** Returns the builder for the settings used for calls to exportAssets. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder< ExportAssetsRequest, ExportAssetsResponse, ExportAssetsRequest> exportAssetsOperationSettings() { @@ -1238,8 +1236,6 @@ public UnaryCallSettings.Builder deleteFeedSettings() } /** Returns the builder for the settings used for calls to analyzeIamPolicyLongrunning. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder< AnalyzeIamPolicyLongrunningRequest, AnalyzeIamPolicyLongrunningResponse, diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceCallableFactory.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceCallableFactory.java index 312ceb6c4d..052b7ca345 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceCallableFactory.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceCallableFactory.java @@ -16,7 +16,6 @@ package com.google.cloud.asset.v1.stub; -import com.google.api.core.BetaApi; import com.google.api.gax.httpjson.HttpJsonCallSettings; import com.google.api.gax.httpjson.HttpJsonCallableFactory; import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable; @@ -41,7 +40,6 @@ *

This class is for advanced usage. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonAssetServiceCallableFactory implements HttpJsonStubCallableFactory { @@ -73,8 +71,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java index 6ea9e35d3e..1bf71bd60c 100644 --- a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java +++ b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.longrunning.OperationFuture; import com.google.api.gax.paging.AbstractFixedSizeCollection; @@ -442,8 +441,6 @@ public final OperationFuture deleteAsync( * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") public final OperationFuture deleteAsync(DeleteAddressRequest request) { return deleteOperationCallable().futureCall(request); } @@ -573,8 +570,6 @@ public final OperationFuture insertAsync( * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") public final OperationFuture insertAsync(InsertAddressRequest request) { return insertOperationCallable().futureCall(request); } diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java index 9b77825c69..51eff66198 100644 --- a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java +++ b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java @@ -21,7 +21,6 @@ import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; -import com.google.api.core.BetaApi; import com.google.api.gax.core.GaxProperties; import com.google.api.gax.core.GoogleCredentialsProvider; import com.google.api.gax.core.InstantiatingExecutorProvider; @@ -579,8 +578,6 @@ public UnaryCallSettings.Builder deleteSettings } /** Returns the builder for the settings used for calls to delete. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder deleteOperationSettings() { return deleteOperationSettings; @@ -592,8 +589,6 @@ public UnaryCallSettings.Builder insertSettings } /** Returns the builder for the settings used for calls to insert. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder insertOperationSettings() { return insertOperationSettings; diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesCallableFactory.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesCallableFactory.java index 8f0188d286..2210f2a190 100644 --- a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesCallableFactory.java +++ b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesCallableFactory.java @@ -16,7 +16,6 @@ package com.google.cloud.compute.v1small.stub; -import com.google.api.core.BetaApi; import com.google.api.gax.httpjson.HttpJsonCallSettings; import com.google.api.gax.httpjson.HttpJsonCallableFactory; import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable; @@ -40,7 +39,6 @@ *

This class is for advanced usage. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonAddressesCallableFactory implements HttpJsonStubCallableFactory { @@ -72,8 +70,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsCallableFactory.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsCallableFactory.java index d4dd29cd71..d004b97fb0 100644 --- a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsCallableFactory.java +++ b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsCallableFactory.java @@ -16,7 +16,6 @@ package com.google.cloud.compute.v1small.stub; -import com.google.api.core.BetaApi; import com.google.api.gax.httpjson.HttpJsonCallSettings; import com.google.api.gax.httpjson.HttpJsonCallableFactory; import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable; @@ -41,7 +40,6 @@ *

This class is for advanced usage. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonRegionOperationsCallableFactory implements HttpJsonStubCallableFactory { @@ -73,8 +71,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStub.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStub.java index 7517e20696..60f5de4a71 100644 --- a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStub.java +++ b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStub.java @@ -16,7 +16,6 @@ package com.google.cloud.compute.v1small.stub; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.rpc.LongRunningClient; import com.google.api.gax.rpc.UnaryCallable; @@ -34,7 +33,6 @@ @Generated("by gapic-generator-java") public abstract class RegionOperationsStub implements BackgroundResource { - @BetaApi public LongRunningClient longRunningClient() { throw new UnsupportedOperationException("Not implemented: longRunningClient()"); } diff --git a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsCallableFactory.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsCallableFactory.java index d17d440123..44cacc7b73 100644 --- a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsCallableFactory.java +++ b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsCallableFactory.java @@ -16,7 +16,6 @@ package com.google.cloud.iam.credentials.v1.stub; -import com.google.api.core.BetaApi; import com.google.api.gax.httpjson.HttpJsonCallSettings; import com.google.api.gax.httpjson.HttpJsonCallableFactory; import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable; @@ -41,7 +40,6 @@ *

This class is for advanced usage. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonIamCredentialsCallableFactory implements HttpJsonStubCallableFactory { @@ -73,8 +71,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceCallableFactory.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceCallableFactory.java index 60cd7ae542..0818b5d80c 100644 --- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceCallableFactory.java +++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceCallableFactory.java @@ -16,7 +16,6 @@ package com.google.cloud.example.library.v1.stub; -import com.google.api.core.BetaApi; import com.google.api.gax.httpjson.HttpJsonCallSettings; import com.google.api.gax.httpjson.HttpJsonCallableFactory; import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable; @@ -41,7 +40,6 @@ *

This class is for advanced usage. */ @Generated("by gapic-generator-java") -@BetaApi public class HttpJsonLibraryServiceCallableFactory implements HttpJsonStubCallableFactory { @@ -73,8 +71,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java index 8d53820dd7..2d27a6965d 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java @@ -23,7 +23,6 @@ import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; -import com.google.api.core.BetaApi; import com.google.api.gax.core.GaxProperties; import com.google.api.gax.core.GoogleCredentialsProvider; import com.google.api.gax.core.InstantiatingExecutorProvider; @@ -1200,8 +1199,6 @@ public UnaryCallSettings.Builder copyLogEntrie } /** Returns the builder for the settings used for calls to copyLogEntries. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder< CopyLogEntriesRequest, CopyLogEntriesResponse, CopyLogEntriesMetadata> copyLogEntriesOperationSettings() { diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java index 937ab5700a..3b256b283c 100644 --- a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java +++ b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java @@ -907,8 +907,6 @@ public UnaryCallSettings.Builder createInstanc } /** Returns the builder for the settings used for calls to createInstance. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder createInstanceOperationSettings() { return createInstanceOperationSettings; @@ -920,8 +918,6 @@ public UnaryCallSettings.Builder updateInstanc } /** Returns the builder for the settings used for calls to updateInstance. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder updateInstanceOperationSettings() { return updateInstanceOperationSettings; @@ -933,8 +929,6 @@ public UnaryCallSettings.Builder upgradeInsta } /** Returns the builder for the settings used for calls to upgradeInstance. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder upgradeInstanceOperationSettings() { return upgradeInstanceOperationSettings; @@ -946,8 +940,6 @@ public UnaryCallSettings.Builder importInstanc } /** Returns the builder for the settings used for calls to importInstance. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder importInstanceOperationSettings() { return importInstanceOperationSettings; @@ -959,8 +951,6 @@ public UnaryCallSettings.Builder exportInstanc } /** Returns the builder for the settings used for calls to exportInstance. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder exportInstanceOperationSettings() { return exportInstanceOperationSettings; @@ -973,8 +963,6 @@ public UnaryCallSettings.Builder exportInstanc } /** Returns the builder for the settings used for calls to failoverInstance. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder failoverInstanceOperationSettings() { return failoverInstanceOperationSettings; @@ -986,8 +974,6 @@ public UnaryCallSettings.Builder deleteInstanc } /** Returns the builder for the settings used for calls to deleteInstance. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder deleteInstanceOperationSettings() { return deleteInstanceOperationSettings; @@ -1000,8 +986,6 @@ public UnaryCallSettings.Builder deleteInstanc } /** Returns the builder for the settings used for calls to rescheduleMaintenance. */ - @BetaApi( - "The surface for use by generated code is not stable yet and may change in the future.") public OperationCallSettings.Builder rescheduleMaintenanceOperationSettings() { return rescheduleMaintenanceOperationSettings; diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/HttpJsonCloudRedisCallableFactory.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/HttpJsonCloudRedisCallableFactory.java index 62351e0986..0a60408c3e 100644 --- a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/HttpJsonCloudRedisCallableFactory.java +++ b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/HttpJsonCloudRedisCallableFactory.java @@ -73,8 +73,6 @@ public UnaryCallable createBatchingCa httpJsonCallSettings, callSettings, clientContext); } - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") @Override public OperationCallable createOperationCallable( From dedc40fb451633b11be10013b74a91053e155620 Mon Sep 17 00:00:00 2001 From: Mattie Fu Date: Fri, 23 Feb 2024 18:21:59 -0500 Subject: [PATCH 14/20] fix: Fix watchdog to start with WAITING state (#2468) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Watchdog should start with WAITING state, and only switch to `idle` if auto flow control was disabled. Before the fix, when auto flow control was enabled, we wait for server to return a response without calling `onRequest()` and watchdog would report the timeout exception because of idle timeout, which is incorrect and causes confusion. Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/gapic-generator-java/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) Fixes #2498 ☕️ --------- Co-authored-by: Igor Bernstein Co-authored-by: Lawrence Qiu --- .../java/com/google/api/gax/rpc/Watchdog.java | 15 +++++- .../com/google/api/gax/rpc/WatchdogTest.java | 51 +++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/gax-java/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java b/gax-java/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java index df975fd2a3..f28bb19dee 100644 --- a/gax-java/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java +++ b/gax-java/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java @@ -193,8 +193,11 @@ class WatchdogStream extends StateCheckingResponseObserver private final ResponseObserver outerResponseObserver; private volatile StreamController innerController; + // When a stream is created it has automatic inbound flow control enabled. The stream + // won't wait for the caller to request a message. Setting the default to WAITING + // to reflect this state. @GuardedBy("lock") - private State state = State.IDLE; + private State state = State.WAITING; @GuardedBy("lock") private int pendingCount = 0; @@ -220,6 +223,16 @@ public void onStartImpl(StreamController controller) { public void disableAutoInboundFlowControl() { Preconditions.checkState( !hasStarted, "Can't disable automatic flow control after the stream has started"); + + // Adding the lock only to satisfy the annotation. It doesn't matter because before + // the stream is started, this is only accessed by the caller. + synchronized (lock) { + // When auto flow control is disabled, caller needs to call onRequest() to request a + // message. Setting the state to IDLE because now we're waiting for caller to call + // onRequest(). + state = State.IDLE; + } + autoAutoFlowControl = false; innerController.disableAutoInboundFlowControl(); } diff --git a/gax-java/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java b/gax-java/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java index e20218452c..d82fbeec49 100644 --- a/gax-java/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java +++ b/gax-java/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java @@ -154,6 +154,31 @@ public void testTimedOutBeforeStart() throws InterruptedException { assertThat(error).isInstanceOf(WatchdogTimeoutException.class); } + @Test + public void testTimedOutBeforeResponse() throws InterruptedException { + MockServerStreamingCallable autoFlowControlCallable = + new MockServerStreamingCallable<>(); + AutoFlowControlObserver downstreamObserver = new AutoFlowControlObserver<>(); + + autoFlowControlCallable.call("request", watchdog.watch(downstreamObserver, waitTime, idleTime)); + MockServerStreamingCall call1 = autoFlowControlCallable.popLastCall(); + + clock.incrementNanoTime(idleTime.toNanos() + 1); + watchdog.run(); + assertThat(downstreamObserver.done.isDone()).isFalse(); + assertThat(call1.getController().isCancelled()).isTrue(); + call1.getController().getObserver().onError(new CancellationException("cancelled")); + + Throwable actualError = null; + try { + downstreamObserver.done.get(); + } catch (ExecutionException e) { + actualError = e.getCause(); + } + assertThat(actualError).isInstanceOf(WatchdogTimeoutException.class); + assertThat(actualError.getMessage()).contains("waiting for next response"); + } + @Test public void testMultiple() throws Exception { // Start stream1 @@ -310,4 +335,30 @@ public void onComplete() { done.set(null); } } + + static class AutoFlowControlObserver implements ResponseObserver { + SettableApiFuture controller = SettableApiFuture.create(); + Queue responses = Queues.newLinkedBlockingDeque(); + SettableApiFuture done = SettableApiFuture.create(); + + @Override + public void onStart(StreamController controller) { + this.controller.set(controller); + } + + @Override + public void onResponse(T response) { + responses.add(response); + } + + @Override + public void onError(Throwable t) { + done.setException(t); + } + + @Override + public void onComplete() { + done.set(null); + } + } } From 7902a41c87240d607179d07c28cce462ea135c5f Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Mon, 26 Feb 2024 10:39:49 -0500 Subject: [PATCH 15/20] chore: add docker image for hermetic build scripts (#2493) Similar changes to those of https://github.com/googleapis/sdk-platform-java/pull/2298 by @mpeddada1 This setup uses two triggers: - The first one is [library-generation-presubmit-sdk-platform-java](https://pantheon.corp.google.com/cloud-build/triggers;region=global/edit/5783744f-0820-419f-bc5e-abbbece4be0b?e=13803378&mods=monitoring_api_prod&project=cloud-devrel-kokoro-resources), which runs on each pull request. It builds a docker image with the contents of `library_generation` at HEAD and runs `library_generation/integration_tests.py` with such image - The second one is [library-generation-sdk-platform-java](https://pantheon.corp.google.com/cloud-build/triggers;region=global/edit/e3373892-82a2-4eac-a1f2-95523966df70?e=13803378&mods=monitoring_api_prod&project=cloud-devrel-kokoro-resources), which: - is triggered upon a commit pushed to the `main` branch, then - builds a docker image with two tags - `latest`, which will be constantly updated to match the latest build - a tag based on the branch `${COMMIT_SHA}` - then the image is pushed with both tags ### tasks - [x] create dockerfile - [x] create cloudbuild.yaml for testing - [x] create cloudbuild test infra - [x] create cloudbuild.yaml for releasing the image - [x] create cloudbuild release infra --------- Co-authored-by: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> --- .../cloudbuild-library-generation.yaml | 33 +++++++++++++++ .../cloudbuild-test-library-generation.yaml | 31 ++++++++++++++ .cloudbuild/library_generation.Dockerfile | 40 +++++++++++++++++++ library_generation/dockerignore | 6 +++ library_generation/generate_repo.py | 0 library_generation/postprocess_library.sh | 37 ++++++++++++++--- library_generation/setup.py | 0 .../test/container_integration_tests.sh | 39 ++++++++++++++++++ library_generation/test/integration_tests.py | 40 +++++++++++++++---- 9 files changed, 213 insertions(+), 13 deletions(-) create mode 100644 .cloudbuild/cloudbuild-library-generation.yaml create mode 100644 .cloudbuild/cloudbuild-test-library-generation.yaml create mode 100644 .cloudbuild/library_generation.Dockerfile create mode 100644 library_generation/dockerignore mode change 100644 => 100755 library_generation/generate_repo.py mode change 100644 => 100755 library_generation/setup.py create mode 100644 library_generation/test/container_integration_tests.sh mode change 100644 => 100755 library_generation/test/integration_tests.py diff --git a/.cloudbuild/cloudbuild-library-generation.yaml b/.cloudbuild/cloudbuild-library-generation.yaml new file mode 100644 index 0000000000..7bdf371bfb --- /dev/null +++ b/.cloudbuild/cloudbuild-library-generation.yaml @@ -0,0 +1,33 @@ +# 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. + +timeout: 7200s # 2 hours +substitutions: + _IMAGE_NAME: "gcr.io/cloud-devrel-public-resources/java-library-generation" + _SHA_IMAGE_ID: "${_IMAGE_NAME}:${COMMIT_SHA}" + _LATEST_IMAGE_ID: "${_IMAGE_NAME}:latest" +steps: + # Library generation build + - name: gcr.io/cloud-builders/docker + args: [ + "build", + "-t", "${_SHA_IMAGE_ID}", + "-t", "${_LATEST_IMAGE_ID}", + "--file", ".cloudbuild/library_generation.Dockerfile", "."] + id: library-generation-build + waitFor: ["-"] + +images: + - ${_SHA_IMAGE_ID} + - ${_LATEST_IMAGE_ID} diff --git a/.cloudbuild/cloudbuild-test-library-generation.yaml b/.cloudbuild/cloudbuild-test-library-generation.yaml new file mode 100644 index 0000000000..909a6439cf --- /dev/null +++ b/.cloudbuild/cloudbuild-test-library-generation.yaml @@ -0,0 +1,31 @@ +# 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. + +timeout: 7200s # 2 hours +substitutions: + _TEST_IMAGE_ID: 'gcr.io/cloud-devrel-public-resources/java-library-generation:${COMMIT_SHA}' + +steps: + # Library generation build + - name: gcr.io/cloud-builders/docker + args: ["build", "-t", "${_TEST_IMAGE_ID}", "--file", ".cloudbuild/library_generation.Dockerfile", "."] + id: library-generation-build + waitFor: ["-"] + - name: ${_TEST_IMAGE_ID} + entrypoint: bash + args: [ './library_generation/test/container_integration_tests.sh' ] + waitFor: [ "library-generation-build" ] + env: + - 'TEST_IMAGE_ID=${_TEST_IMAGE_ID}' + diff --git a/.cloudbuild/library_generation.Dockerfile b/.cloudbuild/library_generation.Dockerfile new file mode 100644 index 0000000000..62a8c516de --- /dev/null +++ b/.cloudbuild/library_generation.Dockerfile @@ -0,0 +1,40 @@ +# 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. + +# build from the root of this repo: +FROM gcr.io/cloud-devrel-public-resources/python + +# install tools +RUN apt-get update && apt-get install -y \ + unzip openjdk-17-jdk rsync maven \ + && apt-get clean + +COPY library_generation /src + +RUN rm $(which python3) +RUN ln -s $(which python3.11) /usr/local/bin/python +RUN ln -s $(which python3.11) /usr/local/bin/python3 +RUN python -m pip install --upgrade pip +RUN cd /src && python -m pip install -r requirements.in +RUN cd /src && python -m pip install . + +# set dummy git credentials for empty commit used in postprocessing +RUN git config --global user.email "cloud-java-bot@google.com" +RUN git config --global user.name "Cloud Java Bot" + +WORKDIR /workspace +RUN chmod 750 /workspace +RUN chmod 750 /src/generate_repo.py + +CMD [ "/src/generate_repo.py" ] diff --git a/library_generation/dockerignore b/library_generation/dockerignore new file mode 100644 index 0000000000..7e978caea9 --- /dev/null +++ b/library_generation/dockerignore @@ -0,0 +1,6 @@ +README.md +**/__pycache__/ +**/*.egg-info/ +**/output/ +**/build/ +**/google-cloud-java/ diff --git a/library_generation/generate_repo.py b/library_generation/generate_repo.py old mode 100644 new mode 100755 diff --git a/library_generation/postprocess_library.sh b/library_generation/postprocess_library.sh index 2951a8e9a4..9f9b5a3786 100755 --- a/library_generation/postprocess_library.sh +++ b/library_generation/postprocess_library.sh @@ -61,22 +61,48 @@ fi # we determine the location of the .OwlBot.yaml file by checking if the target # folder is a monorepo folder or not -if [[ "${postprocessing_target}" == *google-cloud-java* ]]; then +if [[ "${is_monorepo}" == "true" ]]; then owlbot_yaml_relative_path=".OwlBot.yaml" else owlbot_yaml_relative_path=".github/.OwlBot.yaml" fi +# Default values for running copy-code directly from host +repo_binding="${postprocessing_target}" +repo_workspace="/repo" +preprocessed_libraries_binding="${owlbot_cli_source_folder}" + +# When running docker inside docker, we run into the issue of volume bindings +# being mapped from the host machine to the child container (instead of the +# parent container to child container) because we bind the `docker.sock` socket +# to the parent container (i.e. docker calls use the host's filesystem context) +# see https://serverfault.com/a/819371 +# We solve this by referencing environment variables that will be +# set to produce the correct volume mapping. +# +# The workflow is: to check if we are in a docker container (via passed env var) +# and use managed volumes (docker volume create) instead of bindings +# (-v /path:/other-path). The volume names are also received as env vars. + +if [[ -n "${RUNNING_IN_DOCKER}" ]]; then + set -u # temporarily fail on unset variables + repo_binding="${REPO_BINDING_VOLUME}" + set +u + if [[ "${is_monorepo}" == "true" ]]; then + repo_workspace="/repo/$(echo "${postprocessing_target}" | rev | cut -d'/' -f1 | rev)" + fi +fi + docker run --rm \ --user "$(id -u)":"$(id -g)" \ - -v "${postprocessing_target}:/repo" \ - -v "${owlbot_cli_source_folder}:/pre-processed-libraries" \ - -w /repo \ + -v "${repo_binding}:/repo" \ + -v "/tmp:/tmp" \ + -w "${repo_workspace}" \ --env HOME=/tmp \ gcr.io/cloud-devrel-public-resources/owlbot-cli@"${owlbot_cli_image_sha}" \ copy-code \ --source-repo-commit-hash=none \ - --source-repo=/pre-processed-libraries \ + --source-repo="${preprocessed_libraries_binding}" \ --config-file="${owlbot_yaml_relative_path}" # we clone the synthtool library and manually build it @@ -86,6 +112,7 @@ pushd /tmp/synthtool if [ ! -d "synthtool" ]; then git clone https://github.com/googleapis/synthtool.git fi +git config --global --add safe.directory /tmp/synthtool/synthtool pushd "synthtool" git reset --hard "${synthtool_commitish}" diff --git a/library_generation/setup.py b/library_generation/setup.py old mode 100644 new mode 100755 diff --git a/library_generation/test/container_integration_tests.sh b/library_generation/test/container_integration_tests.sh new file mode 100644 index 0000000000..9a17e585a6 --- /dev/null +++ b/library_generation/test/container_integration_tests.sh @@ -0,0 +1,39 @@ +#!/bin/bash +# This is a wrapper of integration_tests.py that sets up the environment to run +# the script in a docker container + +set -xe +if [[ -z "${TEST_IMAGE_ID}" ]]; then + echo "required environemnt variable TEST_IMAGE_ID is not set" + exit 1 +fi + +if [[ ! -d google-cloud-java ]]; then + git clone https://github.com/googleapis/google-cloud-java +fi +pushd google-cloud-java +git reset --hard main +popd + +# We use a volume to hold the google-cloud-java repository used in the +# integration tests. This is because the test container creates a child +# container using the host machine's docker socket, meaning that we can only +# reference volumes created from within the host machine (i.e. the machine +# running this script) +# +# To summarize, we create a special volume that can be referenced both in the +# main container and in any child containers created by this one. +if [[ $(docker volume inspect repo) != '[]' ]]; then + docker volume rm repo +fi +docker volume create --name "repo" --opt "type=none" --opt "device=$(pwd)/google-cloud-java" --opt "o=bind" + +docker run --rm \ + -v repo:/workspace \ + -v /tmp:/tmp \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -e "RUNNING_IN_DOCKER=true" \ + -e "REPO_BINDING_VOLUME=repo" \ + -w "/src" \ + "${TEST_IMAGE_ID}" \ + python -m unittest /src/test/integration_tests.py diff --git a/library_generation/test/integration_tests.py b/library_generation/test/integration_tests.py old mode 100644 new mode 100755 index 4f806cf17f..c552a52e4a --- a/library_generation/test/integration_tests.py +++ b/library_generation/test/integration_tests.py @@ -26,8 +26,11 @@ from library_generation.generate_repo import generate_from_yaml from library_generation.model.generation_config import from_yaml from library_generation.test.compare_poms import compare_xml -from library_generation.utilities import get_library_name -from library_generation.utilities import sh_util as shell_call +from library_generation.utilities import ( + get_library_name, + sh_util as shell_call, + run_process_and_print_output, +) config_name = "generation_config.yaml" script_dir = os.path.dirname(os.path.realpath(__file__)) @@ -48,8 +51,9 @@ def test_generate_repo(self): config_files = self.__get_config_files(config_dir) i = 0 for repo, config_file in config_files.items(): - repo_dest = f"{output_folder}/{repo}" - self.__pull_repo_to(Path(repo_dest), repo, committish_list[i]) + repo_dest = self.__pull_repo_to( + Path(f"{golden_dir}/{repo}"), repo, committish_list[i] + ) library_names = self.__get_library_names_from_config(config_file) # prepare golden files for library_name in library_names: @@ -109,11 +113,31 @@ def test_generate_repo(self): i += 1 @classmethod - def __pull_repo_to(cls, dest: Path, repo: str, committish: str): - repo_url = f"{repo_prefix}/{repo}" - print(f"Cloning repository {repo_url}") - repo = Repo.clone_from(repo_url, dest) + def __pull_repo_to(cls, default_dest: Path, repo: str, committish: str) -> str: + if "RUNNING_IN_DOCKER" in os.environ: + # the docker image expects the repo to be in /workspace + dest_in_docker = "/workspace" + run_process_and_print_output( + [ + "git", + "config", + "--global", + "--add", + "safe.directory", + dest_in_docker, + ], + "Add /workspace to safe directories", + ) + dest = Path(dest_in_docker) + repo = Repo(dest) + else: + dest = default_dest + repo_dest = f"{golden_dir}/{repo}" + repo_url = f"{repo_prefix}/{repo}" + print(f"Cloning repository {repo_url}") + repo = Repo.clone_from(repo_url, dest) repo.git.checkout(committish) + return str(dest) @classmethod def __get_library_names_from_config(cls, config_path: str) -> List[str]: From 9ceab23144ba7a9ca9114d585376e09587fd1bee Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 26 Feb 2024 15:36:24 -0500 Subject: [PATCH 16/20] deps: grandfathering the dependencies for java-pubsublite and java-bigquery (#2504) Apache Arrow dependencies for java-bigquery Flogger dependencies for java-pubsublite --- .../third-party-dependencies/pom.xml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml index 3eb48c6852..461329cb3d 100644 --- a/java-shared-dependencies/third-party-dependencies/pom.xml +++ b/java-shared-dependencies/third-party-dependencies/pom.xml @@ -24,6 +24,7 @@ ${project.artifactId} 1.6.8 + 1.7.2 1.3.2 1.23 0.31.1 @@ -38,10 +39,27 @@ 0.27.0 2.8 1.34.1 + 0.8 + 15.0.0 + + org.apache.arrow + arrow-memory-core + ${arrow.version} + + + org.apache.arrow + arrow-memory-netty + ${arrow.version} + + + org.apache.arrow + arrow-vector + ${arrow.version} + org.apache.httpcomponents httpcore @@ -57,6 +75,11 @@ threetenbp ${threeten.version} + + org.threeten + threeten-extra + ${threeten-extra.version} + javax.annotation javax.annotation-api @@ -78,6 +101,18 @@ error_prone_annotations ${errorprone.version} + + + com.google.flogger + google-extensions + ${flogger.version} + + + com.google.flogger + flogger-system-backend + ${flogger.version} + com.fasterxml.jackson jackson-bom From f4386038766c2381e141d7073959cc6bde896efb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 27 Feb 2024 18:24:41 +0100 Subject: [PATCH 17/20] deps: update grpc dependencies to v1.62.2 (#2506) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [io.grpc:grpc-core](https://togithub.com/grpc/grpc-java) | `1.61.1` -> `1.62.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/io.grpc:grpc-core/1.62.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/io.grpc:grpc-core/1.62.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/io.grpc:grpc-core/1.61.1/1.62.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/io.grpc:grpc-core/1.61.1/1.62.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [io.grpc:grpc-bom](https://togithub.com/grpc/grpc-java) | `1.61.1` -> `1.62.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/io.grpc:grpc-bom/1.62.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/io.grpc:grpc-bom/1.62.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/io.grpc:grpc-bom/1.61.1/1.62.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/io.grpc:grpc-bom/1.61.1/1.62.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes

grpc/grpc-java (io.grpc:grpc-core) ### [`v1.62.2`](https://togithub.com/grpc/grpc-java/releases/tag/v1.62.2) ##### gRPC Java 1.62.2 Release Notes Note that this is the initial 1.62.x release ##### API Changes - services: Remove `io.grpc.services.BinaryLogs`, which was deprecated since 2021. `io.grpc.protobuf.services.BinaryLogs` should be used instead ([#​10832](https://togithub.com/grpc/grpc-java/issues/10832)). - Allow users outside of io.grpc.xds package to create custom xDS resources ([#​10834](https://togithub.com/grpc/grpc-java/issues/10834)) ([`6d96e65`](https://togithub.com/grpc/grpc-java/commit/6d96e6588)) ##### New Features - api:Add ClientTransportFilter. Similarly to ServerTransportFilter, this will provide an observability hook and it allows direct modification of the transport's attributes. ([#​10646](https://togithub.com/grpc/grpc-java/issues/10646)) ##### Improvements - java_grpc_library.bzl: Add support for Auto Exec Groups ([`cb03bd2`](https://togithub.com/grpc/grpc-java/commit/cb03bd234)). This is mostly a behind-the-scenes change to adjust to the newer way Bazel operates - java_grpc_library.bzl: Support runfiles for protoc and the plugin ([`65a6b3b`](https://togithub.com/grpc/grpc-java/commit/65a6b3bc2)). Neither binary uses runfiles, but the task will be ready if they need to in the future - xds: Add EC key support for XdsChannelCredentials/XdsServerCredentials ([`100d5a5`](https://togithub.com/grpc/grpc-java/commit/100d5a55f)) - binder:Change log level from WARNING to FINER for expected exception during close with error, to reduce log spamming ([#​10899](https://togithub.com/grpc/grpc-java/issues/10899)) ([`7ba0718`](https://togithub.com/grpc/grpc-java/commit/7ba0718bb)) ##### Bug Fixes - xds: Fix a bug in WeightedRoundRobinLoadBalancer policy that could raise NullPointerException and further cause channel panic when picking a subchannel. This bug can only be triggered when connection can not be established and the channel reports TRANSIENT_FAILURE state. ([#​10868](https://togithub.com/grpc/grpc-java/issues/10868)) ##### Dependencies - The protoc plugin no longer supports macOS Big Sur (macOS 11). Binaries are now built using Monterey (macOS 12) ##### Acknowledgements - [@​joybestourous](https://togithub.com/joybestourous)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/sdk-platform-java). --- gapic-generator-java-pom-parent/pom.xml | 2 +- gax-java/dependencies.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index 5154540493..59d6c8121f 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -26,7 +26,7 @@ 1.3.2 - 1.61.1 + 1.62.2 1.23.0 1.44.1 2.10.1 diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index f869063376..213396ea9a 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -28,7 +28,7 @@ version.gax_httpjson=2.43.1-SNAPSHOT version.com_google_protobuf=3.25.2 version.google_java_format=1.15.0 -version.io_grpc=1.61.1 +version.io_grpc=1.62.2 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). From 2de487b34c43fee3b81e4af7a2dfe4f2eb6418ac Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 27 Feb 2024 21:45:23 +0100 Subject: [PATCH 18/20] deps: update dependency org.graalvm.sdk:graal-sdk to v22.3.5 (#2475) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.sdk:graal-sdk](https://togithub.com/oracle/graal) | `22.3.3` -> `22.3.5` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.graalvm.sdk:graal-sdk/22.3.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.graalvm.sdk:graal-sdk/22.3.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.graalvm.sdk:graal-sdk/22.3.3/22.3.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.graalvm.sdk:graal-sdk/22.3.3/22.3.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/sdk-platform-java). Co-authored-by: Min Zhu --- gax-java/dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 213396ea9a..8b57ebcab7 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -74,7 +74,7 @@ maven.com_google_http_client_google_http_client=com.google.http-client:google-ht maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.44.1 maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.23 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 -maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.3 +maven.org_graalvm_sdk=org.graalvm.sdk:graal-sdk:22.3.5 # Testing maven artifacts maven.junit_junit=junit:junit:4.13.2 From 7c09e230b6528a4f8c4590fcc4ab681b7a98eac7 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 28 Feb 2024 11:05:21 -0500 Subject: [PATCH 19/20] chore: create release cloudbuild yaml for library_generation (#2510) # In this PR - We add a new `cloudbuild` yaml that is configured to push a new image tagged as `gcr.io/cloud-devrel-public-resources/java-library-generation:${_GAPIC_GENERATOR_JAVA_VERSION}` - We reorganize the folder structure of `sdk-platform-java/.cloudbuild` ## The new trigger It's called `library-generation-sdk-platform-java-release` ![image](https://github.com/googleapis/sdk-platform-java/assets/22083784/b14525c5-fbe9-4d33-9381-4e6cbfae686a) # Before merging this PR - [x] Update _all_ library_generation triggers to point to the new location (`.cloudbuild/library_generation`) - [x] Get approval from @mpeddada1 in order to: - [x] Update graalvm __test__ triggers to point to the new location (`.cloudbuild/graalvm`) - [x] Update graalvm release triggers to point to the new location (`.cloudbuild/graalvm`) --- .cloudbuild/google-cloud-sdk.repo | 8 ----- .../{ => graalvm}/cloudbuild-test-a.yaml | 4 +-- .../{ => graalvm}/cloudbuild-test-b.yaml | 4 +-- .cloudbuild/{ => graalvm}/cloudbuild.yaml | 4 +-- .../{ => graalvm}/graalvm_a.Dockerfile | 0 .../{ => graalvm}/graalvm_b.Dockerfile | 0 .../cloudbuild-library-generation-push.yaml} | 2 +- ...cloudbuild-library-generation-release.yaml | 31 +++++++++++++++++++ .../cloudbuild-test-library-generation.yaml | 2 +- .../library_generation.Dockerfile | 0 10 files changed, 39 insertions(+), 16 deletions(-) delete mode 100644 .cloudbuild/google-cloud-sdk.repo rename .cloudbuild/{ => graalvm}/cloudbuild-test-a.yaml (94%) rename .cloudbuild/{ => graalvm}/cloudbuild-test-b.yaml (94%) rename .cloudbuild/{ => graalvm}/cloudbuild.yaml (96%) rename .cloudbuild/{ => graalvm}/graalvm_a.Dockerfile (100%) rename .cloudbuild/{ => graalvm}/graalvm_b.Dockerfile (100%) rename .cloudbuild/{cloudbuild-library-generation.yaml => library_generation/cloudbuild-library-generation-push.yaml} (92%) create mode 100644 .cloudbuild/library_generation/cloudbuild-library-generation-release.yaml rename .cloudbuild/{ => library_generation}/cloudbuild-test-library-generation.yaml (94%) rename .cloudbuild/{ => library_generation}/library_generation.Dockerfile (100%) diff --git a/.cloudbuild/google-cloud-sdk.repo b/.cloudbuild/google-cloud-sdk.repo deleted file mode 100644 index 8c654dc317..0000000000 --- a/.cloudbuild/google-cloud-sdk.repo +++ /dev/null @@ -1,8 +0,0 @@ -[google-cloud-sdk] -name=Google Cloud SDK -baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el7-x86_64 -enabled=1 -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg - https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg diff --git a/.cloudbuild/cloudbuild-test-a.yaml b/.cloudbuild/graalvm/cloudbuild-test-a.yaml similarity index 94% rename from .cloudbuild/cloudbuild-test-a.yaml rename to .cloudbuild/graalvm/cloudbuild-test-a.yaml index 6727039eb0..01b99f820e 100644 --- a/.cloudbuild/cloudbuild-test-a.yaml +++ b/.cloudbuild/graalvm/cloudbuild-test-a.yaml @@ -21,7 +21,7 @@ steps: # GraalVM A build - name: gcr.io/cloud-builders/docker args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_a.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "."] - dir: .cloudbuild + dir: .cloudbuild/graalvm id: graalvm-a-build waitFor: ["-"] - name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION} @@ -30,4 +30,4 @@ steps: waitFor: [ "graalvm-a-build" ] env: - 'MODULES_UNDER_TEST=java-kms' - - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test' \ No newline at end of file + - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test' diff --git a/.cloudbuild/cloudbuild-test-b.yaml b/.cloudbuild/graalvm/cloudbuild-test-b.yaml similarity index 94% rename from .cloudbuild/cloudbuild-test-b.yaml rename to .cloudbuild/graalvm/cloudbuild-test-b.yaml index 219aacc491..97d8256ebd 100644 --- a/.cloudbuild/cloudbuild-test-b.yaml +++ b/.cloudbuild/graalvm/cloudbuild-test-b.yaml @@ -21,7 +21,7 @@ steps: # GraalVM A build - name: gcr.io/cloud-builders/docker args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_b.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "."] - dir: .cloudbuild + dir: .cloudbuild/graalvm id: graalvm-b-build waitFor: ["-"] - name: gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION} @@ -30,4 +30,4 @@ steps: waitFor: [ "graalvm-b-build" ] env: - 'MODULES_UNDER_TEST=java-kms' - - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test' \ No newline at end of file + - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test' diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/graalvm/cloudbuild.yaml similarity index 96% rename from .cloudbuild/cloudbuild.yaml rename to .cloudbuild/graalvm/cloudbuild.yaml index 0f26b79b23..d0b0589bb9 100644 --- a/.cloudbuild/cloudbuild.yaml +++ b/.cloudbuild/graalvm/cloudbuild.yaml @@ -20,14 +20,14 @@ steps: # GraalVM A build - name: gcr.io/cloud-builders/docker args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_a.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "."] - dir: .cloudbuild + dir: .cloudbuild/graalvm id: graalvm-a-build waitFor: ["-"] # GraalVM B build - name: gcr.io/cloud-builders/docker args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:${_SHARED_DEPENDENCIES_VERSION}", "--file", "graalvm_b.Dockerfile", "--build-arg", "JAVA_SHARED_CONFIG_VERSION=$_JAVA_SHARED_CONFIG_VERSION", "." ] - dir: .cloudbuild + dir: .cloudbuild/graalvm id: graalvm-b-build waitFor: [ "-" ] diff --git a/.cloudbuild/graalvm_a.Dockerfile b/.cloudbuild/graalvm/graalvm_a.Dockerfile similarity index 100% rename from .cloudbuild/graalvm_a.Dockerfile rename to .cloudbuild/graalvm/graalvm_a.Dockerfile diff --git a/.cloudbuild/graalvm_b.Dockerfile b/.cloudbuild/graalvm/graalvm_b.Dockerfile similarity index 100% rename from .cloudbuild/graalvm_b.Dockerfile rename to .cloudbuild/graalvm/graalvm_b.Dockerfile diff --git a/.cloudbuild/cloudbuild-library-generation.yaml b/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml similarity index 92% rename from .cloudbuild/cloudbuild-library-generation.yaml rename to .cloudbuild/library_generation/cloudbuild-library-generation-push.yaml index 7bdf371bfb..296cdb6db5 100644 --- a/.cloudbuild/cloudbuild-library-generation.yaml +++ b/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml @@ -24,7 +24,7 @@ steps: "build", "-t", "${_SHA_IMAGE_ID}", "-t", "${_LATEST_IMAGE_ID}", - "--file", ".cloudbuild/library_generation.Dockerfile", "."] + "--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."] id: library-generation-build waitFor: ["-"] diff --git a/.cloudbuild/library_generation/cloudbuild-library-generation-release.yaml b/.cloudbuild/library_generation/cloudbuild-library-generation-release.yaml new file mode 100644 index 0000000000..814bd001ea --- /dev/null +++ b/.cloudbuild/library_generation/cloudbuild-library-generation-release.yaml @@ -0,0 +1,31 @@ +# 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. + +timeout: 7200s # 2 hours +substitutions: + _GAPIC_GENERATOR_JAVA_VERSION: '2.35.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current} + _IMAGE_ID: "gcr.io/cloud-devrel-public-resources/java-library-generation:${_GAPIC_GENERATOR_JAVA_VERSION}" +steps: + # Library generation build + - name: gcr.io/cloud-builders/docker + args: [ + "build", + "-t", "${_IMAGE_ID}", + "--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."] + id: library-generation-build + waitFor: ["-"] + +images: + - ${_IMAGE_ID} + diff --git a/.cloudbuild/cloudbuild-test-library-generation.yaml b/.cloudbuild/library_generation/cloudbuild-test-library-generation.yaml similarity index 94% rename from .cloudbuild/cloudbuild-test-library-generation.yaml rename to .cloudbuild/library_generation/cloudbuild-test-library-generation.yaml index 909a6439cf..6cdb333f19 100644 --- a/.cloudbuild/cloudbuild-test-library-generation.yaml +++ b/.cloudbuild/library_generation/cloudbuild-test-library-generation.yaml @@ -19,7 +19,7 @@ substitutions: steps: # Library generation build - name: gcr.io/cloud-builders/docker - args: ["build", "-t", "${_TEST_IMAGE_ID}", "--file", ".cloudbuild/library_generation.Dockerfile", "."] + args: ["build", "-t", "${_TEST_IMAGE_ID}", "--file", ".cloudbuild/library_generation/library_generation.Dockerfile", "."] id: library-generation-build waitFor: ["-"] - name: ${_TEST_IMAGE_ID} diff --git a/.cloudbuild/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile similarity index 100% rename from .cloudbuild/library_generation.Dockerfile rename to .cloudbuild/library_generation/library_generation.Dockerfile From c8d145bb7c75aedcea1031c59cd6e5b8f0d9a1af Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 28 Feb 2024 14:34:34 -0500 Subject: [PATCH 20/20] test: do not show unnecessary BatcherImplTest logging (#2519) This is the follow-up of a pull request #2285, where we wanted to catch any flaky test failure with logging, just in case the test failed again. https://github.com/googleapis/sdk-platform-java/pull/2285/files#r1416300479 It turned out that the fix worked well. We don't observe the test failures any more. Therefore turning off the excessive logging. --- .../com/google/api/gax/batching/BatcherImplTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gax-java/gax/src/test/java/com/google/api/gax/batching/BatcherImplTest.java b/gax-java/gax/src/test/java/com/google/api/gax/batching/BatcherImplTest.java index 314fa81ae2..70340d77d6 100644 --- a/gax-java/gax/src/test/java/com/google/api/gax/batching/BatcherImplTest.java +++ b/gax-java/gax/src/test/java/com/google/api/gax/batching/BatcherImplTest.java @@ -873,7 +873,7 @@ public void testThrottlingBlocking() throws Exception { public void run() { batcherAddThreadHolder.add(Thread.currentThread()); batcher.add(1); - logger.info("Called batcher.add(1)"); + logger.fine("Called batcher.add(1)"); } }); @@ -893,20 +893,20 @@ public void run() { () -> { try { Thread.sleep(throttledTime); - logger.info("Calling flowController.release"); + logger.fine("Calling flowController.release"); flowController.release(1, 1); - logger.info("Called flowController.release"); + logger.fine("Called flowController.release"); } catch (InterruptedException e) { } }); try { - logger.info("Calling future.get(10 ms)"); + logger.fine("Calling future.get(10 ms)"); future.get(10, TimeUnit.MILLISECONDS); long afterGetCall = System.currentTimeMillis(); long actualWaitTimeMs = afterGetCall - beforeGetCall; - logger.info("future.get(10 ms) unexpectedly returned. Wait time: " + actualWaitTimeMs); + logger.fine("future.get(10 ms) unexpectedly returned. Wait time: " + actualWaitTimeMs); // In a flaky test troubleshooting // (https://github.com/googleapis/sdk-platform-java/issues/1931), we observed that // "future.get" method did not throw TimeoutException in this multithreaded test. @@ -919,7 +919,7 @@ public void run() { .isAtLeast(10); } catch (TimeoutException e) { // expected - logger.info("future.get(10 ms) timed out expectedly."); + logger.fine("future.get(10 ms) timed out expectedly."); } try {