Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-10-23 18:59:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix config/src/test/kotlin nullability for web

Browse Source 
Issue gh-17535
This commit is contained in:
Rob Winch 2025-08-29 15:46:08 -05:00
parent c2ba662b91
commit a58f3282d9
No known key found for this signature in database
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/src/test/kotlin/org/springframework/security/config/annotation/web/OneTimeTokenLoginDslTests.kt
View File

@ -22,7 +22,6 @@ import io.mockk.mockk
import io.mockk.verify import io.mockk.verify
import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletRequest
import jakarta.servlet.http.HttpServletResponse import jakarta.servlet.http.HttpServletResponse
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
@ -44,7 +43,6 @@ import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequ
import org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers import org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers
import org.springframework.security.web.SecurityFilterChain import org.springframework.security.web.SecurityFilterChain
import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler
import org.springframework.security.web.authentication.ott.DefaultGenerateOneTimeTokenRequestResolver
import org.springframework.security.web.authentication.ott.GenerateOneTimeTokenRequestResolver import org.springframework.security.web.authentication.ott.GenerateOneTimeTokenRequestResolver
import org.springframework.security.web.authentication.ott.OneTimeTokenGenerationSuccessHandler import org.springframework.security.web.authentication.ott.OneTimeTokenGenerationSuccessHandler
import org.springframework.security.web.authentication.ott.RedirectOneTimeTokenGenerationSuccessHandler import org.springframework.security.web.authentication.ott.RedirectOneTimeTokenGenerationSuccessHandler
@ -53,7 +51,6 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders
import org.springframework.test.web.servlet.result.MockMvcResultMatchers import org.springframework.test.web.servlet.result.MockMvcResultMatchers
import java.time.Duration import java.time.Duration
import java.time.Instant import java.time.Instant
import java.time.ZoneOffset
/** /**
* Tests for [OneTimeTokenLoginDsl] * Tests for [OneTimeTokenLoginDsl]
@ -267,7 +264,7 @@ class OneTimeTokenLoginDslTests {
) )
} }
constructor(redirectUrl: String?) { constructor(redirectUrl: String) {
this.delegate = this.delegate =
RedirectOneTimeTokenGenerationSuccessHandler( RedirectOneTimeTokenGenerationSuccessHandler(
redirectUrl redirectUrl

4
config/src/test/kotlin/org/springframework/security/config/web/server/ServerOAuth2ResourceServerDslTests.kt
View File

@ -175,8 +175,8 @@ class ServerOAuth2ResourceServerDslTests {
open class MockServerAuthenticationFailureHandler: ServerAuthenticationFailureHandler { open class MockServerAuthenticationFailureHandler: ServerAuthenticationFailureHandler {
override fun onAuthenticationFailure( override fun onAuthenticationFailure(
webFilterExchange: WebFilterExchange?, webFilterExchange: WebFilterExchange,
exception: AuthenticationException? exception: AuthenticationException
): Mono<Void> { ): Mono<Void> {
return Mono.empty() return Mono.empty()
} }

4
config/src/test/kotlin/org/springframework/security/config/web/server/ServerOneTimeTokenLoginDslTests.kt
View File

@ -280,11 +280,11 @@ class ServerOneTimeTokenLoginDslTests {
this.delegate = ServerRedirectOneTimeTokenGenerationSuccessHandler("/login/ott") this.delegate = ServerRedirectOneTimeTokenGenerationSuccessHandler("/login/ott")
} }
constructor(redirectUrl: String?) { constructor(redirectUrl: String) {
this.delegate = ServerRedirectOneTimeTokenGenerationSuccessHandler(redirectUrl) this.delegate = ServerRedirectOneTimeTokenGenerationSuccessHandler(redirectUrl)
} }
override fun handle(exchange: ServerWebExchange?, oneTimeToken: OneTimeToken?): Mono<Void> { override fun handle(exchange: ServerWebExchange, oneTimeToken: OneTimeToken): Mono<Void> {
lastToken = oneTimeToken lastToken = oneTimeToken
return delegate!!.handle(exchange, oneTimeToken) return delegate!!.handle(exchange, oneTimeToken)
} }