The value may be null in which case the first path segment of the + * URL is turned into the contextPath. Otherwise it must conform to + * {@link HttpServletRequest#getContextPath()} which states it can be + * an empty string, or it must start with a "/" and not end with a "/". + * @param contextPath a valid contextPath + * @throws IllegalArgumentException if the contextPath is not a valid + * {@link HttpServletRequest#getContextPath()} + */ + public void setContextPath(@Nullable String contextPath) { + MockMvcWebConnection.validateContextPath(contextPath); + this.contextPath = contextPath; + } + + public void setForwardPostProcessor(RequestPostProcessor forwardPostProcessor) { + this.forwardPostProcessor = forwardPostProcessor; + } + + @Override public MockHttpServletRequest buildRequest(ServletContext servletContext) { - Charset charset = getCharset(); String httpMethod = this.webRequest.getHttpMethod().name(); - UriComponents uriComponents = uriComponents(); - String path = uriComponents.getPath(); + UriComponents uri = UriComponentsBuilder.fromUriString(this.webRequest.getUrl().toExternalForm()).build(); - MockHttpServletRequest request = - new HtmlUnitMockHttpServletRequest(servletContext, httpMethod, (path != null ? path : "")); + MockHttpServletRequest request = new HtmlUnitMockHttpServletRequest( + servletContext, httpMethod, (uri.getPath() != null ? uri.getPath() : "")); parent(request, this.parentBuilder); - String host = uriComponents.getHost(); - request.setServerName(host != null ? host : ""); // needs to be first for additional headers - authType(request); - request.setCharacterEncoding(charset.name()); - content(request, charset); - contextPath(request, uriComponents); - contentType(request); - cookies(request); - headers(request); - locales(request); - servletPath(uriComponents, request); - params(request, uriComponents); - ports(uriComponents, request); + request.setProtocol("HTTP/1.1"); - request.setQueryString(uriComponents.getQuery()); - String scheme = uriComponents.getScheme(); - request.setScheme(scheme != null ? scheme : ""); + request.setScheme(uri.getScheme() != null ? uri.getScheme() : ""); + request.setServerName(uri.getHost() != null ? uri.getHost() : ""); // needs to be first for additional headers + ports(uri, request); + authType(request); + contextPath(request, uri); + servletPath(uri, request); request.setPathInfo(null); - return postProcess(request); - } - - private Charset getCharset() { Charset charset = this.webRequest.getCharset(); - return (charset != null ? charset : StandardCharsets.ISO_8859_1); - } + charset = (charset != null ? charset : StandardCharsets.ISO_8859_1); + request.setCharacterEncoding(charset.name()); + content(request, charset); + contentType(request); - private MockHttpServletRequest postProcess(MockHttpServletRequest request) { - if (this.parentPostProcessor != null) { - request = this.parentPostProcessor.postProcessRequest(request); - } - if (this.forwardPostProcessor != null) { - request = this.forwardPostProcessor.postProcessRequest(request); - } - return request; + cookies(request); + this.webRequest.getAdditionalHeaders().forEach(request::addHeader); + locales(request); + params(request, uri); + request.setQueryString(uri.getQuery()); + + return postProcess(request); } private void parent(MockHttpServletRequest request, @Nullable RequestBuilder parent) { @@ -208,50 +213,30 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable { } } - /** - * Set the contextPath to be used. - *
The value may be null in which case the first path segment of the
- * URL is turned into the contextPath. Otherwise it must conform to
- * {@link HttpServletRequest#getContextPath()} which states it can be
- * an empty string, or it must start with a "/" and not end with a "/".
- * @param contextPath a valid contextPath
- * @throws IllegalArgumentException if the contextPath is not a valid
- * {@link HttpServletRequest#getContextPath()}
- */
- public void setContextPath(@Nullable String contextPath) {
- MockMvcWebConnection.validateContextPath(contextPath);
- this.contextPath = contextPath;
- }
-
- public void setForwardPostProcessor(RequestPostProcessor forwardPostProcessor) {
- this.forwardPostProcessor = forwardPostProcessor;
+ private void ports(UriComponents uriComponents, MockHttpServletRequest request) {
+ int serverPort = uriComponents.getPort();
+ request.setServerPort(serverPort);
+ if (serverPort == -1) {
+ int portConnection = this.webRequest.getUrl().getDefaultPort();
+ request.setLocalPort(serverPort);
+ request.setRemotePort(portConnection);
+ }
+ else {
+ request.setRemotePort(serverPort);
+ }
}
private void authType(MockHttpServletRequest request) {
- String authorization = header("Authorization");
+ String authorization = getHeader("Authorization");
String[] authSplit = StringUtils.split(authorization, ": ");
if (authSplit != null) {
request.setAuthType(authSplit[0]);
}
}
- private void content(MockHttpServletRequest request, Charset charset) {
- String requestBody = this.webRequest.getRequestBody();
- if (requestBody == null) {
- return;
- }
- request.setContent(requestBody.getBytes(charset));
- }
-
- private void contentType(MockHttpServletRequest request) {
- String contentType = header("Content-Type");
- if (contentType == null) {
- FormEncodingType encodingType = this.webRequest.getEncodingType();
- if (encodingType != null) {
- contentType = encodingType.getName();
- }
- }
- request.setContentType(contentType != null ? contentType : MediaType.ALL_VALUE);
+ @Nullable
+ private String getHeader(String headerName) {
+ return this.webRequest.getAdditionalHeaders().get(headerName);
}
private void contextPath(MockHttpServletRequest request, UriComponents uriComponents) {
@@ -273,10 +258,36 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
}
}
+ private void servletPath(UriComponents uriComponents, MockHttpServletRequest request) {
+ String path = uriComponents.getPath();
+ String requestPath = (path != null ? path : "");
+ String servletPath = requestPath.substring(request.getContextPath().length());
+ request.setServletPath(servletPath);
+ }
+
+ private void content(MockHttpServletRequest request, Charset charset) {
+ String requestBody = this.webRequest.getRequestBody();
+ if (requestBody == null) {
+ return;
+ }
+ request.setContent(requestBody.getBytes(charset));
+ }
+
+ private void contentType(MockHttpServletRequest request) {
+ String contentType = getHeader("Content-Type");
+ if (contentType == null) {
+ FormEncodingType encodingType = this.webRequest.getEncodingType();
+ if (encodingType != null) {
+ contentType = encodingType.getName();
+ }
+ }
+ request.setContentType(contentType != null ? contentType : MediaType.ALL_VALUE);
+ }
+
private void cookies(MockHttpServletRequest request) {
List