From 4f186f2c1fb520dc95fa5307db9dde299b642e3a Mon Sep 17 00:00:00 2001 From: Norbert Nowak Date: Fri, 5 Nov 2021 20:12:59 +0100 Subject: [PATCH] Move Dsl files to annotation Package Closes gh-10333 --- .../web}/AbstractRequestMatcherDsl.kt | 2 +- .../{web/servlet => annotation/web}/AnonymousDsl.kt | 2 +- .../servlet => annotation/web}/AuthorizeRequestsDsl.kt | 2 +- .../config/{web/servlet => annotation/web}/CorsDsl.kt | 2 +- .../config/{web/servlet => annotation/web}/CsrfDsl.kt | 2 +- .../servlet => annotation/web}/ExceptionHandlingDsl.kt | 2 +- .../{web/servlet => annotation/web}/FormLoginDsl.kt | 2 +- .../{web/servlet => annotation/web}/HeadersDsl.kt | 4 ++-- .../{web/servlet => annotation/web}/HttpBasicDsl.kt | 2 +- .../{web/servlet => annotation/web}/HttpSecurityDsl.kt | 2 +- .../{web/servlet => annotation/web}/LogoutDsl.kt | 2 +- .../{web/servlet => annotation/web}/OAuth2ClientDsl.kt | 6 +++--- .../{web/servlet => annotation/web}/OAuth2LoginDsl.kt | 10 +++++----- .../web}/OAuth2ResourceServerDsl.kt | 6 +++--- .../web}/PasswordManagementDsl.kt | 2 +- .../{web/servlet => annotation/web}/PortMapperDsl.kt | 2 +- .../{web/servlet => annotation/web}/RememberMeDsl.kt | 2 +- .../{web/servlet => annotation/web}/RequestCacheDsl.kt | 2 +- .../servlet => annotation/web}/RequiresChannelDsl.kt | 2 +- .../config/{web/servlet => annotation/web}/Saml2Dsl.kt | 2 +- .../{web/servlet => annotation/web}/SecurityMarker.kt | 2 +- .../servlet => annotation/web}/SessionManagementDsl.kt | 6 +++--- .../config/{web/servlet => annotation/web}/X509Dsl.kt | 2 +- .../web}/headers/CacheControlDsl.kt | 2 +- .../web}/headers/ContentSecurityPolicyDsl.kt | 2 +- .../web}/headers/ContentTypeOptionsDsl.kt | 2 +- .../web}/headers/FrameOptionsDsl.kt | 2 +- .../web}/headers/HeadersSecurityMarker.kt | 2 +- .../web}/headers/HttpPublicKeyPinningDsl.kt | 2 +- .../web}/headers/HttpStrictTransportSecurityDsl.kt | 2 +- .../web}/headers/PermissionsPolicyDsl.kt | 2 +- .../web}/headers/ReferrerPolicyDsl.kt | 2 +- .../web}/headers/XssProtectionConfigDsl.kt | 2 +- .../web}/oauth2/client/AuthorizationCodeGrantDsl.kt | 2 +- .../web}/oauth2/client/OAuth2ClientSecurityMarker.kt | 2 +- .../web}/oauth2/login/AuthorizationEndpointDsl.kt | 2 +- .../web}/oauth2/login/OAuth2LoginSecurityMarker.kt | 2 +- .../web}/oauth2/login/RedirectionEndpointDsl.kt | 2 +- .../web}/oauth2/login/TokenEndpointDsl.kt | 2 +- .../web}/oauth2/login/UserInfoEndpointDsl.kt | 2 +- .../web}/oauth2/resourceserver/JwtDsl.kt | 2 +- .../OAuth2ResourceServerSecurityMarker.kt | 2 +- .../web}/oauth2/resourceserver/OpaqueTokenDsl.kt | 2 +- .../web}/session/SessionConcurrencyDsl.kt | 2 +- .../web}/session/SessionFixationDsl.kt | 2 +- .../web}/session/SessionSecurityMarker.kt | 2 +- .../servlet => annotation/web}/AnonymousDslTests.kt | 2 +- .../web}/AuthorizeRequestsDslTests.kt | 2 +- .../{web/servlet => annotation/web}/CorsDslTests.kt | 2 +- .../{web/servlet => annotation/web}/CsrfDslTests.kt | 2 +- .../web}/ExceptionHandlingDslTests.kt | 2 +- .../servlet => annotation/web}/FormLoginDslTests.kt | 2 +- .../{web/servlet => annotation/web}/HeadersDslTests.kt | 2 +- .../servlet => annotation/web}/HttpBasicDslTests.kt | 2 +- .../servlet => annotation/web}/HttpSecurityDslTests.kt | 2 +- .../{web/servlet => annotation/web}/LogoutDslTests.kt | 2 +- .../servlet => annotation/web}/OAuth2ClientDslTests.kt | 2 +- .../servlet => annotation/web}/OAuth2LoginDslTests.kt | 2 +- .../web}/OAuth2ResourceServerDslTests.kt | 2 +- .../web}/PasswordManagementDslTests.kt | 2 +- .../servlet => annotation/web}/PortMapperDslTests.kt | 2 +- .../servlet => annotation/web}/RememberMeDslTests.kt | 2 +- .../servlet => annotation/web}/RequestCacheDslTests.kt | 2 +- .../web}/RequiresChannelDslTests.kt | 2 +- .../{web/servlet => annotation/web}/Saml2DslTests.kt | 2 +- .../web}/SessionManagementDslTests.kt | 2 +- .../{web/servlet => annotation/web}/X509DslTests.kt | 2 +- .../web}/headers/CacheControlDslTests.kt | 4 ++-- .../web}/headers/ContentSecurityPolicyDslTests.kt | 4 ++-- .../web}/headers/ContentTypeOptionsDslTests.kt | 4 ++-- .../web}/headers/FrameOptionsDslTests.kt | 4 ++-- .../web}/headers/HttpPublicKeyPinningDslTests.kt | 4 ++-- .../headers/HttpStrictTransportSecurityDslTests.kt | 4 ++-- .../web}/headers/ReferrerPolicyDslTests.kt | 4 ++-- .../web}/headers/XssProtectionConfigDslTests.kt | 4 ++-- .../oauth2/client/AuthorizationCodeGrantDslTests.kt | 4 ++-- .../web}/oauth2/login/AuthorizationEndpointDslTests.kt | 4 ++-- .../web}/oauth2/login/RedirectionEndpointDslTests.kt | 4 ++-- .../web}/oauth2/login/TokenEndpointDslTests.kt | 4 ++-- .../web}/oauth2/login/UserInfoEndpointDslTests.kt | 4 ++-- .../web}/oauth2/resourceserver/JwtDslTests.kt | 4 ++-- .../web}/oauth2/resourceserver/OpaqueTokenDslTests.kt | 4 ++-- .../web}/session/SessionConcurrencyDslTests.kt | 4 ++-- .../web}/session/SessionFixationDslTests.kt | 4 ++-- 84 files changed, 112 insertions(+), 112 deletions(-) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/AbstractRequestMatcherDsl.kt (96%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/AnonymousDsl.kt (97%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/AuthorizeRequestsDsl.kt (99%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/CorsDsl.kt (96%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/CsrfDsl.kt (98%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/ExceptionHandlingDsl.kt (98%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/FormLoginDsl.kt (98%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/HeadersDsl.kt (98%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/HttpBasicDsl.kt (97%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/HttpSecurityDsl.kt (99%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/LogoutDsl.kt (98%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/OAuth2ClientDsl.kt (94%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/OAuth2LoginDsl.kt (95%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/OAuth2ResourceServerDsl.kt (95%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/PasswordManagementDsl.kt (95%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/PortMapperDsl.kt (96%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/RememberMeDsl.kt (98%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/RequestCacheDsl.kt (96%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/RequiresChannelDsl.kt (99%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/Saml2Dsl.kt (98%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/SecurityMarker.kt (93%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/SessionManagementDsl.kt (95%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/X509Dsl.kt (98%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/CacheControlDsl.kt (95%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/ContentSecurityPolicyDsl.kt (96%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/ContentTypeOptionsDsl.kt (95%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/FrameOptionsDsl.kt (96%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/HeadersSecurityMarker.kt (92%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/HttpPublicKeyPinningDsl.kt (97%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/HttpStrictTransportSecurityDsl.kt (97%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/PermissionsPolicyDsl.kt (95%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/ReferrerPolicyDsl.kt (95%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/XssProtectionConfigDsl.kt (96%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/client/AuthorizationCodeGrantDsl.kt (97%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/client/OAuth2ClientSecurityMarker.kt (91%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/login/AuthorizationEndpointDsl.kt (96%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/login/OAuth2LoginSecurityMarker.kt (92%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/login/RedirectionEndpointDsl.kt (95%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/login/TokenEndpointDsl.kt (95%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/login/UserInfoEndpointDsl.kt (98%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/resourceserver/JwtDsl.kt (97%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/resourceserver/OAuth2ResourceServerSecurityMarker.kt (91%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/resourceserver/OpaqueTokenDsl.kt (97%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/session/SessionConcurrencyDsl.kt (97%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/session/SessionFixationDsl.kt (97%) rename config/src/main/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/session/SessionSecurityMarker.kt (92%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/AnonymousDslTests.kt (98%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/AuthorizeRequestsDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/CorsDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/CsrfDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/ExceptionHandlingDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/FormLoginDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/HeadersDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/HttpBasicDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/HttpSecurityDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/LogoutDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/OAuth2ClientDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/OAuth2LoginDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/OAuth2ResourceServerDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/PasswordManagementDslTests.kt (98%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/PortMapperDslTests.kt (98%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/RememberMeDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/RequestCacheDslTests.kt (98%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/RequiresChannelDslTests.kt (98%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/Saml2DslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/SessionManagementDslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/X509DslTests.kt (99%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/CacheControlDslTests.kt (96%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/ContentSecurityPolicyDslTests.kt (96%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/ContentTypeOptionsDslTests.kt (95%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/FrameOptionsDslTests.kt (97%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/HttpPublicKeyPinningDslTests.kt (98%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/HttpStrictTransportSecurityDslTests.kt (97%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/ReferrerPolicyDslTests.kt (95%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/headers/XssProtectionConfigDslTests.kt (97%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/client/AuthorizationCodeGrantDslTests.kt (98%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/login/AuthorizationEndpointDslTests.kt (97%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/login/RedirectionEndpointDslTests.kt (97%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/login/TokenEndpointDslTests.kt (97%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/login/UserInfoEndpointDslTests.kt (97%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/resourceserver/JwtDslTests.kt (98%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/oauth2/resourceserver/OpaqueTokenDslTests.kt (98%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/session/SessionConcurrencyDslTests.kt (98%) rename config/src/test/kotlin/org/springframework/security/config/{web/servlet => annotation/web}/session/SessionFixationDslTests.kt (98%) diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/AbstractRequestMatcherDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/AbstractRequestMatcherDsl.kt similarity index 96% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/AbstractRequestMatcherDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/AbstractRequestMatcherDsl.kt index 9e35287b5f5..0a4720341e8 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/AbstractRequestMatcherDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/AbstractRequestMatcherDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.http.HttpMethod import org.springframework.security.web.util.matcher.AnyRequestMatcher diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/AnonymousDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/AnonymousDsl.kt similarity index 97% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/AnonymousDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/AnonymousDsl.kt index 89055ed025a..8fca7646b47 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/AnonymousDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/AnonymousDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.authentication.AuthenticationProvider import org.springframework.security.config.annotation.web.builders.HttpSecurity diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/AuthorizeRequestsDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDsl.kt similarity index 99% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/AuthorizeRequestsDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDsl.kt index 663287a1184..693966ace78 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/AuthorizeRequestsDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.http.HttpMethod import org.springframework.security.config.annotation.web.builders.HttpSecurity diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/CorsDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/CorsDsl.kt similarity index 96% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/CorsDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/CorsDsl.kt index a4b0d0ba68a..38363bf5883 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/CorsDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/CorsDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.CorsConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/CsrfDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/CsrfDsl.kt similarity index 98% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/CsrfDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/CsrfDsl.kt index 9d67012c734..0ed411416cc 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/CsrfDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/CsrfDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/ExceptionHandlingDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/ExceptionHandlingDsl.kt similarity index 98% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/ExceptionHandlingDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/ExceptionHandlingDsl.kt index cba38265c76..7acd172cb7c 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/ExceptionHandlingDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/ExceptionHandlingDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.ExceptionHandlingConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/FormLoginDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/FormLoginDsl.kt similarity index 98% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/FormLoginDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/FormLoginDsl.kt index 7de3587c3fe..3e63243b0e2 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/FormLoginDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/FormLoginDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.authentication.AuthenticationDetailsSource import org.springframework.security.config.annotation.web.HttpSecurityBuilder diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/HeadersDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HeadersDsl.kt similarity index 98% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/HeadersDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/HeadersDsl.kt index 3079dd11ff3..c4f5aa2b15d 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/HeadersDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HeadersDsl.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer -import org.springframework.security.config.web.servlet.headers.* +import org.springframework.security.config.annotation.web.headers.* import org.springframework.security.web.header.HeaderWriter import org.springframework.security.web.header.writers.* import org.springframework.security.web.header.writers.frameoptions.XFrameOptionsHeaderWriter diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/HttpBasicDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpBasicDsl.kt similarity index 97% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/HttpBasicDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpBasicDsl.kt index a7dd27b0c7a..53235664e92 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/HttpBasicDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpBasicDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.authentication.AuthenticationDetailsSource import org.springframework.security.config.annotation.web.builders.HttpSecurity diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/HttpSecurityDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt similarity index 99% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/HttpSecurityDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt index 2c5b11d80b3..ef35967ffda 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/HttpSecurityDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.context.ApplicationContext import org.springframework.security.authentication.AuthenticationManager diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/LogoutDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/LogoutDsl.kt similarity index 98% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/LogoutDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/LogoutDsl.kt index bf2d9df6f12..476f571967f 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/LogoutDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/LogoutDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.LogoutConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/OAuth2ClientDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/OAuth2ClientDsl.kt similarity index 94% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/OAuth2ClientDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/OAuth2ClientDsl.kt index 2681ed4e192..f0df1b281ba 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/OAuth2ClientDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/OAuth2ClientDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web /* * Copyright 2002-2020 the original author or authors. @@ -33,8 +33,8 @@ package org.springframework.security.config.web.servlet */ import org.springframework.security.config.annotation.web.builders.HttpSecurity -import org.springframework.security.config.web.servlet.oauth2.client.AuthorizationCodeGrantDsl -import org.springframework.security.config.web.servlet.oauth2.login.AuthorizationEndpointDsl +import org.springframework.security.config.annotation.web.oauth2.client.AuthorizationCodeGrantDsl +import org.springframework.security.config.annotation.web.oauth2.login.AuthorizationEndpointDsl import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2ClientConfigurer import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/OAuth2LoginDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/OAuth2LoginDsl.kt similarity index 95% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/OAuth2LoginDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/OAuth2LoginDsl.kt index 4bf22695b94..7f84be7e8aa 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/OAuth2LoginDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/OAuth2LoginDsl.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.authentication.AuthenticationDetailsSource import org.springframework.security.config.annotation.web.HttpSecurityBuilder import org.springframework.security.config.annotation.web.builders.HttpSecurity -import org.springframework.security.config.web.servlet.oauth2.login.AuthorizationEndpointDsl -import org.springframework.security.config.web.servlet.oauth2.login.RedirectionEndpointDsl -import org.springframework.security.config.web.servlet.oauth2.login.TokenEndpointDsl -import org.springframework.security.config.web.servlet.oauth2.login.UserInfoEndpointDsl +import org.springframework.security.config.annotation.web.oauth2.login.AuthorizationEndpointDsl +import org.springframework.security.config.annotation.web.oauth2.login.RedirectionEndpointDsl +import org.springframework.security.config.annotation.web.oauth2.login.TokenEndpointDsl +import org.springframework.security.config.annotation.web.oauth2.login.UserInfoEndpointDsl import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/OAuth2ResourceServerDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/OAuth2ResourceServerDsl.kt similarity index 95% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/OAuth2ResourceServerDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/OAuth2ResourceServerDsl.kt index 30d6f776ed9..0dfeced425d 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/OAuth2ResourceServerDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/OAuth2ResourceServerDsl.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.authentication.AuthenticationManagerResolver import org.springframework.security.config.annotation.web.builders.HttpSecurity -import org.springframework.security.config.web.servlet.oauth2.resourceserver.JwtDsl -import org.springframework.security.config.web.servlet.oauth2.resourceserver.OpaqueTokenDsl +import org.springframework.security.config.annotation.web.oauth2.resourceserver.JwtDsl +import org.springframework.security.config.annotation.web.oauth2.resourceserver.OpaqueTokenDsl import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver import org.springframework.security.web.AuthenticationEntryPoint diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/PasswordManagementDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/PasswordManagementDsl.kt similarity index 95% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/PasswordManagementDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/PasswordManagementDsl.kt index 474dca8704d..3d8f2e3ed0a 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/PasswordManagementDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/PasswordManagementDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.PasswordManagementConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/PortMapperDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/PortMapperDsl.kt similarity index 96% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/PortMapperDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/PortMapperDsl.kt index d23f584fe06..a2671a271c4 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/PortMapperDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/PortMapperDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.PortMapperConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/RememberMeDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/RememberMeDsl.kt similarity index 98% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/RememberMeDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/RememberMeDsl.kt index db69d5d4f69..9f6ff66cf14 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/RememberMeDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/RememberMeDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.RememberMeConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/RequestCacheDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/RequestCacheDsl.kt similarity index 96% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/RequestCacheDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/RequestCacheDsl.kt index b57f017538f..738e0a06132 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/RequestCacheDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/RequestCacheDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.RequestCacheConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/RequiresChannelDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDsl.kt similarity index 99% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/RequiresChannelDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDsl.kt index a7149014c2e..c567dc56792 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/RequiresChannelDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.ChannelSecurityConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/Saml2Dsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/Saml2Dsl.kt similarity index 98% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/Saml2Dsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/Saml2Dsl.kt index 3c658e2397a..52ee1e03a9d 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/Saml2Dsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/Saml2Dsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.authentication.AuthenticationManager import org.springframework.security.config.annotation.web.HttpSecurityBuilder diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/SecurityMarker.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/SecurityMarker.kt similarity index 93% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/SecurityMarker.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/SecurityMarker.kt index d86554668e0..f82ffeafdae 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/SecurityMarker.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/SecurityMarker.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web /** * Marker annotation indicating that the annotated class is part of the security DSL. diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/SessionManagementDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/SessionManagementDsl.kt similarity index 95% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/SessionManagementDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/SessionManagementDsl.kt index c0405ff4f86..52df70a3dc7 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/SessionManagementDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/SessionManagementDsl.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity -import org.springframework.security.config.web.servlet.session.SessionConcurrencyDsl -import org.springframework.security.config.web.servlet.session.SessionFixationDsl +import org.springframework.security.config.annotation.web.session.SessionConcurrencyDsl +import org.springframework.security.config.annotation.web.session.SessionFixationDsl import org.springframework.security.config.annotation.web.configurers.SessionManagementConfigurer import org.springframework.security.config.http.SessionCreationPolicy import org.springframework.security.web.authentication.AuthenticationFailureHandler diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/X509Dsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/X509Dsl.kt similarity index 98% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/X509Dsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/X509Dsl.kt index 669c16cd02d..85652b8fa7d 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/X509Dsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/X509Dsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.springframework.security.authentication.AuthenticationDetailsSource import org.springframework.security.config.annotation.web.builders.HttpSecurity diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/CacheControlDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/CacheControlDsl.kt similarity index 95% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/CacheControlDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/CacheControlDsl.kt index 316015b0160..eb63d73c30b 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/CacheControlDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/CacheControlDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/ContentSecurityPolicyDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/ContentSecurityPolicyDsl.kt similarity index 96% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/ContentSecurityPolicyDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/ContentSecurityPolicyDsl.kt index 270b1d14b4d..559da5275de 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/ContentSecurityPolicyDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/ContentSecurityPolicyDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/ContentTypeOptionsDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/ContentTypeOptionsDsl.kt similarity index 95% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/ContentTypeOptionsDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/ContentTypeOptionsDsl.kt index 92014ae4063..98cf2da39cb 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/ContentTypeOptionsDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/ContentTypeOptionsDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/FrameOptionsDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/FrameOptionsDsl.kt similarity index 96% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/FrameOptionsDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/FrameOptionsDsl.kt index 3bf766ca98a..a4a1c20b106 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/FrameOptionsDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/FrameOptionsDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/HeadersSecurityMarker.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HeadersSecurityMarker.kt similarity index 92% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/HeadersSecurityMarker.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HeadersSecurityMarker.kt index 67a97f56c05..93cdaa95b14 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/HeadersSecurityMarker.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HeadersSecurityMarker.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers /** * Marker annotation indicating that the annotated class is part of the headers security DSL. diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/HttpPublicKeyPinningDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDsl.kt similarity index 97% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/HttpPublicKeyPinningDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDsl.kt index 74fbb6272a7..987278476f9 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/HttpPublicKeyPinningDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/HttpStrictTransportSecurityDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HttpStrictTransportSecurityDsl.kt similarity index 97% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/HttpStrictTransportSecurityDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HttpStrictTransportSecurityDsl.kt index e23e6d36b85..dfe5aa1015d 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/HttpStrictTransportSecurityDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HttpStrictTransportSecurityDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/PermissionsPolicyDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/PermissionsPolicyDsl.kt similarity index 95% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/PermissionsPolicyDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/PermissionsPolicyDsl.kt index e668931bcd6..2dd77b1fe9b 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/PermissionsPolicyDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/PermissionsPolicyDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/ReferrerPolicyDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/ReferrerPolicyDsl.kt similarity index 95% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/ReferrerPolicyDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/ReferrerPolicyDsl.kt index 1ac54d94c02..3f08fa88efb 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/ReferrerPolicyDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/ReferrerPolicyDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/XssProtectionConfigDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/XssProtectionConfigDsl.kt similarity index 96% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/XssProtectionConfigDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/XssProtectionConfigDsl.kt index a48a30af10a..295ddc82db8 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/headers/XssProtectionConfigDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/XssProtectionConfigDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/client/AuthorizationCodeGrantDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/client/AuthorizationCodeGrantDsl.kt similarity index 97% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/client/AuthorizationCodeGrantDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/client/AuthorizationCodeGrantDsl.kt index b1ab6eca61f..35356b09e12 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/client/AuthorizationCodeGrantDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/client/AuthorizationCodeGrantDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.client +package org.springframework.security.config.annotation.web.oauth2.client import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2ClientConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/client/OAuth2ClientSecurityMarker.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/client/OAuth2ClientSecurityMarker.kt similarity index 91% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/client/OAuth2ClientSecurityMarker.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/client/OAuth2ClientSecurityMarker.kt index 3b6722a2590..df40bcd5f63 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/client/OAuth2ClientSecurityMarker.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/client/OAuth2ClientSecurityMarker.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.client +package org.springframework.security.config.annotation.web.oauth2.client /** * Marker annotation indicating that the annotated class is part of the OAuth 2.0 client security DSL. diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/AuthorizationEndpointDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/AuthorizationEndpointDsl.kt similarity index 96% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/AuthorizationEndpointDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/AuthorizationEndpointDsl.kt index 27c7982c6db..96289fa825d 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/AuthorizationEndpointDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/AuthorizationEndpointDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.login +package org.springframework.security.config.annotation.web.oauth2.login import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/OAuth2LoginSecurityMarker.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/OAuth2LoginSecurityMarker.kt similarity index 92% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/OAuth2LoginSecurityMarker.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/OAuth2LoginSecurityMarker.kt index 24ab0807d9d..0120f623b1c 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/OAuth2LoginSecurityMarker.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/OAuth2LoginSecurityMarker.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.login +package org.springframework.security.config.annotation.web.oauth2.login /** * Marker annotation indicating that the annotated class is part of the OAuth 2.0 login security DSL. diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/RedirectionEndpointDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/RedirectionEndpointDsl.kt similarity index 95% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/RedirectionEndpointDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/RedirectionEndpointDsl.kt index ac63d88c9c1..094623aa159 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/RedirectionEndpointDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/RedirectionEndpointDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.login +package org.springframework.security.config.annotation.web.oauth2.login import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/TokenEndpointDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/TokenEndpointDsl.kt similarity index 95% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/TokenEndpointDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/TokenEndpointDsl.kt index ddba776d551..8628044299a 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/TokenEndpointDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/TokenEndpointDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.login +package org.springframework.security.config.annotation.web.oauth2.login import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/UserInfoEndpointDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/UserInfoEndpointDsl.kt similarity index 98% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/UserInfoEndpointDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/UserInfoEndpointDsl.kt index 0a5073fc9a9..ab536582340 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/login/UserInfoEndpointDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/login/UserInfoEndpointDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.login +package org.springframework.security.config.annotation.web.oauth2.login import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/JwtDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/JwtDsl.kt similarity index 97% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/JwtDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/JwtDsl.kt index a3b5cbc71a2..a91e277401c 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/JwtDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/JwtDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.resourceserver +package org.springframework.security.config.annotation.web.oauth2.resourceserver import org.springframework.core.convert.converter.Converter import org.springframework.security.authentication.AbstractAuthenticationToken diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OAuth2ResourceServerSecurityMarker.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OAuth2ResourceServerSecurityMarker.kt similarity index 91% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OAuth2ResourceServerSecurityMarker.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OAuth2ResourceServerSecurityMarker.kt index c561531ae97..fc24a96203a 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OAuth2ResourceServerSecurityMarker.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OAuth2ResourceServerSecurityMarker.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.resourceserver +package org.springframework.security.config.annotation.web.oauth2.resourceserver /** * Marker annotation indicating that the annotated class is part of the OAuth 2.0 resource server security DSL. diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OpaqueTokenDsl.kt similarity index 97% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OpaqueTokenDsl.kt index 5c8ab0c3f53..a0d84177636 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OpaqueTokenDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.resourceserver +package org.springframework.security.config.annotation.web.oauth2.resourceserver import org.springframework.security.authentication.AuthenticationManager import org.springframework.security.config.annotation.web.builders.HttpSecurity diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/session/SessionConcurrencyDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionConcurrencyDsl.kt similarity index 97% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/session/SessionConcurrencyDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionConcurrencyDsl.kt index e0af442a9c0..0d33c0702a5 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/session/SessionConcurrencyDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionConcurrencyDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.session +package org.springframework.security.config.annotation.web.session import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.SessionManagementConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/session/SessionFixationDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt similarity index 97% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/session/SessionFixationDsl.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt index 68854c5d0ec..92634a2dd76 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/session/SessionFixationDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.session +package org.springframework.security.config.annotation.web.session import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configurers.SessionManagementConfigurer diff --git a/config/src/main/kotlin/org/springframework/security/config/web/servlet/session/SessionSecurityMarker.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionSecurityMarker.kt similarity index 92% rename from config/src/main/kotlin/org/springframework/security/config/web/servlet/session/SessionSecurityMarker.kt rename to config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionSecurityMarker.kt index 6e5ef671b7a..5e32e6be3d6 100644 --- a/config/src/main/kotlin/org/springframework/security/config/web/servlet/session/SessionSecurityMarker.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionSecurityMarker.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.session +package org.springframework.security.config.annotation.web.session /** * Marker annotation indicating that the annotated class is part of the session security DSL. diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/AnonymousDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/AnonymousDslTests.kt similarity index 98% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/AnonymousDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/AnonymousDslTests.kt index 754a9d91ff7..2387a2c64d5 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/AnonymousDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/AnonymousDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/AuthorizeRequestsDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/AuthorizeRequestsDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDslTests.kt index 279d78b359a..94c31ff7684 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/AuthorizeRequestsDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/CorsDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/CorsDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/CorsDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/CorsDslTests.kt index bd33989bb7c..c5a21e72ac0 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/CorsDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/CorsDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.assertj.core.api.Assertions.assertThatThrownBy import org.junit.jupiter.api.Test diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/CsrfDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/CsrfDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/CsrfDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/CsrfDslTests.kt index 19b885e29b7..8ecca56eb38 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/CsrfDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/CsrfDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.every import io.mockk.mockkObject diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/ExceptionHandlingDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/ExceptionHandlingDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/ExceptionHandlingDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/ExceptionHandlingDslTests.kt index 43a525148f7..d49e106d72e 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/ExceptionHandlingDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/ExceptionHandlingDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.assertj.core.api.Assertions.assertThatExceptionOfType import org.junit.jupiter.api.Test diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/FormLoginDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/FormLoginDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/FormLoginDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/FormLoginDslTests.kt index 082e95580eb..f60692be1cb 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/FormLoginDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/FormLoginDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.every import io.mockk.mockkObject diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/HeadersDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/HeadersDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/HeadersDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/HeadersDslTests.kt index c2cbfb371dd..5e8e281c901 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/HeadersDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/HeadersDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/HttpBasicDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpBasicDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/HttpBasicDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpBasicDslTests.kt index 6c32db53430..31e2f05721d 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/HttpBasicDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpBasicDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.every import io.mockk.mockkObject diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/HttpSecurityDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/HttpSecurityDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDslTests.kt index 7116c0c883b..860afdf5670 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/HttpSecurityDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.every import io.mockk.mockkObject diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/LogoutDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/LogoutDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/LogoutDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/LogoutDslTests.kt index 2bf1af54716..ecf5eafa46b 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/LogoutDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/LogoutDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.every import io.mockk.mockkObject diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2ClientDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/OAuth2ClientDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2ClientDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/OAuth2ClientDslTests.kt index ba45eb97cbb..2becea07133 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2ClientDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/OAuth2ClientDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.every import io.mockk.mockkObject diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2LoginDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/OAuth2LoginDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2LoginDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/OAuth2LoginDslTests.kt index 76a54652bda..3a878b316e2 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2LoginDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/OAuth2LoginDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.every import io.mockk.mockkObject diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2ResourceServerDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/OAuth2ResourceServerDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2ResourceServerDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/OAuth2ResourceServerDslTests.kt index 93d65331806..b111f27f412 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2ResourceServerDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/OAuth2ResourceServerDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.every import io.mockk.mockk diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/PasswordManagementDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/PasswordManagementDslTests.kt similarity index 98% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/PasswordManagementDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/PasswordManagementDslTests.kt index af302cf96ff..53d9b3ed188 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/PasswordManagementDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/PasswordManagementDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/PortMapperDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/PortMapperDslTests.kt similarity index 98% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/PortMapperDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/PortMapperDslTests.kt index 7f020208c82..14e221ed36c 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/PortMapperDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/PortMapperDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/RememberMeDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/RememberMeDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/RememberMeDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/RememberMeDslTests.kt index f2f6fbb3a79..4eb234fc6b9 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/RememberMeDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/RememberMeDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.Called import io.mockk.confirmVerified diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/RequestCacheDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/RequestCacheDslTests.kt similarity index 98% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/RequestCacheDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/RequestCacheDslTests.kt index 52ee0492e58..8a50adb1ec2 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/RequestCacheDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/RequestCacheDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/RequiresChannelDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDslTests.kt similarity index 98% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/RequiresChannelDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDslTests.kt index 3ec020307bc..5f7190790ca 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/RequiresChannelDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.mockkObject import io.mockk.verify diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/Saml2DslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2DslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/Saml2DslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2DslTests.kt index a9dc47a2daf..da48324474e 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/Saml2DslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2DslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.every import io.mockk.mockk diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/SessionManagementDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/SessionManagementDslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/SessionManagementDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/SessionManagementDslTests.kt index 25302355ea2..334a22388e8 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/SessionManagementDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/SessionManagementDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.every import io.mockk.justRun diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/X509DslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/X509DslTests.kt similarity index 99% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/X509DslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/X509DslTests.kt index e0f6577f149..71be4040737 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/X509DslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/X509DslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet +package org.springframework.security.config.annotation.web import io.mockk.mockk import java.security.cert.Certificate diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/CacheControlDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/CacheControlDslTests.kt similarity index 96% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/CacheControlDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/CacheControlDslTests.kt index ab2782ac43b..c058f368d94 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/CacheControlDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/CacheControlDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -23,7 +23,7 @@ import org.springframework.http.HttpHeaders import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension import org.springframework.test.web.servlet.MockMvc diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ContentSecurityPolicyDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/ContentSecurityPolicyDslTests.kt similarity index 96% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ContentSecurityPolicyDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/ContentSecurityPolicyDslTests.kt index b312311cd65..130e143dfab 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ContentSecurityPolicyDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/ContentSecurityPolicyDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension import org.springframework.security.web.server.header.ContentSecurityPolicyServerHttpHeadersWriter diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ContentTypeOptionsDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/ContentTypeOptionsDslTests.kt similarity index 95% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ContentTypeOptionsDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/ContentTypeOptionsDslTests.kt index ce682ed76d4..75efe8c8c06 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ContentTypeOptionsDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/ContentTypeOptionsDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension import org.springframework.security.web.server.header.ContentTypeOptionsServerHttpHeadersWriter diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/FrameOptionsDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/FrameOptionsDslTests.kt similarity index 97% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/FrameOptionsDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/FrameOptionsDslTests.kt index 021dda0848f..215b015b1bd 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/FrameOptionsDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/FrameOptionsDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension import org.springframework.security.web.header.writers.frameoptions.XFrameOptionsHeaderWriter diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/HttpPublicKeyPinningDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDslTests.kt similarity index 98% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/HttpPublicKeyPinningDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDslTests.kt index e4759fb2840..3ffd42a66d8 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/HttpPublicKeyPinningDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.assertj.core.api.Assertions import org.junit.jupiter.api.Test @@ -25,7 +25,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.get diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/HttpStrictTransportSecurityDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/HttpStrictTransportSecurityDslTests.kt similarity index 97% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/HttpStrictTransportSecurityDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/HttpStrictTransportSecurityDslTests.kt index 374eb607c30..00decf1d0a9 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/HttpStrictTransportSecurityDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/HttpStrictTransportSecurityDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.assertj.core.api.Assertions import org.junit.jupiter.api.Test @@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension import org.springframework.security.web.server.header.StrictTransportSecurityServerHttpHeadersWriter diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ReferrerPolicyDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/ReferrerPolicyDslTests.kt similarity index 95% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ReferrerPolicyDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/ReferrerPolicyDslTests.kt index c9d3c04d067..76dc74bfd8c 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ReferrerPolicyDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/ReferrerPolicyDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/XssProtectionConfigDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/XssProtectionConfigDslTests.kt similarity index 97% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/XssProtectionConfigDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/XssProtectionConfigDslTests.kt index 8b10f28cce4..93622c15fbb 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/XssProtectionConfigDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/XssProtectionConfigDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.headers +package org.springframework.security.config.annotation.web.headers import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension import org.springframework.security.web.server.header.XXssProtectionServerHttpHeadersWriter diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/client/AuthorizationCodeGrantDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/client/AuthorizationCodeGrantDslTests.kt similarity index 98% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/client/AuthorizationCodeGrantDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/client/AuthorizationCodeGrantDslTests.kt index 72e5db552e3..d624a781c90 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/client/AuthorizationCodeGrantDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/client/AuthorizationCodeGrantDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.client +package org.springframework.security.config.annotation.web.oauth2.client import io.mockk.every import io.mockk.mockk @@ -31,7 +31,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur import org.springframework.security.config.oauth2.client.CommonOAuth2Provider import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/AuthorizationEndpointDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/AuthorizationEndpointDslTests.kt similarity index 97% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/AuthorizationEndpointDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/AuthorizationEndpointDslTests.kt index 5e85f074161..84d0d792978 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/AuthorizationEndpointDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/AuthorizationEndpointDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.login +package org.springframework.security.config.annotation.web.oauth2.login import io.mockk.every import io.mockk.mockkObject @@ -31,7 +31,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur import org.springframework.security.config.oauth2.client.CommonOAuth2Provider import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository import org.springframework.security.oauth2.client.web.AuthorizationRequestRepository diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/RedirectionEndpointDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/RedirectionEndpointDslTests.kt similarity index 97% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/RedirectionEndpointDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/RedirectionEndpointDslTests.kt index 9487e857ec8..051436c93ac 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/RedirectionEndpointDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/RedirectionEndpointDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.login +package org.springframework.security.config.annotation.web.oauth2.login import io.mockk.every import io.mockk.mockkObject @@ -29,7 +29,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur import org.springframework.security.config.oauth2.client.CommonOAuth2Provider import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.core.authority.SimpleGrantedAuthority import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/TokenEndpointDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/TokenEndpointDslTests.kt similarity index 97% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/TokenEndpointDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/TokenEndpointDslTests.kt index 9dc1df0cb51..63f526a88c0 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/TokenEndpointDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/TokenEndpointDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.login +package org.springframework.security.config.annotation.web.oauth2.login import io.mockk.every import io.mockk.mockkObject @@ -30,7 +30,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur import org.springframework.security.config.oauth2.client.CommonOAuth2Provider import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/UserInfoEndpointDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/UserInfoEndpointDslTests.kt similarity index 97% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/UserInfoEndpointDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/UserInfoEndpointDslTests.kt index 477504ec5c3..23d7e42281d 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/UserInfoEndpointDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/login/UserInfoEndpointDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.login +package org.springframework.security.config.annotation.web.oauth2.login import io.mockk.every import io.mockk.mockk @@ -31,7 +31,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur import org.springframework.security.config.oauth2.client.CommonOAuth2Provider import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.core.authority.SimpleGrantedAuthority import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/JwtDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/JwtDslTests.kt similarity index 98% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/JwtDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/JwtDslTests.kt index b0d92a53bd5..fe57a566ce0 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/JwtDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/JwtDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.resourceserver +package org.springframework.security.config.annotation.web.oauth2.resourceserver import io.mockk.every import io.mockk.mockk @@ -35,7 +35,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.core.Authentication import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames import org.springframework.security.oauth2.jwt.Jwt diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OpaqueTokenDslTests.kt similarity index 98% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OpaqueTokenDslTests.kt index 218e0618b94..634cae0a78b 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OpaqueTokenDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.oauth2.resourceserver +package org.springframework.security.config.annotation.web.oauth2.resourceserver import io.mockk.every import io.mockk.mockkObject @@ -35,7 +35,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.core.Authentication import org.springframework.security.oauth2.core.DefaultOAuth2AuthenticatedPrincipal import org.springframework.security.oauth2.core.TestOAuth2AccessTokens diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/session/SessionConcurrencyDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionConcurrencyDslTests.kt similarity index 98% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/session/SessionConcurrencyDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionConcurrencyDslTests.kt index f35ca1284fa..5a44272c710 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/session/SessionConcurrencyDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionConcurrencyDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.session +package org.springframework.security.config.annotation.web.session import io.mockk.every import io.mockk.mockkObject @@ -30,7 +30,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.core.session.SessionInformation import org.springframework.security.core.session.SessionRegistry import org.springframework.security.core.session.SessionRegistryImpl diff --git a/config/src/test/kotlin/org/springframework/security/config/web/servlet/session/SessionFixationDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDslTests.kt similarity index 98% rename from config/src/test/kotlin/org/springframework/security/config/web/servlet/session/SessionFixationDslTests.kt rename to config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDslTests.kt index c28d9397027..349bcfe747d 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/servlet/session/SessionFixationDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDslTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.config.web.servlet.session +package org.springframework.security.config.annotation.web.session import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test @@ -28,7 +28,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter import org.springframework.security.core.userdetails.User import org.springframework.security.core.userdetails.UserDetailsService -import org.springframework.security.config.web.servlet.invoke +import org.springframework.security.config.annotation.web.invoke import org.springframework.security.config.test.SpringTestContext import org.springframework.security.config.test.SpringTestContextExtension import org.springframework.security.provisioning.InMemoryUserDetailsManager