File tree Expand file tree Collapse file tree 2 files changed +2
-40
lines changed
main/java/org/springframework/security/authentication
test/java/org/springframework/security/authentication Expand file tree Collapse file tree 2 files changed +2
-40
lines changed Original file line number Diff line number Diff line change 18
18
19
19
import org .apache .commons .logging .Log ;
20
20
import org .apache .commons .logging .LogFactory ;
21
- import org .springframework .beans .factory .DisposableBean ;
22
21
import reactor .core .publisher .Mono ;
23
22
import reactor .core .scheduler .Scheduler ;
24
23
import reactor .core .scheduler .Schedulers ;
46
45
* @author Eddú Meléndez
47
46
* @since 5.2
48
47
*/
49
- public abstract class AbstractUserDetailsReactiveAuthenticationManager implements ReactiveAuthenticationManager , DisposableBean {
48
+ public abstract class AbstractUserDetailsReactiveAuthenticationManager implements ReactiveAuthenticationManager {
50
49
51
50
protected final Log logger = LogFactory .getLog (getClass ());
52
51
@@ -56,9 +55,7 @@ public abstract class AbstractUserDetailsReactiveAuthenticationManager implement
56
55
57
56
private ReactiveUserDetailsPasswordService userDetailsPasswordService ;
58
57
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" );
62
59
63
60
private UserDetailsChecker preAuthenticationChecks = user -> {
64
61
if (!user .isAccountNonLocked ()) {
@@ -174,8 +171,4 @@ public void setPostAuthenticationChecks(UserDetailsChecker postAuthenticationChe
174
171
*/
175
172
protected abstract Mono <UserDetails > retrieveUser (String username );
176
173
177
- @ Override
178
- public void destroy () {
179
- this .DEFAULT_SCHEDULER .dispose ();
180
- }
181
174
}
Original file line number Diff line number Diff line change 33
33
import org .springframework .security .core .userdetails .UserDetails ;
34
34
import org .springframework .security .crypto .password .PasswordEncoder ;
35
35
import reactor .core .publisher .Mono ;
36
- import reactor .core .scheduler .Scheduler ;
37
- import reactor .core .scheduler .Schedulers ;
38
36
import reactor .test .StepVerifier ;
39
37
40
38
/**
@@ -138,33 +136,4 @@ public void authenticateWhenPasswordEncoderAndFailThenFail() {
138
136
.expectError (BadCredentialsException .class )
139
137
.verify ();
140
138
}
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
-
170
139
}
You can’t perform that action at this time.
0 commit comments