Skip to content

Improve part content type determination in MockMultipartHttpServletRequest #24074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Improve part content type determination in MockMultipartHttpServletRequest #24074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32d4517
Add test to multipart request mock for non-file parts.
Nov 25, 2019
fdc69e8
Fix determination of content type in multipart request mock.
Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@

package org.springframework.mock.web;

import java.io.IOException;
import java.util.Collections;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.Part;

import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
Expand Down Expand Up @@ -121,9 +124,17 @@ public String getMultipartContentType(String paramOrFileName) {
if (file != null) {
return file.getContentType();
}
else {
return null;

try {
Part part = getPart(paramOrFileName);
if (part != null) {
return part.getContentType();
}
} catch (ServletException | IOException e) {
throw new IllegalStateException("Cannot extract content type from multipart request.", e);
}

return null;
}

@Override
Expand Down
20 changes: 20 additions & 0 deletions ...test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@

import org.junit.jupiter.api.Test;

import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;
Expand Down Expand Up @@ -61,6 +63,24 @@ void mockMultipartHttpServletRequestWithInputStream() throws IOException {
doTestMultipartHttpServletRequest(request);
}

@Test
void mockMultiPartHttpServletRequestWithMixedData() {
MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest();
request.addFile(new MockMultipartFile("file", "myOrigFilename", MediaType.TEXT_PLAIN_VALUE, "myContent2".getBytes()));

MockPart metadataPart = new MockPart("metadata", "{\"foo\": \"bar\"}".getBytes());
metadataPart.getHeaders().setContentType(MediaType.APPLICATION_JSON);
request.addPart(metadataPart);

HttpHeaders fileHttpHeaders = request.getMultipartHeaders("file");
assertThat(fileHttpHeaders).isNotNull();
assertThat(fileHttpHeaders.getContentType()).isEqualTo(MediaType.TEXT_PLAIN);

HttpHeaders dataHttpHeaders = request.getMultipartHeaders("metadata");
assertThat(dataHttpHeaders).isNotNull();
assertThat(dataHttpHeaders.getContentType()).isEqualTo(MediaType.APPLICATION_JSON);
}

private void doTestMultipartHttpServletRequest(MultipartHttpServletRequest request) throws IOException {
Set<String> fileNames = new HashSet<>();
Iterator<String> fileIter = request.getFileNames();
Expand Down