Skip to content

Commit 1bf0e70

Browse files
committed
Revert "Dispose default Scheduler"
This reverts commit 39600b9.
1 parent 8bc3ad1 commit 1bf0e70

File tree

2 files changed

+2
-40
lines changed

2 files changed

+2
-40
lines changed

core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import org.apache.commons.logging.Log;
2020
import org.apache.commons.logging.LogFactory;
21-
import org.springframework.beans.factory.DisposableBean;
2221
import reactor.core.publisher.Mono;
2322
import reactor.core.scheduler.Scheduler;
2423
import reactor.core.scheduler.Schedulers;
@@ -46,7 +45,7 @@
4645
* @author Eddú Meléndez
4746
* @since 5.2
4847
*/
49-
public abstract class AbstractUserDetailsReactiveAuthenticationManager implements ReactiveAuthenticationManager, DisposableBean {
48+
public abstract class AbstractUserDetailsReactiveAuthenticationManager implements ReactiveAuthenticationManager {
5049

5150
protected final Log logger = LogFactory.getLog(getClass());
5251

@@ -56,9 +55,7 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement
5655

5756
private ReactiveUserDetailsPasswordService userDetailsPasswordService;
5857

59-
private final Scheduler DEFAULT_SCHEDULER = Schedulers.newParallel("password-encoder");
60-
61-
private Scheduler scheduler = this.DEFAULT_SCHEDULER;
58+
private Scheduler scheduler = Schedulers.newParallel("password-encoder");
6259

6360
private UserDetailsChecker preAuthenticationChecks = user -> {
6461
if (!user.isAccountNonLocked()) {
@@ -174,8 +171,4 @@ public void setPostAuthenticationChecks(UserDetailsChecker postAuthenticationChe
174171
*/
175172
protected abstract Mono<UserDetails> retrieveUser(String username);
176173

177-
@Override
178-
public void destroy() {
179-
this.DEFAULT_SCHEDULER.dispose();
180-
}
181174
}

core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import org.springframework.security.core.userdetails.UserDetails;
3434
import org.springframework.security.crypto.password.PasswordEncoder;
3535
import reactor.core.publisher.Mono;
36-
import reactor.core.scheduler.Scheduler;
37-
import reactor.core.scheduler.Schedulers;
3836
import reactor.test.StepVerifier;
3937

4038
/**
@@ -138,33 +136,4 @@ public void authenticateWhenPasswordEncoderAndFailThenFail() {
138136
.expectError(BadCredentialsException.class)
139137
.verify();
140138
}
141-
142-
@Test
143-
public void destroyWhenDefaultSchedulerThenShouldDispose() {
144-
assertThat(manager.scheduler.isDisposed()).isFalse();
145-
manager.destroy();
146-
assertThat(manager.scheduler.isDisposed())
147-
.as("default Scheduler should be disposed")
148-
.isTrue();
149-
}
150-
151-
@Test
152-
public void destroyWhenCustomSchedulerThenShouldNotDispose() {
153-
manager.setScheduler(Schedulers.parallel());
154-
manager.destroy();
155-
assertThat(manager.scheduler.isDisposed())
156-
.as("custom Scheduler should not be disposed")
157-
.isFalse();
158-
}
159-
160-
@Test
161-
public void setSchedulerWhenSetCustomSchedulerThenDisposeDefault() {
162-
Scheduler defaultScheduler = manager.scheduler;
163-
assertThat(defaultScheduler.isDisposed()).isFalse();
164-
manager.setScheduler(Schedulers.parallel());
165-
assertThat(defaultScheduler.isDisposed())
166-
.as("default Scheduler should be disposed")
167-
.isTrue();
168-
}
169-
170139
}

0 commit comments

Comments
 (0)