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

Polishing contribution

Browse Source 
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
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 -11
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 extraPath = requestUri.substring(this.contextPath.length() + this.servletPath.length());
pathInfoToUse = (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(pathInfoToUse);
request.setPathInfo(path);
}
private void addRequestParams(MockHttpServletRequest request, MultiValueMap<String, String> map) {