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

Fix ResourceHintsWriter for leading/trailing wildcards

Browse Source 
Closes gh-28597
This commit is contained in:
Sébastien Deleuze
2022-06-09 14:31:21 +02:00
parent 40ab20e14a
commit 99ffd97a72
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-core/src/main/java/org/springframework/aot/nativex/ResourceHintsWriter.java
View File

@@ -82,7 +82,12 @@ class ResourceHintsWriter {
}
private String patternToRegexp(String pattern) {
return Arrays.stream(pattern.split("\\*")).map(Pattern::quote).collect(Collectors.joining(".*"));
String prefix = (pattern.startsWith("*") ? ".*" : "");
String suffix = (pattern.endsWith("*") ? ".*" : "");
return Arrays.stream(pattern.split("\\*"))
.filter(s -> !s.isEmpty())
.map(Pattern::quote)
.collect(Collectors.joining(".*", prefix, suffix));
}
private void addIfNotEmpty(Map<String, Object> attributes, String name, @Nullable Object value) {