admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
This commit is contained in:
rstoyanchev
2025-10-01 14:46:47 +01:00
parent 96e90e10b9 df860fd3cd
commit f071f95899
4 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/main/java/org/springframework/test/web/servlet/request/AbstractMockHttpServletRequestBuilder.java
+7 -9
View File
@@ -898,16 +898,14 @@ public abstract class AbstractMockHttpServletRequestBuilder<B extends AbstractMo
request.setContextPath(this.contextPath);
request.setServletPath(this.servletPath);
if ("".equals(this.pathInfo)) {
if (!requestUri.startsWith(this.contextPath + this.servletPath)) {
throw new IllegalArgumentException(
"Invalid servlet path [" + this.servletPath + "] for request URI [" + requestUri + "]");
}
String extraPath = requestUri.substring(this.contextPath.length() + this.servletPath.length());
this.pathInfo = (StringUtils.hasText(extraPath) ?
UrlPathHelper.defaultInstance.decodeRequestString(request, extraPath) : null);
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);
}
request.setPathInfo(this.pathInfo);
request.setPathInfo(path);
}
private void addRequestParams(MockHttpServletRequest request, MultiValueMap<String, String> map) {