Fix an issue with builder getters. #1387
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
copybara-service
bot
force-pushed
the
test_483480779
branch
2 times, most recently
from
259e2a0 to
4c2328d
Compare
In a builder, if a property `bar` has its own builder `barBuilder()` and also a getter `bar()`, then either the property must be set or `barBuilder()` must be called. If neither of those has happened, both the `bar` and `barBuilder$` fields will be null, and we should correctly report that with an empty `Optional` return from `bar()`. Previously we incorrectly simplified this logic and ended up calling `Optional.of(bar)` even though `bar` is null. Fixes #1386. Thanks to @jmesny for the bug report and regression test. RELNOTES=Fixed an issue when a builder has a property `foo` with both a getter `foo()` and a builder `fooBuilder()`. PiperOrigin-RevId: 483736037
copybara-service
bot
force-pushed
the
test_483480779
branch
from
4c2328d to
3659a0e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix an issue with builder getters.
In a builder, if a property
barhas its own builderbarBuilder()and also a getterbar(), then either the property must be set orbarBuilder()must be called.If neither of those has happened, both the
barandbarBuilder$fields will be null, and we should correctly report that with an emptyOptionalreturn frombar().Previously we incorrectly simplified this logic and ended up calling
Optional.of(bar)even thoughbaris null.Fixes #1386. Thanks to @jmesny for the bug report and regression test.
RELNOTES=Fixed an issue when a builder has a property
foowith both a getterfoo()and a builderfooBuilder().