Skip to content

Commit a77895b

Browse files
snicollsnicoll
committed
Merge branch '6.1.x'
2 parents ed188f8 + 16d8d69 commit a77895b

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

‎framework-docs/modules/ROOT/pages/languages/kotlin/spring-projects-in.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public class SampleConfiguration {
166166
@Bean
167167
@NotNull
168168
public SampleBean sampleBean$demo_kotlin_internal_test() {
169-
return new SampleBean();
169+
return new SampleBean();
170170
}
171171
}
172172
----

‎spring-context/src/test/kotlin/org/springframework/context/event/KotlinApplicationListenerMethodAdapterTests.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 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.
@@ -64,9 +64,9 @@ class KotlinApplicationListenerMethodAdapterTests {
6464
private class StaticApplicationListenerMethodAdapter(method: Method, private val targetBean: Any) :
6565
ApplicationListenerMethodAdapter("unused", targetBean.javaClass, method) {
6666
public override fun getTargetBean(): Any {
67-
return targetBean
67+
return targetBean
68+
}
6869
}
69-
}
7070

7171
@Suppress("RedundantSuspendModifier", "UNUSED_PARAMETER")
7272
private class SampleEvents {

‎spring-core-test/src/test/java/org/springframework/aot/agent/InstrumentedMethodTests.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 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.
@@ -124,7 +124,7 @@ public void setup() throws Exception {
124124
}
125125

126126
@Test
127-
void classGetConstructorShouldMatchInstrospectPublicConstructorsHint() {
127+
void classGetConstructorShouldMatchIntrospectPublicConstructorsHint() {
128128
hints.reflection().registerType(String.class, MemberCategory.INTROSPECT_PUBLIC_CONSTRUCTORS);
129129
assertThatInvocationMatches(InstrumentedMethod.CLASS_GETCONSTRUCTOR, this.stringGetConstructor);
130130
}
@@ -148,7 +148,7 @@ void classGetConstructorShouldMatchInvokeDeclaredConstructorsHint() {
148148
}
149149

150150
@Test
151-
void classGetConstructorShouldMatchInstrospectConstructorHint() {
151+
void classGetConstructorShouldMatchIntrospectConstructorHint() {
152152
hints.reflection().registerType(String.class,typeHint ->
153153
typeHint.withConstructor(Collections.emptyList(), ExecutableMode.INTROSPECT));
154154
assertThatInvocationMatches(InstrumentedMethod.CLASS_GETCONSTRUCTOR, this.stringGetConstructor);
@@ -210,7 +210,7 @@ void classGetDeclaredConstructorShouldNotMatchIntrospectPublicConstructorsHint()
210210
}
211211

212212
@Test
213-
void classGetDeclaredConstructorShouldMatchInstrospectConstructorHint() {
213+
void classGetDeclaredConstructorShouldMatchIntrospectConstructorHint() {
214214
hints.reflection().registerType(String.class, typeHint ->
215215
typeHint.withConstructor(TypeReference.listOf(byte[].class, byte.class), ExecutableMode.INTROSPECT));
216216
assertThatInvocationMatches(InstrumentedMethod.CLASS_GETDECLAREDCONSTRUCTOR, this.stringGetDeclaredConstructor);
@@ -354,13 +354,13 @@ void classGetDeclaredMethodsShouldNotMatchMethodReflectionHint() throws Exceptio
354354
}
355355

356356
@Test
357-
void classGetMethodsShouldMatchInstrospectDeclaredMethodsHint() {
357+
void classGetMethodsShouldMatchIntrospectDeclaredMethodsHint() {
358358
hints.reflection().registerType(String.class, MemberCategory.INTROSPECT_DECLARED_METHODS);
359359
assertThatInvocationMatches(InstrumentedMethod.CLASS_GETMETHODS, this.stringGetMethods);
360360
}
361361

362362
@Test
363-
void classGetMethodsShouldMatchInstrospectPublicMethodsHint() {
363+
void classGetMethodsShouldMatchIntrospectPublicMethodsHint() {
364364
hints.reflection().registerType(String.class, MemberCategory.INTROSPECT_PUBLIC_METHODS);
365365
assertThatInvocationMatches(InstrumentedMethod.CLASS_GETMETHODS, this.stringGetMethods);
366366
}
@@ -396,7 +396,7 @@ void classGetMethodsShouldNotMatchMethodReflectionHint() throws Exception {
396396
}
397397

398398
@Test
399-
void classGetMethodShouldMatchInstrospectPublicMethodsHint() {
399+
void classGetMethodShouldMatchIntrospectPublicMethodsHint() {
400400
hints.reflection().registerType(String.class, MemberCategory.INTROSPECT_PUBLIC_METHODS);
401401
assertThatInvocationMatches(InstrumentedMethod.CLASS_GETMETHOD, this.stringGetToStringMethod);
402402
}
@@ -434,13 +434,13 @@ void classGetMethodShouldMatchInvokeMethodHint() {
434434
}
435435

436436
@Test
437-
void classGetMethodShouldNotMatchInstrospectPublicMethodsHintWhenPrivate() {
437+
void classGetMethodShouldNotMatchIntrospectPublicMethodsHintWhenPrivate() {
438438
hints.reflection().registerType(String.class, MemberCategory.INTROSPECT_PUBLIC_METHODS);
439439
assertThatInvocationDoesNotMatch(InstrumentedMethod.CLASS_GETMETHOD, this.stringGetScaleMethod);
440440
}
441441

442442
@Test
443-
void classGetMethodShouldMatchInstrospectDeclaredMethodsHintWhenPrivate() {
443+
void classGetMethodShouldMatchIntrospectDeclaredMethodsHintWhenPrivate() {
444444
hints.reflection().registerType(String.class, MemberCategory.INTROSPECT_DECLARED_METHODS);
445445
assertThatInvocationMatches(InstrumentedMethod.CLASS_GETMETHOD, this.stringGetScaleMethod);
446446
}

‎spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,12 +432,12 @@ private static final class QuoteHandler {
432432

433433
private final boolean quoting;
434434

435-
public QuoteHandler(@Nullable String identifierQuoteString) {
435+
QuoteHandler(@Nullable String identifierQuoteString) {
436436
this.identifierQuoteString = identifierQuoteString;
437437
this.quoting = StringUtils.hasText(identifierQuoteString);
438438
}
439439

440-
public void appendTo(StringBuilder stringBuilder, @Nullable String item) {
440+
void appendTo(StringBuilder stringBuilder, @Nullable String item) {
441441
if (this.quoting) {
442442
stringBuilder.append(this.identifierQuoteString)
443443
.append(item).append(this.identifierQuoteString);

‎spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
* <li>{@code **} matches zero or more <em>path segments</em> until the end of the path</li>
4545
* <li><code>{spring}</code> matches a <em>path segment</em> and captures it as a variable named "spring"</li>
4646
* <li><code>{spring:[a-z]+}</code> matches the regexp {@code [a-z]+} against a path segment
47-
* and captures it a path variable named "spring"</li>
47+
* and captures it as a path variable named "spring"</li>
4848
* <li><code>{*spring}</code> matches zero or more <em>path segments</em> until the end of the path
4949
* and captures it as a variable named "spring"</li>
5050
* </ul>

‎spring-web/src/test/java/org/springframework/web/client/RestTemplateObservationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ static class ObservationErrorHandler implements ResponseErrorHandler {
238238
@Nullable
239239
Observation currentObservation;
240240

241-
public ObservationErrorHandler(TestObservationRegistry observationRegistry) {
241+
ObservationErrorHandler(TestObservationRegistry observationRegistry) {
242242
this.observationRegistry = observationRegistry;
243243
}
244244

‎spring-webmvc/src/test/kotlin/org/springframework/web/servlet/function/RouterFunctionDslTests.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,23 @@ class RouterFunctionDslTests {
3838
val servletRequest = PathPatternsTestUtils.initRequest("GET", "", true)
3939
servletRequest.addHeader("bar", "bar")
4040
val request = DefaultServerRequest(servletRequest, emptyList())
41-
assertThat(sampleRouter().route(request).isPresent).isTrue()
41+
assertThat(sampleRouter().route(request)).isPresent()
4242
}
4343

4444
@Test
4545
fun accept() {
4646
val servletRequest = PathPatternsTestUtils.initRequest("GET", "/content", true)
4747
servletRequest.addHeader(ACCEPT, APPLICATION_ATOM_XML_VALUE)
4848
val request = DefaultServerRequest(servletRequest, emptyList())
49-
assertThat(sampleRouter().route(request).isPresent).isTrue()
49+
assertThat(sampleRouter().route(request)).isPresent()
5050
}
5151

5252
@Test
5353
fun acceptAndPOST() {
5454
val servletRequest = PathPatternsTestUtils.initRequest("POST", "/api/foo/", true)
5555
servletRequest.addHeader(ACCEPT, APPLICATION_JSON_VALUE)
5656
val request = DefaultServerRequest(servletRequest, emptyList())
57-
assertThat(sampleRouter().route(request).isPresent).isTrue()
57+
assertThat(sampleRouter().route(request)).isPresent()
5858
}
5959

6060
@Test
@@ -63,57 +63,57 @@ class RouterFunctionDslTests {
6363
servletRequest.addHeader(ACCEPT, APPLICATION_JSON_VALUE)
6464
servletRequest.addHeader(CONTENT_TYPE, APPLICATION_JSON_VALUE)
6565
val request = DefaultServerRequest(servletRequest, emptyList())
66-
assertThat(sampleRouter().route(request).isPresent).isTrue()
66+
assertThat(sampleRouter().route(request)).isPresent()
6767
}
6868

6969
@Test
7070
fun contentType() {
7171
val servletRequest = PathPatternsTestUtils.initRequest("GET", "/content", true)
7272
servletRequest.addHeader(CONTENT_TYPE, APPLICATION_OCTET_STREAM_VALUE)
7373
val request = DefaultServerRequest(servletRequest, emptyList())
74-
assertThat(sampleRouter().route(request).isPresent).isTrue()
74+
assertThat(sampleRouter().route(request)).isPresent()
7575
}
7676

7777
@Test
7878
fun method() {
7979
val servletRequest = PathPatternsTestUtils.initRequest("PATCH", "/", true)
8080
val request = DefaultServerRequest(servletRequest, emptyList())
81-
assertThat(sampleRouter().route(request).isPresent).isTrue()
81+
assertThat(sampleRouter().route(request)).isPresent()
8282
}
8383

8484
@Test
8585
fun path() {
8686
val servletRequest = PathPatternsTestUtils.initRequest("GET", "/baz", true)
8787
val request = DefaultServerRequest(servletRequest, emptyList())
88-
assertThat(sampleRouter().route(request).isPresent).isTrue()
88+
assertThat(sampleRouter().route(request)).isPresent()
8989
}
9090

9191
@Test
9292
fun pathExtension() {
9393
val servletRequest = PathPatternsTestUtils.initRequest("GET", "/test.properties", true)
9494
val request = DefaultServerRequest(servletRequest, emptyList())
95-
assertThat(sampleRouter().route(request).isPresent).isTrue()
95+
assertThat(sampleRouter().route(request)).isPresent()
9696
}
9797

9898
@Test
9999
fun resource() {
100100
val servletRequest = PathPatternsTestUtils.initRequest("GET","/response2.txt", true)
101101
val request = DefaultServerRequest(servletRequest, emptyList())
102-
assertThat(sampleRouter().route(request).isPresent).isTrue()
102+
assertThat(sampleRouter().route(request)).isPresent()
103103
}
104104

105105
@Test
106106
fun resources() {
107107
val servletRequest = PathPatternsTestUtils.initRequest("GET", "/resources/response.txt", true)
108108
val request = DefaultServerRequest(servletRequest, emptyList())
109-
assertThat(sampleRouter().route(request).isPresent).isTrue()
109+
assertThat(sampleRouter().route(request)).isPresent()
110110
}
111111

112112
@Test
113113
fun resourcesLookupFunction() {
114114
val servletRequest = PathPatternsTestUtils.initRequest("GET", "/response.txt", true)
115115
val request = DefaultServerRequest(servletRequest, emptyList())
116-
assertThat(sampleRouter().route(request).isPresent).isTrue()
116+
assertThat(sampleRouter().route(request)).isPresent()
117117
}
118118

119119
@Test
@@ -123,7 +123,7 @@ class RouterFunctionDslTests {
123123
servletRequest.addHeader(ACCEPT, APPLICATION_PDF_VALUE)
124124
servletRequest.addHeader(CONTENT_TYPE, APPLICATION_PDF_VALUE)
125125
val request = DefaultServerRequest(servletRequest, emptyList())
126-
assertThat(sampleRouter().route(request).isPresent).isFalse()
126+
assertThat(sampleRouter().route(request)).isNotPresent()
127127
}
128128

129129
@Test

0 commit comments

Comments
 (0)