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 in MockMvcClientHttpRequestFactory

Browse Source 
Replace anonymous subclass with inner.
Simplify methods to adapt client-server request and response.
This commit is contained in:
rstoyanchev
2025-10-03 11:49:16 +01:00
parent 7e6874ad80
commit 451f2b5a90
1 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcClientHttpRequestFactory.java
+59 -54
View File
@@ -21,7 +21,6 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import jakarta.servlet.http.Cookie;
import org.jspecify.annotations.Nullable;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -36,12 +35,13 @@ import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.request;
/**
* A {@link ClientHttpRequestFactory} for requests executed via {@link MockMvc}.
* {@link ClientHttpRequestFactory} for requests executed via {@link MockMvc}.
*
* @author Rossen Stoyanchev
* @author Rob Worsnop
@@ -60,74 +60,79 @@ class MockMvcClientHttpRequestFactory implements ClientHttpRequestFactory {
@Override
public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) {
return new MockClientHttpRequest(httpMethod, uri) {
@Override
public ClientHttpResponse executeInternal() {
return getClientHttpResponse(httpMethod, uri, getHeaders(), getBodyAsBytes());
}
};
return new MockMvcClientHttpRequest(httpMethod, uri);
}
private ClientHttpResponse getClientHttpResponse(
HttpMethod httpMethod, URI uri, HttpHeaders requestHeaders, byte[] requestBody) {
try {
Cookie[] cookies = parseCookies(requestHeaders.get(HttpHeaders.COOKIE));
MockHttpServletRequestBuilder requestBuilder = request(httpMethod, uri)
.content(requestBody).headers(requestHeaders);
if (cookies.length > 0) {
requestBuilder.cookie(cookies);
/**
* {@link ClientHttpRequest} that executes via MockMvc.
*/
private class MockMvcClientHttpRequest extends MockClientHttpRequest {
MockMvcClientHttpRequest(HttpMethod httpMethod, URI uri) {
super(httpMethod, uri);
}
@Override
public ClientHttpResponse executeInternal() {
try {
MockHttpServletRequestBuilder servletRequestBuilder = request(getMethod(), getURI())
.headers(getHeaders())
.content(getBodyAsBytes());
addCookies(servletRequestBuilder);
MockHttpServletResponse servletResponse = MockMvcClientHttpRequestFactory.this.mockMvc
.perform(servletRequestBuilder)
.andReturn()
.getResponse();
MockClientHttpResponse clientResponse = new MockClientHttpResponse(
getResponseBody(servletResponse),
HttpStatusCode.valueOf(servletResponse.getStatus()));
copyHeaders(servletResponse, clientResponse);
return clientResponse;
}
MockHttpServletResponse servletResponse = this.mockMvc
.perform(requestBuilder)
.andReturn()
.getResponse();
catch (Exception ex) {
byte[] body = ex.toString().getBytes(StandardCharsets.UTF_8);
return new MockClientHttpResponse(body, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
HttpStatusCode status = HttpStatusCode.valueOf(servletResponse.getStatus());
private void addCookies(MockHttpServletRequestBuilder requestBuilder) {
List<String> values = getHeaders().get(HttpHeaders.COOKIE);
if (!ObjectUtils.isEmpty(values)) {
values.stream()
.flatMap(header -> StringUtils.commaDelimitedListToSet(header).stream())
.map(value -> {
String[] parts = StringUtils.split(value, "=");
Assert.isTrue(parts != null && parts.length == 2, "Invalid cookie: '" + value + "'");
return new Cookie(parts[0], parts[1]);
})
.forEach(requestBuilder::cookie);
}
}
private static byte[] getResponseBody(MockHttpServletResponse servletResponse) {
byte[] body = servletResponse.getContentAsByteArray();
if (body.length == 0) {
String error = servletResponse.getErrorMessage();
if (StringUtils.hasLength(error)) {
// sendError message as default body
body = error.getBytes(StandardCharsets.UTF_8);
}
}
MockClientHttpResponse clientResponse = new MockClientHttpResponse(body, status);
clientResponse.getHeaders().putAll(getResponseHeaders(servletResponse));
return clientResponse;
return body;
}
catch (Exception ex) {
byte[] body = ex.toString().getBytes(StandardCharsets.UTF_8);
return new MockClientHttpResponse(body, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
private static Cookie[] parseCookies(@Nullable List<String> headerValues) {
if (headerValues == null) {
return new Cookie[0];
}
return headerValues.stream()
.flatMap(header -> StringUtils.commaDelimitedListToSet(header).stream())
.map(MockMvcClientHttpRequestFactory::parseCookie)
.toArray(Cookie[]::new);
}
private static void copyHeaders(
MockHttpServletResponse servletResponse, MockClientHttpResponse clientResponse) {
private static Cookie parseCookie(String cookie) {
String[] parts = StringUtils.split(cookie, "=");
Assert.isTrue(parts != null && parts.length == 2, "Invalid cookie: '" + cookie + "'");
return new Cookie(parts[0], parts[1]);
}
private HttpHeaders getResponseHeaders(MockHttpServletResponse response) {
HttpHeaders headers = new HttpHeaders();
for (String name : response.getHeaderNames()) {
List<String> values = response.getHeaders(name);
for (String value : values) {
headers.add(name, value);
}
servletResponse.getHeaderNames()
.forEach(name -> servletResponse.getHeaders(name)
.forEach(value -> clientResponse.getHeaders().add(name, value)));
}
return headers;
}
}