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

Merge branch '2.4.x' into 2.5.x

Browse Source 
Closes gh-28424
This commit is contained in:
Phillip Webb
2021-10-21 11:27:29 -07:00
parent a3182e453c 2f6651c3cb
commit daf36dff55
24 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzer.java
View File

@@ -32,7 +32,7 @@ class PatternParseFailureAnalyzer extends AbstractFailureAnalyzer<PatternParseEx
protected FailureAnalysis analyze(Throwable rootFailure, PatternParseException cause) {
return new FailureAnalysis("Invalid mapping pattern detected: " + cause.toDetailedString(),
"Fix this pattern in your application or switch to the legacy parser implementation with "
+ "`spring.mvc.pathpattern.matching-strategy=ant_path_matcher`.",
+ "'spring.mvc.pathpattern.matching-strategy=ant_path_matcher'.",
cause);
}

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/package-info.java
View File

@@ -15,6 +15,6 @@
*/
/**
* Classes and utilities designed to work with the `javax.servlet` specification.
* Classes and utilities designed to work with the {@code javax.servlet} specification.
*/
package org.springframework.boot.web.servlet;

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyNameTests.java
View File

@@ -709,7 +709,7 @@ class ConfigurationPropertyNameTests {
void hashCodeIsStored() {
ConfigurationPropertyName name = ConfigurationPropertyName.of("hash.code");
int hashCode = name.hashCode();
// hasFieldOrPropertyWithValue would lookup for `hashCode()`.
// hasFieldOrPropertyWithValue would lookup for hashCode()
assertThat(ReflectionTestUtils.getField(name, "hashCode")).isEqualTo(hashCode);
}

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/PatternParseFailureAnalyzerTests.java
View File

@@ -39,7 +39,7 @@ class PatternParseFailureAnalyzerTests {
assertThat(failureAnalysis.getDescription()).contains("Invalid mapping pattern detected: /spring/**/framework");
assertThat(failureAnalysis.getAction())
.contains("Fix this pattern in your application or switch to the legacy parser"
+ " implementation with `spring.mvc.pathpattern.matching-strategy=ant_path_matcher`.");
+ " implementation with 'spring.mvc.pathpattern.matching-strategy=ant_path_matcher'.");
}
private FailureAnalysis performAnalysis(String pattern) {