From 9d54c2c453d98353e1ea2b56e8f2b96fafc1b509 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 22 Jul 2021 16:08:31 -0700 Subject: [PATCH 01/17] chore: regenerate README (#583) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-07-22 23:00:01,792 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-vision/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-07-22 23:00:04,403 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/e6334b4c-c554-4242-a453-55e9920b2a81/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 17374fc64..c045bcafc 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-vision.git", - "sha": "f97136e4a140f0a59affe1c1238d1ae0bee1c6bd" + "sha": "e3adf9d43dc7e926e365b137466b24ca096a162e" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "4124d245133c0f740ac5e6fa2e7daeba327f1297" + "sha": "82fe6d92bf9cf8a042a33234aa02343f73c12492" } } ] diff --git a/README.md b/README.md index 3d9b83445..c76c42a95 100644 --- a/README.md +++ b/README.md @@ -93,8 +93,7 @@ use this Cloud Vision Client Library. ## Samples -Samples are in the [`samples/`](https://github.com/googleapis/java-vision/tree/master/samples) directory. The samples' `README.md` -has instructions for running the samples. +Samples are in the [`samples/`](https://github.com/googleapis/java-vision/tree/master/samples) directory. | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | From eb5839f34afdae6fcaa9d3f41aa6ac724be3a2c8 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 22 Jul 2021 23:12:29 +0000 Subject: [PATCH 02/17] chore: release 1.113.8-SNAPSHOT (#584) :robot: I have created a release \*beep\* \*boop\* --- ### 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). --- google-cloud-vision-bom/pom.xml | 24 ++++++++++----------- google-cloud-vision/pom.xml | 4 ++-- grpc-google-cloud-vision-v1/pom.xml | 4 ++-- grpc-google-cloud-vision-v1p1beta1/pom.xml | 4 ++-- grpc-google-cloud-vision-v1p2beta1/pom.xml | 4 ++-- grpc-google-cloud-vision-v1p3beta1/pom.xml | 4 ++-- grpc-google-cloud-vision-v1p4beta1/pom.xml | 4 ++-- pom.xml | 24 ++++++++++----------- proto-google-cloud-vision-v1/pom.xml | 4 ++-- proto-google-cloud-vision-v1p1beta1/pom.xml | 4 ++-- proto-google-cloud-vision-v1p2beta1/pom.xml | 4 ++-- proto-google-cloud-vision-v1p3beta1/pom.xml | 4 ++-- proto-google-cloud-vision-v1p4beta1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 22 +++++++++---------- 15 files changed, 58 insertions(+), 58 deletions(-) diff --git a/google-cloud-vision-bom/pom.xml b/google-cloud-vision-bom/pom.xml index 5e14aa1e4..c6368c32c 100644 --- a/google-cloud-vision-bom/pom.xml +++ b/google-cloud-vision-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-vision-bom - 1.103.7 + 1.103.8-SNAPSHOT pom com.google.cloud @@ -54,57 +54,57 @@ com.google.api.grpc proto-google-cloud-vision-v1p4beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.cloud google-cloud-vision - 1.103.7 + 1.103.8-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p3beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1 - 1.103.7 + 1.103.8-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p3beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p4beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 1.103.7 + 1.103.8-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1 - 1.103.7 + 1.103.8-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/google-cloud-vision/pom.xml b/google-cloud-vision/pom.xml index 8bd820bd0..5c232c78a 100644 --- a/google-cloud-vision/pom.xml +++ b/google-cloud-vision/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-vision - 1.103.7 + 1.103.8-SNAPSHOT jar Google Cloud Vision https://github.com/googleapis/java-vision @@ -11,7 +11,7 @@ com.google.cloud google-cloud-vision-parent - 1.103.7 + 1.103.8-SNAPSHOT google-cloud-vision diff --git a/grpc-google-cloud-vision-v1/pom.xml b/grpc-google-cloud-vision-v1/pom.xml index 509e86e79..be459c806 100644 --- a/grpc-google-cloud-vision-v1/pom.xml +++ b/grpc-google-cloud-vision-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1 - 1.103.7 + 1.103.8-SNAPSHOT grpc-google-cloud-vision-v1 GRPC library for grpc-google-cloud-vision-v1 com.google.cloud google-cloud-vision-parent - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/grpc-google-cloud-vision-v1p1beta1/pom.xml b/grpc-google-cloud-vision-v1p1beta1/pom.xml index 849f9cfb6..a50e56742 100644 --- a/grpc-google-cloud-vision-v1p1beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.86.7 + 0.86.8-SNAPSHOT grpc-google-cloud-vision-v1p1beta1 GRPC library for grpc-google-cloud-vision-v1p1beta1 com.google.cloud google-cloud-vision-parent - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/grpc-google-cloud-vision-v1p2beta1/pom.xml b/grpc-google-cloud-vision-v1p2beta1/pom.xml index 99bb9e88b..071ead079 100644 --- a/grpc-google-cloud-vision-v1p2beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 1.103.7 + 1.103.8-SNAPSHOT grpc-google-cloud-vision-v1p2beta1 GRPC library for grpc-google-cloud-vision-v1p2beta1 com.google.cloud google-cloud-vision-parent - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/grpc-google-cloud-vision-v1p3beta1/pom.xml b/grpc-google-cloud-vision-v1p3beta1/pom.xml index 8ba19384e..bc648874d 100644 --- a/grpc-google-cloud-vision-v1p3beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p3beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p3beta1 - 0.86.7 + 0.86.8-SNAPSHOT grpc-google-cloud-vision-v1p3beta1 GRPC library for grpc-google-cloud-vision-v1p3beta1 com.google.cloud google-cloud-vision-parent - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/grpc-google-cloud-vision-v1p4beta1/pom.xml b/grpc-google-cloud-vision-v1p4beta1/pom.xml index 29e28f2d9..51f54b199 100644 --- a/grpc-google-cloud-vision-v1p4beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p4beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p4beta1 - 0.86.7 + 0.86.8-SNAPSHOT grpc-google-cloud-vision-v1p4beta1 GRPC library for grpc-google-cloud-vision-v1p4beta1 com.google.cloud google-cloud-vision-parent - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/pom.xml b/pom.xml index 192f043c9..a59a41090 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-vision-parent pom - 1.103.7 + 1.103.8-SNAPSHOT Google Cloud Vision Parent https://github.com/googleapis/java-vision @@ -61,57 +61,57 @@ com.google.api.grpc proto-google-cloud-vision-v1p4beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1 - 1.103.7 + 1.103.8-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p3beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 1.103.7 + 1.103.8-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p3beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p4beta1 - 0.86.7 + 0.86.8-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 1.103.7 + 1.103.8-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1 - 1.103.7 + 1.103.8-SNAPSHOT com.google.cloud google-cloud-vision - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/proto-google-cloud-vision-v1/pom.xml b/proto-google-cloud-vision-v1/pom.xml index 3e1065b3a..93f642bdf 100644 --- a/proto-google-cloud-vision-v1/pom.xml +++ b/proto-google-cloud-vision-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1 - 1.103.7 + 1.103.8-SNAPSHOT proto-google-cloud-vision-v1 PROTO library for proto-google-cloud-vision-v1 com.google.cloud google-cloud-vision-parent - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/proto-google-cloud-vision-v1p1beta1/pom.xml b/proto-google-cloud-vision-v1p1beta1/pom.xml index c1ec0bee4..a7039e3f7 100644 --- a/proto-google-cloud-vision-v1p1beta1/pom.xml +++ b/proto-google-cloud-vision-v1p1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.86.7 + 0.86.8-SNAPSHOT proto-google-cloud-vision-v1p1beta1 PROTO library for proto-google-cloud-vision-v1p1beta1 com.google.cloud google-cloud-vision-parent - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/proto-google-cloud-vision-v1p2beta1/pom.xml b/proto-google-cloud-vision-v1p2beta1/pom.xml index 8e7ed8312..2f20719aa 100644 --- a/proto-google-cloud-vision-v1p2beta1/pom.xml +++ b/proto-google-cloud-vision-v1p2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 1.103.7 + 1.103.8-SNAPSHOT proto-google-cloud-vision-v1p2beta1 PROTO library for proto-google-cloud-vision-v1p2beta1 com.google.cloud google-cloud-vision-parent - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/proto-google-cloud-vision-v1p3beta1/pom.xml b/proto-google-cloud-vision-v1p3beta1/pom.xml index 49640d5a7..995be837c 100644 --- a/proto-google-cloud-vision-v1p3beta1/pom.xml +++ b/proto-google-cloud-vision-v1p3beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p3beta1 - 0.86.7 + 0.86.8-SNAPSHOT proto-google-cloud-vision-v1p3beta1 PROTO library for proto-google-cloud-vision-v1p3beta1 com.google.cloud google-cloud-vision-parent - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/proto-google-cloud-vision-v1p4beta1/pom.xml b/proto-google-cloud-vision-v1p4beta1/pom.xml index 5b375bcb3..44589a447 100644 --- a/proto-google-cloud-vision-v1p4beta1/pom.xml +++ b/proto-google-cloud-vision-v1p4beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p4beta1 - 0.86.7 + 0.86.8-SNAPSHOT proto-google-cloud-vision-v1p4beta1 PROTO library for proto-google-cloud-vision-v1p4beta1 com.google.cloud google-cloud-vision-parent - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index a7ca235c0..390807e98 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-vision - 1.103.7 + 1.103.8-SNAPSHOT diff --git a/versions.txt b/versions.txt index f652a49ef..ea50be589 100644 --- a/versions.txt +++ b/versions.txt @@ -1,14 +1,14 @@ # Format: # module:released-version:current-version -proto-google-cloud-vision-v1p4beta1:0.86.7:0.86.7 -proto-google-cloud-vision-v1:1.103.7:1.103.7 -proto-google-cloud-vision-v1p1beta1:0.86.7:0.86.7 -proto-google-cloud-vision-v1p3beta1:0.86.7:0.86.7 -proto-google-cloud-vision-v1p2beta1:1.103.7:1.103.7 -grpc-google-cloud-vision-v1p3beta1:0.86.7:0.86.7 -grpc-google-cloud-vision-v1p1beta1:0.86.7:0.86.7 -grpc-google-cloud-vision-v1p4beta1:0.86.7:0.86.7 -grpc-google-cloud-vision-v1p2beta1:1.103.7:1.103.7 -grpc-google-cloud-vision-v1:1.103.7:1.103.7 -google-cloud-vision:1.103.7:1.103.7 \ No newline at end of file +proto-google-cloud-vision-v1p4beta1:0.86.7:0.86.8-SNAPSHOT +proto-google-cloud-vision-v1:1.103.7:1.103.8-SNAPSHOT +proto-google-cloud-vision-v1p1beta1:0.86.7:0.86.8-SNAPSHOT +proto-google-cloud-vision-v1p3beta1:0.86.7:0.86.8-SNAPSHOT +proto-google-cloud-vision-v1p2beta1:1.103.7:1.103.8-SNAPSHOT +grpc-google-cloud-vision-v1p3beta1:0.86.7:0.86.8-SNAPSHOT +grpc-google-cloud-vision-v1p1beta1:0.86.7:0.86.8-SNAPSHOT +grpc-google-cloud-vision-v1p4beta1:0.86.7:0.86.8-SNAPSHOT +grpc-google-cloud-vision-v1p2beta1:1.103.7:1.103.8-SNAPSHOT +grpc-google-cloud-vision-v1:1.103.7:1.103.8-SNAPSHOT +google-cloud-vision:1.103.7:1.103.8-SNAPSHOT \ No newline at end of file From 74b3c56ca61e9f154e8172ee76f8eaa5e9fbc6de Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 27 Jul 2021 22:50:28 +0200 Subject: [PATCH 03/17] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v0.13.1 (#588) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `0.12.0` -> `0.13.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.13.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.13.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.13.1/compatibility-slim/0.12.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/0.13.1/confidence-slim/0.12.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v0.13.1`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​0131-httpswwwgithubcomgoogleapisjava-shared-configcomparev0130v0131-2021-07-27) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.13.0...v0.13.1) ### [`v0.13.0`](https://togithub.com/googleapis/java-shared-config/releases/v0.13.0) ##### Features - add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#​264](https://www.github.com/googleapis/java-shared-config/issues/264)) ([d274af8](https://www.github.com/googleapis/java-shared-config/commit/d274af836ac9b3e98be84e551b7e9e552397ecc1)) ##### Bug Fixes - Add shopt -s nullglob to dependencies script ([865ca3c](https://www.github.com/googleapis/java-shared-config/commit/865ca3cbf106a7aaae1a989320a1ad5a47b6ffaf)) - Update dependencies.sh to not break on mac ([#​276](https://www.github.com/googleapis/java-shared-config/issues/276)) ([865ca3c](https://www.github.com/googleapis/java-shared-config/commit/865ca3cbf106a7aaae1a989320a1ad5a47b6ffaf)) ##### Dependencies - update auto-value-annotation.version to v1.8.2 ([#​275](https://www.github.com/googleapis/java-shared-config/issues/275)) ([4d15246](https://www.github.com/googleapis/java-shared-config/commit/4d152461a5592940a8be762c7a8698a02dbe26cf)) - update dependency com.puppycrawl.tools:checkstyle to v8.43 ([#​266](https://www.github.com/googleapis/java-shared-config/issues/266)) ([fae7961](https://www.github.com/googleapis/java-shared-config/commit/fae7961412b33e34e8fcfec78d1451894d4e61d9)) - update dependency com.puppycrawl.tools:checkstyle to v8.44 ([#​274](https://www.github.com/googleapis/java-shared-config/issues/274)) ([d53d0e0](https://www.github.com/googleapis/java-shared-config/commit/d53d0e0935e908d16f4e7cf763577cf3fd8128d3)) ***
--- ### Configuration 📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-vision). --- google-cloud-vision-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-vision-bom/pom.xml b/google-cloud-vision-bom/pom.xml index c6368c32c..9b3152326 100644 --- a/google-cloud-vision-bom/pom.xml +++ b/google-cloud-vision-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 0.12.0 + 0.13.1 Google Cloud Vision BOM diff --git a/pom.xml b/pom.xml index a59a41090..912e6b5ec 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.12.0 + 0.13.1 From 5ec7952599dc4fe119731d345ccb33b272bf3bb3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 28 Jul 2021 01:12:38 +0200 Subject: [PATCH 04/17] chore(deps): update dependency com.google.cloud:libraries-bom to v20.9.0 (#586) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.8.0` -> `20.9.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.9.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.9.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.9.0/compatibility-slim/20.8.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.9.0/confidence-slim/20.8.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-vision). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 5aba7910a..251df8658 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.8.0 + 20.9.0 pom import From b95dd43c6fabe757a304be43f4171d7d74a86412 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 28 Jul 2021 01:22:43 +0200 Subject: [PATCH 05/17] chore(deps): update dependency com.google.cloud:google-cloud-vision to v1.103.7 (#585) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-vision](https://togithub.com/googleapis/java-vision) | `1.103.6` -> `1.103.7` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-vision/1.103.7/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-vision/1.103.7/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-vision/1.103.7/compatibility-slim/1.103.6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-vision/1.103.7/confidence-slim/1.103.6)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-vision). --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 96441b1fd..2eecddf66 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-vision - 1.103.6 + 1.103.7 From 413fbe9f0f37a5d8c16cbb8e35b01e1d47e3255b Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 28 Jul 2021 08:56:36 -0700 Subject: [PATCH 06/17] chore: regenerate README (#589) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-07-27 20:55:34,047 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-vision/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-07-27 20:55:35,581 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/512896ca-cc4b-436b-9a34-a76b1b858c69/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 4 ++-- README.md | 21 +++++++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index c045bcafc..394629772 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-vision.git", - "sha": "e3adf9d43dc7e926e365b137466b24ca096a162e" + "sha": "74b3c56ca61e9f154e8172ee76f8eaa5e9fbc6de" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "82fe6d92bf9cf8a042a33234aa02343f73c12492" + "sha": "3d32990b6f4b57be77455e3ca89e6e21cd0c06b3" } } ] diff --git a/README.md b/README.md index c76c42a95..bc357fc34 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,11 @@ Java idiomatic client for [Cloud Vision][product-docs]. - [Product Documentation][product-docs] - [Client Library Documentation][javadocs] + ## Quickstart If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file + ```xml @@ -35,6 +37,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file If you are using Maven without BOM, add this to your dependencies: + ```xml com.google.cloud @@ -45,25 +48,32 @@ If you are using Maven without BOM, add this to your dependencies: ``` If you are using Gradle 5.x or later, add this to your dependencies + ```Groovy -implementation platform('com.google.cloud:libraries-bom:20.8.0') +implementation platform('com.google.cloud:libraries-bom:20.9.0') compile 'com.google.cloud:google-cloud-vision' ``` If you are using Gradle without BOM, add this to your dependencies + ```Groovy -compile 'com.google.cloud:google-cloud-vision:1.103.6' +compile 'com.google.cloud:google-cloud-vision:1.103.7' ``` If you are using SBT, add this to your dependencies + ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "1.103.6" +libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "1.103.7" ``` ## Authentication See the [Authentication][authentication] section in the base directory's README. +## Authorization + +The client application making API calls must be granted [authorization scopes][auth-scopes] required for the desired Cloud Vision APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the Cloud Vision API calls. + ## Getting Started ### Prerequisites @@ -204,6 +214,7 @@ and on [google-cloud-java][g-c-j]. This library follows [Semantic Versioning](http://semver.org/). + ## Contributing @@ -215,6 +226,7 @@ Please note that this project is released with a Contributor Code of Conduct. By this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information. + ## License Apache 2.0 - See [LICENSE][license] for more information. @@ -247,6 +259,9 @@ Java is a registered trademark of Oracle and/or its affiliates. [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-vision.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-vision&core=gav [authentication]: https://github.com/googleapis/google-cloud-java#authentication +[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes +[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles +[iam-policy]: https://cloud.google.com/iam/docs/overview#cloud-iam-policy [developer-console]: https://console.developers.google.com/ [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects [cloud-sdk]: https://cloud.google.com/sdk/ From 5b4a665cd14dc35ceb630ed479898560d18c0243 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 28 Jul 2021 09:06:43 -0700 Subject: [PATCH 07/17] chore: regenerate README (#590) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2021-07-28 15:59:02,754 synthtool [DEBUG] > Executing /root/.cache/synthtool/java-vision/.github/readme/synth.py. On branch autosynth-readme nothing to commit, working tree clean 2021-07-28 15:59:04,916 synthtool [DEBUG] > Wrote metadata to .github/readme/synth.metadata/synth.metadata. ```
Full log will be available here: https://source.cloud.google.com/results/invocations/875a0516-9f81-481f-9363-0eff0eef134d/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) --- .github/readme/synth.metadata/synth.metadata | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 394629772..1fca5f342 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-vision.git", - "sha": "74b3c56ca61e9f154e8172ee76f8eaa5e9fbc6de" + "sha": "413fbe9f0f37a5d8c16cbb8e35b01e1d47e3255b" } }, { diff --git a/README.md b/README.md index bc357fc34..8a03b2025 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 20.8.0 + 20.9.0 pom import @@ -42,7 +42,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-vision - 1.103.6 + 1.103.7 ``` From 2bae4cea7ead0a5a2b6b38d42b73e68074319ce7 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Thu, 29 Jul 2021 15:46:27 -0400 Subject: [PATCH 08/17] build: configure branch java7 as a release branch (#592) enable releases --- .github/release-please.yml | 5 ++ .github/sync-repo-settings.yaml | 82 +++++++++++++++------------------ 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 8ca7f9cab..7bf580765 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,3 +1,8 @@ bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi +branches: + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-yoshi + branch: java7 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 6bddd18ea..d3ce755af 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -1,49 +1,43 @@ - -# Whether or not rebase-merging is enabled on this repository. -# Defaults to `true` rebaseMergeAllowed: false - -# Whether or not squash-merging is enabled on this repository. -# Defaults to `true` squashMergeAllowed: true - -# Whether or not PRs are merged with a merge commit on this repository. -# Defaults to `false` mergeCommitAllowed: false - -# Rules for master branch protection branchProtectionRules: -# Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` -- pattern: master - # Can admins overwrite branch protection. - # Defaults to `true` - isAdminEnforced: true - # Number of approving reviews required to update matching branches. - # Defaults to `1` - requiredApprovingReviewCount: 1 - # Are reviews from code owners required to update matching branches. - # Defaults to `false` - requiresCodeOwnerReviews: true - # Require up to date branches - requiresStrictStatusChecks: false - # List of required status check contexts that must pass for commits to be accepted to matching branches. - requiredStatusCheckContexts: - - "dependencies (8)" - - "dependencies (11)" - - "linkage-monitor" - - "lint" - - "clirr" - - "units (7)" - - "units (8)" - - "units (11)" - - "Kokoro - Test: Integration" - - "cla/google" -# List of explicit permissions to add (additive only) + - pattern: master + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (7) + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - pattern: java7 + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (7) + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google permissionRules: -- team: yoshi-admins - permission: admin -- team: yoshi-java-admins - permission: admin -- team: yoshi-java - permission: push \ No newline at end of file + - team: yoshi-admins + permission: admin + - team: yoshi-java-admins + permission: admin + - team: yoshi-java + permission: push From f6744133dad24036372685f1c9bcc23f41ccef90 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 4 Aug 2021 23:57:06 +0200 Subject: [PATCH 09/17] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1 (#595) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `0.13.1` -> `1.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.0/compatibility-slim/0.13.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.0.0/confidence-slim/0.13.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.0.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​100-httpswwwgithubcomgoogleapisjava-shared-configcomparev0131v100-2021-07-29) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v0.13.1...v1.0.0) ##### âš  BREAKING CHANGES - update shared-config to java 1.8 ([#​277](https://togithub.com/googleapis/java-shared-config/issues/277)) ##### Features - update shared-config to java 1.8 ([#​277](https://www.github.com/googleapis/java-shared-config/issues/277)) ([9c297a2](https://www.github.com/googleapis/java-shared-config/commit/9c297a27bc236092aab3ae292c7bed206293bc51)) ##### [0.13.1](https://www.github.com/googleapis/java-shared-config/compare/v0.13.0...v0.13.1) (2021-07-27) ##### Bug Fixes - revert update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.2.0 ([#​280](https://www.github.com/googleapis/java-shared-config/issues/280)) ([bdbbb9c](https://www.github.com/googleapis/java-shared-config/commit/bdbbb9c13571d0ef06009ebf03bc25c6e6fcbc17))
--- ### Configuration 📅 **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-vision). --- google-cloud-vision-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-vision-bom/pom.xml b/google-cloud-vision-bom/pom.xml index 9b3152326..dac2697ce 100644 --- a/google-cloud-vision-bom/pom.xml +++ b/google-cloud-vision-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 0.13.1 + 1.0.0 Google Cloud Vision BOM diff --git a/pom.xml b/pom.xml index 912e6b5ec..49cd88c95 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.13.1 + 1.0.0 From 1f876443df624c3080c5ccdb034e7b08d216243a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 5 Aug 2021 09:32:23 -0700 Subject: [PATCH 10/17] chore: remove java 7 units check (#591) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/f647946a-1a60-44a8-80e4-5483535a0e7e/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/1a2878d6909dd10ca4e3c1b5943d6622e996054e --- .github/workflows/ci.yaml | 2 +- synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0195b32f0..65ae6ecdd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [7, 8, 11] + java: [8, 11] steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 diff --git a/synth.metadata b/synth.metadata index 43f685902..bda9abc27 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-vision.git", - "sha": "f3b1dc522c35445bc37dddd985adff1d17603352" + "sha": "5b4a665cd14dc35ceb630ed479898560d18c0243" } }, { @@ -51,7 +51,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5d3c52f5db664eee9026db76b5bcb466f3a09ca9" + "sha": "1a2878d6909dd10ca4e3c1b5943d6622e996054e" } } ], From 747c5a0a3fa7bca745d6d7aff4d4ecf7f91ac87a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 6 Aug 2021 11:06:09 -0700 Subject: [PATCH 11/17] feat!: release gapic-generator-java v2.0.0 (#600) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/2a082ef0-c330-4a6e-9973-9c369e5572b8/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) PiperOrigin-RevId: 388535346 Source-Link: https://github.com/googleapis/googleapis/commit/d9eaf41de44d953458b18712a3f240bb4c564e48 PiperOrigin-RevId: 388499329 Source-Link: https://github.com/googleapis/googleapis/commit/bb0a090d9204110042ab5dee2ce9e06e8071ce54 --- .../vision/v1/ImageAnnotatorSettings.java | 3 +- .../cloud/vision/v1/ProductSearchClient.java | 29 +-- .../vision/v1/ProductSearchSettings.java | 3 +- .../v1/stub/GrpcImageAnnotatorStub.java | 54 ++--- .../vision/v1/stub/GrpcProductSearchStub.java | 221 +++++++----------- .../v1/stub/ImageAnnotatorStubSettings.java | 3 +- .../v1/stub/ProductSearchStubSettings.java | 3 +- .../v1p1beta1/ImageAnnotatorSettings.java | 3 +- .../stub/GrpcImageAnnotatorStub.java | 8 +- .../stub/ImageAnnotatorStubSettings.java | 3 +- .../v1p2beta1/ImageAnnotatorSettings.java | 3 +- .../stub/GrpcImageAnnotatorStub.java | 8 +- .../stub/ImageAnnotatorStubSettings.java | 3 +- .../v1p3beta1/ImageAnnotatorSettings.java | 3 +- .../vision/v1p3beta1/ProductSearchClient.java | 29 +-- .../v1p3beta1/ProductSearchSettings.java | 3 +- .../stub/GrpcImageAnnotatorStub.java | 8 +- .../v1p3beta1/stub/GrpcProductSearchStub.java | 210 +++++++---------- .../stub/ImageAnnotatorStubSettings.java | 3 +- .../stub/ProductSearchStubSettings.java | 3 +- .../v1p4beta1/ImageAnnotatorSettings.java | 3 +- .../vision/v1p4beta1/ProductSearchClient.java | 29 +-- .../v1p4beta1/ProductSearchSettings.java | 3 +- .../stub/GrpcImageAnnotatorStub.java | 8 +- .../v1p4beta1/stub/GrpcProductSearchStub.java | 221 +++++++----------- .../stub/ImageAnnotatorStubSettings.java | 3 +- .../stub/ProductSearchStubSettings.java | 3 +- synth.metadata | 22 +- 28 files changed, 335 insertions(+), 560 deletions(-) diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java index df14ac406..17160ba9d 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java @@ -193,14 +193,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() { return ((ImageAnnotatorStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java index 634b7b70e..5ecec5677 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchClient.java @@ -16,7 +16,6 @@ package com.google.cloud.vision.v1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -3300,12 +3299,7 @@ public static ApiFuture createAsync( ListProductSetsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListProductSetsPagedResponse apply(ListProductSetsPage input) { - return new ListProductSetsPagedResponse(input); - } - }, + input -> new ListProductSetsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3382,12 +3376,7 @@ public static ApiFuture createAsync( ListProductsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListProductsPagedResponse apply(ListProductsPage input) { - return new ListProductsPagedResponse(input); - } - }, + input -> new ListProductsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3463,12 +3452,7 @@ public static ApiFuture createAsync( ListReferenceImagesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListReferenceImagesPagedResponse apply(ListReferenceImagesPage input) { - return new ListReferenceImagesPagedResponse(input); - } - }, + input -> new ListReferenceImagesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3552,12 +3536,7 @@ public static ApiFuture createAsync( ListProductsInProductSetPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListProductsInProductSetPagedResponse apply(ListProductsInProductSetPage input) { - return new ListProductsInProductSetPagedResponse(input); - } - }, + input -> new ListProductsInProductSetPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java index a42d214be..e6dc55fe6 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ProductSearchSettings.java @@ -278,14 +278,13 @@ public ProductSearchStubSettings.Builder getStubSettingsBuilder() { return ((ProductSearchStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java index 0d9a56a6f..6eff5ee22 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcImageAnnotatorStub.java @@ -22,7 +22,6 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.OperationCallable; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest; import com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse; @@ -39,7 +38,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -157,13 +155,10 @@ protected GrpcImageAnnotatorStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(batchAnnotateImagesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchAnnotateImagesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -171,13 +166,10 @@ public Map extract(BatchAnnotateImagesRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(batchAnnotateFilesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchAnnotateFilesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -185,13 +177,10 @@ public Map extract(BatchAnnotateFilesRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(asyncBatchAnnotateImagesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(AsyncBatchAnnotateImagesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -199,13 +188,10 @@ public Map extract(AsyncBatchAnnotateImagesRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(asyncBatchAnnotateFilesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(AsyncBatchAnnotateFilesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); @@ -290,7 +276,13 @@ public GrpcOperationsStub getOperationsStub() { @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java index 260d33659..5eaac41fc 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/GrpcProductSearchStub.java @@ -27,7 +27,6 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.OperationCallable; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.vision.v1.AddProductToProductSetRequest; import com.google.cloud.vision.v1.BatchOperationMetadata; @@ -64,7 +63,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -352,13 +350,10 @@ protected GrpcProductSearchStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -366,118 +361,90 @@ public Map extract(CreateProductSetRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listProductSetsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListProductSetsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "product_set.name", String.valueOf(request.getProductSet().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("product_set.name", String.valueOf(request.getProductSet().getName())); + return params.build(); }) .build(); GrpcCallSettings deleteProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings createProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings listProductsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listProductsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListProductsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("product.name", String.valueOf(request.getProduct().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("product.name", String.valueOf(request.getProduct().getName())); + return params.build(); }) .build(); GrpcCallSettings deleteProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -485,26 +452,20 @@ public Map extract(DeleteProductRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createReferenceImageMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateReferenceImageRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings deleteReferenceImageTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteReferenceImageMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteReferenceImageRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -512,39 +473,30 @@ public Map extract(DeleteReferenceImageRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listReferenceImagesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListReferenceImagesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getReferenceImageTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getReferenceImageMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetReferenceImageRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings addProductToProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(addProductToProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(AddProductToProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -552,14 +504,10 @@ public Map extract(AddProductToProductSetRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(removeProductFromProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - RemoveProductFromProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -568,39 +516,30 @@ public Map extract( .newBuilder() .setMethodDescriptor(listProductsInProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListProductsInProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings importProductSetsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(importProductSetsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ImportProductSetsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings purgeProductsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(purgeProductsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(PurgeProductsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); @@ -850,7 +789,13 @@ public UnaryCallable purgeProductsCallable() { @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java index 9ec3cc875..8681b4bcc 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ImageAnnotatorStubSettings.java @@ -412,14 +412,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java index d8fc18247..f809d2ac4 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/stub/ProductSearchStubSettings.java @@ -982,14 +982,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java index 03965d482..167e721b9 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorSettings.java @@ -158,14 +158,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() { return ((ImageAnnotatorStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java index 2579fd8c1..251f45c95 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/GrpcImageAnnotatorStub.java @@ -127,7 +127,13 @@ public GrpcOperationsStub getOperationsStub() { @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java index daadc1a09..68ea7e3e8 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p1beta1/stub/ImageAnnotatorStubSettings.java @@ -253,14 +253,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java index 1ea4e1c1b..5a01dcec9 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorSettings.java @@ -174,14 +174,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() { return ((ImageAnnotatorStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java index d4ec7b72d..7a2f78b4a 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/GrpcImageAnnotatorStub.java @@ -177,7 +177,13 @@ public GrpcOperationsStub getOperationsStub() { @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java index c6851e9dd..bbec54696 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p2beta1/stub/ImageAnnotatorStubSettings.java @@ -324,14 +324,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java index e1a75a263..0d72ff62b 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorSettings.java @@ -174,14 +174,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() { return ((ImageAnnotatorStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java index 3f091dd4d..aa2c72308 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchClient.java @@ -16,7 +16,6 @@ package com.google.cloud.vision.v1p3beta1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -2987,12 +2986,7 @@ public static ApiFuture createAsync( ListProductSetsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListProductSetsPagedResponse apply(ListProductSetsPage input) { - return new ListProductSetsPagedResponse(input); - } - }, + input -> new ListProductSetsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3069,12 +3063,7 @@ public static ApiFuture createAsync( ListProductsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListProductsPagedResponse apply(ListProductsPage input) { - return new ListProductsPagedResponse(input); - } - }, + input -> new ListProductsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3150,12 +3139,7 @@ public static ApiFuture createAsync( ListReferenceImagesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListReferenceImagesPagedResponse apply(ListReferenceImagesPage input) { - return new ListReferenceImagesPagedResponse(input); - } - }, + input -> new ListReferenceImagesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3239,12 +3223,7 @@ public static ApiFuture createAsync( ListProductsInProductSetPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListProductsInProductSetPagedResponse apply(ListProductsInProductSetPage input) { - return new ListProductsInProductSetPagedResponse(input); - } - }, + input -> new ListProductsInProductSetPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java index bbc6ed14d..270cd78be 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchSettings.java @@ -268,14 +268,13 @@ public ProductSearchStubSettings.Builder getStubSettingsBuilder() { return ((ProductSearchStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java index a569566d0..b4044b61e 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcImageAnnotatorStub.java @@ -177,7 +177,13 @@ public GrpcOperationsStub getOperationsStub() { @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.java index 3569f2903..7943bb7d5 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/GrpcProductSearchStub.java @@ -28,7 +28,6 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.OperationCallable; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest; import com.google.cloud.vision.v1p3beta1.BatchOperationMetadata; @@ -64,7 +63,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -343,13 +341,10 @@ protected GrpcProductSearchStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -357,118 +352,90 @@ public Map extract(CreateProductSetRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listProductSetsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListProductSetsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "product_set.name", String.valueOf(request.getProductSet().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("product_set.name", String.valueOf(request.getProductSet().getName())); + return params.build(); }) .build(); GrpcCallSettings deleteProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings createProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings listProductsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listProductsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListProductsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("product.name", String.valueOf(request.getProduct().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("product.name", String.valueOf(request.getProduct().getName())); + return params.build(); }) .build(); GrpcCallSettings deleteProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -476,26 +443,20 @@ public Map extract(DeleteProductRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createReferenceImageMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateReferenceImageRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings deleteReferenceImageTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteReferenceImageMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteReferenceImageRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -503,39 +464,30 @@ public Map extract(DeleteReferenceImageRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listReferenceImagesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListReferenceImagesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getReferenceImageTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getReferenceImageMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetReferenceImageRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings addProductToProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(addProductToProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(AddProductToProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -543,14 +495,10 @@ public Map extract(AddProductToProductSetRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(removeProductFromProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - RemoveProductFromProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -559,26 +507,20 @@ public Map extract( .newBuilder() .setMethodDescriptor(listProductsInProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListProductsInProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings importProductSetsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(importProductSetsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ImportProductSetsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); @@ -808,7 +750,13 @@ public UnaryCallable importProductSetsCalla @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ImageAnnotatorStubSettings.java index 4dce5c7b5..5acfa9bf5 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ImageAnnotatorStubSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ImageAnnotatorStubSettings.java @@ -337,14 +337,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ProductSearchStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ProductSearchStubSettings.java index ac35e3916..ff6b4bc8d 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ProductSearchStubSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p3beta1/stub/ProductSearchStubSettings.java @@ -928,14 +928,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorSettings.java index 43afbf998..97a284097 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ImageAnnotatorSettings.java @@ -194,14 +194,13 @@ public ImageAnnotatorStubSettings.Builder getStubSettingsBuilder() { return ((ImageAnnotatorStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchClient.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchClient.java index 0fd275c4f..3b0f6569e 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchClient.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchClient.java @@ -16,7 +16,6 @@ package com.google.cloud.vision.v1p4beta1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -3105,12 +3104,7 @@ public static ApiFuture createAsync( ListProductSetsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListProductSetsPagedResponse apply(ListProductSetsPage input) { - return new ListProductSetsPagedResponse(input); - } - }, + input -> new ListProductSetsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3187,12 +3181,7 @@ public static ApiFuture createAsync( ListProductsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListProductsPagedResponse apply(ListProductsPage input) { - return new ListProductsPagedResponse(input); - } - }, + input -> new ListProductsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3268,12 +3257,7 @@ public static ApiFuture createAsync( ListReferenceImagesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListReferenceImagesPagedResponse apply(ListReferenceImagesPage input) { - return new ListReferenceImagesPagedResponse(input); - } - }, + input -> new ListReferenceImagesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -3357,12 +3341,7 @@ public static ApiFuture createAsync( ListProductsInProductSetPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListProductsInProductSetPagedResponse apply(ListProductsInProductSetPage input) { - return new ListProductsInProductSetPagedResponse(input); - } - }, + input -> new ListProductsInProductSetPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchSettings.java index b47b32fb9..e0ec4a1cf 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/ProductSearchSettings.java @@ -279,14 +279,13 @@ public ProductSearchStubSettings.Builder getStubSettingsBuilder() { return ((ProductSearchStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcImageAnnotatorStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcImageAnnotatorStub.java index b642a5127..180a7ac35 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcImageAnnotatorStub.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcImageAnnotatorStub.java @@ -255,7 +255,13 @@ public GrpcOperationsStub getOperationsStub() { @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcProductSearchStub.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcProductSearchStub.java index 2ec3e6756..6e85bd3b4 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcProductSearchStub.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/GrpcProductSearchStub.java @@ -28,7 +28,6 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.OperationCallable; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.vision.v1p4beta1.AddProductToProductSetRequest; import com.google.cloud.vision.v1p4beta1.BatchOperationMetadata; @@ -65,7 +64,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -357,13 +355,10 @@ protected GrpcProductSearchStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(createProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -371,118 +366,90 @@ public Map extract(CreateProductSetRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listProductSetsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListProductSetsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "product_set.name", String.valueOf(request.getProductSet().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("product_set.name", String.valueOf(request.getProductSet().getName())); + return params.build(); }) .build(); GrpcCallSettings deleteProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings createProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings listProductsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listProductsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListProductsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("product.name", String.valueOf(request.getProduct().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("product.name", String.valueOf(request.getProduct().getName())); + return params.build(); }) .build(); GrpcCallSettings deleteProductTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteProductMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteProductRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -490,26 +457,20 @@ public Map extract(DeleteProductRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createReferenceImageMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateReferenceImageRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings deleteReferenceImageTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteReferenceImageMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteReferenceImageRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -517,39 +478,30 @@ public Map extract(DeleteReferenceImageRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listReferenceImagesMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListReferenceImagesRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getReferenceImageTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getReferenceImageMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetReferenceImageRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings addProductToProductSetTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(addProductToProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(AddProductToProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -557,14 +509,10 @@ public Map extract(AddProductToProductSetRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(removeProductFromProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - RemoveProductFromProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -573,39 +521,30 @@ public Map extract( .newBuilder() .setMethodDescriptor(listProductsInProductSetMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListProductsInProductSetRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings importProductSetsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(importProductSetsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ImportProductSetsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings purgeProductsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(purgeProductsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(PurgeProductsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); @@ -855,7 +794,13 @@ public UnaryCallable purgeProductsCallable() { @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ImageAnnotatorStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ImageAnnotatorStubSettings.java index 134dfe11b..9781ac9eb 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ImageAnnotatorStubSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ImageAnnotatorStubSettings.java @@ -410,14 +410,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ProductSearchStubSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ProductSearchStubSettings.java index 57875b9c5..c6690c103 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ProductSearchStubSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1p4beta1/stub/ProductSearchStubSettings.java @@ -986,14 +986,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/synth.metadata b/synth.metadata index bda9abc27..2b29e0fe0 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,47 +4,47 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-vision.git", - "sha": "5b4a665cd14dc35ceb630ed479898560d18c0243" + "sha": "2bae4cea7ead0a5a2b6b38d42b73e68074319ce7" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "551681f25e36b11829e87e580281350461f4f3f5", - "internalRef": "379784268" + "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48", + "internalRef": "388535346" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "551681f25e36b11829e87e580281350461f4f3f5", - "internalRef": "379784268" + "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48", + "internalRef": "388535346" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "551681f25e36b11829e87e580281350461f4f3f5", - "internalRef": "379784268" + "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48", + "internalRef": "388535346" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "551681f25e36b11829e87e580281350461f4f3f5", - "internalRef": "379784268" + "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48", + "internalRef": "388535346" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "551681f25e36b11829e87e580281350461f4f3f5", - "internalRef": "379784268" + "sha": "d9eaf41de44d953458b18712a3f240bb4c564e48", + "internalRef": "388535346" } }, { From 71e344630d964ddfe806abcc7be81d5cb33d6ea3 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Fri, 6 Aug 2021 14:48:04 -0400 Subject: [PATCH 12/17] chore: remove java7 units check from required checks in master (#603) --- .github/sync-repo-settings.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index d3ce755af..7dd5c3765 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -13,7 +13,6 @@ branchProtectionRules: - linkage-monitor - lint - clirr - - units (7) - units (8) - units (11) - 'Kokoro - Test: Integration' From 17db6ea599e5929a8e487c8867e67d38f4ae8b28 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 6 Aug 2021 20:48:21 +0200 Subject: [PATCH 13/17] deps: update dependency com.google.cloud:google-cloud-core to v2 (#599) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 2eecddf66..4c21d4869 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -62,7 +62,7 @@ com.google.cloud google-cloud-core - 1.95.4 + 2.0.2 test tests diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 390807e98..64451e76e 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -62,7 +62,7 @@ com.google.cloud google-cloud-core - 1.95.4 + 2.0.2 test tests diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 251df8658..73b5ef89c 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -66,7 +66,7 @@ com.google.cloud google-cloud-core - 1.95.4 + 2.0.2 test tests From 34ea73f3dcd71027a3bf92eae32bbc78126fef77 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 6 Aug 2021 20:48:46 +0200 Subject: [PATCH 14/17] deps: update dependency org.apache.commons:commons-csv to v1.9.0 (#598) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 4c21d4869..134f356cf 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -45,7 +45,7 @@ org.apache.commons commons-csv - 1.8 + 1.9.0 junit diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 64451e76e..9aff94b76 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -45,7 +45,7 @@ org.apache.commons commons-csv - 1.8 + 1.9.0 junit diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 73b5ef89c..7c40ac534 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -55,7 +55,7 @@ org.apache.commons commons-csv - 1.8 + 1.9.0 junit From fe58ac2fbc0166bad26b90b5a64145fa02350838 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 10 Aug 2021 21:26:45 +0200 Subject: [PATCH 15/17] deps: update dependency com.google.cloud:google-cloud-storage to v2 (#606) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 134f356cf..49505367e 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -35,7 +35,7 @@ com.google.cloud google-cloud-storage - 1.118.0 + 2.0.0 net.sourceforge.argparse4j diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 9aff94b76..786f136a8 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -35,7 +35,7 @@ com.google.cloud google-cloud-storage - 1.118.0 + 2.0.0 net.sourceforge.argparse4j From 140c5d301978975874b7c68e14a7ff51279a03e9 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 10 Aug 2021 15:43:33 -0400 Subject: [PATCH 16/17] chore: fix checker-qual (#608) * deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2 * chore: fix checker-qual issue Co-authored-by: Renovate Bot --- google-cloud-vision/pom.xml | 6 ++++++ pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/google-cloud-vision/pom.xml b/google-cloud-vision/pom.xml index 5c232c78a..c30174ea2 100644 --- a/google-cloud-vision/pom.xml +++ b/google-cloud-vision/pom.xml @@ -120,6 +120,12 @@ truth 1.1.3 test + + + org.checkerframework + checker-qual + + diff --git a/pom.xml b/pom.xml index 49cd88c95..0b7005b3d 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ com.google.cloud google-cloud-shared-dependencies - 1.4.0 + 2.0.0 pom import From 16580329921864f50016a91a75e86fa89243dc9b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 10 Aug 2021 19:50:11 +0000 Subject: [PATCH 17/17] chore: release 2.0.0 (#604) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release \*beep\* \*boop\* --- ## [2.0.0](https://www.github.com/googleapis/java-vision/compare/v1.113.7...v2.0.0) (2021-08-10) ### âš  BREAKING CHANGES * release gapic-generator-java v2.0.0 (#600) ### Features * release gapic-generator-java v2.0.0 ([#600](https://www.github.com/googleapis/java-vision/issues/600)) ([747c5a0](https://www.github.com/googleapis/java-vision/commit/747c5a0a3fa7bca745d6d7aff4d4ecf7f91ac87a)) ### Dependencies * update dependency com.google.cloud:google-cloud-core to v2 ([#599](https://www.github.com/googleapis/java-vision/issues/599)) ([17db6ea](https://www.github.com/googleapis/java-vision/commit/17db6ea599e5929a8e487c8867e67d38f4ae8b28)) * update dependency com.google.cloud:google-cloud-storage to v2 ([#606](https://www.github.com/googleapis/java-vision/issues/606)) ([fe58ac2](https://www.github.com/googleapis/java-vision/commit/fe58ac2fbc0166bad26b90b5a64145fa02350838)) * update dependency org.apache.commons:commons-csv to v1.9.0 ([#598](https://www.github.com/googleapis/java-vision/issues/598)) ([34ea73f](https://www.github.com/googleapis/java-vision/commit/34ea73f3dcd71027a3bf92eae32bbc78126fef77)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 18 ++++++++++++++++ google-cloud-vision-bom/pom.xml | 24 ++++++++++----------- google-cloud-vision/pom.xml | 4 ++-- grpc-google-cloud-vision-v1/pom.xml | 4 ++-- grpc-google-cloud-vision-v1p1beta1/pom.xml | 4 ++-- grpc-google-cloud-vision-v1p2beta1/pom.xml | 4 ++-- grpc-google-cloud-vision-v1p3beta1/pom.xml | 4 ++-- grpc-google-cloud-vision-v1p4beta1/pom.xml | 4 ++-- pom.xml | 24 ++++++++++----------- proto-google-cloud-vision-v1/pom.xml | 4 ++-- proto-google-cloud-vision-v1p1beta1/pom.xml | 4 ++-- proto-google-cloud-vision-v1p2beta1/pom.xml | 4 ++-- proto-google-cloud-vision-v1p3beta1/pom.xml | 4 ++-- proto-google-cloud-vision-v1p4beta1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 22 +++++++++---------- 16 files changed, 76 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5ecf7c05..98d48b102 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## [2.0.0](https://www.github.com/googleapis/java-vision/compare/v1.113.7...v2.0.0) (2021-08-10) + + +### âš  BREAKING CHANGES + +* release gapic-generator-java v2.0.0 (#600) + +### Features + +* release gapic-generator-java v2.0.0 ([#600](https://www.github.com/googleapis/java-vision/issues/600)) ([747c5a0](https://www.github.com/googleapis/java-vision/commit/747c5a0a3fa7bca745d6d7aff4d4ecf7f91ac87a)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-core to v2 ([#599](https://www.github.com/googleapis/java-vision/issues/599)) ([17db6ea](https://www.github.com/googleapis/java-vision/commit/17db6ea599e5929a8e487c8867e67d38f4ae8b28)) +* update dependency com.google.cloud:google-cloud-storage to v2 ([#606](https://www.github.com/googleapis/java-vision/issues/606)) ([fe58ac2](https://www.github.com/googleapis/java-vision/commit/fe58ac2fbc0166bad26b90b5a64145fa02350838)) +* update dependency org.apache.commons:commons-csv to v1.9.0 ([#598](https://www.github.com/googleapis/java-vision/issues/598)) ([34ea73f](https://www.github.com/googleapis/java-vision/commit/34ea73f3dcd71027a3bf92eae32bbc78126fef77)) + ### [1.113.7](https://www.github.com/googleapis/java-vision/compare/v1.113.6...v1.113.7) (2021-07-22) diff --git a/google-cloud-vision-bom/pom.xml b/google-cloud-vision-bom/pom.xml index dac2697ce..d9a49c284 100644 --- a/google-cloud-vision-bom/pom.xml +++ b/google-cloud-vision-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-vision-bom - 1.103.8-SNAPSHOT + 2.0.0 pom com.google.cloud @@ -54,57 +54,57 @@ com.google.api.grpc proto-google-cloud-vision-v1p4beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.cloud google-cloud-vision - 1.103.8-SNAPSHOT + 2.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p3beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.api.grpc proto-google-cloud-vision-v1 - 1.103.8-SNAPSHOT + 2.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.api.grpc proto-google-cloud-vision-v1p3beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.api.grpc grpc-google-cloud-vision-v1p4beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 1.103.8-SNAPSHOT + 2.0.0 com.google.api.grpc grpc-google-cloud-vision-v1 - 1.103.8-SNAPSHOT + 2.0.0 com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/google-cloud-vision/pom.xml b/google-cloud-vision/pom.xml index c30174ea2..531396698 100644 --- a/google-cloud-vision/pom.xml +++ b/google-cloud-vision/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-vision - 1.103.8-SNAPSHOT + 2.0.0 jar Google Cloud Vision https://github.com/googleapis/java-vision @@ -11,7 +11,7 @@ com.google.cloud google-cloud-vision-parent - 1.103.8-SNAPSHOT + 2.0.0 google-cloud-vision diff --git a/grpc-google-cloud-vision-v1/pom.xml b/grpc-google-cloud-vision-v1/pom.xml index be459c806..a93d815b0 100644 --- a/grpc-google-cloud-vision-v1/pom.xml +++ b/grpc-google-cloud-vision-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1 - 1.103.8-SNAPSHOT + 2.0.0 grpc-google-cloud-vision-v1 GRPC library for grpc-google-cloud-vision-v1 com.google.cloud google-cloud-vision-parent - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/grpc-google-cloud-vision-v1p1beta1/pom.xml b/grpc-google-cloud-vision-v1p1beta1/pom.xml index a50e56742..b8e7dd42c 100644 --- a/grpc-google-cloud-vision-v1p1beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.86.8-SNAPSHOT + 0.87.0 grpc-google-cloud-vision-v1p1beta1 GRPC library for grpc-google-cloud-vision-v1p1beta1 com.google.cloud google-cloud-vision-parent - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/grpc-google-cloud-vision-v1p2beta1/pom.xml b/grpc-google-cloud-vision-v1p2beta1/pom.xml index 071ead079..d6be3c319 100644 --- a/grpc-google-cloud-vision-v1p2beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 1.103.8-SNAPSHOT + 2.0.0 grpc-google-cloud-vision-v1p2beta1 GRPC library for grpc-google-cloud-vision-v1p2beta1 com.google.cloud google-cloud-vision-parent - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/grpc-google-cloud-vision-v1p3beta1/pom.xml b/grpc-google-cloud-vision-v1p3beta1/pom.xml index bc648874d..9f52555ce 100644 --- a/grpc-google-cloud-vision-v1p3beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p3beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p3beta1 - 0.86.8-SNAPSHOT + 0.87.0 grpc-google-cloud-vision-v1p3beta1 GRPC library for grpc-google-cloud-vision-v1p3beta1 com.google.cloud google-cloud-vision-parent - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/grpc-google-cloud-vision-v1p4beta1/pom.xml b/grpc-google-cloud-vision-v1p4beta1/pom.xml index 51f54b199..18a9d911f 100644 --- a/grpc-google-cloud-vision-v1p4beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p4beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p4beta1 - 0.86.8-SNAPSHOT + 0.87.0 grpc-google-cloud-vision-v1p4beta1 GRPC library for grpc-google-cloud-vision-v1p4beta1 com.google.cloud google-cloud-vision-parent - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/pom.xml b/pom.xml index 0b7005b3d..867544bf8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-vision-parent pom - 1.103.8-SNAPSHOT + 2.0.0 Google Cloud Vision Parent https://github.com/googleapis/java-vision @@ -61,57 +61,57 @@ com.google.api.grpc proto-google-cloud-vision-v1p4beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.api.grpc proto-google-cloud-vision-v1 - 1.103.8-SNAPSHOT + 2.0.0 com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.api.grpc proto-google-cloud-vision-v1p3beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 1.103.8-SNAPSHOT + 2.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p3beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.api.grpc grpc-google-cloud-vision-v1p4beta1 - 0.86.8-SNAPSHOT + 0.87.0 com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 1.103.8-SNAPSHOT + 2.0.0 com.google.api.grpc grpc-google-cloud-vision-v1 - 1.103.8-SNAPSHOT + 2.0.0 com.google.cloud google-cloud-vision - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/proto-google-cloud-vision-v1/pom.xml b/proto-google-cloud-vision-v1/pom.xml index 93f642bdf..57fd6a1da 100644 --- a/proto-google-cloud-vision-v1/pom.xml +++ b/proto-google-cloud-vision-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1 - 1.103.8-SNAPSHOT + 2.0.0 proto-google-cloud-vision-v1 PROTO library for proto-google-cloud-vision-v1 com.google.cloud google-cloud-vision-parent - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/proto-google-cloud-vision-v1p1beta1/pom.xml b/proto-google-cloud-vision-v1p1beta1/pom.xml index a7039e3f7..9372cf642 100644 --- a/proto-google-cloud-vision-v1p1beta1/pom.xml +++ b/proto-google-cloud-vision-v1p1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.86.8-SNAPSHOT + 0.87.0 proto-google-cloud-vision-v1p1beta1 PROTO library for proto-google-cloud-vision-v1p1beta1 com.google.cloud google-cloud-vision-parent - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/proto-google-cloud-vision-v1p2beta1/pom.xml b/proto-google-cloud-vision-v1p2beta1/pom.xml index 2f20719aa..9cdd9c719 100644 --- a/proto-google-cloud-vision-v1p2beta1/pom.xml +++ b/proto-google-cloud-vision-v1p2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 1.103.8-SNAPSHOT + 2.0.0 proto-google-cloud-vision-v1p2beta1 PROTO library for proto-google-cloud-vision-v1p2beta1 com.google.cloud google-cloud-vision-parent - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/proto-google-cloud-vision-v1p3beta1/pom.xml b/proto-google-cloud-vision-v1p3beta1/pom.xml index 995be837c..87bfe6141 100644 --- a/proto-google-cloud-vision-v1p3beta1/pom.xml +++ b/proto-google-cloud-vision-v1p3beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p3beta1 - 0.86.8-SNAPSHOT + 0.87.0 proto-google-cloud-vision-v1p3beta1 PROTO library for proto-google-cloud-vision-v1p3beta1 com.google.cloud google-cloud-vision-parent - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/proto-google-cloud-vision-v1p4beta1/pom.xml b/proto-google-cloud-vision-v1p4beta1/pom.xml index 44589a447..c65301240 100644 --- a/proto-google-cloud-vision-v1p4beta1/pom.xml +++ b/proto-google-cloud-vision-v1p4beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p4beta1 - 0.86.8-SNAPSHOT + 0.87.0 proto-google-cloud-vision-v1p4beta1 PROTO library for proto-google-cloud-vision-v1p4beta1 com.google.cloud google-cloud-vision-parent - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 786f136a8..c1a85a78a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-vision - 1.103.8-SNAPSHOT + 2.0.0 diff --git a/versions.txt b/versions.txt index ea50be589..7c68a6d6d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,14 +1,14 @@ # Format: # module:released-version:current-version -proto-google-cloud-vision-v1p4beta1:0.86.7:0.86.8-SNAPSHOT -proto-google-cloud-vision-v1:1.103.7:1.103.8-SNAPSHOT -proto-google-cloud-vision-v1p1beta1:0.86.7:0.86.8-SNAPSHOT -proto-google-cloud-vision-v1p3beta1:0.86.7:0.86.8-SNAPSHOT -proto-google-cloud-vision-v1p2beta1:1.103.7:1.103.8-SNAPSHOT -grpc-google-cloud-vision-v1p3beta1:0.86.7:0.86.8-SNAPSHOT -grpc-google-cloud-vision-v1p1beta1:0.86.7:0.86.8-SNAPSHOT -grpc-google-cloud-vision-v1p4beta1:0.86.7:0.86.8-SNAPSHOT -grpc-google-cloud-vision-v1p2beta1:1.103.7:1.103.8-SNAPSHOT -grpc-google-cloud-vision-v1:1.103.7:1.103.8-SNAPSHOT -google-cloud-vision:1.103.7:1.103.8-SNAPSHOT \ No newline at end of file +proto-google-cloud-vision-v1p4beta1:0.87.0:0.87.0 +proto-google-cloud-vision-v1:2.0.0:2.0.0 +proto-google-cloud-vision-v1p1beta1:0.87.0:0.87.0 +proto-google-cloud-vision-v1p3beta1:0.87.0:0.87.0 +proto-google-cloud-vision-v1p2beta1:2.0.0:2.0.0 +grpc-google-cloud-vision-v1p3beta1:0.87.0:0.87.0 +grpc-google-cloud-vision-v1p1beta1:0.87.0:0.87.0 +grpc-google-cloud-vision-v1p4beta1:0.87.0:0.87.0 +grpc-google-cloud-vision-v1p2beta1:2.0.0:2.0.0 +grpc-google-cloud-vision-v1:2.0.0:2.0.0 +google-cloud-vision:2.0.0:2.0.0 \ No newline at end of file