Skip to content

Commit 45376b3

Browse files
jzheauxjzheaux
committed
Adjust Packaging
Issue gh-9289
1 parent 20778f7 commit 45376b3

File tree

29 files changed

+39
-54
lines changed

29 files changed

+39
-54
lines changed

‎config/src/main/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfiguration.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@
4545
import org.springframework.core.annotation.AnnotatedElementUtils;
4646
import org.springframework.core.annotation.AnnotationAttributes;
4747
import org.springframework.core.type.AnnotationMetadata;
48-
import org.springframework.security.access.annotation.Jsr250AuthorizationManager;
48+
import org.springframework.security.authorization.method.Jsr250AuthorizationManager;
4949
import org.springframework.security.access.annotation.Secured;
50-
import org.springframework.security.access.annotation.SecuredAuthorizationManager;
50+
import org.springframework.security.authorization.method.SecuredAuthorizationManager;
5151
import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
5252
import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
53-
import org.springframework.security.access.intercept.aopalliance.AuthorizationMethodInterceptor;
54-
import org.springframework.security.access.method.AuthorizationManagerMethodAfterAdvice;
55-
import org.springframework.security.access.method.AuthorizationManagerMethodBeforeAdvice;
56-
import org.springframework.security.access.method.AuthorizationMethodAfterAdvice;
57-
import org.springframework.security.access.method.AuthorizationMethodBeforeAdvice;
58-
import org.springframework.security.access.method.DelegatingAuthorizationMethodAfterAdvice;
59-
import org.springframework.security.access.method.DelegatingAuthorizationMethodBeforeAdvice;
60-
import org.springframework.security.access.method.MethodAuthorizationContext;
53+
import org.springframework.security.authorization.method.AuthorizationMethodInterceptor;
54+
import org.springframework.security.authorization.method.AuthorizationManagerMethodAfterAdvice;
55+
import org.springframework.security.authorization.method.AuthorizationManagerMethodBeforeAdvice;
56+
import org.springframework.security.authorization.method.AuthorizationMethodAfterAdvice;
57+
import org.springframework.security.authorization.method.AuthorizationMethodBeforeAdvice;
58+
import org.springframework.security.authorization.method.DelegatingAuthorizationMethodAfterAdvice;
59+
import org.springframework.security.authorization.method.DelegatingAuthorizationMethodBeforeAdvice;
60+
import org.springframework.security.authorization.method.MethodAuthorizationContext;
6161
import org.springframework.security.access.prepost.PostAuthorize;
6262
import org.springframework.security.access.prepost.PreAuthorize;
6363
import org.springframework.security.authorization.method.PostAuthorizeAuthorizationManager;

‎config/src/test/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityConfigurationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
import org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl;
3636
import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
3737
import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
38-
import org.springframework.security.access.method.AuthorizationManagerMethodBeforeAdvice;
39-
import org.springframework.security.access.method.AuthorizationMethodAfterAdvice;
40-
import org.springframework.security.access.method.AuthorizationMethodBeforeAdvice;
41-
import org.springframework.security.access.method.MethodAuthorizationContext;
38+
import org.springframework.security.authorization.method.AuthorizationManagerMethodBeforeAdvice;
39+
import org.springframework.security.authorization.method.AuthorizationMethodAfterAdvice;
40+
import org.springframework.security.authorization.method.AuthorizationMethodBeforeAdvice;
41+
import org.springframework.security.authorization.method.MethodAuthorizationContext;
4242
import org.springframework.security.authorization.AuthorizationDecision;
4343
import org.springframework.security.authorization.AuthorizationManager;
4444
import org.springframework.security.config.test.SpringTestRule;

‎core/src/main/java/org/springframework/security/access/annotation/AbstractAuthorizationManagerRegistry.java renamed to ‎core/src/main/java/org/springframework/security/authorization/method/AbstractAuthorizationManagerRegistry.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.access.annotation;
17+
package org.springframework.security.authorization.method;
1818

1919
import java.lang.reflect.Method;
2020
import java.util.Map;
@@ -24,7 +24,6 @@
2424

2525
import org.springframework.core.MethodClassKey;
2626
import org.springframework.lang.NonNull;
27-
import org.springframework.security.access.method.MethodAuthorizationContext;
2827
import org.springframework.security.authorization.AuthorizationManager;
2928

3029
/**

‎core/src/main/java/org/springframework/security/authorization/method/AbstractExpressionAttributeRegistry.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.springframework.core.MethodClassKey;
2626
import org.springframework.lang.NonNull;
27-
import org.springframework.security.access.method.MethodAuthorizationContext;
2827

2928
/**
3029
* An abstract registry which provides an {@link ExpressionAttribute} for the

‎core/src/main/java/org/springframework/security/access/method/AuthorizationManagerMethodAfterAdvice.java renamed to ‎core/src/main/java/org/springframework/security/authorization/method/AuthorizationManagerMethodAfterAdvice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.access.method;
17+
package org.springframework.security.authorization.method;
1818

1919
import java.util.function.Supplier;
2020

‎core/src/main/java/org/springframework/security/access/method/AuthorizationManagerMethodBeforeAdvice.java renamed to ‎core/src/main/java/org/springframework/security/authorization/method/AuthorizationManagerMethodBeforeAdvice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.access.method;
17+
package org.springframework.security.authorization.method;
1818

1919
import java.util.function.Supplier;
2020

‎core/src/main/java/org/springframework/security/access/method/AuthorizationMethodAfterAdvice.java renamed to ‎core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodAfterAdvice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.access.method;
17+
package org.springframework.security.authorization.method;
1818

1919
import java.util.function.Supplier;
2020

‎core/src/main/java/org/springframework/security/access/method/AuthorizationMethodBeforeAdvice.java renamed to ‎core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodBeforeAdvice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.access.method;
17+
package org.springframework.security.authorization.method;
1818

1919
import java.util.function.Supplier;
2020

‎core/src/main/java/org/springframework/security/access/intercept/aopalliance/AuthorizationMethodInterceptor.java renamed to ‎core/src/main/java/org/springframework/security/authorization/method/AuthorizationMethodInterceptor.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.access.intercept.aopalliance;
17+
package org.springframework.security.authorization.method;
1818

1919
import org.aopalliance.intercept.MethodInterceptor;
2020
import org.aopalliance.intercept.MethodInvocation;
2121

2222
import org.springframework.aop.support.AopUtils;
2323
import org.springframework.lang.NonNull;
24-
import org.springframework.security.access.method.AuthorizationMethodAfterAdvice;
25-
import org.springframework.security.access.method.AuthorizationMethodBeforeAdvice;
26-
import org.springframework.security.access.method.MethodAuthorizationContext;
2724
import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
2825
import org.springframework.security.core.Authentication;
2926
import org.springframework.security.core.context.SecurityContextHolder;

‎core/src/main/java/org/springframework/security/access/method/DelegatingAuthorizationMethodAfterAdvice.java renamed to ‎core/src/main/java/org/springframework/security/authorization/method/DelegatingAuthorizationMethodAfterAdvice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.security.access.method;
17+
package org.springframework.security.authorization.method;
1818

1919
import java.lang.reflect.Method;
2020
import java.util.List;

0 commit comments

Comments
 (0)