Commit d4e00e4

committed

Reduce Comments

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 <3627351+jzheaux@users.noreply.github.com>

1 parent d06ef17 commit d4e00e4Copy full SHA for d4e00e4

File tree

1 file changed

-5

lines changed

config/src/main/java/org/springframework/security/config/annotation/authentication/configuration
- InitializeUserDetailsBeanManagerConfigurer.java

1 file changed

-5

lines changed

`‎config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java‎`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,7 @@ public void configure(AuthenticationManagerBuilder auth) {`
`84`	`84`	`return;`
`85`	`85`	`}`
`86`	`86`
`87`		`- // Try to resolve a single candidate using the container's rules (@Primary,`
`88`		`- // etc.)`
`89`	`87`	`UserDetailsService userDetailsService = getBeanIfUnique(UserDetailsService.class);`
`90`		`-`
`91`		`- // If ambiguous or otherwise not resolvable, keep the warn-and-skip behavior`
`92`	`88`	`if (userDetailsService == null) {`
`93`	`89`	`this.logger.warn(LogMessage.format("Found %s UserDetailsService beans, with names %s. "`
`94`	`90`	`+ "Global Authentication Manager will not use a UserDetailsService for username/password login. "`
`@@ -98,7 +94,6 @@ public void configure(AuthenticationManagerBuilder auth) {`
`98`	`94`	`}`
`99`	`95`
`100`	`96`	`PasswordEncoder passwordEncoder = getBeanIfUnique(PasswordEncoder.class);`
`101`		`- // Also resolve UDPS via container so @Primary is honored`
`102`	`97`	`UserDetailsPasswordService passwordManager = getAutowireCandidateOrNull(UserDetailsPasswordService.class);`
`103`	`98`	`CompromisedPasswordChecker passwordChecker = getBeanIfUnique(CompromisedPasswordChecker.class);`
`104`	`99`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit d4e00e4

File tree

1 file changed

1 file changed

`‎config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java‎`

0 commit comments