Skip to content

Commit 13e738e

Browse files
jzheauxjzheaux
committed
Use HttpSecurity Lambda DSL in Test
Issue gh-13067
1 parent c43afbf commit 13e738e

19 files changed

+71
-74
lines changed

‎test/src/test/java/org/springframework/security/test/web/servlet/request/Sec2935Tests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.springframework.web.context.WebApplicationContext;
3838
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
3939

40+
import static org.springframework.security.config.Customizer.withDefaults;
4041
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
4142
import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated;
4243
import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated;
@@ -132,11 +133,10 @@ static class Config {
132133
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
133134
// @formatter:off
134135
http
135-
.authorizeRequests()
136+
.authorizeRequests((requests) -> requests
136137
.requestMatchers("/admin/**").hasRole("ADMIN")
137-
.anyRequest().authenticated()
138-
.and()
139-
.httpBasic();
138+
.anyRequest().authenticated())
139+
.httpBasic(withDefaults());
140140
return http.build();
141141
// @formatter:on
142142
}

‎test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ static class Config {
8282
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
8383
// @formatter:off
8484
http
85-
.sessionManagement()
86-
.sessionCreationPolicy(SessionCreationPolicy.STATELESS);
85+
.sessionManagement((management) -> management
86+
.sessionCreationPolicy(SessionCreationPolicy.STATELESS));
8787
return http.build();
8888
// @formatter:on
8989
}

‎test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfDebugFilterTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static class Config {
6363

6464
@Bean
6565
SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
66-
http.csrf().csrfTokenRepository(cookieCsrfTokenRepository);
66+
http.csrf((csrf) -> csrf.csrfTokenRepository(cookieCsrfTokenRepository));
6767
return http.build();
6868
}
6969

‎test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOAuth2ClientTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import static org.mockito.BDDMockito.given;
6161
import static org.mockito.Mockito.mock;
6262
import static org.mockito.Mockito.verify;
63+
import static org.springframework.security.config.Customizer.withDefaults;
6364
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oauth2Client;
6465
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
6566
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -181,9 +182,9 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
181182
// @formatter:off
182183
http
183184
.authorizeRequests((authz) -> authz
184-
.anyRequest().permitAll()
185+
.anyRequest().permitAll()
185186
)
186-
.oauth2Client();
187+
.oauth2Client(withDefaults());
187188
return http.build();
188189
// @formatter:on
189190
}

‎test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOAuth2LoginTests.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
5656

5757
import static org.mockito.Mockito.mock;
58+
import static org.springframework.security.config.Customizer.withDefaults;
5859
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oauth2Login;
5960
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
6061
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -158,9 +159,9 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
158159
// @formatter:off
159160
http
160161
.authorizeRequests((authorize) -> authorize
161-
.requestMatchers("/admin/**").hasAuthority("SCOPE_admin")
162-
.anyRequest().hasAuthority("SCOPE_read")
163-
).oauth2Login();
162+
.requestMatchers("/admin/**").hasAuthority("SCOPE_admin")
163+
.anyRequest().hasAuthority("SCOPE_read")
164+
).oauth2Login(withDefaults());
164165
return http.build();
165166
// @formatter:on
166167
}

‎test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOidcLoginTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
5757

5858
import static org.mockito.Mockito.mock;
59+
import static org.springframework.security.config.Customizer.withDefaults;
5960
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oidcLogin;
6061
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
6162
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -155,11 +156,10 @@ static class OAuth2LoginConfig {
155156
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
156157
// @formatter:off
157158
http
158-
.authorizeRequests()
159+
.authorizeRequests((requests) -> requests
159160
.requestMatchers("/admin/**").hasAuthority("SCOPE_admin")
160-
.anyRequest().hasAuthority("SCOPE_read")
161-
.and()
162-
.oauth2Login();
161+
.anyRequest().hasAuthority("SCOPE_read"))
162+
.oauth2Login(withDefaults());
163163
return http.build();
164164
// @formatter:on
165165
}

‎test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOpaqueTokenTests.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,12 @@ static class OAuth2LoginConfig {
130130
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
131131
// @formatter:off
132132
http
133-
.authorizeRequests()
133+
.authorizeRequests((requests) -> requests
134134
.requestMatchers("/admin/**").hasAuthority("SCOPE_admin")
135-
.anyRequest().hasAuthority("SCOPE_read")
136-
.and()
137-
.oauth2ResourceServer()
138-
.opaqueToken()
139-
.introspector(mock(OpaqueTokenIntrospector.class));
135+
.anyRequest().hasAuthority("SCOPE_read"))
136+
.oauth2ResourceServer((server) -> server
137+
.opaqueToken((opaqueToken) -> opaqueToken
138+
.introspector(mock(OpaqueTokenIntrospector.class))));
140139
return http.build();
141140
// @formatter:on
142141
}

‎test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ static class Config {
8080
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
8181
// @formatter:off
8282
http
83-
.sessionManagement()
84-
.sessionCreationPolicy(SessionCreationPolicy.STATELESS);
83+
.sessionManagement((management) -> management
84+
.sessionCreationPolicy(SessionCreationPolicy.STATELESS));
8585
return http.build();
8686
// @formatter:on
8787
}

‎test/src/test/java/org/springframework/security/test/web/servlet/response/Gh3409Tests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.springframework.web.context.WebApplicationContext;
3636
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
3737

38+
import static org.springframework.security.config.Customizer.withDefaults;
3839
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.securityContext;
3940
import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated;
4041
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
@@ -98,12 +99,11 @@ static class Config {
9899
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
99100
// @formatter:off
100101
http
101-
.authorizeRequests()
102+
.authorizeRequests((requests) -> requests
102103
.requestMatchers("/public/**").permitAll()
103-
.anyRequest().authenticated()
104-
.and()
105-
.formLogin().and()
106-
.httpBasic();
104+
.anyRequest().authenticated())
105+
.formLogin(withDefaults())
106+
.httpBasic(withDefaults());
107107
return http.build();
108108
// @formatter:on
109109
}

‎test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ static class Config {
8484
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
8585
// @formatter:off
8686
http
87-
.csrf()
88-
.csrfTokenRepository(repo());
87+
.csrf((csrf) -> csrf
88+
.csrfTokenRepository(repo()));
8989
return http.build();
9090
// @formatter:on
9191
}

0 commit comments

Comments
 (0)