root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Fix error mark position for PatternParseException 

PatternParseException.toDetailedString() return a String
with a mark to specify the error position in the pattern.
The mark takes place in the second line in the String
returned. Because PatternParseFailureAnalyzer.analyze
appended "Invalid mapping pattern detected:" at the
beginning of the returned String, the mark was not well
positioned.

Now, a "\n" is inserted after "Invalid mapping pattern detected:"
and the mark is well positioned

See gh-38944
This commit is contained in:
Fabrice Bibonne 2023-12-29 14:03:22 +01:00 committed by Moritz Halbritter
parent 52a4097997
commit fccce54d52
2 changed files with 8 additions and 4 deletions
Show Stats 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

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

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

@ -36,7 +36,11 @@ class PatternParseFailureAnalyzerTests {
@Test @Test
void patternParseFailureQuotesPattern() { void patternParseFailureQuotesPattern() {
FailureAnalysis failureAnalysis = performAnalysis("/spring/**/framework"); FailureAnalysis failureAnalysis = performAnalysis("/spring/**/framework");
assertThat(failureAnalysis.getDescription()).contains("Invalid mapping pattern detected: /spring/**/framework"); assertThat(failureAnalysis.getDescription()).contains("""
Invalid mapping pattern detected:
/spring/**/framework
^
""");
assertThat(failureAnalysis.getAction()) assertThat(failureAnalysis.getAction())
.contains("Fix this pattern in your application or switch to the legacy parser" .contains("Fix this pattern in your application or switch to the legacy parser"
+ " implementation with 'spring.mvc.pathmatch.matching-strategy=ant_path_matcher'."); + " implementation with 'spring.mvc.pathmatch.matching-strategy=ant_path_matcher'.");