Merge pull request #24074

Closes gh-24074
spring-projects · Nov 29, 2019 · c18d1ce · c18d1ce
2 parents 47779df + 395c1e4
commit c18d1ce
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 6 deletions.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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;
@@ -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 ex) {
+			// Should never happen (we're not actually parsing)
+			throw new IllegalStateException(ex);
 		}
+		return null;
 	}
 
 	@Override

diff --git a/...test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java b/...test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java
@@ -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;
@@ -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();

diff --git a/...-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java b/...-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,16 @@
 
 package org.springframework.mock.web.test;
 
+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;
@@ -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 ex) {
+			// Should never happen (we're not actually parsing)
+			throw new IllegalStateException(ex);
 		}
+		return null;
 	}
 
 	@Override