-
Notifications
You must be signed in to change notification settings - Fork 53
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(protoc): Mirror protoc's field name conflict resolution logic in client generation [ggj] #781
Conversation
…va into dev/protoc
Codecov Report
@@ Coverage Diff @@
## master #781 +/- ##
==========================================
+ Coverage 91.24% 91.27% +0.03%
==========================================
Files 140 140
Lines 14920 14952 +32
Branches 1070 1074 +4
==========================================
+ Hits 13614 13648 +34
+ Misses 1012 1011 -1
+ Partials 294 293 -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, just a few minor comments
src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
Outdated
Show resolved
Hide resolved
….10.0 (#781) [![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.auth:google-auth-library-bom](https://togithub.com/googleapis/google-auth-library-java) | `1.9.0` -> `1.10.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.auth:google-auth-library-bom/1.10.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.auth:google-auth-library-bom/1.10.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.auth:google-auth-library-bom/1.10.0/compatibility-slim/1.9.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.auth:google-auth-library-bom/1.10.0/confidence-slim/1.9.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>googleapis/google-auth-library-java</summary> ### [`v1.10.0`](https://togithub.com/googleapis/google-auth-library-java/blob/HEAD/CHANGELOG.md#​1100-httpsgithubcomgoogleapisgoogle-auth-library-javacomparev190v1100-2022-08-05) [Compare Source](https://togithub.com/googleapis/google-auth-library-java/compare/v1.9.0...v1.10.0) ##### Features - workforce identity federation for pluggable auth ([#​959](https://togithub.com/googleapis/google-auth-library-java/issues/959)) ([7f2c535](https://togithub.com/googleapis/google-auth-library-java/commit/7f2c535ab7c842a672d6761f4cd80df88e1a37ed)) ##### Bug Fixes - updates executable response spec for executable-sourced credentials ([#​955](https://togithub.com/googleapis/google-auth-library-java/issues/955)) ([48ff83d](https://togithub.com/googleapis/google-auth-library-java/commit/48ff83dc68e29dcae07fdea963cbbe5525f86a89)) ##### Documentation - **samples:** added auth samples and tests ([#​927](https://togithub.com/googleapis/google-auth-library-java/issues/927)) ([32c717f](https://togithub.com/googleapis/google-auth-library-java/commit/32c717fdf1a721f3e7ca3d75f03fcc229923689c)) </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 this update 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:eyJjcmVhdGVkSW5WZXIiOiIzMi4xNTMuMCIsInVwZGF0ZWRJblZlciI6IjMyLjE1NC40In0=-->
🤖 I have created a release *beep* *boop* --- ## [3.0.2](googleapis/java-shared-dependencies@v3.0.1...v3.0.2) (2022-09-08) ### Dependencies * Update dependency com.fasterxml.jackson:jackson-bom to v2.13.4 ([#789](googleapis/java-shared-dependencies#789)) ([d0b6888](googleapis/java-shared-dependencies@d0b6888)) * Update dependency com.google.auth:google-auth-library-bom to v1.10.0 ([#781](googleapis/java-shared-dependencies#781)) ([450a3fe](googleapis/java-shared-dependencies@450a3fe)) * Update dependency com.google.auth:google-auth-library-bom to v1.11.0 ([#790](googleapis/java-shared-dependencies#790)) ([fdbab60](googleapis/java-shared-dependencies@fdbab60)) * Update dependency com.google.auth:google-auth-library-bom to v1.9.0 ([#773](googleapis/java-shared-dependencies#773)) ([f59be02](googleapis/java-shared-dependencies@f59be02)) * Update dependency com.google.errorprone:error_prone_annotations to v2.15.0 ([#776](googleapis/java-shared-dependencies#776)) ([8eddf23](googleapis/java-shared-dependencies@8eddf23)) * Update dependency com.google.protobuf:protobuf-bom to v3.21.5 ([#780](googleapis/java-shared-dependencies#780)) ([80c783f](googleapis/java-shared-dependencies@80c783f)) * Update dependency io.grpc:grpc-bom to v1.48.1 ([#768](googleapis/java-shared-dependencies#768)) ([c1e6978](googleapis/java-shared-dependencies@c1e6978)) * Update dependency io.grpc:grpc-bom to v1.49.0 ([#786](googleapis/java-shared-dependencies#786)) ([c5c4a0b](googleapis/java-shared-dependencies@c5c4a0b)) * Update dependency org.checkerframework:checker-qual to v3.24.0 ([#775](googleapis/java-shared-dependencies#775)) ([4bb5bee](googleapis/java-shared-dependencies@4bb5bee)) * Update dependency org.checkerframework:checker-qual to v3.25.0 ([#788](googleapis/java-shared-dependencies#788)) ([ad9e4f1](googleapis/java-shared-dependencies@ad9e4f1)) * Update dependency org.threeten:threetenbp to v1.6.1 ([#782](googleapis/java-shared-dependencies#782)) ([30717c3](googleapis/java-shared-dependencies@30717c3)) * Update gax.version to v2.19.0 ([#785](googleapis/java-shared-dependencies#785)) ([b5a674e](googleapis/java-shared-dependencies@b5a674e)) * Update google.core.version to v2.8.10 ([#787](googleapis/java-shared-dependencies#787)) ([754e622](googleapis/java-shared-dependencies@754e622)) * Update google.core.version to v2.8.7 ([#774](googleapis/java-shared-dependencies#774)) ([0c8e010](googleapis/java-shared-dependencies@0c8e010)) * Update google.core.version to v2.8.8 ([#777](googleapis/java-shared-dependencies#777)) ([e354fe1](googleapis/java-shared-dependencies@e354fe1)) * Update google.core.version to v2.8.9 ([#784](googleapis/java-shared-dependencies#784)) ([a9847d7](googleapis/java-shared-dependencies@a9847d7)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
This closes #781. Signed-off-by: tison <wander4096@gmail.com> Signed-off-by: tison <wander4096@gmail.com>
Mirrors protoc’s field name conflict handling in Java. This is needed to enable GAPIC coverage for additional APIs.
This change will result in changes like these in the generated libraries.
cc @alexander-fenster