Merge branch '6.1.x' into 6.2.x

Closes gh-14392
spring-projects · Dec 29, 2023 · 0b155a1 · 0b155a1
2 parents ec0dbbf + e11ed2d
commit 0b155a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/docs/modules/ROOT/pages/servlet/configuration/java.adoc b/docs/modules/ROOT/pages/servlet/configuration/java.adoc
@@ -173,7 +173,7 @@ It is configured with the following default implementation:
 @Bean
 public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 	http
-		.authorizeRequests(authorize -> authorize
+		.authorizeHttpRequests(authorize -> authorize
 			.anyRequest().authenticated()
 		)
 		.formLogin(withDefaults())
@@ -326,7 +326,7 @@ class MyCustomDsl : AbstractHttpConfigurer<MyCustomDsl, HttpSecurity>() {
 
 [NOTE]
 ====
-This is actually how methods like `HttpSecurity.authorizeRequests()` are implemented.
+This is actually how methods like `HttpSecurity.authorizeHttpRequests()` are implemented.
 ====
 
 You can then use the custom DSL:
@@ -451,7 +451,7 @@ For example, to configure the `filterSecurityPublishAuthorizationSuccess` proper
 @Bean
 public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 	http
-		.authorizeRequests(authorize -> authorize
+		.authorizeHttpRequests(authorize -> authorize
 			.anyRequest().authenticated()
 			.withObjectPostProcessor(new ObjectPostProcessor<FilterSecurityInterceptor>() {
 				public <O extends FilterSecurityInterceptor> O postProcess(

diff --git a/docs/modules/ROOT/pages/servlet/configuration/kotlin.adoc b/docs/modules/ROOT/pages/servlet/configuration/kotlin.adoc
@@ -24,7 +24,7 @@ import org.springframework.security.config.annotation.web.invoke
 @Bean
 open fun filterChain(http: HttpSecurity): SecurityFilterChain {
    http {
-        authorizeRequests {
+        authorizeHttpRequests {
             authorize(anyRequest, authenticated)
         }
        formLogin { }
@@ -81,7 +81,7 @@ class MultiHttpSecurityConfig {
     open fun apiFilterChain(http: HttpSecurity): SecurityFilterChain {
         http {
             securityMatcher("/api/**")                               <3>
-            authorizeRequests {
+            authorizeHttpRequests {
                 authorize(anyRequest, hasRole("ADMIN"))
             }
             httpBasic { }
@@ -92,7 +92,7 @@ class MultiHttpSecurityConfig {
     @Bean                                                            <4>
     open fun formLoginFilterChain(http: HttpSecurity): SecurityFilterChain {
         http {
-            authorizeRequests {
+            authorizeHttpRequests {
                 authorize(anyRequest, authenticated)
             }
             formLogin { }