Honor @Primary for UserDetailsService and UserDetailsPasswordService in InitializeUserDetailsBeanManagerConfigurer #18015
+211
−27
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
spring-projects-issues
added
the
status: waiting-for-triage
jzheaux
force-pushed
the
honor-primary-uds-17902
branch
from
2382273 to
d4e00e4
Compare
jzheaux
added
in: config
jzheaux
requested changes
Oct 20, 2025
|
|
||
| PasswordEncoder passwordEncoder = getBeanIfUnique(PasswordEncoder.class); | ||
| // Also resolve UDPS via container so @Primary is honored | ||
| UserDetailsPasswordService passwordManager = getAutowireCandidateOrNull(UserDetailsPasswordService.class); |
There was a problem hiding this comment.
I believe this changes the existing semantics by calling getIfAvailable instead of getIfUnique. The ObjectProvider JavaDoc implies that it accounts for @Primary:
/**
* Return an instance (possibly shared or independent) of the object
* managed by this factory.
* @return an instance of the bean, or {@code null} if not available or
* not unique (i.e. multiple candidates found **with none marked as primary**)
* @throws BeansException in case of creation errors
* @see #getObject()
*/Can you confirm with unit tests that changing to getIfAvailable is necessary to support @Primary?
Signed-off-by: Siva Sai Udayagiri <[email protected]>
This commit rearranges the branches to reduce nesting Signed-off-by: Josh Cummings <[email protected]>
Given that the codebase uses getBeanIfUnique logic in many places, it is a little noisy to clarify how it works in just this location. Instead, the previous commit simplifies the branching logic, reducing the need for clarification of what could otherwise be surprising. Signed-off-by: Josh Cummings <[email protected]>
jzheaux
force-pushed
the
honor-primary-uds-17902
branch
from
d4e00e4 to
581d666
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Motivation
In scenarios where multiple
UserDetailsServiceorUserDetailsPasswordServicebeansare defined, Spring may raise
NoUniqueBeanDefinitionExceptionor select the wrongbean without explicit resolution.
Changes
@PrimarytoUserDetailsServiceandUserDetailsPasswordServicebeans inInitializeUserDetailsBeanManagerConfigurerIssue Reference
Fixes gh-17902
Testing
InitializeUserDetailsBeanManagerConfigurerTeststo validateresolution when multiple candidates are present
./gradlew checkNotes