Skip to content

Commit 6739ca8

Browse files
izeyesbrannen
izeye
authored and
sbrannen
committed
Polishing
See gh-23846 See gh-29955 Closes gh-29992
1 parent 88e6544 commit 6739ca8

File tree

6 files changed

+33
-31
lines changed

6 files changed

+33
-31
lines changed

‎spring-tx/src/test/kotlin/org/springframework/transaction/interceptor/AbstractCoroutinesTransactionAspectTests.kt

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import org.assertj.core.api.Assertions.assertThat
2222
import org.assertj.core.api.Fail
2323
import org.junit.jupiter.api.BeforeEach
2424
import org.junit.jupiter.api.Test
25-
import org.mockito.BDDMockito
25+
import org.mockito.BDDMockito.*
2626
import org.mockito.Mockito
2727
import org.springframework.transaction.*
2828
import org.springframework.transaction.reactive.TransactionContext
@@ -83,8 +83,8 @@ abstract class AbstractCoroutinesTransactionAspectTests {
8383
val status = Mockito.mock(ReactiveTransaction::class.java)
8484
val rtm = Mockito.mock(ReactiveTransactionManager::class.java)
8585
// expect a transaction
86-
BDDMockito.given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status))
87-
BDDMockito.given(rtm.commit(status)).willReturn(Mono.empty())
86+
given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status))
87+
given(rtm.commit(status)).willReturn(Mono.empty())
8888
val tb = DefaultTestBean()
8989
val itb = advised(tb, rtm, tas) as TestBean
9090
runBlocking {
@@ -106,8 +106,8 @@ abstract class AbstractCoroutinesTransactionAspectTests {
106106
val status = Mockito.mock(ReactiveTransaction::class.java)
107107
val rtm = Mockito.mock(ReactiveTransactionManager::class.java)
108108
// expect a transaction
109-
BDDMockito.given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status))
110-
BDDMockito.given(rtm.commit(status)).willReturn(Mono.empty())
109+
given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status))
110+
given(rtm.commit(status)).willReturn(Mono.empty())
111111
val tb = DefaultTestBean()
112112
val itb = advised(tb, rtm, arrayOf(tas1, tas2)) as TestBean
113113
runBlocking {
@@ -128,8 +128,8 @@ abstract class AbstractCoroutinesTransactionAspectTests {
128128
val status = Mockito.mock(ReactiveTransaction::class.java)
129129
val rtm = Mockito.mock(ReactiveTransactionManager::class.java)
130130
// expect a transaction
131-
BDDMockito.given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status))
132-
BDDMockito.given(rtm.commit(status)).willReturn(Mono.empty())
131+
given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status))
132+
given(rtm.commit(status)).willReturn(Mono.empty())
133133
val tb = DefaultTestBean()
134134
val itb = advised(tb, rtm, tas) as TestBean
135135
runBlocking {
@@ -198,17 +198,17 @@ abstract class AbstractCoroutinesTransactionAspectTests {
198198
val status = Mockito.mock(ReactiveTransaction::class.java)
199199
val rtm = Mockito.mock(ReactiveTransactionManager::class.java)
200200
// Gets additional call(s) from TransactionControl
201-
BDDMockito.given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status))
201+
given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status))
202202
val tex = TransactionSystemException("system exception")
203203
if (rollbackException) {
204204
if (shouldRollback) {
205-
BDDMockito.given(rtm.rollback(status)).willReturn(Mono.error(tex))
205+
given(rtm.rollback(status)).willReturn(Mono.error(tex))
206206
} else {
207-
BDDMockito.given(rtm.commit(status)).willReturn(Mono.error(tex))
207+
given(rtm.commit(status)).willReturn(Mono.error(tex))
208208
}
209209
} else {
210-
BDDMockito.given(rtm.commit(status)).willReturn(Mono.empty())
211-
BDDMockito.given(rtm.rollback(status)).willReturn(Mono.empty())
210+
given(rtm.commit(status)).willReturn(Mono.empty())
211+
given(rtm.rollback(status)).willReturn(Mono.empty())
212212
}
213213
val tb = DefaultTestBean()
214214
val itb = advised(tb, rtm, tas) as TestBean
@@ -246,7 +246,7 @@ abstract class AbstractCoroutinesTransactionAspectTests {
246246
val rtm = Mockito.mock(ReactiveTransactionManager::class.java)
247247
// Expect a transaction
248248
val ex = CannotCreateTransactionException("foobar")
249-
BDDMockito.given(rtm.getReactiveTransaction(txatt)).willThrow(ex)
249+
given(rtm.getReactiveTransaction(txatt)).willThrow(ex)
250250
val tb: DefaultTestBean = object : DefaultTestBean() {
251251
override suspend fun getName(): String? {
252252
throw UnsupportedOperationException(
@@ -279,10 +279,10 @@ abstract class AbstractCoroutinesTransactionAspectTests {
279279
// No attributes for m2
280280
val rtm = Mockito.mock(ReactiveTransactionManager::class.java)
281281
val status = Mockito.mock(ReactiveTransaction::class.java)
282-
BDDMockito.given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status))
282+
given(rtm.getReactiveTransaction(txatt)).willReturn(Mono.just(status))
283283
val ex = UnexpectedRollbackException("foobar")
284-
BDDMockito.given(rtm.commit(status)).willReturn(Mono.error(ex))
285-
BDDMockito.given(rtm.rollback(status)).willReturn(Mono.empty())
284+
given(rtm.commit(status)).willReturn(Mono.error(ex))
285+
given(rtm.rollback(status)).willReturn(Mono.empty())
286286
val tb = DefaultTestBean()
287287
val itb = advised(tb, rtm, tas) as TestBean
288288
val name = "new name"

‎spring-web/src/main/java/org/springframework/http/CacheControl.java

+1
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ public CacheControl staleIfError(Duration staleIfError) {
329329
* Adding a {@link #maxAge(Duration) max-age} directive is strongly advised
330330
* to enforce the actual freshness lifetime.
331331
* @return {@code this}, to facilitate method chaining
332+
* @since 6.0.5
332333
* @see <a href="https://tools.ietf.org/html/rfc8246">rfc8246</a>
333334
*/
334335
public CacheControl immutable() {

‎spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public MethodArgumentNotValidException(MethodParameter parameter, BindingResult
7474
* Constructor for {@link MethodArgumentNotValidException}.
7575
* @param executable the executable that failed validation
7676
* @param bindingResult the results of the validation
77+
* @since 6.0.5
7778
*/
7879
public MethodArgumentNotValidException(Executable executable, BindingResult bindingResult) {
7980
super(bindingResult);

‎spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.List;
2525

2626
import org.junit.jupiter.api.Test;
27-
import org.mockito.BDDMockito;
2827

2928
import org.springframework.core.ParameterizedTypeReference;
3029
import org.springframework.core.io.ClassPathResource;
@@ -37,6 +36,7 @@
3736
import org.springframework.web.testfixture.http.MockHttpOutputMessage;
3837

3938
import static org.assertj.core.api.Assertions.assertThat;
39+
import static org.mockito.BDDMockito.given;
4040
import static org.mockito.Mockito.mock;
4141

4242
/**
@@ -187,9 +187,9 @@ public void partialContentMultipleByteRangesInRandomOrderAndOverlapping() throws
187187
public void applicationOctetStreamDefaultContentType() throws Exception {
188188
MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
189189
ClassPathResource body = mock();
190-
BDDMockito.given(body.getFilename()).willReturn("spring.dat");
191-
BDDMockito.given(body.contentLength()).willReturn(12L);
192-
BDDMockito.given(body.getInputStream()).willReturn(new ByteArrayInputStream("Spring Framework".getBytes()));
190+
given(body.getFilename()).willReturn("spring.dat");
191+
given(body.contentLength()).willReturn(12L);
192+
given(body.getInputStream()).willReturn(new ByteArrayInputStream("Spring Framework".getBytes()));
193193
HttpRange range = HttpRange.createByteRange(0, 5);
194194
ResourceRegion resourceRegion = range.toResourceRegion(body);
195195

‎spring-web/src/test/kotlin/org/springframework/web/method/annotation/ModelAttributeMethodProcessorKotlinTests.kt

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import org.assertj.core.api.Assertions.assertThatThrownBy
2121
import org.junit.jupiter.api.BeforeEach
2222
import org.junit.jupiter.api.Test
2323
import org.mockito.ArgumentMatchers.*
24-
import org.mockito.BDDMockito
25-
import org.mockito.Mockito
24+
import org.mockito.BDDMockito.given
25+
import org.mockito.Mockito.mock
2626
import org.springframework.core.MethodParameter
2727
import org.springframework.core.annotation.SynthesizingMethodParameter
2828
import org.springframework.web.bind.MethodArgumentNotValidException
@@ -51,16 +51,16 @@ class ModelAttributeMethodProcessorKotlinTests {
5151
fun setup() {
5252
container = ModelAndViewContainer()
5353
processor = ModelAttributeMethodProcessor(false)
54-
var method = ModelAttributeHandler::class.java.getDeclaredMethod("test",Param::class.java)
54+
val method = ModelAttributeHandler::class.java.getDeclaredMethod("test", Param::class.java)
5555
param = SynthesizingMethodParameter(method, 0)
5656
}
5757

5858
@Test
5959
fun resolveArgumentWithValue() {
6060
val mockRequest = MockHttpServletRequest().apply { addParameter("a", "b") }
6161
val requestWithParam = ServletWebRequest(mockRequest)
62-
val factory = Mockito.mock<WebDataBinderFactory>()
63-
BDDMockito.given(factory.createBinder(any(), any(), eq("param")))
62+
val factory = mock<WebDataBinderFactory>()
63+
given(factory.createBinder(any(), any(), eq("param")))
6464
.willAnswer { WebRequestDataBinder(it.getArgument(1)) }
6565
assertThat(processor.resolveArgument(this.param, container, requestWithParam, factory)).isEqualTo(Param("b"))
6666
}
@@ -69,8 +69,8 @@ class ModelAttributeMethodProcessorKotlinTests {
6969
fun throwMethodArgumentNotValidExceptionWithNull() {
7070
val mockRequest = MockHttpServletRequest().apply { addParameter("a", null) }
7171
val requestWithParam = ServletWebRequest(mockRequest)
72-
val factory = Mockito.mock<WebDataBinderFactory>()
73-
BDDMockito.given(factory.createBinder(any(), any(), eq("param")))
72+
val factory = mock<WebDataBinderFactory>()
73+
given(factory.createBinder(any(), any(), eq("param")))
7474
.willAnswer { WebRequestDataBinder(it.getArgument(1)) }
7575
assertThatThrownBy {
7676
processor.resolveArgument(this.param, container, requestWithParam, factory)
@@ -80,8 +80,8 @@ class ModelAttributeMethodProcessorKotlinTests {
8080

8181
private data class Param(val a: String)
8282

83-
@Suppress("UNUSED_PARAMETER")
8483
private class ModelAttributeHandler {
84+
@Suppress("UNUSED_PARAMETER")
8585
fun test(param: Param) { }
8686
}
8787

‎spring-web/src/test/kotlin/org/springframework/web/server/CoWebFilterTests.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.springframework.web.server
1818

1919
import org.assertj.core.api.Assertions.assertThat
2020
import org.junit.jupiter.api.Test
21-
import org.mockito.BDDMockito
21+
import org.mockito.BDDMockito.given
2222
import org.mockito.Mockito
2323
import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest
2424
import org.springframework.web.testfixture.server.MockServerWebExchange
@@ -35,7 +35,7 @@ class CoWebFilterTests {
3535
val exchange = MockServerWebExchange.from(MockServerHttpRequest.get("https://example.com"))
3636

3737
val chain = Mockito.mock(WebFilterChain::class.java)
38-
BDDMockito.given(chain.filter(exchange)).willReturn(Mono.empty())
38+
given(chain.filter(exchange)).willReturn(Mono.empty())
3939

4040
val filter = MyCoWebFilter()
4141
val result = filter.filter(exchange, chain)

0 commit comments

Comments
 (0)