Skip to content

Commit 8bafd94

Browse files
ngocnhan-tran1996rwinch
ngocnhan-tran1996
authored and
rwinch
committed
Add compile-warnings-error
Closes gh-18424 Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
1 parent d244bcf commit 8bafd94

17 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎docs/spring-security-docs.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
id 'security-kotlin'
66
id 'java-toolchain'
77
id 'test-compile-target-jdk25'
8+
id 'compile-warnings-error'
89
}
910

1011
apply plugin: 'io.spring.convention.docs'

‎docs/src/test/kotlin/org/springframework/security/kt/docs/features/authentication/authenticationcompromisedpasswordcheck/CompromisedPasswordCheckerUsage.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import org.springframework.security.web.authentication.SimpleUrlAuthenticationFa
1515
import org.springframework.security.web.authentication.password.HaveIBeenPwnedRestApiPasswordChecker
1616

1717

18-
class CompromisedPasswordCheckerUsage {
18+
open class CompromisedPasswordCheckerUsage {
1919
// tag::configuration[]
2020
@Bean
2121
open fun filterChain(http: HttpSecurity): SecurityFilterChain {

‎docs/src/test/kotlin/org/springframework/security/kt/docs/features/authentication/authenticationpasswordstoragedepgettingstarted/WithDefaultPasswordEncoderUsage.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import org.springframework.security.core.userdetails.User
44
import org.springframework.security.core.userdetails.UserDetails
55

66
class WithDefaultPasswordEncoderUsage {
7+
8+
@Suppress("DEPRECATION")
79
fun createSingleUser(): UserDetails {
810
// tag::createSingleUser[]
911
val user = User.withDefaultPasswordEncoder()
@@ -17,6 +19,7 @@ class WithDefaultPasswordEncoderUsage {
1719
return user
1820
}
1921

22+
@Suppress("DEPRECATION")
2023
fun createMultipleUsers(): List<UserDetails> {
2124
// tag::createMultipleUsers[]
2225
val users = User.withDefaultPasswordEncoder()

‎docs/src/test/kotlin/org/springframework/security/kt/docs/features/authentication/authenticationpasswordstoragedpe/DelegatingPasswordEncoderUsage.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ import org.springframework.security.crypto.argon2.Argon2PasswordEncoder
44
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
55
import org.springframework.security.crypto.factory.PasswordEncoderFactories
66
import org.springframework.security.crypto.password.DelegatingPasswordEncoder
7-
import org.springframework.security.crypto.password.NoOpPasswordEncoder
87
import org.springframework.security.crypto.password.PasswordEncoder
98
import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder
10-
import org.springframework.security.crypto.password.StandardPasswordEncoder
119
import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder
1210

1311
class DelegatingPasswordEncoderUsage {
@@ -18,19 +16,20 @@ class DelegatingPasswordEncoderUsage {
1816
return passwordEncoder
1917
}
2018

19+
@Suppress("DEPRECATION")
2120
fun customDelegatingPasswordEncoder(): PasswordEncoder {
2221
// tag::createCustomPasswordEncoder[]
2322
val idForEncode = "bcrypt"
2423
val encoders: MutableMap<String, PasswordEncoder> = mutableMapOf()
2524
encoders[idForEncode] = BCryptPasswordEncoder()
26-
encoders["noop"] = NoOpPasswordEncoder.getInstance()
25+
encoders["noop"] = org.springframework.security.crypto.password.NoOpPasswordEncoder.getInstance()
2726
encoders["pbkdf2"] = Pbkdf2PasswordEncoder.defaultsForSpringSecurity_v5_5()
2827
encoders["pbkdf2@SpringSecurity_v5_8"] = Pbkdf2PasswordEncoder.defaultsForSpringSecurity_v5_8()
2928
encoders["scrypt"] = SCryptPasswordEncoder.defaultsForSpringSecurity_v4_1()
3029
encoders["scrypt@SpringSecurity_v5_8"] = SCryptPasswordEncoder.defaultsForSpringSecurity_v5_8()
3130
encoders["argon2"] = Argon2PasswordEncoder.defaultsForSpringSecurity_v5_2()
3231
encoders["argon2@SpringSecurity_v5_8"] = Argon2PasswordEncoder.defaultsForSpringSecurity_v5_8()
33-
encoders["sha256"] = StandardPasswordEncoder()
32+
encoders["sha256"] = org.springframework.security.crypto.password.StandardPasswordEncoder()
3433

3534
val passwordEncoder: PasswordEncoder = DelegatingPasswordEncoder(idForEncode, encoders)
3635
// end::createCustomPasswordEncoder[]

‎docs/src/test/kotlin/org/springframework/security/kt/docs/reactive/authentication/reactivex509/X509ConfigurationTests.kt‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,17 @@ import org.junit.jupiter.api.Test
1919
import org.junit.jupiter.api.extension.ExtendWith
2020
import org.springframework.beans.factory.annotation.Autowired
2121
import org.springframework.core.io.ClassPathResource
22-
import org.springframework.http.client.reactive.ClientHttpConnector
23-
import org.springframework.http.server.reactive.SslInfo
2422
import org.springframework.security.config.test.SpringTestContext
2523
import org.springframework.security.config.test.SpringTestContextExtension
2624
import org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers
2725
import org.springframework.security.test.web.reactive.server.WebTestClientBuilder.Http200RestController
2826
import org.springframework.security.web.authentication.preauth.x509.X509TestUtils
2927
import org.springframework.test.web.reactive.server.UserWebTestClientConfigurer.x509
3028
import org.springframework.test.web.reactive.server.WebTestClient
31-
import org.springframework.test.web.reactive.server.WebTestClientConfigurer
32-
import org.springframework.util.Assert
33-
import org.springframework.web.server.ServerWebExchange
3429
import org.springframework.web.server.WebFilter
35-
import org.springframework.web.server.WebFilterChain
36-
import org.springframework.web.server.adapter.WebHttpHandlerBuilder
37-
import reactor.core.publisher.Mono
3830
import java.security.cert.Certificate
3931
import java.security.cert.CertificateFactory
4032
import java.security.cert.X509Certificate
41-
import java.util.function.Consumer
4233

4334
/**
4435
* Tests [CustomX509Configuration].
@@ -88,9 +79,10 @@ class X509ConfigurationTests {
8879
// @formatter:on
8980
}
9081

82+
@Suppress("UNCHECKED_CAST")
9183
private fun <T : Certificate?> loadCert(location: String): T {
9284
try {
93-
ClassPathResource(location).getInputStream().use { `is` ->
85+
ClassPathResource(location).inputStream.use { `is` ->
9486
val certFactory = CertificateFactory.getInstance("X.509")
9587
return certFactory.generateCertificate(`is`) as T
9688
}

‎docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/authentication/authorizationmanagerfactory/UseAuthorizationManagerFactoryConfiguration.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ internal class UseAuthorizationManagerFactoryConfiguration {
3737

3838
// tag::authorizationManagerFactoryBean[]
3939
@Bean
40-
fun authz(): AuthorizationManagerFactory<Object> {
41-
return AuthorizationManagerFactories.multiFactor<Object>()
40+
fun authz(): AuthorizationManagerFactory<Any> {
41+
return AuthorizationManagerFactories.multiFactor<Any>()
4242
.requireFactors(
4343
FactorGrantedAuthority.PASSWORD_AUTHORITY,
4444
FactorGrantedAuthority.OTT_AUTHORITY
@@ -47,6 +47,7 @@ internal class UseAuthorizationManagerFactoryConfiguration {
4747
}
4848
// end::authorizationManagerFactoryBean[]
4949

50+
@Suppress("DEPRECATION")
5051
@Bean
5152
fun userDetailsService(): UserDetailsService {
5253
return InMemoryUserDetailsManager(

‎docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/authentication/emfa/EnableMultiFactorAuthenticationConfiguration.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ internal class EnableMultiFactorAuthenticationConfiguration {
4444
}
4545
// end::httpSecurity[]
4646

47+
@Suppress("DEPRECATION")
4748
@Bean
4849
fun userDetailsService(): UserDetailsService {
4950
return InMemoryUserDetailsManager(

‎docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/authentication/hasallauthorities/ListAuthoritiesConfiguration.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ internal class ListAuthoritiesConfiguration {
3838
}
3939
// end::httpSecurity[]
4040

41+
@Suppress("DEPRECATION")
4142
@Bean
4243
fun userDetailsService(): UserDetailsService {
4344
return InMemoryUserDetailsManager(

‎docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/authentication/hasallauthorities/MultipleAuthorizationRulesConfiguration.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ internal class MultipleAuthorizationRulesConfiguration {
4545
}
4646
// end::httpSecurity[]
4747

48+
@Suppress("DEPRECATION")
4849
@Bean
4950
fun userDetailsService(): UserDetailsService {
5051
return InMemoryUserDetailsManager(

‎docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/authentication/obtainingmoreauthorization/MissingAuthorityConfiguration.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ internal class MissingAuthorityConfiguration {
5353

5454
// tag::authorizationManagerFactoryBean[]
5555
@Bean
56-
fun authz(): AuthorizationManagerFactory<Object> {
57-
return AuthorizationManagerFactories.multiFactor<Object>()
56+
fun authz(): AuthorizationManagerFactory<Any> {
57+
return AuthorizationManagerFactories.multiFactor<Any>()
5858
.requireFactors(
5959
FactorGrantedAuthority.X509_AUTHORITY,
6060
FactorGrantedAuthority.AUTHORIZATION_CODE_AUTHORITY

0 commit comments

Comments
 (0)