root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Improve javadoc adding how to stick with defaults and link to documentation 

Closes gh-13273
This commit is contained in:
Marcus Da Coregio 2023-06-02 15:05:17 -03:00
parent 25e6c51a0b
commit 537e10cf9c
6 changed files with 382 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
View File

@ -285,7 +285,10 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* </pre> * </pre>
* @return the {@link HeadersConfigurer} for further customizations * @return the {@link HeadersConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #headers(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #headers(Customizer)} or
* {@code headers(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
* @see HeadersConfigurer * @see HeadersConfigurer
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
@ -401,7 +404,10 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* on the classpath a {@link HandlerMappingIntrospector} is used. * on the classpath a {@link HandlerMappingIntrospector} is used.
* @return the {@link CorsConfigurer} for customizations * @return the {@link CorsConfigurer} for customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #cors(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #cors(Customizer)} or
* {@code cors(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public CorsConfigurer<HttpSecurity> cors() throws Exception { public CorsConfigurer<HttpSecurity> cors() throws Exception {
@ -490,7 +496,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* could return true. * could return true.
* @return the {@link SessionManagementConfigurer} for further customizations * @return the {@link SessionManagementConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #sessionManagement(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #sessionManagement(Customizer)} or
* {@code sessionManagement(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public SessionManagementConfigurer<HttpSecurity> sessionManagement() throws Exception { public SessionManagementConfigurer<HttpSecurity> sessionManagement() throws Exception {
@ -614,7 +624,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* </pre> * </pre>
* @return the {@link PortMapperConfigurer} for further customizations * @return the {@link PortMapperConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #portMapper(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #portMapper(Customizer)} or
* {@code portMapper(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
* @see #requiresChannel() * @see #requiresChannel()
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
@ -747,7 +761,10 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* Servlet Container's documentation. * Servlet Container's documentation.
* @return the {@link JeeConfigurer} for further customizations * @return the {@link JeeConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #jee(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #jee(Customizer)} or
* {@code jee(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public JeeConfigurer<HttpSecurity> jee() throws Exception { public JeeConfigurer<HttpSecurity> jee() throws Exception {
@ -860,7 +877,10 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* </pre> * </pre>
* @return the {@link X509Configurer} for further customizations * @return the {@link X509Configurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #x509(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #x509(Customizer)} or
* {@code x509(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public X509Configurer<HttpSecurity> x509() throws Exception { public X509Configurer<HttpSecurity> x509() throws Exception {
@ -940,7 +960,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* </pre> * </pre>
* @return the {@link RememberMeConfigurer} for further customizations * @return the {@link RememberMeConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #rememberMe(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #rememberMe(Customizer)} or
* {@code rememberMe(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public RememberMeConfigurer<HttpSecurity> rememberMe() throws Exception { public RememberMeConfigurer<HttpSecurity> rememberMe() throws Exception {
@ -1451,7 +1475,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* when using {@link EnableWebSecurity}. * when using {@link EnableWebSecurity}.
* @return the {@link RequestCacheConfigurer} for further customizations * @return the {@link RequestCacheConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #requestCache(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #requestCache(Customizer)} or
* {@code requestCache(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public RequestCacheConfigurer<HttpSecurity> requestCache() throws Exception { public RequestCacheConfigurer<HttpSecurity> requestCache() throws Exception {
@ -1504,7 +1532,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* {@link EnableWebSecurity}. * {@link EnableWebSecurity}.
* @return the {@link ExceptionHandlingConfigurer} for further customizations * @return the {@link ExceptionHandlingConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #exceptionHandling(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #exceptionHandling(Customizer)} or
* {@code exceptionHandling(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ExceptionHandlingConfigurer<HttpSecurity> exceptionHandling() throws Exception { public ExceptionHandlingConfigurer<HttpSecurity> exceptionHandling() throws Exception {
@ -1558,7 +1590,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* automatically applied when using {@link EnableWebSecurity}. * automatically applied when using {@link EnableWebSecurity}.
* @return the {@link SecurityContextConfigurer} for further customizations * @return the {@link SecurityContextConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #securityContext(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #securityContext(Customizer)} or
* {@code securityContext(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public SecurityContextConfigurer<HttpSecurity> securityContext() throws Exception { public SecurityContextConfigurer<HttpSecurity> securityContext() throws Exception {
@ -1605,7 +1641,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* {@link EnableWebSecurity}. * {@link EnableWebSecurity}.
* @return the {@link ServletApiConfigurer} for further customizations * @return the {@link ServletApiConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #servletApi(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #servletApi(Customizer)} or
* {@code servletApi(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServletApiConfigurer<HttpSecurity> servletApi() throws Exception { public ServletApiConfigurer<HttpSecurity> servletApi() throws Exception {
@ -1663,7 +1703,10 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* </pre> * </pre>
* @return the {@link CsrfConfigurer} for further customizations * @return the {@link CsrfConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #csrf(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #csrf(Customizer)} or
* {@code csrf(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public CsrfConfigurer<HttpSecurity> csrf() throws Exception { public CsrfConfigurer<HttpSecurity> csrf() throws Exception {
@ -1740,7 +1783,10 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* </pre> * </pre>
* @return the {@link LogoutConfigurer} for further customizations * @return the {@link LogoutConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #logout(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #logout(Customizer)} or
* {@code logout(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public LogoutConfigurer<HttpSecurity> logout() throws Exception { public LogoutConfigurer<HttpSecurity> logout() throws Exception {
@ -1881,7 +1927,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* </pre> * </pre>
* @return the {@link AnonymousConfigurer} for further customizations * @return the {@link AnonymousConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #anonymous(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #anonymous(Customizer)} or
* {@code anonymous(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public AnonymousConfigurer<HttpSecurity> anonymous() throws Exception { public AnonymousConfigurer<HttpSecurity> anonymous() throws Exception {
@ -2046,7 +2096,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* </pre> * </pre>
* @return the {@link FormLoginConfigurer} for further customizations * @return the {@link FormLoginConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #formLogin(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #formLogin(Customizer)} or
* {@code formLogin(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
* @see FormLoginConfigurer#loginPage(String) * @see FormLoginConfigurer#loginPage(String)
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
@ -2224,7 +2278,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* @return the {@link Saml2LoginConfigurer} for further customizations * @return the {@link Saml2LoginConfigurer} for further customizations
* @throws Exception * @throws Exception
* @since 5.2 * @since 5.2
* @deprecated For removal in 7.0. Use {@link #saml2Login(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #saml2Login(Customizer)} or
* {@code saml2Login(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public Saml2LoginConfigurer<HttpSecurity> saml2Login() throws Exception { public Saml2LoginConfigurer<HttpSecurity> saml2Login() throws Exception {
@ -2456,7 +2514,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* @return the {@link Saml2LoginConfigurer} for further customizations * @return the {@link Saml2LoginConfigurer} for further customizations
* @throws Exception * @throws Exception
* @since 5.6 * @since 5.6
* @deprecated For removal in 7.0. Use {@link #saml2Logout(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #saml2Logout(Customizer)} or
* {@code saml2Logout(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public Saml2LogoutConfigurer<HttpSecurity> saml2Logout() throws Exception { public Saml2LogoutConfigurer<HttpSecurity> saml2Logout() throws Exception {
@ -2554,7 +2616,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* @return the {@link Saml2MetadataConfigurer} for further customizations * @return the {@link Saml2MetadataConfigurer} for further customizations
* @throws Exception * @throws Exception
* @since 6.1 * @since 6.1
* @deprecated For removal in 7.0. Use {@link #saml2Metadata(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #saml2Metadata(Customizer)} or
* {@code saml2Metadata(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public Saml2MetadataConfigurer<HttpSecurity> saml2Metadata() throws Exception { public Saml2MetadataConfigurer<HttpSecurity> saml2Metadata() throws Exception {
@ -2647,7 +2713,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* @return the {@link OAuth2LoginConfigurer} for further customizations * @return the {@link OAuth2LoginConfigurer} for further customizations
* @throws Exception * @throws Exception
* @since 5.0 * @since 5.0
* @deprecated For removal in 7.0. Use {@link #oauth2Login(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #oauth2Login(Customizer)} or
* {@code oauth2Login(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
* @see <a target="_blank" href= * @see <a target="_blank" href=
* "https://tools.ietf.org/html/rfc6749#section-4.1">Section 4.1 Authorization Code * "https://tools.ietf.org/html/rfc6749#section-4.1">Section 4.1 Authorization Code
* Grant</a> * Grant</a>
@ -2770,7 +2840,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* @return the {@link OAuth2ClientConfigurer} for further customizations * @return the {@link OAuth2ClientConfigurer} for further customizations
* @throws Exception * @throws Exception
* @since 5.1 * @since 5.1
* @deprecated For removal in 7.0. Use {@link #oauth2Client(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #oauth2Client(Customizer)} or
* {@code oauth2Client(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
* @see <a target="_blank" href= * @see <a target="_blank" href=
* "https://tools.ietf.org/html/rfc6749#section-1.1">OAuth 2.0 Authorization * "https://tools.ietf.org/html/rfc6749#section-1.1">OAuth 2.0 Authorization
* Framework</a> * Framework</a>
@ -2930,7 +3004,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* </pre> * </pre>
* @return the {@link ChannelSecurityConfigurer} for further customizations * @return the {@link ChannelSecurityConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #requiresChannel(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #requiresChannel(Customizer)} or
* {@code requiresChannel(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ChannelSecurityConfigurer<HttpSecurity>.ChannelRequestMatcherRegistry requiresChannel() throws Exception { public ChannelSecurityConfigurer<HttpSecurity>.ChannelRequestMatcherRegistry requiresChannel() throws Exception {
@ -3027,7 +3105,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* </pre> * </pre>
* @return the {@link HttpBasicConfigurer} for further customizations * @return the {@link HttpBasicConfigurer} for further customizations
* @throws Exception * @throws Exception
* @deprecated For removal in 7.0. Use {@link #httpBasic(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #httpBasic(Customizer)} or
* {@code httpBasic(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public HttpBasicConfigurer<HttpSecurity> httpBasic() throws Exception { public HttpBasicConfigurer<HttpSecurity> httpBasic() throws Exception {
@ -3358,7 +3440,11 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
* } * }
* </pre> * </pre>
* @return the {@link RequestMatcherConfigurer} for further customizations * @return the {@link RequestMatcherConfigurer} for further customizations
* @deprecated For removal in 7.0. Use {@link #securityMatchers(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #securityMatchers(Customizer)} or
* {@code securityMatchers(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public RequestMatcherConfigurer securityMatchers() { public RequestMatcherConfigurer securityMatchers() {

73
config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java
View File

@ -24,6 +24,7 @@ import java.util.Map;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.springframework.security.config.Customizer; import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.configuration.ObjectPostProcessorConfiguration;
import org.springframework.security.config.annotation.web.HttpSecurityBuilder; import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity; 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.EnableWebSecurity;
@ -135,7 +136,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
* X-Content-Type-Options: nosniff * X-Content-Type-Options: nosniff
* </pre> * </pre>
* @return the {@link ContentTypeOptionsConfig} for additional customizations * @return the {@link ContentTypeOptionsConfig} for additional customizations
* @deprecated For removal in 7.0. Use {@link #contentTypeOptions(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #contentTypeOptions(Customizer)} or
* {@code contentTypeOptions(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ContentTypeOptionsConfig contentTypeOptions() { public ContentTypeOptionsConfig contentTypeOptions() {
@ -168,7 +173,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
* >X-XSS-Protection header</a> * >X-XSS-Protection header</a>
* </p> * </p>
* @return the {@link XXssConfig} for additional customizations * @return the {@link XXssConfig} for additional customizations
* @deprecated For removal in 7.0. Use {@link #xssProtection(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #xssProtection(Customizer)} or
* {@code xssProtection(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public XXssConfig xssProtection() { public XXssConfig xssProtection() {
@ -201,7 +210,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
* <li>Expires: 0</li> * <li>Expires: 0</li>
* </ul> * </ul>
* @return the {@link CacheControlConfig} for additional customizations * @return the {@link CacheControlConfig} for additional customizations
* @deprecated For removal in 7.0. Use {@link #cacheControl(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #cacheControl(Customizer)} or
* {@code cacheControl(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public CacheControlConfig cacheControl() { public CacheControlConfig cacheControl() {
@ -254,7 +267,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
/** /**
* Allows customizing the {@link XFrameOptionsHeaderWriter}. * Allows customizing the {@link XFrameOptionsHeaderWriter}.
* @return the {@link FrameOptionsConfig} for additional customizations * @return the {@link FrameOptionsConfig} for additional customizations
* @deprecated For removal in 7.0. Use {@link #frameOptions(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #frameOptions(Customizer)} or
* {@code frameOptions(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public FrameOptionsConfig frameOptions() { public FrameOptionsConfig frameOptions() {
@ -460,7 +477,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
* </pre> * </pre>
* @return the {@link ReferrerPolicyConfig} for additional configuration * @return the {@link ReferrerPolicyConfig} for additional configuration
* @since 4.2 * @since 4.2
* @deprecated For removal in 7.0. Use {@link #referrerPolicy(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #referrerPolicy(Customizer)} or
* {@code referrerPolicy(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
* @see ReferrerPolicyHeaderWriter * @see ReferrerPolicyHeaderWriter
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
@ -485,7 +506,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
* @return the {@link ReferrerPolicyConfig} for additional configuration * @return the {@link ReferrerPolicyConfig} for additional configuration
* @throws IllegalArgumentException if policy is null or empty * @throws IllegalArgumentException if policy is null or empty
* @since 4.2 * @since 4.2
* @deprecated For removal in 7.0. Use {@link #referrerPolicy(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #referrerPolicy(Customizer)} or
* {@code referrerPolicy(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
* @see ReferrerPolicyHeaderWriter * @see ReferrerPolicyHeaderWriter
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
@ -530,7 +555,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
* @return the {@link FeaturePolicyConfig} for additional configuration * @return the {@link FeaturePolicyConfig} for additional configuration
* @throws IllegalArgumentException if policyDirectives is {@code null} or empty * @throws IllegalArgumentException if policyDirectives is {@code null} or empty
* @since 5.1 * @since 5.1
* @deprecated For removal in 7.0. Use {@link #permissionsPolicy(Customizer)} instead. * @deprecated For removal in 7.0. Use {@link #permissionsPolicy(Customizer)} or
* {@code permissionsPolicy(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
* @see ObjectPostProcessorConfiguration FeaturePolicyHeaderWriter * @see ObjectPostProcessorConfiguration FeaturePolicyHeaderWriter
*/ */
@Deprecated @Deprecated
@ -555,7 +584,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
* </ul> * </ul>
* @return the {@link PermissionsPolicyConfig} for additional configuration * @return the {@link PermissionsPolicyConfig} for additional configuration
* @since 5.5 * @since 5.5
* @deprecated For removal in 7.0. Use {@link #permissionsPolicy(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #permissionsPolicy(Customizer)} or
* {@code permissionsPolicy(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
* @see PermissionsPolicyHeaderWriter * @see PermissionsPolicyHeaderWriter
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
@ -813,7 +846,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
* Allows completing configuration of X-XSS-Protection and continuing * Allows completing configuration of X-XSS-Protection and continuing
* configuration of headers. * configuration of headers.
* @return the {@link HeadersConfigurer} for additional configuration * @return the {@link HeadersConfigurer} for additional configuration
* @deprecated For removal in 7.0. Use {@link #xssProtection(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #xssProtection(Customizer)} or
* {@code xssProtection(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public HeadersConfigurer<H> and() { public HeadersConfigurer<H> and() {
@ -854,7 +891,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
* Allows completing configuration of Cache Control and continuing configuration * Allows completing configuration of Cache Control and continuing configuration
* of headers. * of headers.
* @return the {@link HeadersConfigurer} for additional configuration * @return the {@link HeadersConfigurer} for additional configuration
* @deprecated For removal in 7.0. Use {@link #cacheControl(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #cacheControl(Customizer)} or
* {@code cacheControl(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public HeadersConfigurer<H> and() { public HeadersConfigurer<H> and() {
@ -1026,7 +1067,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
/** /**
* Allows continuing customizing the headers configuration. * Allows continuing customizing the headers configuration.
* @return the {@link HeadersConfigurer} for additional configuration * @return the {@link HeadersConfigurer} for additional configuration
* @deprecated For removal in 7.0. Use {@link #frameOptions(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #frameOptions(Customizer)} or
* {@code frameOptions(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public HeadersConfigurer<H> and() { public HeadersConfigurer<H> and() {
@ -1280,7 +1325,11 @@ public class HeadersConfigurer<H extends HttpSecurityBuilder<H>>
} }
/** /**
* @deprecated For removal in 7.0. Use {@link #referrerPolicy(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #referrerPolicy(Customizer)} or
* {@code referrerPolicy(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public HeadersConfigurer<H> and() { public HeadersConfigurer<H> and() {

18
config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java
View File

@ -230,7 +230,11 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
* Returns the {@link TokenEndpointConfig} for configuring the Authorization Server's * Returns the {@link TokenEndpointConfig} for configuring the Authorization Server's
* Token Endpoint. * Token Endpoint.
* @return the {@link TokenEndpointConfig} * @return the {@link TokenEndpointConfig}
* @deprecated For removal in 7.0. Use {@link #tokenEndpoint(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #tokenEndpoint(Customizer)} or
* {@code tokenEndpoint(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public TokenEndpointConfig tokenEndpoint() { public TokenEndpointConfig tokenEndpoint() {
@ -277,7 +281,11 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
* Returns the {@link UserInfoEndpointConfig} for configuring the Authorization * Returns the {@link UserInfoEndpointConfig} for configuring the Authorization
* Server's UserInfo Endpoint. * Server's UserInfo Endpoint.
* @return the {@link UserInfoEndpointConfig} * @return the {@link UserInfoEndpointConfig}
* @deprecated For removal in 7.0. Use {@link #userInfoEndpoint(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #userInfoEndpoint(Customizer)} or
* {@code userInfoEndpoint(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public UserInfoEndpointConfig userInfoEndpoint() { public UserInfoEndpointConfig userInfoEndpoint() {
@ -637,7 +645,11 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
/** /**
* Returns the {@link OAuth2LoginConfigurer} for further configuration. * Returns the {@link OAuth2LoginConfigurer} for further configuration.
* @return the {@link OAuth2LoginConfigurer} * @return the {@link OAuth2LoginConfigurer}
* @deprecated For removal in 7.0. Use {@link #tokenEndpoint(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #tokenEndpoint(Customizer)} or
* {@code tokenEndpoint(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public OAuth2LoginConfigurer<B> and() { public OAuth2LoginConfigurer<B> and() {

16
config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java
View File

@ -199,7 +199,10 @@ public final class OAuth2ResourceServerConfigurer<H extends HttpSecurityBuilder<
} }
/** /**
* @deprecated For removal in 7.0. Use {@link #jwt(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #jwt(Customizer)} or
* {@code jwt(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public JwtConfigurer jwt() { public JwtConfigurer jwt() {
@ -224,7 +227,11 @@ public final class OAuth2ResourceServerConfigurer<H extends HttpSecurityBuilder<
} }
/** /**
* @deprecated For removal in 7.0. Use {@link #opaqueToken(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #opaqueToken(Customizer)} or
* {@code opaqueToken(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public OpaqueTokenConfigurer opaqueToken() { public OpaqueTokenConfigurer opaqueToken() {
@ -403,7 +410,10 @@ public final class OAuth2ResourceServerConfigurer<H extends HttpSecurityBuilder<
} }
/** /**
* @deprecated For removal in 7.0. Use {@link #jwt(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #jwt(Customizer)} or
* {@code jwt(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public OAuth2ResourceServerConfigurer<H> and() { public OAuth2ResourceServerConfigurer<H> and() {

24
config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java
View File

@ -168,7 +168,11 @@ public final class Saml2LogoutConfigurer<H extends HttpSecurityBuilder<H>>
/** /**
* Get configurer for SAML 2.0 Logout Request components * Get configurer for SAML 2.0 Logout Request components
* @return the {@link LogoutRequestConfigurer} for further customizations * @return the {@link LogoutRequestConfigurer} for further customizations
* @deprecated For removal in 7.0. Use {@link #logoutRequest(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #logoutRequest(Customizer)} or
* {@code logoutRequest(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public LogoutRequestConfigurer logoutRequest() { public LogoutRequestConfigurer logoutRequest() {
@ -190,7 +194,11 @@ public final class Saml2LogoutConfigurer<H extends HttpSecurityBuilder<H>>
/** /**
* Get configurer for SAML 2.0 Logout Response components * Get configurer for SAML 2.0 Logout Response components
* @return the {@link LogoutResponseConfigurer} for further customizations * @return the {@link LogoutResponseConfigurer} for further customizations
* @deprecated For removal in 7.0. Use {@link #logoutResponse(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #logoutResponse(Customizer)} or
* {@code logoutResponse(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public LogoutResponseConfigurer logoutResponse() { public LogoutResponseConfigurer logoutResponse() {
@ -376,7 +384,11 @@ public final class Saml2LogoutConfigurer<H extends HttpSecurityBuilder<H>>
} }
/** /**
* @deprecated For removal in 7.0. Use {@link #logoutRequest(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #logoutRequest(Customizer)} or
* {@code logoutRequest(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public Saml2LogoutConfigurer<H> and() { public Saml2LogoutConfigurer<H> and() {
@ -448,7 +460,11 @@ public final class Saml2LogoutConfigurer<H extends HttpSecurityBuilder<H>>
} }
/** /**
* @deprecated For removal in 7.0. Use {@link #logoutResponse(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #logoutResponse(Customizer)} or
* {@code logoutResponse(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public Saml2LogoutConfigurer<H> and() { public Saml2LogoutConfigurer<H> and() {

198
config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
View File

@ -421,7 +421,11 @@ public class ServerHttpSecurity {
* } * }
* </pre> * </pre>
* @return the {@link HttpsRedirectSpec} to customize * @return the {@link HttpsRedirectSpec} to customize
* @deprecated For removal in 7.0. Use {@link #redirectToHttps(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #redirectToHttps(Customizer)} or
* {@code redirectToHttps(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public HttpsRedirectSpec redirectToHttps() { public HttpsRedirectSpec redirectToHttps() {
@ -504,7 +508,10 @@ public class ServerHttpSecurity {
* } * }
* </pre> * </pre>
* @return the {@link CsrfSpec} to customize * @return the {@link CsrfSpec} to customize
* @deprecated For removal in 7.0. Use {@link #csrf(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #csrf(Customizer)} or
* {@code csrf(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public CsrfSpec csrf() { public CsrfSpec csrf() {
@ -570,7 +577,10 @@ public class ServerHttpSecurity {
* used instead. If neither has been configured, the Cors configuration will do * used instead. If neither has been configured, the Cors configuration will do
* nothing. * nothing.
* @return the {@link CorsSpec} to customize * @return the {@link CorsSpec} to customize
* @deprecated For removal in 7.0. Use {@link #cors(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #cors(Customizer)} or
* {@code cors(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public CorsSpec cors() { public CorsSpec cors() {
@ -614,7 +624,11 @@ public class ServerHttpSecurity {
* </pre> * </pre>
* @return the {@link AnonymousSpec} to customize * @return the {@link AnonymousSpec} to customize
* @since 5.2.0 * @since 5.2.0
* @deprecated For removal in 7.0. Use {@link #anonymous(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #anonymous(Customizer)} or
* {@code anonymous(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public AnonymousSpec anonymous() { public AnonymousSpec anonymous() {
@ -670,7 +684,11 @@ public class ServerHttpSecurity {
* } * }
* </pre> * </pre>
* @return the {@link HttpBasicSpec} to customize * @return the {@link HttpBasicSpec} to customize
* @deprecated For removal in 7.0. Use {@link #httpBasic(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #httpBasic(Customizer)} or
* {@code httpBasic(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public HttpBasicSpec httpBasic() { public HttpBasicSpec httpBasic() {
@ -724,7 +742,11 @@ public class ServerHttpSecurity {
* </pre> * </pre>
* @return the {@link PasswordManagementSpec} to customize * @return the {@link PasswordManagementSpec} to customize
* @since 5.6 * @since 5.6
* @deprecated For removal in 7.0. Use {@link #passwordManagement(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #passwordManagement(Customizer)} or
* {@code passwordManagement(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public PasswordManagementSpec passwordManagement() { public PasswordManagementSpec passwordManagement() {
@ -783,7 +805,11 @@ public class ServerHttpSecurity {
* } * }
* </pre> * </pre>
* @return the {@link FormLoginSpec} to customize * @return the {@link FormLoginSpec} to customize
* @deprecated For removal in 7.0. Use {@link #formLogin(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #formLogin(Customizer)} or
* {@code formLogin(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public FormLoginSpec formLogin() { public FormLoginSpec formLogin() {
@ -846,7 +872,10 @@ public class ServerHttpSecurity {
* {@link ReactivePreAuthenticatedAuthenticationManager} will be used. * {@link ReactivePreAuthenticatedAuthenticationManager} will be used.
* @return the {@link X509Spec} to customize * @return the {@link X509Spec} to customize
* @since 5.2 * @since 5.2
* @deprecated For removal in 7.0. Use {@link #x509(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #x509(Customizer)} or
* {@code x509(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public X509Spec x509() { public X509Spec x509() {
@ -905,7 +934,11 @@ public class ServerHttpSecurity {
* } * }
* </pre> * </pre>
* @return the {@link OAuth2LoginSpec} to customize * @return the {@link OAuth2LoginSpec} to customize
* @deprecated For removal in 7.0. Use {@link #oauth2Login(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #oauth2Login(Customizer)} or
* {@code oauth2Login(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public OAuth2LoginSpec oauth2Login() { public OAuth2LoginSpec oauth2Login() {
@ -959,7 +992,11 @@ public class ServerHttpSecurity {
* } * }
* </pre> * </pre>
* @return the {@link OAuth2ClientSpec} to customize * @return the {@link OAuth2ClientSpec} to customize
* @deprecated For removal in 7.0. Use {@link #oauth2Client(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #oauth2Client(Customizer)} or
* {@code oauth2Client(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public OAuth2ClientSpec oauth2Client() { public OAuth2ClientSpec oauth2Client() {
@ -1087,7 +1124,10 @@ public class ServerHttpSecurity {
* } * }
* </pre> * </pre>
* @return the {@link HeaderSpec} to customize * @return the {@link HeaderSpec} to customize
* @deprecated For removal in 7.0. Use {@link #headers(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #headers(Customizer)} or
* {@code headers(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public HeaderSpec headers() { public HeaderSpec headers() {
@ -1163,7 +1203,11 @@ public class ServerHttpSecurity {
* } * }
* </pre> * </pre>
* @return the {@link ExceptionHandlingSpec} to customize * @return the {@link ExceptionHandlingSpec} to customize
* @deprecated For removal in 7.0. Use {@link #exceptionHandling(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #exceptionHandling(Customizer)} or
* {@code exceptionHandling(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ExceptionHandlingSpec exceptionHandling() { public ExceptionHandlingSpec exceptionHandling() {
@ -1231,7 +1275,11 @@ public class ServerHttpSecurity {
* } * }
* </pre> * </pre>
* @return the {@link AuthorizeExchangeSpec} to customize * @return the {@link AuthorizeExchangeSpec} to customize
* @deprecated For removal in 7.0. Use {@link #authorizeExchange(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #authorizeExchange(Customizer)} or
* {@code authorizeExchange(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public AuthorizeExchangeSpec authorizeExchange() { public AuthorizeExchangeSpec authorizeExchange() {
@ -1302,7 +1350,10 @@ public class ServerHttpSecurity {
* } * }
* </pre> * </pre>
* @return the {@link LogoutSpec} to customize * @return the {@link LogoutSpec} to customize
* @deprecated For removal in 7.0. Use {@link #logout(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #logout(Customizer)} or
* {@code logout(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public LogoutSpec logout() { public LogoutSpec logout() {
@ -1361,7 +1412,11 @@ public class ServerHttpSecurity {
* } * }
* </pre> * </pre>
* @return the {@link RequestCacheSpec} to customize * @return the {@link RequestCacheSpec} to customize
* @deprecated For removal in 7.0. Use {@link #requestCache(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #requestCache(Customizer)} or
* {@code requestCache(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public RequestCacheSpec requestCache() { public RequestCacheSpec requestCache() {
@ -1917,7 +1972,11 @@ public class ServerHttpSecurity {
/** /**
* Allows method chaining to continue configuring the {@link ServerHttpSecurity} * Allows method chaining to continue configuring the {@link ServerHttpSecurity}
* @return the {@link ServerHttpSecurity} to continue configuring * @return the {@link ServerHttpSecurity} to continue configuring
* @deprecated For removal in 7.0. Use {@link #csrf(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #csrf(Customizer)} or
* {@code csrf(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServerHttpSecurity and() { public ServerHttpSecurity and() {
@ -2030,7 +2089,11 @@ public class ServerHttpSecurity {
/** /**
* Allows method chaining to continue configuring the {@link ServerHttpSecurity} * Allows method chaining to continue configuring the {@link ServerHttpSecurity}
* @return the {@link ServerHttpSecurity} to continue configuring * @return the {@link ServerHttpSecurity} to continue configuring
* @deprecated For removal in 7.0. Use {@link #requestCache(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #requestCache(Customizer)} or
* {@code requestCache(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServerHttpSecurity and() { public ServerHttpSecurity and() {
@ -2128,7 +2191,11 @@ public class ServerHttpSecurity {
/** /**
* Allows method chaining to continue configuring the {@link ServerHttpSecurity} * Allows method chaining to continue configuring the {@link ServerHttpSecurity}
* @return the {@link ServerHttpSecurity} to continue configuring * @return the {@link ServerHttpSecurity} to continue configuring
* @deprecated For removal in 7.0. Use {@link #httpBasic(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #httpBasic(Customizer)} or
* {@code httpBasic(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServerHttpSecurity and() { public ServerHttpSecurity and() {
@ -2364,7 +2431,11 @@ public class ServerHttpSecurity {
/** /**
* Allows method chaining to continue configuring the {@link ServerHttpSecurity} * Allows method chaining to continue configuring the {@link ServerHttpSecurity}
* @return the {@link ServerHttpSecurity} to continue configuring * @return the {@link ServerHttpSecurity} to continue configuring
* @deprecated For removal in 7.0. Use {@link #formLogin(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #formLogin(Customizer)} or
* {@code formLogin(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServerHttpSecurity and() { public ServerHttpSecurity and() {
@ -2490,7 +2561,11 @@ public class ServerHttpSecurity {
/** /**
* Allows method chaining to continue configuring the {@link ServerHttpSecurity} * Allows method chaining to continue configuring the {@link ServerHttpSecurity}
* @return the {@link ServerHttpSecurity} to continue configuring * @return the {@link ServerHttpSecurity} to continue configuring
* @deprecated For removal in 7.0. Use {@link #headers(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #headers(Customizer)} or
* {@code headers(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServerHttpSecurity and() { public ServerHttpSecurity and() {
@ -2509,7 +2584,11 @@ public class ServerHttpSecurity {
/** /**
* Configures cache control headers * Configures cache control headers
* @return the {@link CacheSpec} to configure * @return the {@link CacheSpec} to configure
* @deprecated For removal in 7.0. Use {@link #cache(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #cache(Customizer)} or
* {@code cache(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public CacheSpec cache() { public CacheSpec cache() {
@ -2552,7 +2631,11 @@ public class ServerHttpSecurity {
/** /**
* Configures frame options response headers * Configures frame options response headers
* @return the {@link FrameOptionsSpec} to configure * @return the {@link FrameOptionsSpec} to configure
* @deprecated For removal in 7.0. Use {@link #frameOptions(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #frameOptions(Customizer)} or
* {@code frameOptions(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public FrameOptionsSpec frameOptions() { public FrameOptionsSpec frameOptions() {
@ -2586,7 +2669,11 @@ public class ServerHttpSecurity {
/** /**
* Configures the Strict Transport Security response headers * Configures the Strict Transport Security response headers
* @return the {@link HstsSpec} to configure * @return the {@link HstsSpec} to configure
* @deprecated For removal in 7.0. Use {@link #hsts(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #hsts(Customizer)} or
* {@code hsts(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public HstsSpec hsts() { public HstsSpec hsts() {
@ -2613,7 +2700,11 @@ public class ServerHttpSecurity {
/** /**
* Configures x-xss-protection response header. * Configures x-xss-protection response header.
* @return the {@link XssProtectionSpec} to configure * @return the {@link XssProtectionSpec} to configure
* @deprecated For removal in 7.0. Use {@link #xssProtection(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #xssProtection(Customizer)} or
* {@code xssProtection(Customizer.withDefaults())} to stick with defaults. See
* the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public XssProtectionSpec xssProtection() { public XssProtectionSpec xssProtection() {
@ -2947,7 +3038,11 @@ public class ServerHttpSecurity {
* Allows method chaining to continue configuring the * Allows method chaining to continue configuring the
* {@link ServerHttpSecurity} * {@link ServerHttpSecurity}
* @return the {@link HeaderSpec} to continue configuring * @return the {@link HeaderSpec} to continue configuring
* @deprecated For removal in 7.0. Use {@link #hsts(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #hsts(Customizer)} or
* {@code hsts(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public HeaderSpec and() { public HeaderSpec and() {
@ -3324,7 +3419,11 @@ public class ServerHttpSecurity {
/** /**
* Allows method chaining to continue configuring the {@link ServerHttpSecurity} * Allows method chaining to continue configuring the {@link ServerHttpSecurity}
* @return the {@link ServerHttpSecurity} to continue configuring * @return the {@link ServerHttpSecurity} to continue configuring
* @deprecated For removal in 7.0. Use {@link #logout(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #logout(Customizer)} or
* {@code logout(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServerHttpSecurity and() { public ServerHttpSecurity and() {
@ -3437,7 +3536,11 @@ public class ServerHttpSecurity {
/** /**
* Allows method chaining to continue configuring the {@link ServerHttpSecurity} * Allows method chaining to continue configuring the {@link ServerHttpSecurity}
* @return the {@link ServerHttpSecurity} to continue configuring * @return the {@link ServerHttpSecurity} to continue configuring
* @deprecated For removal in 7.0. Use {@link #cors(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #cors(Customizer)} or
* {@code cors(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServerHttpSecurity and() { public ServerHttpSecurity and() {
@ -3496,7 +3599,11 @@ public class ServerHttpSecurity {
} }
/** /**
* @deprecated For removal in 7.0. Use {@link #x509(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #x509(Customizer)} or
* {@code x509(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServerHttpSecurity and() { public ServerHttpSecurity and() {
@ -3751,7 +3858,11 @@ public class ServerHttpSecurity {
/** /**
* Allows method chaining to continue configuring the {@link ServerHttpSecurity} * Allows method chaining to continue configuring the {@link ServerHttpSecurity}
* @return the {@link ServerHttpSecurity} to continue configuring * @return the {@link ServerHttpSecurity} to continue configuring
* @deprecated For removal in 7.0. Use {@link #oauth2Login(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #oauth2Login(Customizer)} or
* {@code oauth2Login(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServerHttpSecurity and() { public ServerHttpSecurity and() {
@ -4088,7 +4199,11 @@ public class ServerHttpSecurity {
/** /**
* Allows method chaining to continue configuring the {@link ServerHttpSecurity} * Allows method chaining to continue configuring the {@link ServerHttpSecurity}
* @return the {@link ServerHttpSecurity} to continue configuring * @return the {@link ServerHttpSecurity} to continue configuring
* @deprecated For removal in 7.0. Use {@link #oauth2Client(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #oauth2Client(Customizer)} or
* {@code oauth2Client(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServerHttpSecurity and() { public ServerHttpSecurity and() {
@ -4238,7 +4353,10 @@ public class ServerHttpSecurity {
/** /**
* Enables JWT Resource Server support. * Enables JWT Resource Server support.
* @return the {@link JwtSpec} for additional configuration * @return the {@link JwtSpec} for additional configuration
* @deprecated For removal in 7.0. Use {@link #jwt(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #jwt(Customizer)} or
* {@code jwt(Customizer.withDefaults())} to stick with defaults. See the <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public JwtSpec jwt() { public JwtSpec jwt() {
@ -4265,7 +4383,11 @@ public class ServerHttpSecurity {
/** /**
* Enables Opaque Token Resource Server support. * Enables Opaque Token Resource Server support.
* @return the {@link OpaqueTokenSpec} for additional configuration * @return the {@link OpaqueTokenSpec} for additional configuration
* @deprecated For removal in 7.0. Use {@link #opaqueToken(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #opaqueToken(Customizer)} or
* {@code opaqueToken(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public OpaqueTokenSpec opaqueToken() { public OpaqueTokenSpec opaqueToken() {
@ -4438,7 +4560,11 @@ public class ServerHttpSecurity {
} }
/** /**
* @deprecated For removal in 7.0. Use {@link #jwt(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #jwt(Customizer)} or
* {@code jwt(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public OAuth2ResourceServerSpec and() { public OAuth2ResourceServerSpec and() {
@ -4680,7 +4806,11 @@ public class ServerHttpSecurity {
/** /**
* Allows method chaining to continue configuring the {@link ServerHttpSecurity} * Allows method chaining to continue configuring the {@link ServerHttpSecurity}
* @return the {@link ServerHttpSecurity} to continue configuring * @return the {@link ServerHttpSecurity} to continue configuring
* @deprecated For removal in 7.0. Use {@link #anonymous(Customizer)} instead * @deprecated For removal in 7.0. Use {@link #anonymous(Customizer)} or
* {@code anonymous(Customizer.withDefaults())} to stick with defaults. See the
* <a href=
* "https://docs.spring.io/spring-security/reference/migration-7/configuration.html#_use_the_lambda_dsl">documentation</a>
* for more details.
*/ */
@Deprecated(since = "6.1", forRemoval = true) @Deprecated(since = "6.1", forRemoval = true)
public ServerHttpSecurity and() { public ServerHttpSecurity and() {