Skip to content
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

Merge findInjectableValues() results in AnnotationIntrospectorPair #3146

Merged

Conversation

josephlbarnett
Copy link
Contributor

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

@cowtowncoder
Copy link
Member

Cool! I think I already have your CLA, right?

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
Copy link
Contributor Author

Moved test and support classes for it to IntrospectorPairTest. Yes, you should have my CLA from #2404

@cowtowncoder
Copy link
Member

Thank you! Will merge for 2.12.4.

@cowtowncoder cowtowncoder merged commit e0b74c5 into FasterXML:2.12 May 7, 2021
@cowtowncoder cowtowncoder added this to the 2.12.4 milestone May 7, 2021
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
If primary is not null but primary.useInput is null,
and secondary is null, just return primary.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants