spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Brian Clozel
2026-04-23 16:24:27 +02:00
parent 7a5844f1ce 4fb0244b5a
commit 5e6e223686
6 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-webflux/src/main/java/org/springframework/web/reactive/resource/AbstractFileNameVersionStrategy.java
+6 -1
View File
@@ -54,7 +54,12 @@ public abstract class AbstractFileNameVersionStrategy implements VersionStrategy
@Override
public String removeVersion(String requestPath, String version) {
return StringUtils.delete(requestPath, "-" + version);
String versionString = "-" + version;
int index = requestPath.lastIndexOf(versionString);
if (index != -1) {
return requestPath.substring(0, index) + requestPath.substring(index + versionString.length());
}
return requestPath;
}
@Override
spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java
+3
View File
@@ -180,6 +180,9 @@ public class VersionResourceResolver extends AbstractResourceResolver {
}
String simplePath = versionStrategy.removeVersion(requestPath, candidate);
if (ResourceHandlerUtils.shouldIgnoreInputPath(simplePath)) {
return Mono.empty();
}
return chain.resolveResource(exchange, simplePath, locations)
.filterWhen(resource -> versionStrategy.getResourceVersion(resource)
.map(actual -> {
spring-webflux/src/test/java/org/springframework/web/reactive/resource/ContentBasedVersionStrategyTests.java
+8
View File
@@ -62,6 +62,14 @@ class ContentBasedVersionStrategyTests {
assertThat(this.strategy.removeVersion(String.format(path, "-", hash), hash)).isEqualTo(String.format(path, "", ""));
}
@Test
void removeVersionOnlyOnce() {
String hash = "sha";
String path = "font-awesome/css%s%s/font-awesome.min%s%s.css";
assertThat(this.strategy.removeVersion(String.format(path, "-", hash, "-", hash), hash)).isEqualTo(String.format(path, "-", hash, "", ""));
}
@Test
void getResourceVersion() throws Exception {
Resource expected = new ClassPathResource("test/bar.css", getClass());
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AbstractVersionStrategy.java
+6 -1
View File
@@ -134,7 +134,12 @@ public abstract class AbstractVersionStrategy implements VersionStrategy {
@Override
public String removeVersion(String requestPath, String version) {
return StringUtils.delete(requestPath, "-" + version);
String versionString = "-" + version;
int index = requestPath.lastIndexOf(versionString);
if (index != -1) {
return requestPath.substring(0, index) + requestPath.substring(index + versionString.length());
}
return requestPath;
}
@Override
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
+3
View File
@@ -177,6 +177,9 @@ public class VersionResourceResolver extends AbstractResourceResolver {
}
String simplePath = versionStrategy.removeVersion(requestPath, candidateVersion);
if (ResourceHandlerUtils.shouldIgnoreInputPath(simplePath)) {
return null;
}
Resource baseResource = chain.resolveResource(request, simplePath, locations);
if (baseResource == null) {
return null;
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ContentBasedVersionStrategyTests.java
+8
View File
@@ -63,6 +63,14 @@ class ContentBasedVersionStrategyTests {
assertThat(this.versionStrategy.removeVersion(String.format(file, "-", hash), hash)).isEqualTo(String.format(file, "", ""));
}
@Test
void removeVersionOnlyOnce() {
String hash = "sha";
String file = "font-awesome/css%s%s/font-awesome.min%s%s.css";
assertThat(this.versionStrategy.removeVersion(String.format(file, "-", hash, "-", hash), hash)).isEqualTo(String.format(file, "-", hash, "", ""));
}
@Test
void getResourceVersion() throws IOException {
Resource expected = new ClassPathResource("test/bar.css", getClass());