Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Stéphane Nicoll
2024-04-23 15:34:49 +02:00
parent ed188f82d8 16d8d69cf9
commit a77895bd90
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java
View File

@@ -44,7 +44,7 @@ import org.springframework.util.StringUtils;
* <li>{@code **} matches zero or more <em>path segments</em> until the end of the path</li>
* <li><code>{spring}</code> matches a <em>path segment</em> and captures it as a variable named "spring"</li>
* <li><code>{spring:[a-z]+}</code> matches the regexp {@code [a-z]+} against a path segment
* and captures it a path variable named "spring"</li>
* and captures it as a path variable named "spring"</li>
* <li><code>{*spring}</code> matches zero or more <em>path segments</em> until the end of the path
* and captures it as a variable named "spring"</li>
* </ul>

2
spring-web/src/test/java/org/springframework/web/client/RestTemplateObservationTests.java
View File

@@ -238,7 +238,7 @@ class RestTemplateObservationTests {
@Nullable
Observation currentObservation;
public ObservationErrorHandler(TestObservationRegistry observationRegistry) {
ObservationErrorHandler(TestObservationRegistry observationRegistry) {
this.observationRegistry = observationRegistry;
}