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

Polishing contribution 

Closes gh-35493
This commit is contained in:
rstoyanchev 2025-09-30 15:35:01 +01:00
parent 636523a2f5
commit df860fd3cd
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-test/src/main/java/org/springframework/test/web/servlet/request/AbstractMockHttpServletRequestBuilder.java
View File

@ -74,7 +74,6 @@ import org.springframework.web.util.UrlPathHelper;
* @author Arjen Poutsma
* @author Sam Brannen
* @author Kamill Sokol
* @author Réda Housni Alaoui
* @since 6.2
* @param <B> a self reference to the builder type
*/
@ -855,17 +854,14 @@ public abstract class AbstractMockHttpServletRequestBuilder<B extends AbstractMo
request.setContextPath(this.contextPath);
request.setServletPath(this.servletPath);
String pathInfoToUse = this.pathInfo;
if ("".equals(pathInfoToUse)) {
if (!requestUri.startsWith(this.contextPath + this.servletPath)) {
throw new IllegalArgumentException(
"Invalid servlet path [" + this.servletPath + "] for request URI [" + requestUri + "]");
String path = this.pathInfo;
if ("".equals(path)) {
Assert.isTrue(requestUri.startsWith(this.contextPath + this.servletPath),
() -> "Invalid servlet path [" + this.servletPath + "] for request URI [" + requestUri + "]");
String other = requestUri.substring(this.contextPath.length() + this.servletPath.length());
path = (StringUtils.hasText(other) ? UrlPathHelper.defaultInstance.decodeRequestString(request, other) : null);
}
String extraPath = requestUri.substring(this.contextPath.length() + this.servletPath.length());
pathInfoToUse = (StringUtils.hasText(extraPath) ?
UrlPathHelper.defaultInstance.decodeRequestString(request, extraPath) : null);
}
request.setPathInfo(pathInfoToUse);
request.setPathInfo(path);
}
private void addRequestParams(MockHttpServletRequest request, MultiValueMap<String, String> map) {

2
spring-test/src/test/java/org/springframework/test/web/servlet/request/AbstractMockHttpServletRequestBuilderTests.java
View File

@ -98,7 +98,7 @@ class AbstractMockHttpServletRequestBuilderTests {
}
@Test
@Test // gh-35493
void pathInfoIsNotMutatedByBuildMethod() {
TestRequestBuilder builder = new TestRequestBuilder(HttpMethod.GET).uri("/b");
assertThat(buildRequest(builder).getPathInfo()).isEqualTo("/b");