From f1bc82dcef6900221a39975fb10544f15d5c6bd9 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Tue, 10 Oct 2017 09:37:27 -0500
Subject: [PATCH] 
 AuthenticatedAuthorizationManager->AuthenticatedReactiveAuthorizationManager

Issue gh-4615
---
 .../security/config/web/server/HttpSecurity.java          | 4 ++--
 ...ava => AuthenticatedReactiveAuthorizationManager.java} | 8 ++++----
 ...> AuthenticatedReactiveAuthorizationManagerTests.java} | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename core/src/main/java/org/springframework/security/authorization/{AuthenticatedAuthorizationManager.java => AuthenticatedReactiveAuthorizationManager.java} (77%)
 rename core/src/test/java/org/springframework/security/authorization/{AuthenticatedAuthorizationManagerTests.java => AuthenticatedReactiveAuthorizationManagerTests.java} (91%)

diff --git a/config/src/main/java/org/springframework/security/config/web/server/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/HttpSecurity.java
index deb76a937b..c95633bbc1 100644
--- a/config/src/main/java/org/springframework/security/config/web/server/HttpSecurity.java
+++ b/config/src/main/java/org/springframework/security/config/web/server/HttpSecurity.java
@@ -20,7 +20,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.security.authentication.ReactiveAuthenticationManager;
-import org.springframework.security.authorization.AuthenticatedAuthorizationManager;
+import org.springframework.security.authorization.AuthenticatedReactiveAuthorizationManager;
 import org.springframework.security.authorization.AuthorityReactiveAuthorizationManager;
 import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.ReactiveAuthorizationManager;
@@ -301,7 +301,7 @@ public class HttpSecurity {
 			}
 
 			public AuthorizeExchangeBuilder authenticated() {
-				return access(AuthenticatedAuthorizationManager.authenticated());
+				return access(AuthenticatedReactiveAuthorizationManager.authenticated());
 			}
 
 			public AuthorizeExchangeBuilder access(ReactiveAuthorizationManager<AuthorizationContext> manager) {
diff --git a/core/src/main/java/org/springframework/security/authorization/AuthenticatedAuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManager.java
similarity index 77%
rename from core/src/main/java/org/springframework/security/authorization/AuthenticatedAuthorizationManager.java
rename to core/src/main/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManager.java
index 1ca3c6a089..cda0b198bd 100644
--- a/core/src/main/java/org/springframework/security/authorization/AuthenticatedAuthorizationManager.java
+++ b/core/src/main/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManager.java
@@ -23,7 +23,7 @@ import reactor.core.publisher.Mono;
  * @author Rob Winch
  * @since 5.0
  */
-public class AuthenticatedAuthorizationManager<T> implements ReactiveAuthorizationManager<T> {
+public class AuthenticatedReactiveAuthorizationManager<T> implements ReactiveAuthorizationManager<T> {
 
 	@Override
 	public Mono<AuthorizationDecision> check(Mono<Authentication> authentication, T object) {
@@ -32,9 +32,9 @@ public class AuthenticatedAuthorizationManager<T> implements ReactiveAuthorizati
 			.defaultIfEmpty(new AuthorizationDecision(false));
 	}
 
-	public static <T> AuthenticatedAuthorizationManager<T> authenticated() {
-		return new AuthenticatedAuthorizationManager<>();
+	public static <T> AuthenticatedReactiveAuthorizationManager<T> authenticated() {
+		return new AuthenticatedReactiveAuthorizationManager<>();
 	}
 
-	private AuthenticatedAuthorizationManager() {}
+	private AuthenticatedReactiveAuthorizationManager() {}
 }
diff --git a/core/src/test/java/org/springframework/security/authorization/AuthenticatedAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManagerTests.java
similarity index 91%
rename from core/src/test/java/org/springframework/security/authorization/AuthenticatedAuthorizationManagerTests.java
rename to core/src/test/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManagerTests.java
index 6bd91b90cb..2d05e46ddd 100644
--- a/core/src/test/java/org/springframework/security/authorization/AuthenticatedAuthorizationManagerTests.java
+++ b/core/src/test/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManagerTests.java
@@ -16,7 +16,6 @@
 
 package org.springframework.security.authorization;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -33,11 +32,12 @@ import static org.mockito.Mockito.when;
  * @since 5.0
  */
 @RunWith(MockitoJUnitRunner.class)
-public class AuthenticatedAuthorizationManagerTests {
+public class AuthenticatedReactiveAuthorizationManagerTests {
 	@Mock
 	Authentication authentication;
 
-	AuthenticatedAuthorizationManager<Object> manager = AuthenticatedAuthorizationManager.authenticated();
+	AuthenticatedReactiveAuthorizationManager<Object> manager = AuthenticatedReactiveAuthorizationManager
+		.authenticated();
 
 	@Test
 	public void checkWhenAuthenticatedThenReturnTrue() {