Skip to content

Commit ce3be72

Browse files
izeyeizeye
committed
Polish
1 parent 3e3f046 commit ce3be72

File tree

18 files changed

+49
-51
lines changed

18 files changed

+49
-51
lines changed

‎framework-docs/src/docs/asciidoc/web/webmvc.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4777,7 +4777,7 @@ directly. For example:
47774777
ContextSnapshot snapshot = ContextSnapshot.captureAll();
47784778
47794779
// On a different thread: restore ThreadLocal values
4780-
try (ContextSnapshot.Scope scoped = snapshot.setThreadLocals()) {
4780+
try (ContextSnapshot.Scope scope = snapshot.setThreadLocals()) {
47814781
// ...
47824782
}
47834783
----

‎spring-context/src/test/kotlin/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessorTests.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616

1717
package org.springframework.context.aot
1818

19-
import org.assertj.core.api.Assertions
19+
import org.assertj.core.api.Assertions.assertThat
2020
import org.junit.jupiter.api.Test
2121
import org.mockito.Mockito
22-
import org.springframework.aot.generate.GenerationContext
2322
import org.springframework.aot.hint.MemberCategory
2423
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates
2524
import org.springframework.aot.test.generate.TestGenerationContext
@@ -41,20 +40,20 @@ class KotlinReflectionBeanRegistrationAotProcessorTests {
4140

4241
@Test
4342
fun processorIsRegistered() {
44-
Assertions.assertThat(
43+
assertThat(
4544
AotServices.factories(javaClass.classLoader).load(BeanRegistrationAotProcessor::class.java))
4645
.anyMatch(KotlinReflectionBeanRegistrationAotProcessor::class.java::isInstance)
4746
}
4847

4948
@Test
5049
fun shouldProcessKotlinBean() {
5150
process(SampleKotlinBean::class.java)
52-
Assertions.assertThat(
51+
assertThat(
5352
RuntimeHintsPredicates.reflection()
5453
.onType(SampleKotlinBean::class.java)
5554
.withMemberCategory(MemberCategory.INTROSPECT_DECLARED_METHODS)
5655
).accepts(generationContext.runtimeHints)
57-
Assertions.assertThat(
56+
assertThat(
5857
RuntimeHintsPredicates.reflection()
5958
.onType(BaseKotlinBean::class.java)
6059
.withMemberCategory(MemberCategory.INTROSPECT_DECLARED_METHODS)
@@ -64,7 +63,7 @@ class KotlinReflectionBeanRegistrationAotProcessorTests {
6463
@Test
6564
fun shouldNotProcessJavaBean() {
6665
process(SampleJavaBean::class.java)
67-
Assertions.assertThat(generationContext.runtimeHints.reflection().typeHints()).isEmpty()
66+
assertThat(generationContext.runtimeHints.reflection().typeHints()).isEmpty()
6867
}
6968

7069
private fun process(beanClass: Class<*>) {

‎spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/KotlinMethodValidationTests.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import jakarta.validation.ValidationException
2020
import jakarta.validation.Validator
2121
import jakarta.validation.constraints.NotEmpty
2222
import kotlinx.coroutines.runBlocking
23-
import org.assertj.core.api.Assertions
23+
import org.assertj.core.api.Assertions.assertThat
24+
import org.assertj.core.api.Assertions.assertThatExceptionOfType
2425
import org.junit.jupiter.api.Test
2526
import org.springframework.aop.framework.ProxyFactory
2627
import org.springframework.validation.annotation.Validated
@@ -41,8 +42,8 @@ class KotlinMethodValidationTests {
4142
validator.afterPropertiesSet()
4243
proxyFactory.addAdvice(MethodValidationInterceptor(validator as Validator))
4344
val proxy = proxyFactory.getProxy() as MyValidBean
44-
Assertions.assertThat(proxy.validName("name")).isEqualTo("name")
45-
Assertions.assertThatExceptionOfType(ValidationException::class.java).isThrownBy {
45+
assertThat(proxy.validName("name")).isEqualTo("name")
46+
assertThatExceptionOfType(ValidationException::class.java).isThrownBy {
4647
proxy.validName("")
4748
}
4849
}
@@ -55,8 +56,8 @@ class KotlinMethodValidationTests {
5556
validator.afterPropertiesSet()
5657
proxyFactory.addAdvice(MethodValidationInterceptor(validator as Validator))
5758
val proxy = proxyFactory.getProxy() as MyValidCoroutinesBean
58-
Assertions.assertThat(proxy.validName("name")).isEqualTo("name")
59-
Assertions.assertThatExceptionOfType(ValidationException::class.java).isThrownBy {
59+
assertThat(proxy.validName("name")).isEqualTo("name")
60+
assertThatExceptionOfType(ValidationException::class.java).isThrownBy {
6061
runBlocking {
6162
proxy.validName("")
6263
}

‎spring-core/src/main/java/org/springframework/cglib/core/TinyBitSet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
@Deprecated
1919
public class TinyBitSet {
20-
private static int[] T = new int[256];
20+
private static final int[] T = new int[256];
2121
private int value = 0;
2222

2323
private static int gcount(int x) {

‎spring-core/src/main/java/org/springframework/core/annotation/RepeatableContainers.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ private static class StandardRepeatableContainers extends RepeatableContainers {
145145

146146
private static final Object NONE = new Object();
147147

148-
private static StandardRepeatableContainers INSTANCE = new StandardRepeatableContainers();
148+
private static final StandardRepeatableContainers INSTANCE = new StandardRepeatableContainers();
149149

150150
StandardRepeatableContainers() {
151151
super(null);
@@ -270,7 +270,7 @@ public int hashCode() {
270270
*/
271271
private static class NoRepeatableContainers extends RepeatableContainers {
272272

273-
private static NoRepeatableContainers INSTANCE = new NoRepeatableContainers();
273+
private static final NoRepeatableContainers INSTANCE = new NoRepeatableContainers();
274274

275275
NoRepeatableContainers() {
276276
super(null);

‎spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
public class ResourceDecoder extends AbstractDataBufferDecoder<Resource> {
4343

4444
/** Name of hint with a filename for the resource(e.g. from "Content-Disposition" HTTP header). */
45-
public static String FILENAME_HINT = ResourceDecoder.class.getName() + ".filename";
45+
public static final String FILENAME_HINT = ResourceDecoder.class.getName() + ".filename";
4646

4747

4848
public ResourceDecoder() {

‎spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -897,9 +897,9 @@ private Resource findResource(ModuleReader moduleReader, String name) {
897897
}
898898

899899
/**
900-
* If it's a "file:" URI, use FileSystemResource to avoid duplicates
901-
* for the same path discovered via class-path scanning.
902-
*/
900+
* If it's a "file:" URI, use FileSystemResource to avoid duplicates
901+
* for the same path discovered via class-path scanning.
902+
*/
903903
private Resource convertModuleSystemURI(URI uri) {
904904
return (ResourceUtils.URL_PROTOCOL_FILE.equals(uri.getScheme()) ?
905905
new FileSystemResource(uri.getPath()) : UrlResource.from(uri));

‎spring-core/src/main/kotlin/org/springframework/aot/hint/TypeHintExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.springframework.aot.hint
1818

1919
/**
20-
* Extension for [TypeHint.Builder.onReachableType] providing a `onReachableType<Foo>())`
20+
* Extension for [TypeHint.Builder.onReachableType] providing a `onReachableType<Foo>()`
2121
* variant.
2222
*
2323
* @author Sebastien Deleuze

‎spring-core/src/test/kotlin/org/springframework/aot/hint/ResourceHintsExtensionsTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ResourceHintsExtensionsTests {
3232
private val resourceHints = mockk<ResourceHints>()
3333

3434
@Test
35-
fun `registerType extension with MemberCategory`() {
35+
fun `registerType extension`() {
3636
every { resourceHints.registerType(any<Class<String>>()) } returns resourceHints
3737
resourceHints.registerType<String>()
3838
verify { resourceHints.registerType(String::class.java) }

‎spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerUnitTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import io.r2dbc.spi.R2dbcBadGrammarException;
2626
import io.r2dbc.spi.R2dbcTimeoutException;
2727
import io.r2dbc.spi.Statement;
28-
import org.assertj.core.api.Assertions;
2928
import org.junit.jupiter.api.BeforeEach;
3029
import org.junit.jupiter.api.Test;
3130
import org.mockito.ArgumentCaptor;
@@ -345,7 +344,7 @@ void testConnectionReleasedWhenRollbackFails() {
345344
.doOnNext(connection -> {
346345
throw new IllegalStateException("Intentional error to trigger rollback");
347346
}).then()).as(StepVerifier::create)
348-
.verifyErrorSatisfies(e -> Assertions.assertThat(e)
347+
.verifyErrorSatisfies(e -> assertThat(e)
349348
.isInstanceOf(BadSqlGrammarException.class)
350349
.hasCause(new R2dbcBadGrammarException("Rollback should fail"))
351350
);

‎spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public final class MockMvcWebConnection implements WebConnection {
6868

6969
private WebClient webClient;
7070

71-
private static int MAX_FORWARDS = 100;
71+
private static final int MAX_FORWARDS = 100;
7272

7373

7474
/**
@@ -143,7 +143,7 @@ public WebResponse getResponse(WebRequest webRequest) throws IOException {
143143
forwards += 1;
144144
}
145145
if (forwards == MAX_FORWARDS) {
146-
throw new IllegalStateException("Forwarded more than " + forwards + " times in a row, potential infinite forward loop");
146+
throw new IllegalStateException("Forwarded " + forwards + " times in a row, potential infinite forward loop");
147147
}
148148
storeCookies(webRequest, httpServletResponse.getCookies());
149149

‎spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void forward() throws IOException {
8585
public void infiniteForward() {
8686
this.webClient.setWebConnection(new MockMvcWebConnection(this.mockMvc, this.webClient, ""));
8787
assertThatIllegalStateException().isThrownBy(() -> this.webClient.getPage("http://localhost/infiniteForward"))
88-
.withMessage("Forwarded more than 100 times in a row, potential infinite forward loop");
88+
.withMessage("Forwarded 100 times in a row, potential infinite forward loop");
8989
}
9090

9191
@Test

‎spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
*/
100100
public class Jackson2ObjectMapperBuilder {
101101

102-
private static boolean jackson2XmlPresent = ClassUtils.isPresent(
102+
private static final boolean jackson2XmlPresent = ClassUtils.isPresent(
103103
"com.fasterxml.jackson.dataformat.xml.XmlMapper", Jackson2ObjectMapperBuilder.class.getClassLoader());
104104

105105

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.springframework.http;
1818

1919
import java.net.URI;
20-
import java.util.List;
2120
import java.util.Optional;
2221
import java.util.concurrent.TimeUnit;
2322

@@ -46,11 +45,8 @@ void normal() {
4645
assertThat(responseEntity).isNotNull();
4746
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
4847
assertThat(responseEntity.getHeaders().containsKey(headerName)).isTrue();
49-
List<String> list = responseEntity.getHeaders().get(headerName);
50-
assertThat(list).hasSize(2);
51-
assertThat(list.get(0)).isEqualTo(headerValue1);
52-
assertThat(list.get(1)).isEqualTo(headerValue2);
53-
assertThat((int) responseEntity.getBody()).isEqualTo((int) entity);
48+
assertThat(responseEntity.getHeaders().get(headerName)).containsExactly(headerValue1, headerValue2);
49+
assertThat(responseEntity.getBody()).isEqualTo(entity);
5450
}
5551

5652
@Test
@@ -69,7 +65,7 @@ void okEntity() {
6965

7066
assertThat(responseEntity).isNotNull();
7167
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
72-
assertThat((int) responseEntity.getBody()).isEqualTo((int) entity);
68+
assertThat(responseEntity.getBody()).isEqualTo(entity);
7369
}
7470

7571
@Test
@@ -79,7 +75,7 @@ void ofOptional() {
7975

8076
assertThat(responseEntity).isNotNull();
8177
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
82-
assertThat((int) responseEntity.getBody()).isEqualTo((int) entity);
78+
assertThat(responseEntity.getBody()).isEqualTo(entity);
8379
}
8480

8581
@Test
@@ -98,7 +94,7 @@ void ofNullable() {
9894

9995
assertThat(responseEntity).isNotNull();
10096
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
101-
assertThat((int) responseEntity.getBody()).isEqualTo((int) entity);
97+
assertThat(responseEntity.getBody()).isEqualTo(entity);
10298
}
10399

104100
@Test
@@ -270,7 +266,7 @@ void emptyCacheControl() {
270266
assertThat(responseEntity).isNotNull();
271267
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
272268
assertThat(responseEntity.getHeaders().containsKey(HttpHeaders.CACHE_CONTROL)).isFalse();
273-
assertThat((int) responseEntity.getBody()).isEqualTo((int) entity);
269+
assertThat(responseEntity.getBody()).isEqualTo(entity);
274270
}
275271

276272
@Test
@@ -286,7 +282,7 @@ void cacheControl() {
286282
assertThat(responseEntity).isNotNull();
287283
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
288284
assertThat(responseEntity.getHeaders().containsKey(HttpHeaders.CACHE_CONTROL)).isTrue();
289-
assertThat((int) responseEntity.getBody()).isEqualTo((int) entity);
285+
assertThat(responseEntity.getBody()).isEqualTo(entity);
290286
String cacheControlHeader = responseEntity.getHeaders().getCacheControl();
291287
assertThat(cacheControlHeader).isEqualTo(
292288
"max-age=3600, must-revalidate, private, proxy-revalidate, s-maxage=1800");
@@ -304,7 +300,7 @@ void cacheControlNoCache() {
304300
assertThat(responseEntity).isNotNull();
305301
assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
306302
assertThat(responseEntity.getHeaders().containsKey(HttpHeaders.CACHE_CONTROL)).isTrue();
307-
assertThat((int) responseEntity.getBody()).isEqualTo((int) entity);
303+
assertThat(responseEntity.getBody()).isEqualTo(entity);
308304

309305
String cacheControlHeader = responseEntity.getHeaders().getCacheControl();
310306
assertThat(cacheControlHeader).isEqualTo("no-store");
@@ -316,7 +312,7 @@ void statusCodeAsInt() {
316312
ResponseEntity<Integer> responseEntity = ResponseEntity.status(200).body(entity);
317313

318314
assertThat(responseEntity.getStatusCode().value()).isEqualTo(200);
319-
assertThat((int) responseEntity.getBody()).isEqualTo((int) entity);
315+
assertThat(responseEntity.getBody()).isEqualTo(entity);
320316
}
321317

322318
@Test
@@ -326,7 +322,7 @@ void customStatusCode() {
326322
ResponseEntity<Integer> responseEntity = ResponseEntity.status(299).body(entity);
327323

328324
assertThat(responseEntity.getStatusCodeValue()).isEqualTo(299);
329-
assertThat((int) responseEntity.getBody()).isEqualTo((int) entity);
325+
assertThat(responseEntity.getBody()).isEqualTo(entity);
330326
}
331327

332328
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
package org.springframework.web.method.annotation
1818

19-
import org.assertj.core.api.Assertions
19+
import org.assertj.core.api.Assertions.assertThat
20+
import org.assertj.core.api.Assertions.assertThatThrownBy
2021
import org.junit.jupiter.api.BeforeEach
2122
import org.junit.jupiter.api.Test
2223
import org.mockito.ArgumentMatchers.*
@@ -61,7 +62,7 @@ class ModelAttributeMethodProcessorKotlinTests {
6162
val factory = Mockito.mock<WebDataBinderFactory>()
6263
BDDMockito.given(factory.createBinder(any(), any(), eq("param")))
6364
.willAnswer { WebRequestDataBinder(it.getArgument(1)) }
64-
Assertions.assertThat(processor.resolveArgument(this.param, container, requestWithParam, factory)).isEqualTo(Param("b"))
65+
assertThat(processor.resolveArgument(this.param, container, requestWithParam, factory)).isEqualTo(Param("b"))
6566
}
6667

6768
@Test
@@ -71,7 +72,7 @@ class ModelAttributeMethodProcessorKotlinTests {
7172
val factory = Mockito.mock<WebDataBinderFactory>()
7273
BDDMockito.given(factory.createBinder(any(), any(), eq("param")))
7374
.willAnswer { WebRequestDataBinder(it.getArgument(1)) }
74-
Assertions.assertThatThrownBy {
75+
assertThatThrownBy {
7576
processor.resolveArgument(this.param, container, requestWithParam, factory)
7677
}.isInstanceOf(MethodArgumentNotValidException::class.java)
7778
.hasMessageContaining("parameter a")

‎spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ public class DefaultClientRequestObservationConvention implements ClientRequestO
4545

4646
private static final KeyValue URI_NONE = KeyValue.of(LowCardinalityKeyNames.URI, KeyValue.NONE_VALUE);
4747

48+
private static final KeyValue URI_ROOT = KeyValue.of(LowCardinalityKeyNames.URI, ROOT_PATH);
49+
4850
private static final KeyValue METHOD_NONE = KeyValue.of(LowCardinalityKeyNames.METHOD, KeyValue.NONE_VALUE);
4951

5052
private static final KeyValue STATUS_IO_ERROR = KeyValue.of(LowCardinalityKeyNames.STATUS, "IO_ERROR");
@@ -101,7 +103,7 @@ protected KeyValue uri(ClientRequestObservationContext context) {
101103
}
102104
ClientRequest request = context.getRequest();
103105
if (request != null && ROOT_PATH.equals(request.url().getPath())) {
104-
return KeyValue.of(LowCardinalityKeyNames.URI, ROOT_PATH);
106+
return URI_ROOT;
105107
}
106108
return URI_NONE;
107109
}

‎spring-webflux/src/test/kotlin/org/springframework/web/reactive/function/client/support/KotlinWebClientHttpServiceProxyTests.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.springframework.web.reactive.function.client.support
1818
import kotlinx.coroutines.runBlocking
1919
import okhttp3.mockwebserver.MockResponse
2020
import okhttp3.mockwebserver.MockWebServer
21-
import org.assertj.core.api.Assertions
21+
import org.assertj.core.api.Assertions.assertThat
2222
import org.junit.jupiter.api.AfterEach
2323
import org.junit.jupiter.api.BeforeEach
2424
import org.junit.jupiter.api.Test
@@ -66,7 +66,7 @@ class KotlinWebClientHttpServiceProxyTests {
6666
}
6767
runBlocking {
6868
val greeting = initHttpService().getGreetingSuspending()
69-
Assertions.assertThat(greeting).isEqualTo("Hello Spring!")
69+
assertThat(greeting).isEqualTo("Hello Spring!")
7070
}
7171
}
7272

@@ -93,7 +93,7 @@ class KotlinWebClientHttpServiceProxyTests {
9393
).setBody("Hello Spring!")
9494
}
9595
val greeting = initHttpService().getGreetingBlocking()
96-
Assertions.assertThat(greeting).isEqualTo("Hello Spring!")
96+
assertThat(greeting).isEqualTo("Hello Spring!")
9797
}
9898

9999
@Test
@@ -115,8 +115,8 @@ class KotlinWebClientHttpServiceProxyTests {
115115
val service = initHttpService(webClient)
116116
runBlocking {
117117
val greeting = service.getGreetingSuspendingWithAttribute("myAttributeValue")
118-
Assertions.assertThat(greeting).isEqualTo("Hello Spring!")
119-
Assertions.assertThat(attributes).containsEntry("myAttribute", "myAttributeValue")
118+
assertThat(greeting).isEqualTo("Hello Spring!")
119+
assertThat(attributes).containsEntry("myAttribute", "myAttributeValue")
120120
}
121121
}
122122

‎spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ void getHandlerMediaTypeNotSupported(TestRequestMappingInfoHandlerMapping mappin
177177
}
178178

179179
@PathPatternsParameterizedTest // gh-28062
180-
void getHandlerMethodTypeNotSupportedWithParseError(TestRequestMappingInfoHandlerMapping mapping) {
180+
void getHandlerMediaTypeNotSupportedWithParseError(TestRequestMappingInfoHandlerMapping mapping) {
181181
MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/person/1");
182182
request.setContentType("This string");
183183
assertThatExceptionOfType(HttpMediaTypeNotSupportedException.class)

0 commit comments

Comments
 (0)