-
Notifications
You must be signed in to change notification settings - Fork 54
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(resnames): fallback to fully-qualified Object name upon proto typing conflicts [ggj] #803
Conversation
Codecov Report
@@ Coverage Diff @@
## master #803 +/- ##
==========================================
+ Coverage 91.27% 91.28% +0.01%
==========================================
Files 140 140
Lines 14961 14965 +4
Branches 1074 1074
==========================================
+ Hits 13655 13661 +6
+ Misses 1012 1009 -3
- Partials 294 295 +1
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, but we probably want to make it a generic behavior (use full name if there is a conflict)
Agreed, tracking the larger-scoped FR in #805. |
[![Mend 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.api.grpc:grpc-google-common-protos](https://github.com/googleapis/java-iam/grpc-google-common-protos) ([source](https://github.com/googleapis/java-common-protos)) | `2.9.2` -> `2.9.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-common-protos/2.9.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-common-protos/2.9.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-common-protos/2.9.3/compatibility-slim/2.9.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:grpc-google-common-protos/2.9.3/confidence-slim/2.9.2)](https://docs.renovatebot.com/merge-confidence/) | | [com.google.api.grpc:proto-google-common-protos](https://github.com/googleapis/java-iam/proto-google-common-protos) ([source](https://github.com/googleapis/java-common-protos)) | `2.9.2` -> `2.9.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-common-protos/2.9.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-common-protos/2.9.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-common-protos/2.9.3/compatibility-slim/2.9.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.api.grpc:proto-google-common-protos/2.9.3/confidence-slim/2.9.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>googleapis/java-common-protos</summary> ### [`v2.9.3`](https://github.com/googleapis/java-common-protos/blob/HEAD/CHANGELOG.md#​293-httpsgithubcomgoogleapisjava-common-protoscomparev292v293-2022-09-20) [Compare Source](https://github.com/googleapis/java-common-protos/compare/v2.9.2...v2.9.3) ##### Dependencies - Update dependency com.google.protobuf:protobuf-bom to v3.21.3 ([#​393](https://github.com/googleapis/java-common-protos/issues/393)) ([f056dbe](https://github.com/googleapis/java-common-protos/commit/f056dbea9d92c92af9d4bffb8442704e4f3480e4)) - Update dependency com.google.protobuf:protobuf-bom to v3.21.4 ([#​397](https://github.com/googleapis/java-common-protos/issues/397)) ([35f20b9](https://github.com/googleapis/java-common-protos/commit/35f20b942487f0500fa7919ddd9dd34e2a98da68)) - Update dependency com.google.protobuf:protobuf-bom to v3.21.5 ([#​402](https://github.com/googleapis/java-common-protos/issues/402)) ([5279823](https://github.com/googleapis/java-common-protos/commit/5279823ab40a011b38003859d888ea48799bf86f)) - Update dependency com.google.protobuf:protobuf-bom to v3.21.6 ([#​410](https://github.com/googleapis/java-common-protos/issues/410)) ([2ae81dc](https://github.com/googleapis/java-common-protos/commit/2ae81dcfe53630b422ab3d81785f9cab4ccd997e)) - Update dependency com.google.protobuf:protobuf-java to v3.21.3 ([#​394](https://github.com/googleapis/java-common-protos/issues/394)) ([ada3199](https://github.com/googleapis/java-common-protos/commit/ada31991b01ff3bcc342b9c8f7e0aaf95b21ab66)) - Update dependency com.google.protobuf:protobuf-java to v3.21.4 ([#​398](https://github.com/googleapis/java-common-protos/issues/398)) ([f6be516](https://github.com/googleapis/java-common-protos/commit/f6be516c23202d2502c25473ccf8bba009948cde)) - Update dependency com.google.protobuf:protobuf-java to v3.21.5 ([#​403](https://github.com/googleapis/java-common-protos/issues/403)) ([89f8ae8](https://github.com/googleapis/java-common-protos/commit/89f8ae82df4fe608f58c6190324a3cec7441cf81)) - Update dependency com.google.protobuf:protobuf-java to v3.21.6 ([#​411](https://github.com/googleapis/java-common-protos/issues/411)) ([764e5d9](https://github.com/googleapis/java-common-protos/commit/764e5d94828b6f4d02bc5d646496340fdada0f25)) - Update dependency io.grpc:grpc-bom to v1.49.0 and guava to 31.1-android ([#​390](https://github.com/googleapis/java-common-protos/issues/390)) ([08d00ec](https://github.com/googleapis/java-common-protos/commit/08d00ec4ab8f9979f4a6b92f76e9666f045f9953)) - Update dependency io.grpc:grpc-bom to v1.49.1 ([#​412](https://github.com/googleapis/java-common-protos/issues/412)) ([d4b66a0](https://github.com/googleapis/java-common-protos/commit/d4b66a03b49b16069ee0c0922448748620cc5745)) - Update dependency io.grpc:grpc-protobuf to v1.48.0 ([#​391](https://github.com/googleapis/java-common-protos/issues/391)) ([171b4bf](https://github.com/googleapis/java-common-protos/commit/171b4bf8bd69ebd8111b0a2b6896282dbfa0525f)) - Update dependency io.grpc:grpc-protobuf to v1.48.1 ([#​400](https://github.com/googleapis/java-common-protos/issues/400)) ([7c96c90](https://github.com/googleapis/java-common-protos/commit/7c96c908a819eef24c92cf9d65966e04825708d3)) - Update dependency io.grpc:grpc-protobuf to v1.49.0 ([#​406](https://github.com/googleapis/java-common-protos/issues/406)) ([da8e116](https://github.com/googleapis/java-common-protos/commit/da8e116d60c17322c2a01de78a42f8e9d4498035)) - Update dependency io.grpc:grpc-protobuf to v1.49.1 ([#​413](https://github.com/googleapis/java-common-protos/issues/413)) ([ab55975](https://github.com/googleapis/java-common-protos/commit/ab5597592c9eb86e4dcc81fa61a67a43d5edcb2a)) - Update dependency io.grpc:grpc-stub to v1.48.0 ([#​392](https://github.com/googleapis/java-common-protos/issues/392)) ([7d404a0](https://github.com/googleapis/java-common-protos/commit/7d404a051ee53933c9f64a7e77cca589a2fd7ceb)) - Update dependency io.grpc:grpc-stub to v1.48.1 ([#​401](https://github.com/googleapis/java-common-protos/issues/401)) ([60ae3bc](https://github.com/googleapis/java-common-protos/commit/60ae3bc53f0a3b2afc32e9b7be8789efb2b551da)) - Update dependency io.grpc:grpc-stub to v1.49.0 ([#​407](https://github.com/googleapis/java-common-protos/issues/407)) ([bedb226](https://github.com/googleapis/java-common-protos/commit/bedb226200ab92d1336652c2c02101796d7c7262)) - Update dependency io.grpc:grpc-stub to v1.49.1 ([#​414](https://github.com/googleapis/java-common-protos/issues/414)) ([d209727](https://github.com/googleapis/java-common-protos/commit/d20972705f275919eef3bc69f99f2d1cbfb7d026)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-dependencies). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzMi4xOTguMSIsInVwZGF0ZWRJblZlciI6IjMyLjE5OC4xIn0=-->
🤖 I have created a release *beep* *boop* --- ## [3.0.4](https://github.com/googleapis/java-shared-dependencies/compare/v3.0.3...v3.0.4) (2022-10-03) ### Dependencies * Update dependency cachetools to v5 ([#816](https://github.com/googleapis/java-shared-dependencies/issues/816)) ([bd2569c](https://github.com/googleapis/java-shared-dependencies/commit/bd2569c8c26e177a83cbcf8ed63fed1c3fce2c4b)) * Update dependency certifi to v2022.9.24 ([#818](https://github.com/googleapis/java-shared-dependencies/issues/818)) ([5406a0c](https://github.com/googleapis/java-shared-dependencies/commit/5406a0ca7e4e2b47f87a39c0fc696fbfd7a6a196)) * Update dependency charset-normalizer to v2.1.1 ([#822](https://github.com/googleapis/java-shared-dependencies/issues/822)) ([5c998e4](https://github.com/googleapis/java-shared-dependencies/commit/5c998e4d05d47882743cdb5a871a6af728b9d920)) * Update dependency click to v8.1.3 ([#823](https://github.com/googleapis/java-shared-dependencies/issues/823)) ([2ad211a](https://github.com/googleapis/java-shared-dependencies/commit/2ad211abb259b0fc225303f695a2f0399e19cd66)) * Update dependency com.google.protobuf:protobuf-bom to v3.21.7 ([#837](https://github.com/googleapis/java-shared-dependencies/issues/837)) ([d5472aa](https://github.com/googleapis/java-shared-dependencies/commit/d5472aa3a98c7a10737b6a9137dba8140087a31b)) * Update dependency gcp-releasetool to v1.8.8 ([#819](https://github.com/googleapis/java-shared-dependencies/issues/819)) ([bfef3b0](https://github.com/googleapis/java-shared-dependencies/commit/bfef3b0cf05bc200e707dfbf0330d672d824004c)) * Update dependency gcp-releasetool to v1.8.9 ([#846](https://github.com/googleapis/java-shared-dependencies/issues/846)) ([533c6a6](https://github.com/googleapis/java-shared-dependencies/commit/533c6a6382c2e933b2e87834b5b94913c1dc4943)) * Update dependency google-api-core to v2.10.1 ([#824](https://github.com/googleapis/java-shared-dependencies/issues/824)) ([1a5d233](https://github.com/googleapis/java-shared-dependencies/commit/1a5d233efa85f1dbd3aa272d2d305d24a35a7576)) * Update dependency google-auth to v2.12.0 ([#825](https://github.com/googleapis/java-shared-dependencies/issues/825)) ([cbca860](https://github.com/googleapis/java-shared-dependencies/commit/cbca860ae78c7ddf4541ed8b7c057710299162a8)) * Update dependency google-cloud-core to v2.3.2 ([#820](https://github.com/googleapis/java-shared-dependencies/issues/820)) ([65a1310](https://github.com/googleapis/java-shared-dependencies/commit/65a1310f50ce6914a67cb5e0e4d258f9f4466f11)) * Update dependency google-cloud-storage to v2.5.0 ([#826](https://github.com/googleapis/java-shared-dependencies/issues/826)) ([5fd7983](https://github.com/googleapis/java-shared-dependencies/commit/5fd7983489b971344e64010c7cfef0a2f60be667)) * Update dependency google-crc32c to v1.5.0 ([#827](https://github.com/googleapis/java-shared-dependencies/issues/827)) ([ee9e013](https://github.com/googleapis/java-shared-dependencies/commit/ee9e013106173cefbc10563d5d51dd906997c658)) * Update dependency google-resumable-media to v2.4.0 ([#838](https://github.com/googleapis/java-shared-dependencies/issues/838)) ([fb02810](https://github.com/googleapis/java-shared-dependencies/commit/fb02810c4a975fc75b26d680266ac48f85779a70)) * Update dependency googleapis-common-protos to v1.56.4 ([#821](https://github.com/googleapis/java-shared-dependencies/issues/821)) ([49d6423](https://github.com/googleapis/java-shared-dependencies/commit/49d64234d57d99c07689d0dd66697bb94d69e958)) * Update dependency importlib-metadata to v4.12.0 ([#832](https://github.com/googleapis/java-shared-dependencies/issues/832)) ([33ef522](https://github.com/googleapis/java-shared-dependencies/commit/33ef5228cb4fda9ef24e2b4396f970bc5ab67322)) * Update dependency importlib-metadata to v4.13.0 ([#843](https://github.com/googleapis/java-shared-dependencies/issues/843)) ([333b61b](https://github.com/googleapis/java-shared-dependencies/commit/333b61baf0f42d64699626bbc57315b3a826c3d3)) * Update dependency importlib-metadata to v5 ([#845](https://github.com/googleapis/java-shared-dependencies/issues/845)) ([7dc299d](https://github.com/googleapis/java-shared-dependencies/commit/7dc299da70133bb0fa9a363816ea804d540edc22)) * Update dependency io.grpc:grpc-bom to v1.49.1 ([#802](https://github.com/googleapis/java-shared-dependencies/issues/802)) ([a810f58](https://github.com/googleapis/java-shared-dependencies/commit/a810f587a5551e5f36a0b161bc350ebcb636acd5)) * Update dependency io.grpc:grpc-bom to v1.49.2 ([#842](https://github.com/googleapis/java-shared-dependencies/issues/842)) ([064a166](https://github.com/googleapis/java-shared-dependencies/commit/064a1666dd030c5f9fe35da7ebbda3dad2421427)) * Update dependency jeepney to v0.8.0 ([#833](https://github.com/googleapis/java-shared-dependencies/issues/833)) ([d1a5a67](https://github.com/googleapis/java-shared-dependencies/commit/d1a5a672089424d3ef9f85ae5d87b669484466e5)) * Update dependency jinja2 to v3.1.2 ([#834](https://github.com/googleapis/java-shared-dependencies/issues/834)) ([ad63e98](https://github.com/googleapis/java-shared-dependencies/commit/ad63e988d2407a62491a309160e1b87b4cc06d9a)) * Update dependency keyring to v23.9.3 ([#828](https://github.com/googleapis/java-shared-dependencies/issues/828)) ([8fed728](https://github.com/googleapis/java-shared-dependencies/commit/8fed728e6c84c8cade5bb24a827c558345149cff)) * Update dependency markupsafe to v2.1.1 ([#829](https://github.com/googleapis/java-shared-dependencies/issues/829)) ([6a93716](https://github.com/googleapis/java-shared-dependencies/commit/6a93716f6f161ced9a08840037bbfe7bfeee0814)) * Update dependency org.threeten:threetenbp to v1.6.2 ([#808](https://github.com/googleapis/java-shared-dependencies/issues/808)) ([f03792d](https://github.com/googleapis/java-shared-dependencies/commit/f03792d49370e0abbe6f90d37c513920759d6581)) * Update dependency protobuf to v3.20.2 ([#830](https://github.com/googleapis/java-shared-dependencies/issues/830)) ([544c20f](https://github.com/googleapis/java-shared-dependencies/commit/544c20f9b45fc42ba6b0071153c05034ea08ddc3)) * Update dependency protobuf to v3.20.3 ([#839](https://github.com/googleapis/java-shared-dependencies/issues/839)) ([69db6d7](https://github.com/googleapis/java-shared-dependencies/commit/69db6d7e56d4673a68e1f49a805635d054856326)) * Update dependency protobuf to v4 ([#817](https://github.com/googleapis/java-shared-dependencies/issues/817)) ([d2df74f](https://github.com/googleapis/java-shared-dependencies/commit/d2df74f6f456acbcccee7120b0ab164f73b8af93)) * Update dependency pyjwt to v2.5.0 ([#812](https://github.com/googleapis/java-shared-dependencies/issues/812)) ([8439533](https://github.com/googleapis/java-shared-dependencies/commit/843953365e464c72aa62df1a512a0ca6086a1c37)) * Update dependency requests to v2.28.1 ([#813](https://github.com/googleapis/java-shared-dependencies/issues/813)) ([de1d896](https://github.com/googleapis/java-shared-dependencies/commit/de1d896da6d7dcaedb520117d675290826d23505)) * Update dependency typing-extensions to v4.3.0 ([#814](https://github.com/googleapis/java-shared-dependencies/issues/814)) ([eb8b96b](https://github.com/googleapis/java-shared-dependencies/commit/eb8b96b916281aad8f330eb506a7d4be420c4263)) * Update dependency zipp to v3.8.1 ([#815](https://github.com/googleapis/java-shared-dependencies/issues/815)) ([74ee8f7](https://github.com/googleapis/java-shared-dependencies/commit/74ee8f75795091303236322e6c090a6a2b3f30e5)) * Update gax.version to v2.19.2 ([#847](https://github.com/googleapis/java-shared-dependencies/issues/847)) ([63228ac](https://github.com/googleapis/java-shared-dependencies/commit/63228ac05cfa27c6ecfee44eb91a8fabb94c5f59)) * Update google.common-protos.version to v2.9.3 ([#803](https://github.com/googleapis/java-shared-dependencies/issues/803)) ([cdf3fe6](https://github.com/googleapis/java-shared-dependencies/commit/cdf3fe6f7b7abbb9ef0c4a7cd1e4783dbbe0e238)) * Update google.common-protos.version to v2.9.5 ([#831](https://github.com/googleapis/java-shared-dependencies/issues/831)) ([62b5617](https://github.com/googleapis/java-shared-dependencies/commit/62b5617fa7960a1fdbad5743e44f14e2b6014b47)) * Update google.common-protos.version to v2.9.6 ([#844](https://github.com/googleapis/java-shared-dependencies/issues/844)) ([0cd42ae](https://github.com/googleapis/java-shared-dependencies/commit/0cd42aee75de5e3ddcde03165620aebae3ce2df0)) * Update google.core.version to v2.8.13 ([#804](https://github.com/googleapis/java-shared-dependencies/issues/804)) ([d1b585e](https://github.com/googleapis/java-shared-dependencies/commit/d1b585eb836fa55a97ca059426bce15cafcb2b5e)) * Update google.core.version to v2.8.14 ([#805](https://github.com/googleapis/java-shared-dependencies/issues/805)) ([3743485](https://github.com/googleapis/java-shared-dependencies/commit/37434855f0ec5bef09a8e8b0a062aa1df93da102)) * Update google.core.version to v2.8.15 ([#807](https://github.com/googleapis/java-shared-dependencies/issues/807)) ([614586e](https://github.com/googleapis/java-shared-dependencies/commit/614586ed92f203901c80ab5539f5c514bb5fe131)) * Update google.core.version to v2.8.16 ([#810](https://github.com/googleapis/java-shared-dependencies/issues/810)) ([6d04bef](https://github.com/googleapis/java-shared-dependencies/commit/6d04bef8689e87a7505ecb18e556b7d55a05d649)) * Update google.core.version to v2.8.17 ([#835](https://github.com/googleapis/java-shared-dependencies/issues/835)) ([5e84cc5](https://github.com/googleapis/java-shared-dependencies/commit/5e84cc533778443b798550fe9e3cb0888ad9b8ac)) * Update google.core.version to v2.8.18 ([#840](https://github.com/googleapis/java-shared-dependencies/issues/840)) ([203e8b4](https://github.com/googleapis/java-shared-dependencies/commit/203e8b4681186f863bc8d2f7e79c3c0102e592b4)) * Update google.core.version to v2.8.19 ([#841](https://github.com/googleapis/java-shared-dependencies/issues/841)) ([35bf0dc](https://github.com/googleapis/java-shared-dependencies/commit/35bf0dcb1b8e6143fb7750dc3e8eeeb6bfac9a3b)) * Update google.core.version to v2.8.20 ([#848](https://github.com/googleapis/java-shared-dependencies/issues/848)) ([047dc3f](https://github.com/googleapis/java-shared-dependencies/commit/047dc3f6f1b1a0c27079c8bc07046793c96f8dfc)) * Update iam.version to v1.6.1 ([#806](https://github.com/googleapis/java-shared-dependencies/issues/806)) ([b2fc57a](https://github.com/googleapis/java-shared-dependencies/commit/b2fc57a99d63554f456f185c136954c688300ab7)) * Update iam.version to v1.6.2 ([#849](https://github.com/googleapis/java-shared-dependencies/issues/849)) ([1251c42](https://github.com/googleapis/java-shared-dependencies/commit/1251c42fd0e9f31991236a1bfd2ff7010ab22e70)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
🤖 I have created a release *beep* *boop* --- ### [2.6.1](googleapis/java-core@v2.6.0...v2.6.1) (2022-04-14) ### Dependencies * update dependency com.google.errorprone:error_prone_annotations to v2.13.0 ([#802](googleapis/java-core#802)) ([b3d6b65](googleapis/java-core@b3d6b65)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
Closes #798.