Skip to content

Commit a58f328

Browse files
committed
Fix config/src/test/kotlin nullability for web
Issue gh-17535
1 parent c2ba662 commit a58f328

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import io.mockk.mockk
2222
import io.mockk.verify
2323
import jakarta.servlet.http.HttpServletRequest
2424
import jakarta.servlet.http.HttpServletResponse
25-
import org.assertj.core.api.Assertions.assertThat
2625
import org.junit.jupiter.api.Test
2726
import org.junit.jupiter.api.extension.ExtendWith
2827
import org.springframework.beans.factory.annotation.Autowired
@@ -44,7 +43,6 @@ import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequ
4443
import org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers
4544
import org.springframework.security.web.SecurityFilterChain
4645
import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler
47-
import org.springframework.security.web.authentication.ott.DefaultGenerateOneTimeTokenRequestResolver
4846
import org.springframework.security.web.authentication.ott.GenerateOneTimeTokenRequestResolver
4947
import org.springframework.security.web.authentication.ott.OneTimeTokenGenerationSuccessHandler
5048
import org.springframework.security.web.authentication.ott.RedirectOneTimeTokenGenerationSuccessHandler
@@ -53,7 +51,6 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders
5351
import org.springframework.test.web.servlet.result.MockMvcResultMatchers
5452
import java.time.Duration
5553
import java.time.Instant
56-
import java.time.ZoneOffset
5754

5855
/**
5956
* Tests for [OneTimeTokenLoginDsl]
@@ -267,7 +264,7 @@ class OneTimeTokenLoginDslTests {
267264
)
268265
}
269266

270-
constructor(redirectUrl: String?) {
267+
constructor(redirectUrl: String) {
271268
this.delegate =
272269
RedirectOneTimeTokenGenerationSuccessHandler(
273270
redirectUrl

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ class ServerOAuth2ResourceServerDslTests {
175175

176176
open class MockServerAuthenticationFailureHandler: ServerAuthenticationFailureHandler {
177177
override fun onAuthenticationFailure(
178-
webFilterExchange: WebFilterExchange?,
179-
exception: AuthenticationException?
178+
webFilterExchange: WebFilterExchange,
179+
exception: AuthenticationException
180180
): Mono<Void> {
181181
return Mono.empty()
182182
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,11 @@ class ServerOneTimeTokenLoginDslTests {
280280
this.delegate = ServerRedirectOneTimeTokenGenerationSuccessHandler("/login/ott")
281281
}
282282

283-
constructor(redirectUrl: String?) {
283+
constructor(redirectUrl: String) {
284284
this.delegate = ServerRedirectOneTimeTokenGenerationSuccessHandler(redirectUrl)
285285
}
286286

287-
override fun handle(exchange: ServerWebExchange?, oneTimeToken: OneTimeToken?): Mono<Void> {
287+
override fun handle(exchange: ServerWebExchange, oneTimeToken: OneTimeToken): Mono<Void> {
288288
lastToken = oneTimeToken
289289
return delegate!!.handle(exchange, oneTimeToken)
290290
}

0 commit comments

Comments
 (0)