From 550285609579061fd1400f1b048aef00e852ea96 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 10 Oct 2017 10:07:14 -0500 Subject: [PATCH] UserDetailsRepositoryAuthenticationManager->UserDetailsRepositoryReactiveAuthenticationManager Issue gh-4615 --- .../annotation/web/reactive/HttpSecurityConfiguration.java | 6 +++--- .../security/config/web/server/FormLoginTests.java | 4 ++-- .../security/config/web/server/LogoutBuilderTests.java | 4 ++-- ...UserDetailsRepositoryReactiveAuthenticationManager.java} | 4 ++-- ...eactiveUserDetailsServiceAuthenticationManagerTests.java | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) rename core/src/main/java/org/springframework/security/authentication/{UserDetailsRepositoryAuthenticationManager.java => UserDetailsRepositoryReactiveAuthenticationManager.java} (90%) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/reactive/HttpSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/reactive/HttpSecurityConfiguration.java index 997d962466..1ca2cd2fe4 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/reactive/HttpSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/reactive/HttpSecurityConfiguration.java @@ -21,7 +21,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Scope; import org.springframework.core.ReactiveAdapterRegistry; import org.springframework.security.authentication.ReactiveAuthenticationManager; -import org.springframework.security.authentication.UserDetailsRepositoryAuthenticationManager; +import org.springframework.security.authentication.UserDetailsRepositoryReactiveAuthenticationManager; import org.springframework.security.config.web.server.HttpSecurity; import org.springframework.security.core.userdetails.ReactiveUserDetailsService; import org.springframework.security.crypto.password.PasswordEncoder; @@ -77,8 +77,8 @@ public class HttpSecurityConfiguration implements WebFluxConfigurer { return this.authenticationManager; } if(this.reactiveUserDetailsService != null) { - UserDetailsRepositoryAuthenticationManager manager = - new UserDetailsRepositoryAuthenticationManager(this.reactiveUserDetailsService); + UserDetailsRepositoryReactiveAuthenticationManager manager = + new UserDetailsRepositoryReactiveAuthenticationManager(this.reactiveUserDetailsService); if(this.passwordEncoder != null) { manager.setPasswordEncoder(this.passwordEncoder); } diff --git a/config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java b/config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java index d069667370..fbeae355ea 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java @@ -22,7 +22,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.PageFactory; import org.springframework.security.authentication.ReactiveAuthenticationManager; -import org.springframework.security.authentication.UserDetailsRepositoryAuthenticationManager; +import org.springframework.security.authentication.UserDetailsRepositoryReactiveAuthenticationManager; import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; @@ -45,7 +45,7 @@ public class FormLoginTests { private UserDetails user = User.withUsername("user").password("password").roles("USER").build(); private HttpSecurity http = HttpSecurity.http(); - ReactiveAuthenticationManager manager = new UserDetailsRepositoryAuthenticationManager(new MapReactiveUserDetailsService(this.user)); + ReactiveAuthenticationManager manager = new UserDetailsRepositoryReactiveAuthenticationManager(new MapReactiveUserDetailsService(this.user)); @Test public void defaultLoginPage() { diff --git a/config/src/test/java/org/springframework/security/config/web/server/LogoutBuilderTests.java b/config/src/test/java/org/springframework/security/config/web/server/LogoutBuilderTests.java index 2c8012c6cc..27b1084a87 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/LogoutBuilderTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/LogoutBuilderTests.java @@ -19,7 +19,7 @@ package org.springframework.security.config.web.server; import org.junit.Test; import org.openqa.selenium.WebDriver; import org.springframework.security.authentication.ReactiveAuthenticationManager; -import org.springframework.security.authentication.UserDetailsRepositoryAuthenticationManager; +import org.springframework.security.authentication.UserDetailsRepositoryReactiveAuthenticationManager; import org.springframework.security.core.userdetails.MapReactiveUserDetailsService; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; @@ -37,7 +37,7 @@ public class LogoutBuilderTests { private UserDetails user = User.withUsername("user").password("password").roles("USER").build(); private HttpSecurity http = HttpSecurity.http(); - ReactiveAuthenticationManager manager = new UserDetailsRepositoryAuthenticationManager(new MapReactiveUserDetailsService(this.user)); + ReactiveAuthenticationManager manager = new UserDetailsRepositoryReactiveAuthenticationManager(new MapReactiveUserDetailsService(this.user)); @Test public void defaultLogout() { diff --git a/core/src/main/java/org/springframework/security/authentication/UserDetailsRepositoryAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManager.java similarity index 90% rename from core/src/main/java/org/springframework/security/authentication/UserDetailsRepositoryAuthenticationManager.java rename to core/src/main/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManager.java index 77af558768..a5548c5e24 100644 --- a/core/src/main/java/org/springframework/security/authentication/UserDetailsRepositoryAuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManager.java @@ -29,12 +29,12 @@ import reactor.core.scheduler.Schedulers; * @author Rob Winch * @since 5.0 */ -public class UserDetailsRepositoryAuthenticationManager implements ReactiveAuthenticationManager { +public class UserDetailsRepositoryReactiveAuthenticationManager implements ReactiveAuthenticationManager { private final ReactiveUserDetailsService repository; private PasswordEncoder passwordEncoder = NoOpPasswordEncoder.getInstance(); - public UserDetailsRepositoryAuthenticationManager(ReactiveUserDetailsService reactiveUserDetailsService) { + public UserDetailsRepositoryReactiveAuthenticationManager(ReactiveUserDetailsService reactiveUserDetailsService) { Assert.notNull(reactiveUserDetailsService, "userDetailsRepository cannot be null"); this.repository = reactiveUserDetailsService; } 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 80b36d3cac..d6b1cec741 100644 --- a/core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java @@ -42,13 +42,13 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests { @Mock ReactiveUserDetailsService repository; @Mock PasswordEncoder passwordEncoder; - UserDetailsRepositoryAuthenticationManager manager; + UserDetailsRepositoryReactiveAuthenticationManager manager; String username; String password; @Before public void setup() { - manager = new UserDetailsRepositoryAuthenticationManager(repository); + manager = new UserDetailsRepositoryReactiveAuthenticationManager(repository); username = "user"; password = "pass"; } @@ -56,7 +56,7 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests { @Test(expected = IllegalArgumentException.class) public void constructorNullUserDetailsRepository() { ReactiveUserDetailsService udr = null; - new UserDetailsRepositoryAuthenticationManager(udr); + new UserDetailsRepositoryReactiveAuthenticationManager(udr); } @Test