Merge findInjectableValues() results in AnnotationIntrospectorPair #3146
Conversation
This file contains 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
|
Cool! I think I already have your CLA, right? |
cowtowncoder
reviewed
May 6, 2021
src/test/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPairTest.java
Outdated
Show resolved
Hide resolved
As many AnnotationIntrospector implementations use default values for useInput, allow the secondary introspector's useInput value to combine with the primary's id to prevent losing the useInput value. Fixes a special case of FasterXML#962 seen by the GuiceAnnotationInspector in FasterXML/jackson-modules-base#134
josephlbarnett
force-pushed
the
merge-injectable-value-pairs
branch
from
8e3f5d2
to
e904965
Compare
|
Moved test and support classes for it to |
|
Thank you! Will merge for 2.12.4. |
cowtowncoder
added a commit
that referenced
this pull request
May 7, 2021
josephlbarnett
added a commit
to josephlbarnett/jackson-databind
that referenced
this pull request
May 7, 2021
If primary is not null but primary.useInput is null, and secondary is null, just return primary.
cowtowncoder
pushed a commit
that referenced
this pull request
May 7, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As many AnnotationIntrospector implementations use default values
for useInput, allow the secondary introspector's useInput value to
combine with the primary's id to prevent losing the useInput value.
Fixes a special case of #962 seen by the GuiceAnnotationInspector
in FasterXML/jackson-modules-base#134