From 45376b359bfe5b4dc3fb36f0d7e500003d8835d5 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Wed, 7 Apr 2021 15:33:47 -0600 Subject: [PATCH] Adjust Packaging Issue gh-9289 --- .../MethodSecurityConfiguration.java | 20 +++++++++---------- .../MethodSecurityConfigurationTests.java | 8 ++++---- .../AbstractAuthorizationManagerRegistry.java | 3 +-- .../AbstractExpressionAttributeRegistry.java | 1 - ...AuthorizationManagerMethodAfterAdvice.java | 2 +- ...uthorizationManagerMethodBeforeAdvice.java | 2 +- .../AuthorizationMethodAfterAdvice.java | 2 +- .../AuthorizationMethodBeforeAdvice.java | 2 +- .../AuthorizationMethodInterceptor.java | 5 +---- ...egatingAuthorizationMethodAfterAdvice.java | 2 +- ...gatingAuthorizationMethodBeforeAdvice.java | 2 +- .../method}/Jsr250AuthorizationManager.java | 3 +-- .../method/MethodAuthorizationContext.java | 2 +- .../PostAuthorizeAuthorizationManager.java | 1 - ...tFilterAuthorizationMethodAfterAdvice.java | 2 -- .../PreAuthorizeAuthorizationManager.java | 1 - ...FilterAuthorizationMethodBeforeAdvice.java | 2 -- .../method}/SecuredAuthorizationManager.java | 4 ++-- ...rizationManagerMethodAfterAdviceTests.java | 3 ++- ...izationManagerMethodBeforeAdviceTests.java | 3 ++- .../AuthorizationMethodInterceptorTests.java | 5 +---- ...ngAuthorizationMethodAfterAdviceTests.java | 5 ++++- ...gAuthorizationMethodBeforeAdviceTests.java | 2 +- .../Jsr250AuthorizationManagerTests.java | 3 +-- ...ostAuthorizeAuthorizationManagerTests.java | 1 - ...erAuthorizationMethodAfterAdviceTests.java | 1 - ...PreAuthorizeAuthorizationManagerTests.java | 1 - ...rAuthorizationMethodBeforeAdviceTests.java | 1 - .../SecuredAuthorizationManagerTests.java | 4 ++-- 29 files changed, 39 insertions(+), 54 deletions(-) rename core/src/main/java/org/springframework/security/{access/annotation => authorization/method}/AbstractAuthorizationManagerRegistry.java (94%) rename core/src/main/java/org/springframework/security/{access => authorization}/method/AuthorizationManagerMethodAfterAdvice.java (97%) rename core/src/main/java/org/springframework/security/{access => authorization}/method/AuthorizationManagerMethodBeforeAdvice.java (97%) rename core/src/main/java/org/springframework/security/{access => authorization}/method/AuthorizationMethodAfterAdvice.java (97%) rename core/src/main/java/org/springframework/security/{access => authorization}/method/AuthorizationMethodBeforeAdvice.java (96%) rename core/src/main/java/org/springframework/security/{access/intercept/aopalliance => authorization/method}/AuthorizationMethodInterceptor.java (90%) rename core/src/main/java/org/springframework/security/{access => authorization}/method/DelegatingAuthorizationMethodAfterAdvice.java (98%) rename core/src/main/java/org/springframework/security/{access => authorization}/method/DelegatingAuthorizationMethodBeforeAdvice.java (98%) rename core/src/main/java/org/springframework/security/{access/annotation => authorization/method}/Jsr250AuthorizationManager.java (97%) rename core/src/main/java/org/springframework/security/{access => authorization}/method/MethodAuthorizationContext.java (97%) rename core/src/main/java/org/springframework/security/{access/annotation => authorization/method}/SecuredAuthorizationManager.java (96%) rename core/src/test/java/org/springframework/security/{access => authorization}/method/AuthorizationManagerMethodAfterAdviceTests.java (94%) rename core/src/test/java/org/springframework/security/{access => authorization}/method/AuthorizationManagerMethodBeforeAdviceTests.java (94%) rename core/src/test/java/org/springframework/security/{access/intercept/aopalliance => authorization/method}/AuthorizationMethodInterceptorTests.java (93%) rename core/src/test/java/org/springframework/security/{access => authorization}/method/DelegatingAuthorizationMethodAfterAdviceTests.java (94%) rename core/src/test/java/org/springframework/security/{access => authorization}/method/DelegatingAuthorizationMethodBeforeAdviceTests.java (99%) rename core/src/test/java/org/springframework/security/{access/annotation => authorization/method}/Jsr250AuthorizationManagerTests.java (97%) rename core/src/test/java/org/springframework/security/{access/annotation => authorization/method}/SecuredAuthorizationManagerTests.java (96%) diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfiguration.java index 529a78f45c..090b193baa 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfiguration.java @@ -45,19 +45,19 @@ import org.springframework.context.annotation.Role; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.type.AnnotationMetadata; -import org.springframework.security.access.annotation.Jsr250AuthorizationManager; +import org.springframework.security.authorization.method.Jsr250AuthorizationManager; import org.springframework.security.access.annotation.Secured; -import org.springframework.security.access.annotation.SecuredAuthorizationManager; +import org.springframework.security.authorization.method.SecuredAuthorizationManager; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; -import org.springframework.security.access.intercept.aopalliance.AuthorizationMethodInterceptor; -import org.springframework.security.access.method.AuthorizationManagerMethodAfterAdvice; -import org.springframework.security.access.method.AuthorizationManagerMethodBeforeAdvice; -import org.springframework.security.access.method.AuthorizationMethodAfterAdvice; -import org.springframework.security.access.method.AuthorizationMethodBeforeAdvice; -import org.springframework.security.access.method.DelegatingAuthorizationMethodAfterAdvice; -import org.springframework.security.access.method.DelegatingAuthorizationMethodBeforeAdvice; -import org.springframework.security.access.method.MethodAuthorizationContext; +import org.springframework.security.authorization.method.AuthorizationMethodInterceptor; +import org.springframework.security.authorization.method.AuthorizationManagerMethodAfterAdvice; +import org.springframework.security.authorization.method.AuthorizationManagerMethodBeforeAdvice; +import org.springframework.security.authorization.method.AuthorizationMethodAfterAdvice; +import org.springframework.security.authorization.method.AuthorizationMethodBeforeAdvice; +import org.springframework.security.authorization.method.DelegatingAuthorizationMethodAfterAdvice; +import org.springframework.security.authorization.method.DelegatingAuthorizationMethodBeforeAdvice; +import org.springframework.security.authorization.method.MethodAuthorizationContext; import org.springframework.security.access.prepost.PostAuthorize; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.authorization.method.PostAuthorizeAuthorizationManager; diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfigurationTests.java index 41bf8f7c3c..d50fc09652 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfigurationTests.java @@ -35,10 +35,10 @@ import org.springframework.security.access.annotation.BusinessService; import org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; -import org.springframework.security.access.method.AuthorizationManagerMethodBeforeAdvice; -import org.springframework.security.access.method.AuthorizationMethodAfterAdvice; -import org.springframework.security.access.method.AuthorizationMethodBeforeAdvice; -import org.springframework.security.access.method.MethodAuthorizationContext; +import org.springframework.security.authorization.method.AuthorizationManagerMethodBeforeAdvice; +import org.springframework.security.authorization.method.AuthorizationMethodAfterAdvice; +import org.springframework.security.authorization.method.AuthorizationMethodBeforeAdvice; +import org.springframework.security.authorization.method.MethodAuthorizationContext; import org.springframework.security.authorization.AuthorizationDecision; import org.springframework.security.authorization.AuthorizationManager; import org.springframework.security.config.test.SpringTestRule; diff --git a/core/src/main/java/org/springframework/security/access/annotation/AbstractAuthorizationManagerRegistry.java b/core/src/main/java/org/springframework/security/authorization/method/AbstractAuthorizationManagerRegistry.java similarity index 94% rename from core/src/main/java/org/springframework/security/access/annotation/AbstractAuthorizationManagerRegistry.java rename to core/src/main/java/org/springframework/security/authorization/method/AbstractAuthorizationManagerRegistry.java index 855f2ab0c0..9509e7a084 100644 --- a/core/src/main/java/org/springframework/security/access/annotation/AbstractAuthorizationManagerRegistry.java +++ b/core/src/main/java/org/springframework/security/authorization/method/AbstractAuthorizationManagerRegistry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.annotation; +package org.springframework.security.authorization.method; import java.lang.reflect.Method; import java.util.Map; @@ -24,7 +24,6 @@ import org.aopalliance.intercept.MethodInvocation; import org.springframework.core.MethodClassKey; import org.springframework.lang.NonNull; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.authorization.AuthorizationManager; /** diff --git a/core/src/main/java/org/springframework/security/authorization/method/AbstractExpressionAttributeRegistry.java b/core/src/main/java/org/springframework/security/authorization/method/AbstractExpressionAttributeRegistry.java index f48d59dd33..cc943f110d 100644 --- a/core/src/main/java/org/springframework/security/authorization/method/AbstractExpressionAttributeRegistry.java +++ b/core/src/main/java/org/springframework/security/authorization/method/AbstractExpressionAttributeRegistry.java @@ -24,7 +24,6 @@ import org.aopalliance.intercept.MethodInvocation; import org.springframework.core.MethodClassKey; import org.springframework.lang.NonNull; -import org.springframework.security.access.method.MethodAuthorizationContext; /** * An abstract registry which provides an {@link ExpressionAttribute} for the diff --git a/core/src/main/java/org/springframework/security/access/method/AuthorizationManagerMethodAfterAdvice.java b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationManagerMethodAfterAdvice.java similarity index 97% rename from core/src/main/java/org/springframework/security/access/method/AuthorizationManagerMethodAfterAdvice.java rename to core/src/main/java/org/springframework/security/authorization/method/AuthorizationManagerMethodAfterAdvice.java index 776cc3e032..f21115e0f5 100644 --- a/core/src/main/java/org/springframework/security/access/method/AuthorizationManagerMethodAfterAdvice.java +++ b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationManagerMethodAfterAdvice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.method; +package org.springframework.security.authorization.method; import java.util.function.Supplier; diff --git a/core/src/main/java/org/springframework/security/access/method/AuthorizationManagerMethodBeforeAdvice.java b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationManagerMethodBeforeAdvice.java similarity index 97% rename from core/src/main/java/org/springframework/security/access/method/AuthorizationManagerMethodBeforeAdvice.java rename to core/src/main/java/org/springframework/security/authorization/method/AuthorizationManagerMethodBeforeAdvice.java index e8d583d92f..9248179b43 100644 --- a/core/src/main/java/org/springframework/security/access/method/AuthorizationManagerMethodBeforeAdvice.java +++ b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationManagerMethodBeforeAdvice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.method; +package org.springframework.security.authorization.method; import java.util.function.Supplier; diff --git a/core/src/main/java/org/springframework/security/access/method/AuthorizationMethodAfterAdvice.java b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodAfterAdvice.java similarity index 97% rename from core/src/main/java/org/springframework/security/access/method/AuthorizationMethodAfterAdvice.java rename to core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodAfterAdvice.java index ac95eb6202..f2c91876a2 100644 --- a/core/src/main/java/org/springframework/security/access/method/AuthorizationMethodAfterAdvice.java +++ b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodAfterAdvice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.method; +package org.springframework.security.authorization.method; import java.util.function.Supplier; diff --git a/core/src/main/java/org/springframework/security/access/method/AuthorizationMethodBeforeAdvice.java b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodBeforeAdvice.java similarity index 96% rename from core/src/main/java/org/springframework/security/access/method/AuthorizationMethodBeforeAdvice.java rename to core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodBeforeAdvice.java index d367d52514..2cbc4de499 100644 --- a/core/src/main/java/org/springframework/security/access/method/AuthorizationMethodBeforeAdvice.java +++ b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodBeforeAdvice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.method; +package org.springframework.security.authorization.method; import java.util.function.Supplier; diff --git a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/AuthorizationMethodInterceptor.java b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodInterceptor.java similarity index 90% rename from core/src/main/java/org/springframework/security/access/intercept/aopalliance/AuthorizationMethodInterceptor.java rename to core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodInterceptor.java index 37de6d2df6..961d4a1705 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/AuthorizationMethodInterceptor.java +++ b/core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodInterceptor.java @@ -14,16 +14,13 @@ * limitations under the License. */ -package org.springframework.security.access.intercept.aopalliance; +package org.springframework.security.authorization.method; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.springframework.aop.support.AopUtils; import org.springframework.lang.NonNull; -import org.springframework.security.access.method.AuthorizationMethodAfterAdvice; -import org.springframework.security.access.method.AuthorizationMethodBeforeAdvice; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/core/src/main/java/org/springframework/security/access/method/DelegatingAuthorizationMethodAfterAdvice.java b/core/src/main/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodAfterAdvice.java similarity index 98% rename from core/src/main/java/org/springframework/security/access/method/DelegatingAuthorizationMethodAfterAdvice.java rename to core/src/main/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodAfterAdvice.java index b4d6c0548d..30207a4bd7 100644 --- a/core/src/main/java/org/springframework/security/access/method/DelegatingAuthorizationMethodAfterAdvice.java +++ b/core/src/main/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodAfterAdvice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.method; +package org.springframework.security.authorization.method; import java.lang.reflect.Method; import java.util.List; diff --git a/core/src/main/java/org/springframework/security/access/method/DelegatingAuthorizationMethodBeforeAdvice.java b/core/src/main/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodBeforeAdvice.java similarity index 98% rename from core/src/main/java/org/springframework/security/access/method/DelegatingAuthorizationMethodBeforeAdvice.java rename to core/src/main/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodBeforeAdvice.java index ee4d4a937e..a34cbf7035 100644 --- a/core/src/main/java/org/springframework/security/access/method/DelegatingAuthorizationMethodBeforeAdvice.java +++ b/core/src/main/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodBeforeAdvice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.method; +package org.springframework.security.authorization.method; import java.lang.reflect.Method; import java.util.List; diff --git a/core/src/main/java/org/springframework/security/access/annotation/Jsr250AuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/method/Jsr250AuthorizationManager.java similarity index 97% rename from core/src/main/java/org/springframework/security/access/annotation/Jsr250AuthorizationManager.java rename to core/src/main/java/org/springframework/security/authorization/method/Jsr250AuthorizationManager.java index 19ed88ee23..a878b71ca1 100644 --- a/core/src/main/java/org/springframework/security/access/annotation/Jsr250AuthorizationManager.java +++ b/core/src/main/java/org/springframework/security/authorization/method/Jsr250AuthorizationManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.annotation; +package org.springframework.security.authorization.method; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; @@ -32,7 +32,6 @@ import org.aopalliance.intercept.MethodInvocation; import org.springframework.aop.support.AopUtils; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.lang.NonNull; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.authorization.AuthorityAuthorizationManager; import org.springframework.security.authorization.AuthorizationDecision; import org.springframework.security.authorization.AuthorizationManager; diff --git a/core/src/main/java/org/springframework/security/access/method/MethodAuthorizationContext.java b/core/src/main/java/org/springframework/security/authorization/method/MethodAuthorizationContext.java similarity index 97% rename from core/src/main/java/org/springframework/security/access/method/MethodAuthorizationContext.java rename to core/src/main/java/org/springframework/security/authorization/method/MethodAuthorizationContext.java index 4361f9ac9a..a73b0f0846 100644 --- a/core/src/main/java/org/springframework/security/access/method/MethodAuthorizationContext.java +++ b/core/src/main/java/org/springframework/security/authorization/method/MethodAuthorizationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.method; +package org.springframework.security.authorization.method; import org.aopalliance.intercept.MethodInvocation; diff --git a/core/src/main/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManager.java index 11109fb67e..9a594288d3 100644 --- a/core/src/main/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManager.java +++ b/core/src/main/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManager.java @@ -29,7 +29,6 @@ import org.springframework.expression.Expression; import org.springframework.security.access.expression.ExpressionUtils; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.access.prepost.PostAuthorize; import org.springframework.security.authorization.AuthorizationDecision; import org.springframework.security.authorization.AuthorizationManager; diff --git a/core/src/main/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodAfterAdvice.java b/core/src/main/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodAfterAdvice.java index c573922c9c..6e5a2f9713 100644 --- a/core/src/main/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodAfterAdvice.java +++ b/core/src/main/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodAfterAdvice.java @@ -30,8 +30,6 @@ import org.springframework.expression.Expression; import org.springframework.lang.NonNull; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; -import org.springframework.security.access.method.AuthorizationMethodAfterAdvice; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.access.prepost.PostFilter; import org.springframework.security.core.Authentication; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManager.java index bebceee0e6..9a876d7ab0 100644 --- a/core/src/main/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManager.java +++ b/core/src/main/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManager.java @@ -29,7 +29,6 @@ import org.springframework.expression.Expression; import org.springframework.security.access.expression.ExpressionUtils; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.authorization.AuthorizationDecision; import org.springframework.security.authorization.AuthorizationManager; diff --git a/core/src/main/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodBeforeAdvice.java b/core/src/main/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodBeforeAdvice.java index 93ab362103..486ead59c9 100644 --- a/core/src/main/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodBeforeAdvice.java +++ b/core/src/main/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodBeforeAdvice.java @@ -30,8 +30,6 @@ import org.springframework.expression.Expression; import org.springframework.lang.NonNull; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; -import org.springframework.security.access.method.AuthorizationMethodBeforeAdvice; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.access.prepost.PreFilter; import org.springframework.security.core.Authentication; import org.springframework.util.Assert; diff --git a/core/src/main/java/org/springframework/security/access/annotation/SecuredAuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/method/SecuredAuthorizationManager.java similarity index 96% rename from core/src/main/java/org/springframework/security/access/annotation/SecuredAuthorizationManager.java rename to core/src/main/java/org/springframework/security/authorization/method/SecuredAuthorizationManager.java index ca962669f2..d74ad1155b 100644 --- a/core/src/main/java/org/springframework/security/access/annotation/SecuredAuthorizationManager.java +++ b/core/src/main/java/org/springframework/security/authorization/method/SecuredAuthorizationManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.annotation; +package org.springframework.security.authorization.method; import java.lang.reflect.Method; import java.util.function.Supplier; @@ -24,7 +24,7 @@ import org.aopalliance.intercept.MethodInvocation; import org.springframework.aop.support.AopUtils; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.lang.NonNull; -import org.springframework.security.access.method.MethodAuthorizationContext; +import org.springframework.security.access.annotation.Secured; import org.springframework.security.authorization.AuthorityAuthorizationManager; import org.springframework.security.authorization.AuthorizationDecision; import org.springframework.security.authorization.AuthorizationManager; diff --git a/core/src/test/java/org/springframework/security/access/method/AuthorizationManagerMethodAfterAdviceTests.java b/core/src/test/java/org/springframework/security/authorization/method/AuthorizationManagerMethodAfterAdviceTests.java similarity index 94% rename from core/src/test/java/org/springframework/security/access/method/AuthorizationManagerMethodAfterAdviceTests.java rename to core/src/test/java/org/springframework/security/authorization/method/AuthorizationManagerMethodAfterAdviceTests.java index f2c8a96ea5..1ce9dddb74 100644 --- a/core/src/test/java/org/springframework/security/access/method/AuthorizationManagerMethodAfterAdviceTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/AuthorizationManagerMethodAfterAdviceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.method; +package org.springframework.security.authorization.method; import java.util.function.Supplier; @@ -24,6 +24,7 @@ import org.junit.Test; import org.springframework.aop.MethodMatcher; import org.springframework.security.authentication.TestAuthentication; import org.springframework.security.authorization.AuthorizationManager; +import org.springframework.security.authorization.method.AuthorizationManagerMethodAfterAdvice; import org.springframework.security.core.Authentication; import static org.assertj.core.api.Assertions.assertThat; diff --git a/core/src/test/java/org/springframework/security/access/method/AuthorizationManagerMethodBeforeAdviceTests.java b/core/src/test/java/org/springframework/security/authorization/method/AuthorizationManagerMethodBeforeAdviceTests.java similarity index 94% rename from core/src/test/java/org/springframework/security/access/method/AuthorizationManagerMethodBeforeAdviceTests.java rename to core/src/test/java/org/springframework/security/authorization/method/AuthorizationManagerMethodBeforeAdviceTests.java index 72da6d2d8f..5c7091429e 100644 --- a/core/src/test/java/org/springframework/security/access/method/AuthorizationManagerMethodBeforeAdviceTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/AuthorizationManagerMethodBeforeAdviceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.method; +package org.springframework.security.authorization.method; import java.util.function.Supplier; @@ -24,6 +24,7 @@ import org.junit.Test; import org.springframework.aop.MethodMatcher; import org.springframework.security.authentication.TestAuthentication; import org.springframework.security.authorization.AuthorizationManager; +import org.springframework.security.authorization.method.AuthorizationManagerMethodBeforeAdvice; import org.springframework.security.core.Authentication; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; diff --git a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/AuthorizationMethodInterceptorTests.java b/core/src/test/java/org/springframework/security/authorization/method/AuthorizationMethodInterceptorTests.java similarity index 93% rename from core/src/test/java/org/springframework/security/access/intercept/aopalliance/AuthorizationMethodInterceptorTests.java rename to core/src/test/java/org/springframework/security/authorization/method/AuthorizationMethodInterceptorTests.java index 3f647cc9bf..fe3b0915e9 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/AuthorizationMethodInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/AuthorizationMethodInterceptorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.intercept.aopalliance; +package org.springframework.security.authorization.method; import java.util.function.Supplier; @@ -23,9 +23,6 @@ import org.junit.Test; import org.springframework.aop.MethodMatcher; import org.springframework.security.access.intercept.method.MockMethodInvocation; -import org.springframework.security.access.method.AuthorizationMethodAfterAdvice; -import org.springframework.security.access.method.AuthorizationMethodBeforeAdvice; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.authentication.TestAuthentication; import org.springframework.security.core.Authentication; diff --git a/core/src/test/java/org/springframework/security/access/method/DelegatingAuthorizationMethodAfterAdviceTests.java b/core/src/test/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodAfterAdviceTests.java similarity index 94% rename from core/src/test/java/org/springframework/security/access/method/DelegatingAuthorizationMethodAfterAdviceTests.java rename to core/src/test/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodAfterAdviceTests.java index 79bb042457..343d6b21a2 100644 --- a/core/src/test/java/org/springframework/security/access/method/DelegatingAuthorizationMethodAfterAdviceTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodAfterAdviceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.method; +package org.springframework.security.authorization.method; import java.lang.reflect.Method; import java.util.ArrayList; @@ -27,6 +27,9 @@ import org.springframework.aop.MethodMatcher; import org.springframework.aop.support.StaticMethodMatcher; import org.springframework.security.access.intercept.method.MockMethodInvocation; import org.springframework.security.authentication.TestAuthentication; +import org.springframework.security.authorization.method.AuthorizationMethodAfterAdvice; +import org.springframework.security.authorization.method.DelegatingAuthorizationMethodAfterAdvice; +import org.springframework.security.authorization.method.MethodAuthorizationContext; import org.springframework.security.core.Authentication; import static org.assertj.core.api.Assertions.assertThat; diff --git a/core/src/test/java/org/springframework/security/access/method/DelegatingAuthorizationMethodBeforeAdviceTests.java b/core/src/test/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodBeforeAdviceTests.java similarity index 99% rename from core/src/test/java/org/springframework/security/access/method/DelegatingAuthorizationMethodBeforeAdviceTests.java rename to core/src/test/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodBeforeAdviceTests.java index 5e82783f7e..4bc00494b8 100644 --- a/core/src/test/java/org/springframework/security/access/method/DelegatingAuthorizationMethodBeforeAdviceTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodBeforeAdviceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.method; +package org.springframework.security.authorization.method; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/core/src/test/java/org/springframework/security/access/annotation/Jsr250AuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/method/Jsr250AuthorizationManagerTests.java similarity index 97% rename from core/src/test/java/org/springframework/security/access/annotation/Jsr250AuthorizationManagerTests.java rename to core/src/test/java/org/springframework/security/authorization/method/Jsr250AuthorizationManagerTests.java index a8cdf3273b..f4414f5bdd 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/Jsr250AuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/Jsr250AuthorizationManagerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.access.annotation; +package org.springframework.security.authorization.method; import java.util.function.Supplier; @@ -25,7 +25,6 @@ import javax.annotation.security.RolesAllowed; import org.junit.Test; import org.springframework.security.access.intercept.method.MockMethodInvocation; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.authentication.TestAuthentication; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.authorization.AuthorizationDecision; diff --git a/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManagerTests.java index 62da757d15..3da8219285 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManagerTests.java @@ -25,7 +25,6 @@ import org.junit.Test; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; import org.springframework.security.access.intercept.method.MockMethodInvocation; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.access.prepost.PostAuthorize; import org.springframework.security.authentication.TestAuthentication; import org.springframework.security.authorization.AuthorizationDecision; diff --git a/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodAfterAdviceTests.java b/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodAfterAdviceTests.java index 32e5784fe3..d1bd6e50a5 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodAfterAdviceTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodAfterAdviceTests.java @@ -23,7 +23,6 @@ import org.springframework.aop.MethodMatcher; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; import org.springframework.security.access.intercept.method.MockMethodInvocation; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.access.prepost.PostFilter; import org.springframework.security.authentication.TestAuthentication; diff --git a/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManagerTests.java index ebabf1c5e3..cbc3b73ba5 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManagerTests.java @@ -21,7 +21,6 @@ import org.junit.Test; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; import org.springframework.security.access.intercept.method.MockMethodInvocation; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.authentication.TestAuthentication; import org.springframework.security.authorization.AuthorizationDecision; diff --git a/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodBeforeAdviceTests.java b/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodBeforeAdviceTests.java index c38b4b165a..70d93e1410 100644 --- a/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodBeforeAdviceTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodBeforeAdviceTests.java @@ -25,7 +25,6 @@ import org.springframework.aop.MethodMatcher; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; import org.springframework.security.access.intercept.method.MockMethodInvocation; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.access.prepost.PreFilter; import org.springframework.security.authentication.TestAuthentication; diff --git a/core/src/test/java/org/springframework/security/access/annotation/SecuredAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/method/SecuredAuthorizationManagerTests.java similarity index 96% rename from core/src/test/java/org/springframework/security/access/annotation/SecuredAuthorizationManagerTests.java rename to core/src/test/java/org/springframework/security/authorization/method/SecuredAuthorizationManagerTests.java index 0d94919219..15ce6ffb06 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/SecuredAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/method/SecuredAuthorizationManagerTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.security.access.annotation; +package org.springframework.security.authorization.method; import java.util.function.Supplier; import org.junit.Test; +import org.springframework.security.access.annotation.Secured; import org.springframework.security.access.intercept.method.MockMethodInvocation; -import org.springframework.security.access.method.MethodAuthorizationContext; import org.springframework.security.authentication.TestAuthentication; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.authorization.AuthorizationDecision;