Skip to content

Commit

Permalink
Fix circular references on LdapAutoConfiguration (#5055)
Browse files Browse the repository at this point in the history
* Update ApolloAuditSpanAspectTest.java

* update changes.md
  • Loading branch information
BlackBear2003 authored Dec 21, 2023
1 parent 76ec52d commit 1cea083
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Release Notes.
Apollo 2.3.0

------------------
* [Fix circular references on LdapAutoConfiguration](https://github.com/apolloconfig/apollo/pull/5055)


------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,11 @@ static class SpringSecurityLDAPAuthAutoConfiguration {

private final LdapProperties properties;
private final Environment environment;
private final LdapTemplate ldapTemplate;

public SpringSecurityLDAPAuthAutoConfiguration(final LdapProperties properties,
final Environment environment,
final LdapTemplate ldapTemplate) {
final Environment environment) {
this.properties = properties;
this.environment = environment;
this.ldapTemplate = ldapTemplate;
}

@Bean
Expand All @@ -225,7 +222,7 @@ public LogoutHandler logoutHandler() {

@Bean
@ConditionalOnMissingBean(UserService.class)
public UserService springSecurityUserService() {
public UserService springSecurityUserService(LdapTemplate ldapTemplate) {
return new LdapUserService(ldapTemplate);
}

Expand Down

0 comments on commit 1cea083

Please sign in to comment.