From 1bf0e70bd0ee60adf81a56ccdfd957eb3fa7fc15 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 30 Sep 2019 15:15:40 -0500 Subject: [PATCH] Revert "Dispose default Scheduler" This reverts commit 39600b901f25b545b57a66129848b1641215de2e. --- ...rDetailsReactiveAuthenticationManager.java | 11 ++----- ...ailsServiceAuthenticationManagerTests.java | 31 ------------------- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java index 83905db87f..6ad3f35b53 100644 --- a/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/authentication/AbstractUserDetailsReactiveAuthenticationManager.java @@ -18,7 +18,6 @@ package org.springframework.security.authentication; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.DisposableBean; import reactor.core.publisher.Mono; import reactor.core.scheduler.Scheduler; import reactor.core.scheduler.Schedulers; @@ -46,7 +45,7 @@ import org.springframework.util.Assert; * @author Eddú Meléndez * @since 5.2 */ -public abstract class AbstractUserDetailsReactiveAuthenticationManager implements ReactiveAuthenticationManager, DisposableBean { +public abstract class AbstractUserDetailsReactiveAuthenticationManager implements ReactiveAuthenticationManager { protected final Log logger = LogFactory.getLog(getClass()); @@ -56,9 +55,7 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement private ReactiveUserDetailsPasswordService userDetailsPasswordService; - private final Scheduler DEFAULT_SCHEDULER = Schedulers.newParallel("password-encoder"); - - private Scheduler scheduler = this.DEFAULT_SCHEDULER; + private Scheduler scheduler = Schedulers.newParallel("password-encoder"); private UserDetailsChecker preAuthenticationChecks = user -> { if (!user.isAccountNonLocked()) { @@ -174,8 +171,4 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement */ protected abstract Mono retrieveUser(String username); - @Override - public void destroy() { - this.DEFAULT_SCHEDULER.dispose(); - } } diff --git a/core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java b/core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java index faf36d6b0b..73011471b0 100644 --- a/core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java @@ -33,8 +33,6 @@ import org.springframework.security.core.userdetails.ReactiveUserDetailsService; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.crypto.password.PasswordEncoder; import reactor.core.publisher.Mono; -import reactor.core.scheduler.Scheduler; -import reactor.core.scheduler.Schedulers; import reactor.test.StepVerifier; /** @@ -138,33 +136,4 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests { .expectError(BadCredentialsException.class) .verify(); } - - @Test - public void destroyWhenDefaultSchedulerThenShouldDispose() { - assertThat(manager.scheduler.isDisposed()).isFalse(); - manager.destroy(); - assertThat(manager.scheduler.isDisposed()) - .as("default Scheduler should be disposed") - .isTrue(); - } - - @Test - public void destroyWhenCustomSchedulerThenShouldNotDispose() { - manager.setScheduler(Schedulers.parallel()); - manager.destroy(); - assertThat(manager.scheduler.isDisposed()) - .as("custom Scheduler should not be disposed") - .isFalse(); - } - - @Test - public void setSchedulerWhenSetCustomSchedulerThenDisposeDefault() { - Scheduler defaultScheduler = manager.scheduler; - assertThat(defaultScheduler.isDisposed()).isFalse(); - manager.setScheduler(Schedulers.parallel()); - assertThat(defaultScheduler.isDisposed()) - .as("default Scheduler should be disposed") - .isTrue(); - } - }