Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unnecessary pattern compilation in WebFluxTags

Browse Source 
See gh-24147
This commit is contained in:
Peter Paul Bakker 2020-11-13 08:57:54 +01:00 committed by Stephane Nicoll
parent 4961599f53
commit b22bb7ea04
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ public final class WebFluxTags {
private static final Tag EXCEPTION_NONE = Tag.of("exception", "None"); private static final Tag EXCEPTION_NONE = Tag.of("exception", "None");
private static final Pattern TRAILING_SLASH_PATTERN = Pattern.compile("/$"); private static final Pattern FORWARD_SLASHES_PATTERN = Pattern.compile("//+");
private WebFluxTags() { private WebFluxTags() {
} }
@ -108,7 +108,7 @@ public final class WebFluxTags {
if (pathPattern != null) { if (pathPattern != null) {
String patternString = pathPattern.getPatternString(); String patternString = pathPattern.getPatternString();
if (ignoreTrailingSlash && patternString.length() > 1) { if (ignoreTrailingSlash && patternString.length() > 1) {
patternString = TRAILING_SLASH_PATTERN.matcher(patternString).replaceAll(""); patternString = removeTrailingSlash(patternString);
} }
if (patternString.isEmpty()) { if (patternString.isEmpty()) {
return URI_ROOT; return URI_ROOT;
@ -131,10 +131,18 @@ public final class WebFluxTags {
return URI_UNKNOWN; return URI_UNKNOWN;
} }
private static String removeTrailingSlash(String text) {
if (!StringUtils.hasLength(text)) {
return text;
}
return text.endsWith("/") ? text.substring(0, text.length() - 1) : text;
}
private static String getPathInfo(ServerWebExchange exchange) { private static String getPathInfo(ServerWebExchange exchange) {
String path = exchange.getRequest().getPath().value(); String path = exchange.getRequest().getPath().value();
String uri = StringUtils.hasText(path) ? path : "/"; String uri = StringUtils.hasText(path) ? path : "/";
return uri.replaceAll("//+", "/").replaceAll("/$", ""); String singleSlashes = FORWARD_SLASHES_PATTERN.matcher(uri).replaceAll("/");
return removeTrailingSlash(singleSlashes);
} }
/** /**