Skip to content

Commit ac38a5a

Browse files
committed
Update javadoc to reflect move to SecurityFilterChain
Closes gh-29900
1 parent b1cfa40 commit ac38a5a

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
public class SecurityProperties {
4242

4343
/**
44-
* Order applied to the WebSecurityConfigurerAdapter that is used to configure basic
44+
* Order applied to the SecurityFilterChain that is used to configure basic
4545
* authentication for application endpoints. If you want to add your own
4646
* authentication for all or some of those endpoints the best thing to do is to add
4747
* your own WebSecurityConfigurerAdapter with lower order.
4848
*/
4949
public static final int BASIC_AUTH_ORDER = Ordered.LOWEST_PRECEDENCE - 5;
5050

5151
/**
52-
* Order applied to the WebSecurityConfigurer that ignores standard static resource
52+
* Order applied to the WebSecurityCustomizer that ignores standard static resource
5353
* paths.
5454
*/
5555
public static final int IGNORED_ORDER = Ordered.HIGHEST_PRECEDENCE;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
2323
import org.springframework.context.annotation.Configuration;
2424
import org.springframework.security.config.Customizer;
2525
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
26-
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
2726
import org.springframework.security.oauth2.client.InMemoryOAuth2AuthorizedClientService;
2827
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
2928
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
@@ -32,7 +31,7 @@
3231
import org.springframework.security.web.SecurityFilterChain;
3332

3433
/**
35-
* {@link WebSecurityConfigurerAdapter} to add OAuth client support.
34+
* {@link SecurityFilterChain} to add OAuth client support.
3635
*
3736
* @author Madhura Bhave
3837
* @author Phillip Webb

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@
3232
import org.springframework.context.annotation.Conditional;
3333
import org.springframework.context.annotation.Configuration;
3434
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
35-
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
3635
import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
3736
import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm;
3837
import org.springframework.security.oauth2.jwt.JwtDecoder;
@@ -43,8 +42,8 @@
4342

4443
/**
4544
* Configures a {@link JwtDecoder} when a JWK Set URI, OpenID Connect Issuer URI or Public
46-
* Key configuration is available. Also configures a {@link WebSecurityConfigurerAdapter}
47-
* if a {@link JwtDecoder} bean is found.
45+
* Key configuration is available. Also configures a {@link SecurityFilterChain} if a
46+
* {@link JwtDecoder} bean is found.
4847
*
4948
* @author Madhura Bhave
5049
* @author Artsiom Yudovin

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,15 +24,14 @@
2424
import org.springframework.context.annotation.Bean;
2525
import org.springframework.context.annotation.Configuration;
2626
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
27-
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
2827
import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
2928
import org.springframework.security.oauth2.server.resource.introspection.NimbusOpaqueTokenIntrospector;
3029
import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector;
3130
import org.springframework.security.web.SecurityFilterChain;
3231

3332
/**
3433
* Configures a {@link OpaqueTokenIntrospector} when a token introspection endpoint is
35-
* available. Also configures a {@link WebSecurityConfigurerAdapter} if a
34+
* available. Also configures a {@link SecurityFilterChain} if a
3635
* {@link OpaqueTokenIntrospector} bean is found.
3736
*
3837
* @author Madhura Bhave

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,13 +21,12 @@
2121
import org.springframework.context.annotation.Bean;
2222
import org.springframework.context.annotation.Configuration;
2323
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
24-
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
2524
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
2625
import org.springframework.security.web.SecurityFilterChain;
2726

2827
/**
29-
* {@link WebSecurityConfigurerAdapter} configuration for Spring Security's relying party
30-
* SAML support.
28+
* {@link SecurityFilterChain} configuration for Spring Security's relying party SAML
29+
* support.
3130
*
3231
* @author Madhura Bhave
3332
*/

0 commit comments

Comments
 (0)