Improve LDAP auto-configuration conditions #13143
Closed
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.
At present, auto-configuration of
LdapContextSourceis conditional on presence ofContextSourcebean. However, there are valid use cases which require multipleContextSourcebean, for instancePooledContextSource. With the current arrangement, the auto-configuration ofLdapContextSourcewill back off if user providesPooledContextSourcebean, while it would still be reasonable to reuse auto-configuredLdapContextSource.This PR improves
LdapContextSourcefactory method return value and condition to back off only if users actually provideLdapContextSourcebean themselves.With this change in place, users can provide
PooledContextSourcebean and reuse auto-configuredLdapContextSource.PooledContextSourcebean should then be marked as@Primaryto ensure it is injected in auto-configuredLdapTemplate.