From b9f974b18f5dfe93581154f71db55c1162384424 Mon Sep 17 00:00:00 2001 From: 023-dev <0_2_3@naver.com> Date: Tue, 27 Jan 2026 03:27:19 +0900 Subject: [PATCH] Remove compiler warnings for spring-security-config Signed-off-by: 023-dev <0_2_3@naver.com> --- .../src/main/groovy/compile-warnings-error.gradle | 1 + config/spring-security-config.gradle | 1 + .../resource/OAuth2ResourceServerConfigurer.java | 12 ++++++++---- .../annotation/web/AuthorizeHttpRequestsDsl.kt | 10 +++++----- .../security/config/annotation/web/HeadersDsl.kt | 4 ++++ .../config/annotation/web/HttpSecurityDsl.kt | 1 + .../config/annotation/web/RequiresChannelDsl.kt | 2 ++ .../security/config/annotation/web/X509Dsl.kt | 1 + .../web/headers/HttpPublicKeyPinningDsl.kt | 2 ++ .../annotation/web/session/SessionFixationDsl.kt | 3 +-- .../security/SerializationSamples.java | 11 +++++++++-- .../web/configurers/HeadersConfigurerTests.java | 4 ++++ .../OAuth2AuthorizationCodeGrantTests.java | 1 + .../OAuth2ClientCredentialsGrantTests.java | 1 + .../authorization/OAuth2ClientRegistrationTests.java | 1 + .../authorization/OAuth2RefreshTokenGrantTests.java | 1 + .../authorization/OAuth2TokenIntrospectionTests.java | 1 + .../authorization/OAuth2TokenRevocationTests.java | 1 + .../authorization/OidcClientRegistrationTests.java | 1 + .../oauth2/server/authorization/OidcTests.java | 1 + .../web/server/OAuth2ResourceServerSpecTests.java | 1 + .../config/web/server/OidcLogoutSpecTests.java | 5 +++++ .../config/web/server/ServerHttpSecurityTests.java | 1 + .../annotation/web/AuthorizeHttpRequestsDslTests.kt | 2 ++ .../security/config/annotation/web/CsrfDslTests.kt | 2 ++ .../config/annotation/web/FormLoginDslTests.kt | 2 ++ .../config/annotation/web/HttpBasicDslTests.kt | 2 ++ .../config/annotation/web/HttpSecurityDslTests.kt | 2 ++ .../config/annotation/web/PortMapperDslTests.kt | 2 ++ .../config/annotation/web/RequiresChannelDslTests.kt | 2 ++ .../security/config/annotation/web/Saml2DslTests.kt | 2 ++ .../config/annotation/web/Saml2LogoutDslTests.kt | 2 ++ .../config/annotation/web/Saml2MetadataDslTests.kt | 2 ++ .../config/annotation/web/SecurityContextDslTests.kt | 2 ++ .../config/annotation/web/WebAuthnDslTests.kt | 2 ++ .../security/config/annotation/web/X509DslTests.kt | 2 ++ .../web/headers/HttpPublicKeyPinningDslTests.kt | 2 ++ .../web/oauth2/resourceserver/OpaqueTokenDslTests.kt | 2 ++ .../web/session/SessionConcurrencyDslTests.kt | 2 ++ .../web/session/SessionFixationDslTests.kt | 2 ++ .../config/web/server/AuthorizeExchangeDslTests.kt | 2 ++ .../web/server/ServerExceptionHandlingDslTests.kt | 2 ++ .../config/web/server/ServerFormLoginDslTests.kt | 2 ++ .../config/web/server/ServerHttpBasicDslTests.kt | 2 ++ .../config/web/server/ServerOpaqueTokenDslTests.kt | 2 ++ .../config/web/server/ServerRequestCacheDslTests.kt | 2 ++ .../security/config/web/server/ServerX509DslTests.kt | 2 ++ 47 files changed, 102 insertions(+), 13 deletions(-) diff --git a/buildSrc/src/main/groovy/compile-warnings-error.gradle b/buildSrc/src/main/groovy/compile-warnings-error.gradle index 4c23ae9f93..cce3634ca8 100644 --- a/buildSrc/src/main/groovy/compile-warnings-error.gradle +++ b/buildSrc/src/main/groovy/compile-warnings-error.gradle @@ -8,3 +8,4 @@ tasks.withType(JavaCompile) { tasks.withType(KotlinCompile) { kotlinOptions.allWarningsAsErrors = true } + diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index 83a84b8525..2e44047856 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -5,6 +5,7 @@ apply plugin: 'io.spring.convention.spring-module' apply plugin: 'trang' apply plugin: 'security-kotlin' apply plugin: 'test-compile-target-jdk25' +apply plugin: 'compile-warnings-error' apply plugin: 'javadoc-warnings-error' configurations { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java index c830013461..beb6c0ccea 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java @@ -521,8 +521,10 @@ public final class OAuth2ResourceServerConfigurer new SpringOpaqueTokenIntrospector(this.introspectionUri, this.clientId, - this.clientSecret); + this.introspector = () -> SpringOpaqueTokenIntrospector.withIntrospectionUri(this.introspectionUri) + .clientId(this.clientId) + .clientSecret(this.clientSecret) + .build(); return this; } @@ -531,8 +533,10 @@ public final class OAuth2ResourceServerConfigurer new SpringOpaqueTokenIntrospector(this.introspectionUri, this.clientId, - this.clientSecret); + this.introspector = () -> SpringOpaqueTokenIntrospector.withIntrospectionUri(this.introspectionUri) + .clientId(this.clientId) + .clientSecret(this.clientSecret) + .build(); return this; } diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDsl.kt index 6c832f79fc..8db4955bd7 100644 --- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDsl.kt @@ -286,7 +286,7 @@ class AuthorizeHttpRequestsDsl : AbstractRequestMatcherDsl { if (factoryOfRequestAuthorizationContext != null) { return factoryOfRequestAuthorizationContext } - val factoryOfObjectType = ResolvableType.forClassWithGenerics(AuthorizationManagerFactory::class.java, Object::class.java) + val factoryOfObjectType = ResolvableType.forClassWithGenerics(AuthorizationManagerFactory::class.java, Any::class.java) val factoryOfAny = context.getBeanProvider>(factoryOfObjectType).getIfUnique() if (factoryOfAny != null) { return factoryOfAny @@ -303,20 +303,20 @@ class AuthorizeHttpRequestsDsl : AbstractRequestMatcherDsl { return defaultFactory } - private fun resolveRolePrefix(context: ApplicationContext): String { + private fun resolveRolePrefix(context: ApplicationContext): String? { val beanNames = context.getBeanNamesForType(GrantedAuthorityDefaults::class.java) if (beanNames.isNotEmpty()) { return context.getBean(GrantedAuthorityDefaults::class.java).rolePrefix } - return "ROLE_"; + return null } - private fun resolveRoleHierarchy(context: ApplicationContext): RoleHierarchy { + private fun resolveRoleHierarchy(context: ApplicationContext): RoleHierarchy? { val beanNames = context.getBeanNamesForType(RoleHierarchy::class.java) if (beanNames.isNotEmpty()) { return context.getBean(RoleHierarchy::class.java) } - return NullRoleHierarchy() + return null } } diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/HeadersDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HeadersDsl.kt index 3707b7a01f..e5bd5a4b0a 100644 --- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/HeadersDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HeadersDsl.kt @@ -37,9 +37,11 @@ class HeadersDsl { private var cacheControl: ((HeadersConfigurer.CacheControlConfig) -> Unit)? = null private var hsts: ((HeadersConfigurer.HstsConfig) -> Unit)? = null private var frameOptions: ((HeadersConfigurer.FrameOptionsConfig) -> Unit)? = null + @Suppress("DEPRECATION") private var hpkp: ((HeadersConfigurer.HpkpConfig) -> Unit)? = null private var contentSecurityPolicy: ((HeadersConfigurer.ContentSecurityPolicyConfig) -> Unit)? = null private var referrerPolicy: ((HeadersConfigurer.ReferrerPolicyConfig) -> Unit)? = null + @Suppress("DEPRECATION") private var featurePolicyDirectives: String? = null private var permissionsPolicy: ((HeadersConfigurer.PermissionsPolicyConfig) -> Unit)? = null private var crossOriginOpenerPolicy: ((HeadersConfigurer.CrossOriginOpenerPolicyConfig) -> Unit)? = null @@ -120,6 +122,7 @@ class HeadersDsl { * @deprecated see Certificate and Public Key Pinning for more context */ @Deprecated(message = "as of 5.8 with no replacement") + @Suppress("DEPRECATION") fun httpPublicKeyPinning(hpkpConfig: HttpPublicKeyPinningDsl.() -> Unit) { this.hpkp = HttpPublicKeyPinningDsl().apply(hpkpConfig).get() } @@ -167,6 +170,7 @@ class HeadersDsl { * @param policyDirectives policyDirectives the security policy directive(s) */ @Deprecated("Use 'permissionsPolicy { }' instead.") + @Suppress("DEPRECATION") fun featurePolicy(policyDirectives: String) { this.featurePolicyDirectives = policyDirectives } diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt index 06863f06e5..5d25617b2b 100644 --- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt @@ -614,6 +614,7 @@ class HttpSecurityDsl(private val http: HttpSecurity, private val init: HttpSecu * @see [RequiresChannelDsl] * @deprecated please use [redirectToHttps] instead */ + @Suppress("DEPRECATION") @Deprecated(message="since 6.5 use redirectToHttps instead") fun requiresChannel(requiresChannelConfiguration: RequiresChannelDsl.() -> Unit) { val requiresChannelCustomizer = RequiresChannelDsl().apply(requiresChannelConfiguration).get() diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDsl.kt index 98ba9debb4..c38b6c4a1a 100644 --- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDsl.kt @@ -14,6 +14,8 @@ * limitations under the License. */ +@file:Suppress("DEPRECATION") + package org.springframework.security.config.annotation.web import org.springframework.security.config.annotation.web.builders.HttpSecurity diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/X509Dsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/X509Dsl.kt index 55fcf14665..3ee34a22bc 100644 --- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/X509Dsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/X509Dsl.kt @@ -62,6 +62,7 @@ class X509Dsl { authenticationDetailsSource?.also { x509.authenticationDetailsSource(authenticationDetailsSource) } userDetailsService?.also { x509.userDetailsService(userDetailsService) } authenticationUserDetailsService?.also { x509.authenticationUserDetailsService(authenticationUserDetailsService) } + @Suppress("DEPRECATION") subjectPrincipalRegex?.also { x509.subjectPrincipalRegex(subjectPrincipalRegex) } } } diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDsl.kt index 6fb1147a27..1774075300 100644 --- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDsl.kt @@ -14,6 +14,8 @@ * limitations under the License. */ +@file:Suppress("DEPRECATION") + package org.springframework.security.config.annotation.web.headers import org.springframework.security.config.annotation.web.builders.HttpSecurity diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt index f239dafbd1..b7888fb555 100644 --- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDsl.kt @@ -68,12 +68,11 @@ class SessionFixationDsl { internal fun get(): (SessionManagementConfigurer.SessionFixationConfigurer) -> Unit { return { sessionFixation -> strategy?.also { - when (strategy) { + when (it) { SessionFixationStrategy.NEW -> sessionFixation.newSession() SessionFixationStrategy.MIGRATE -> sessionFixation.migrateSession() SessionFixationStrategy.CHANGE_ID -> sessionFixation.changeSessionId() SessionFixationStrategy.NONE -> sessionFixation.none() - null -> null } } } diff --git a/config/src/test/java/org/springframework/security/SerializationSamples.java b/config/src/test/java/org/springframework/security/SerializationSamples.java index d98ea76d3e..43e10d58a4 100644 --- a/config/src/test/java/org/springframework/security/SerializationSamples.java +++ b/config/src/test/java/org/springframework/security/SerializationSamples.java @@ -294,6 +294,14 @@ final class SerializationSamples { Authentication authentication = TestAuthentication.authenticated(user); SecurityContext securityContext = new SecurityContextImpl(authentication); + instancioByClassName.put(OneTimeTokenAuthenticationToken.class, () -> { + @SuppressWarnings("removal") + InstancioOfClassApi instancio = Instancio.of(OneTimeTokenAuthenticationToken.class); + instancio.supply(Select.all(OneTimeTokenAuthenticationToken.class), + (r) -> applyDetails(new OneTimeTokenAuthenticationToken("token"))); + return instancio; + }); + // oauth2-core generatorByClassName.put(DefaultOAuth2User.class, (r) -> TestOAuth2Users.create()); generatorByClassName.put(OAuth2AuthorizationRequest.class, @@ -607,8 +615,7 @@ final class SerializationSamples { token.setDetails(details); return token; }); - generatorByClassName.put(OneTimeTokenAuthenticationToken.class, - (r) -> applyDetails(new OneTimeTokenAuthenticationToken("username", "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/configurers/HeadersConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java index e81541f288..b3c80e004c 100644 --- 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 @@ public class HeadersConfigurerTests { @Configuration @EnableWebSecurity + @SuppressWarnings("removal") static class PermissionsPolicyConfig { @Bean @@ -1221,6 +1222,7 @@ public class HeadersConfigurerTests { static class PermissionsPolicyStringConfig { @Bean + @SuppressWarnings("removal") SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http @@ -1235,6 +1237,7 @@ public class HeadersConfigurerTests { @Configuration @EnableWebSecurity + @SuppressWarnings("removal") static class PermissionsPolicyInvalidConfig { @Bean @@ -1252,6 +1255,7 @@ public class HeadersConfigurerTests { @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 index af8b3123a4..f9e5568074 100644 --- 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 @@ public class OAuth2AuthorizationCodeGrantTests { } @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 index 8b27bad816..3e0bc49b8a 100644 --- 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 @@ -561,6 +561,7 @@ public class OAuth2ClientCredentialsGrantTests { } @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 index a0512af77a..801a76462d 100644 --- 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 @@ public class OAuth2ClientRegistrationTests { // @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 index 16df4207b9..1a1f20c0ce 100644 --- 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 @@ public class OAuth2RefreshTokenGrantTests { } @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 index e4bd35d062..a5cc4cb085 100644 --- 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 @@ public class OAuth2TokenIntrospectionTests { } @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 index 8ff0e389f1..c10c342a0a 100644 --- 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 @@ public class OAuth2TokenRevocationTests { } @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 index df1bd6da84..05a121fcf8 100644 --- 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 @@ public class OidcClientRegistrationTests { // @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 index 34984b8fa8..2d63a96084 100644 --- 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 @@ public class OidcTests { } @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 index 2c3c662fc4..40ed262a40 100644 --- 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 @@ import static org.mockito.Mockito.verify; * {@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 index 13afcf091a..defb5fc906 100644 --- 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 @@ public class OidcLogoutSpecTests { } @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 @@ public class OidcLogoutSpecTests { } @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 @@ public class OidcLogoutSpecTests { } @Test + @SuppressWarnings("removal") void logoutWhenRemoteLogoutUriThenUses() { this.spring.register(WebServerConfig.class, OidcProviderConfig.class, LogoutUriConfig.class).autowire(); String registrationId = this.clientRegistration.getRegistrationId(); @@ -302,6 +305,7 @@ public class OidcLogoutSpecTests { } @Test + @SuppressWarnings("removal") void logoutWhenDifferentCookieNameThenUses() { this.spring.register(OidcProviderConfig.class, CookieConfig.class).autowire(); String registrationId = this.clientRegistration.getRegistrationId(); @@ -325,6 +329,7 @@ public class OidcLogoutSpecTests { } @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 index dcc0f7f722..3bd90c0f5a 100644 --- 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 class ServerHttpSecurityTests { } @Test + @SuppressWarnings("removal") void resourcesWhenLoginPageConfiguredThenServesCss() { this.http.formLogin(withDefaults()); this.http.authenticationManager(this.authenticationManager); diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDslTests.kt index 63899a5b72..a50a8388e7 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/CsrfDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/CsrfDslTests.kt index 286fbb9a86..5ab9747384 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/CsrfDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/CsrfDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/FormLoginDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/FormLoginDslTests.kt index d1a56608a2..678400e990 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/FormLoginDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/FormLoginDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpBasicDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpBasicDslTests.kt index 862c9217c6..0aaa84985e 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpBasicDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpBasicDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDslTests.kt index 5cfaadee43..f9985a9458 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/PortMapperDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/PortMapperDslTests.kt index 87d6a58f8f..6dcf6dbe3f 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/PortMapperDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/PortMapperDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDslTests.kt index 876d92e4f1..5714d02634 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/RequiresChannelDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2DslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2DslTests.kt index 1b51bc04df..c533b3d8f7 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2DslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2DslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2LogoutDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2LogoutDslTests.kt index 027d2be432..d078efb62e 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2LogoutDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2LogoutDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2MetadataDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2MetadataDslTests.kt index 9216224e2f..d1ff1a4b89 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2MetadataDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/Saml2MetadataDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/SecurityContextDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/SecurityContextDslTests.kt index 96ff4aa2c4..1850fee5e6 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/SecurityContextDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/SecurityContextDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/WebAuthnDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/WebAuthnDslTests.kt index e856e55bd8..c3e1e935b7 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/WebAuthnDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/WebAuthnDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/X509DslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/X509DslTests.kt index 534ce90c03..37b635e214 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/X509DslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/X509DslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDslTests.kt index ff471eca38..6276116421 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/headers/HttpPublicKeyPinningDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OpaqueTokenDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OpaqueTokenDslTests.kt index ec5969b38b..f593f8a231 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OpaqueTokenDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/oauth2/resourceserver/OpaqueTokenDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionConcurrencyDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionConcurrencyDslTests.kt index 9d3ecf8bde..25d19a5852 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionConcurrencyDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionConcurrencyDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDslTests.kt index c88a0a845b..e9b874e994 100644 --- a/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/annotation/web/session/SessionFixationDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/web/server/AuthorizeExchangeDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/web/server/AuthorizeExchangeDslTests.kt index 2ffc12f03e..3be1c03b64 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/server/AuthorizeExchangeDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/web/server/AuthorizeExchangeDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerExceptionHandlingDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerExceptionHandlingDslTests.kt index ae9c086de2..705784b5c8 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerExceptionHandlingDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerExceptionHandlingDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerFormLoginDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerFormLoginDslTests.kt index 1ca2229017..295e74fa66 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerFormLoginDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerFormLoginDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpBasicDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpBasicDslTests.kt index b80aca8792..f69bda1684 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpBasicDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpBasicDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerOpaqueTokenDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerOpaqueTokenDslTests.kt index 14cbcbbebf..5878ba3d25 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerOpaqueTokenDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerOpaqueTokenDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerRequestCacheDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerRequestCacheDslTests.kt index 2f88afde8d..235f3af24f 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerRequestCacheDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerRequestCacheDslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. * diff --git a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerX509DslTests.kt b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerX509DslTests.kt index 9b4ce88206..e32b1bcbcc 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerX509DslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerX509DslTests.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION", "PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST") + /* * Copyright 2004-present the original author or authors. *