Spring/spring-restdocs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish MockMvcOperationRequestFactory

Browse Source
This commit is contained in:
Andy Wilkinson
2015-09-08 12:29:36 +01:00
parent 875dde3b6f
commit d09950ecaa
1 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcOperationRequestFactory.java
View File

@@ -86,37 +86,57 @@ class MockMvcOperationRequestFactory {
private List<OperationRequestPart> extractParts(MockHttpServletRequest servletRequest)
throws IOException, ServletException {
List<OperationRequestPart> parts = new ArrayList<>();
for (Part part : servletRequest.getParts()) {
HttpHeaders partHeaders = extractHeaders(part);
List<String> contentTypeHeader = partHeaders.get(HttpHeaders.CONTENT_TYPE);
if (part.getContentType() != null && contentTypeHeader == null) {
partHeaders
.setContentType(MediaType.parseMediaType(part.getContentType()));
}
parts.add(new StandardOperationRequestPart(part.getName(), StringUtils
.hasText(part.getSubmittedFileName()) ? part.getSubmittedFileName()
: null, FileCopyUtils.copyToByteArray(part.getInputStream()),
partHeaders));
}
parts.addAll(extractServletRequestParts(servletRequest));
if (servletRequest instanceof MockMultipartHttpServletRequest) {
for (Entry<String, List<MultipartFile>> entry : ((MockMultipartHttpServletRequest) servletRequest)
.getMultiFileMap().entrySet()) {
for (MultipartFile file : entry.getValue()) {
HttpHeaders partHeaders = new HttpHeaders();
if (StringUtils.hasText(file.getContentType())) {
partHeaders.setContentType(MediaType.parseMediaType(file
.getContentType()));
}
parts.add(new StandardOperationRequestPart(file.getName(),
StringUtils.hasText(file.getOriginalFilename()) ? file
.getOriginalFilename() : null, file.getBytes(),
partHeaders));
}
parts.addAll(extractMultipartRequestParts((MockMultipartHttpServletRequest) servletRequest));
}
return parts;
}
private List<OperationRequestPart> extractServletRequestParts(
MockHttpServletRequest servletRequest) throws IOException, ServletException {
List<OperationRequestPart> parts = new ArrayList<>();
for (Part part : servletRequest.getParts()) {
parts.add(createOperationRequestPart(part));
}
return parts;
}
private StandardOperationRequestPart createOperationRequestPart(Part part)
throws IOException {
HttpHeaders partHeaders = extractHeaders(part);
List<String> contentTypeHeader = partHeaders.get(HttpHeaders.CONTENT_TYPE);
if (part.getContentType() != null && contentTypeHeader == null) {
partHeaders.setContentType(MediaType.parseMediaType(part.getContentType()));
}
return new StandardOperationRequestPart(part.getName(), StringUtils.hasText(part
.getSubmittedFileName()) ? part.getSubmittedFileName() : null,
FileCopyUtils.copyToByteArray(part.getInputStream()), partHeaders);
}
private List<OperationRequestPart> extractMultipartRequestParts(
MockMultipartHttpServletRequest multipartRequest) throws IOException {
List<OperationRequestPart> parts = new ArrayList<>();
for (Entry<String, List<MultipartFile>> entry : multipartRequest
.getMultiFileMap().entrySet()) {
for (MultipartFile file : entry.getValue()) {
parts.add(createOperationRequestPart(file));
}
}
return parts;
}
private StandardOperationRequestPart createOperationRequestPart(MultipartFile file)
throws IOException {
HttpHeaders partHeaders = new HttpHeaders();
if (StringUtils.hasText(file.getContentType())) {
partHeaders.setContentType(MediaType.parseMediaType(file.getContentType()));
}
return new StandardOperationRequestPart(file.getName(), StringUtils.hasText(file
.getOriginalFilename()) ? file.getOriginalFilename() : null,
file.getBytes(), partHeaders);
}
private HttpHeaders extractHeaders(Part part) {
HttpHeaders partHeaders = new HttpHeaders();
for (String headerName : part.getHeaderNames()) {