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

Merge branch '2.2.x' 

Closes gh-21560
This commit is contained in:
Stephane Nicoll 2020-05-25 13:52:10 +02:00
parent 18e0db6326 afcb5d54b2
commit 1d2d76b051
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/WebFluxTags.java
View File

@ -110,6 +110,9 @@ public final class WebFluxTags {
if (ignoreTrailingSlash && patternString.length() > 1) { if (ignoreTrailingSlash && patternString.length() > 1) {
patternString = TRAILING_SLASH_PATTERN.matcher(patternString).replaceAll(""); patternString = TRAILING_SLASH_PATTERN.matcher(patternString).replaceAll("");
} }
if (patternString.isEmpty()) {
return URI_ROOT;
}
return Tag.of("uri", patternString); return Tag.of("uri", patternString);
} }
HttpStatus status = exchange.getResponse().getStatusCode(); HttpStatus status = exchange.getResponse().getStatusCode();

3
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcTags.java
View File

@ -115,6 +115,9 @@ public final class WebMvcTags {
if (ignoreTrailingSlash && pattern.length() > 1) { if (ignoreTrailingSlash && pattern.length() > 1) {
pattern = TRAILING_SLASH_PATTERN.matcher(pattern).replaceAll(""); pattern = TRAILING_SLASH_PATTERN.matcher(pattern).replaceAll("");
} }
if (pattern.isEmpty()) {
return URI_ROOT;
}
return Tag.of("uri", pattern); return Tag.of("uri", pattern);
} }
if (response != null) { if (response != null) {

8
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/WebMvcTagsTests.java
View File

@ -58,6 +58,14 @@ class WebMvcTagsTests {
assertThat(tag.getValue()).isEqualTo("/spring/"); assertThat(tag.getValue()).isEqualTo("/spring/");
} }
@Test
void uriTagValueIsRootWhenBestMatchingPatternIsEmpty() {
this.request.setAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, "");
this.response.setStatus(301);
Tag tag = WebMvcTags.uri(this.request, this.response);
assertThat(tag.getValue()).isEqualTo("root");
}
@Test @Test
void uriTagValueWithBestMatchingPatternAndIgnoreTrailingSlashRemoveTrailingSlash() { void uriTagValueWithBestMatchingPatternAndIgnoreTrailingSlashRemoveTrailingSlash() {
this.request.setAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, "/spring/"); this.request.setAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, "/spring/");

8
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/reactive/server/WebFluxTagsTests.java
View File

@ -61,6 +61,14 @@ class WebFluxTagsTests {
assertThat(tag.getValue()).isEqualTo("/spring/"); assertThat(tag.getValue()).isEqualTo("/spring/");
} }
@Test
void uriTagValueIsRootWhenBestMatchingPatternIsEmpty() {
this.exchange.getAttributes().put(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, this.parser.parse(""));
this.exchange.getResponse().setStatusCode(HttpStatus.MOVED_PERMANENTLY);
Tag tag = WebFluxTags.uri(this.exchange);
assertThat(tag.getValue()).isEqualTo("root");
}
@Test @Test
void uriTagValueWithBestMatchingPatternAndIgnoreTrailingSlashRemoveTrailingSlash() { void uriTagValueWithBestMatchingPatternAndIgnoreTrailingSlashRemoveTrailingSlash() {
this.exchange.getAttributes().put(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, this.exchange.getAttributes().put(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE,