Suppress removal warnings in spring-security-config tests

023-dev · 023-dev · commit debfd346c6ed · 2026-02-03T21:30:11.000+09:00
Signed-off-by: 023-dev &lt;0_2_3@naver.com&gt;
diff --git a/config/src/test/java/org/springframework/security/SerializationSamples.java b/config/src/test/java/org/springframework/security/SerializationSamples.java
@@ -598,7 +598,7 @@ final class SerializationSamples {
 			return token;
 		});
 		generatorByClassName.put(OneTimeTokenAuthenticationToken.class,
-				(r) -> applyDetails(new OneTimeTokenAuthenticationToken("username", "token")));
+				(r) -> applyDetails(new OneTimeTokenAuthenticationToken("token")));
 		generatorByClassName.put(OneTimeTokenAuthentication.class,
 				(r) -> applyDetails(new OneTimeTokenAuthentication("username", authentication.getAuthorities())));
 		generatorByClassName.put(AccessDeniedException.class,
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java
@@ -222,7 +222,8 @@ public void loadConfigWhenMultipleWebSecurityConfigurationThenContextLoads() {
 	// SEC-2773
 	@Test
 	public void getMethodDelegatingApplicationListenerWhenWebSecurityConfigurationThenIsStatic() {
-		Method method = ClassUtils.getMethod(WebSecurityConfiguration.class, "delegatingApplicationListener", null);
+		Method method = ClassUtils.getMethod(WebSecurityConfiguration.class, "delegatingApplicationListener",
+				(Class<?>[]) null);
 		assertThat(Modifier.isStatic(method.getModifiers())).isTrue();
 	}
 
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java
@@ -1201,6 +1201,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 
 	@Configuration
 	@EnableWebSecurity
+	@SuppressWarnings("removal")
 	static class PermissionsPolicyConfig {
 
 		@Bean
@@ -1221,6 +1222,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 	static class PermissionsPolicyStringConfig {
 
 		@Bean
+		@SuppressWarnings("removal")
 		SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 			// @formatter:off
 			http
@@ -1235,6 +1237,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 
 	@Configuration
 	@EnableWebSecurity
+	@SuppressWarnings("removal")
 	static class PermissionsPolicyInvalidConfig {
 
 		@Bean
@@ -1252,6 +1255,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 
 	@Configuration
 	@EnableWebSecurity
+	@SuppressWarnings("removal")
 	static class PermissionsPolicyInvalidStringConfig {
 
 		@Bean
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java
@@ -1257,6 +1257,7 @@ OAuth2AuthorizationConsentService authorizationConsentService(JdbcOperations jdb
 		}
 
 		@Bean
+		@SuppressWarnings("removal")
 		RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {
 			JdbcRegisteredClientRepository jdbcRegisteredClientRepository = new JdbcRegisteredClientRepository(
 					jdbcOperations);
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java
@@ -535,6 +535,7 @@ OAuth2AuthorizationService authorizationService(JdbcOperations jdbcOperations,
 		}
 
 		@Bean
+		@SuppressWarnings("removal")
 		RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {
 			JdbcRegisteredClientRepository jdbcRegisteredClientRepository = new JdbcRegisteredClientRepository(
 					jdbcOperations);
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientRegistrationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientRegistrationTests.java
@@ -647,6 +647,7 @@ SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) th
 		// @formatter:on
 
 		@Bean
+		@SuppressWarnings("removal")
 		RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {
 			RegisteredClient registeredClient = TestRegisteredClients.registeredClient().build();
 			RegisteredClientParametersMapper registeredClientParametersMapper = new RegisteredClientParametersMapper();
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2RefreshTokenGrantTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2RefreshTokenGrantTests.java
@@ -469,6 +469,7 @@ OAuth2AuthorizationService authorizationService(JdbcOperations jdbcOperations,
 		}
 
 		@Bean
+		@SuppressWarnings("removal")
 		RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {
 			JdbcRegisteredClientRepository jdbcRegisteredClientRepository = new JdbcRegisteredClientRepository(
 					jdbcOperations);
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenIntrospectionTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenIntrospectionTests.java
@@ -515,6 +515,7 @@ OAuth2AuthorizationConsentService authorizationConsentService(JdbcOperations jdb
 		}
 
 		@Bean
+		@SuppressWarnings("removal")
 		RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {
 			JdbcRegisteredClientRepository jdbcRegisteredClientRepository = new JdbcRegisteredClientRepository(
 					jdbcOperations);
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenRevocationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenRevocationTests.java
@@ -318,6 +318,7 @@ OAuth2AuthorizationService authorizationService(JdbcOperations jdbcOperations,
 		}
 
 		@Bean
+		@SuppressWarnings("removal")
 		RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {
 			JdbcRegisteredClientRepository jdbcRegisteredClientRepository = new JdbcRegisteredClientRepository(
 					jdbcOperations);
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcClientRegistrationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcClientRegistrationTests.java
@@ -778,6 +778,7 @@ SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) th
 		// @formatter:on
 
 		@Bean
+		@SuppressWarnings("removal")
 		RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {
 			RegisteredClient registeredClient = TestRegisteredClients.registeredClient().build();
 			RegisteredClientParametersMapper registeredClientParametersMapper = new RegisteredClientParametersMapper();
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcTests.java
@@ -633,6 +633,7 @@ OAuth2AuthorizationService authorizationService(JdbcOperations jdbcOperations,
 		}
 
 		@Bean
+		@SuppressWarnings("removal")
 		RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {
 			JdbcRegisteredClientRepository jdbcRegisteredClientRepository = new JdbcRegisteredClientRepository(
 					jdbcOperations);
diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java
@@ -100,6 +100,7 @@
  * {@link org.springframework.security.config.web.server.ServerHttpSecurity.OAuth2ResourceServerSpec}
  */
 @ExtendWith({ SpringTestContextExtension.class })
+@SuppressWarnings("removal")
 public class OAuth2ResourceServerSpecTests {
 
 	private String expired = "eyJhbGciOiJSUzI1NiJ9.eyJleHAiOjE1MzUwMzc4OTd9.jqZDDjfc2eysX44lHXEIr9XFd2S8vjIZHCccZU-dRWMRJNsQ1QN5VNnJGklqJBXJR4qgla6cmVqPOLkUHDb0sL0nxM5XuzQaG5ZzKP81RV88shFyAiT0fD-6nl1k-Fai-Fu-VkzSpNXgeONoTxDaYhdB-yxmgrgsApgmbOTE_9AcMk-FQDXQ-pL9kynccFGV0lZx4CA7cyknKN7KBxUilfIycvXODwgKCjj_1WddLTCNGYogJJSg__7NoxzqbyWd3udbHVjqYq7GsMMrGB4_2kBD4CkghOSNcRHbT_DIXowxfAVT7PAg7Q0E5ruZsr2zPZacEUDhJ6-wbvlA0FAOUg";
diff --git a/config/src/test/java/org/springframework/security/config/web/server/OidcLogoutSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/OidcLogoutSpecTests.java
@@ -167,6 +167,7 @@ void logoutWhenDefaultsThenRemotelyInvalidatesSessions() {
 	}
 
 	@Test
+	@SuppressWarnings("removal")
 	void logoutWhenInvalidLogoutTokenThenBadRequest() {
 		this.spring.register(WebServerConfig.class, OidcProviderConfig.class, DefaultConfig.class).autowire();
 		this.test.get().uri("/token/logout").exchange().expectStatus().isUnauthorized();
@@ -209,6 +210,7 @@ void logoutWhenInvalidLogoutTokenThenBadRequest() {
 	}
 
 	@Test
+	@SuppressWarnings("removal")
 	void logoutWhenLogoutTokenSpecifiesOneSessionThenRemotelyInvalidatesOnlyThatSession() throws Exception {
 		this.spring.register(WebServerConfig.class, OidcProviderConfig.class, DefaultConfig.class).autowire();
 		String registrationId = this.clientRegistration.getRegistrationId();
@@ -252,6 +254,7 @@ void logoutWhenLogoutTokenSpecifiesOneSessionThenRemotelyInvalidatesOnlyThatSess
 	}
 
 	@Test
+	@SuppressWarnings("removal")
 	void logoutWhenRemoteLogoutUriThenUses() {
 		this.spring.register(WebServerConfig.class, OidcProviderConfig.class, LogoutUriConfig.class).autowire();
 		String registrationId = this.clientRegistration.getRegistrationId();
@@ -302,6 +305,7 @@ void logoutWhenSelfRemoteLogoutUriThenUses() {
 	}
 
 	@Test
+	@SuppressWarnings("removal")
 	void logoutWhenDifferentCookieNameThenUses() {
 		this.spring.register(OidcProviderConfig.class, CookieConfig.class).autowire();
 		String registrationId = this.clientRegistration.getRegistrationId();
@@ -325,6 +329,7 @@ void logoutWhenDifferentCookieNameThenUses() {
 	}
 
 	@Test
+	@SuppressWarnings("removal")
 	void logoutWhenRemoteLogoutFailsThenReportsPartialLogout() {
 		this.spring.register(WebServerConfig.class, OidcProviderConfig.class, WithBrokenLogoutConfig.class).autowire();
 		ServerLogoutHandler logoutHandler = this.spring.getContext().getBean(ServerLogoutHandler.class);
diff --git a/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java b/config/src/test/java/org/springframework/security/config/web/server/ServerHttpSecurityTests.java
@@ -737,6 +737,7 @@ public void shouldConfigureAuthorizationRedirectStrategyForOAuth2Client() {
 	}
 
 	@Test
+	@SuppressWarnings("removal")
 	void resourcesWhenLoginPageConfiguredThenServesCss() {
 		this.http.formLogin(withDefaults());
 		this.http.authenticationManager(this.authenticationManager);

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,8 @@ public void loadConfigWhenMultipleWebSecurityConfigurationThenContextLoads() {`
`222`	`222`	`// SEC-2773`
`223`	`223`	`@Test`
`224`	`224`	`public void getMethodDelegatingApplicationListenerWhenWebSecurityConfigurationThenIsStatic() {`
`225`		`- Method method = ClassUtils.getMethod(WebSecurityConfiguration.class, "delegatingApplicationListener", null);`
	`225`	`+ Method method = ClassUtils.getMethod(WebSecurityConfiguration.class, "delegatingApplicationListener",`
	`226`	`+ (Class<?>[]) null);`
`226`	`227`	`assertThat(Modifier.isStatic(method.getModifiers())).isTrue();`
`227`	`228`	`}`
`228`	`229`
Original file line number	Diff line number	Diff line change
`@@ -1257,6 +1257,7 @@ OAuth2AuthorizationConsentService authorizationConsentService(JdbcOperations jdb`
`1257`	`1257`	`}`
`1258`	`1258`
`1259`	`1259`	`@Bean`
	`1260`	`+ @SuppressWarnings("removal")`
`1260`	`1261`	`RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {`
`1261`	`1262`	`JdbcRegisteredClientRepository jdbcRegisteredClientRepository = new JdbcRegisteredClientRepository(`
`1262`	`1263`	`jdbcOperations);`
Original file line number	Diff line number	Diff line change
`@@ -535,6 +535,7 @@ OAuth2AuthorizationService authorizationService(JdbcOperations jdbcOperations,`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`@Bean`
	`538`	`+ @SuppressWarnings("removal")`
`538`	`539`	`RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {`
`539`	`540`	`JdbcRegisteredClientRepository jdbcRegisteredClientRepository = new JdbcRegisteredClientRepository(`
`540`	`541`	`jdbcOperations);`
Original file line number	Diff line number	Diff line change
`@@ -469,6 +469,7 @@ OAuth2AuthorizationService authorizationService(JdbcOperations jdbcOperations,`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`@Bean`
	`472`	`+ @SuppressWarnings("removal")`
`472`	`473`	`RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {`
`473`	`474`	`JdbcRegisteredClientRepository jdbcRegisteredClientRepository = new JdbcRegisteredClientRepository(`
`474`	`475`	`jdbcOperations);`
Original file line number	Diff line number	Diff line change
`@@ -515,6 +515,7 @@ OAuth2AuthorizationConsentService authorizationConsentService(JdbcOperations jdb`
`515`	`515`	`}`
`516`	`516`
`517`	`517`	`@Bean`
	`518`	`+ @SuppressWarnings("removal")`
`518`	`519`	`RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {`
`519`	`520`	`JdbcRegisteredClientRepository jdbcRegisteredClientRepository = new JdbcRegisteredClientRepository(`
`520`	`521`	`jdbcOperations);`
Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,7 @@ OAuth2AuthorizationService authorizationService(JdbcOperations jdbcOperations,`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`@Bean`
	`321`	`+ @SuppressWarnings("removal")`
`321`	`322`	`RegisteredClientRepository registeredClientRepository(JdbcOperations jdbcOperations) {`
`322`	`323`	`JdbcRegisteredClientRepository jdbcRegisteredClientRepository = new JdbcRegisteredClientRepository(`
`323`	`324`	`jdbcOperations);`