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.

Sign up for GitHub

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

Fix circular references on LdapAutoConfiguration #5055

Merged
merged 3 commits into from
Dec 21, 2023
Merged

Fix circular references on LdapAutoConfiguration #5055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
658c0d6
Update ApolloAuditSpanAspectTest.java
BlackBear2003 Dec 19, 2023
9ee791a
update changes-2.2.0.md
BlackBear2003 Dec 21, 2023
33b9ab7
update changes.md
BlackBear2003 Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
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
7 changes: 2 additions & 5 deletions .../src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,11 @@

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) {

Check warning on line 200 in apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java

View check run for this annotation

Codecov / codecov/patch

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java#L200 

Added line #L200 was not covered by tests
this.properties = properties;
this.environment = environment;
this.ldapTemplate = ldapTemplate;
}

@Bean
Expand All @@ -225,7 +222,7 @@

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

Expand Down
Loading