Add testRequestPartWithListOfPojosAndListOfMultipartFiles

Author: darrenfoong

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java

@@ -489,6 +489,20 @@ public void testRequestPartWithListOfMultipartFiles() {
 		assertThat(fileNames).contains("hello1.bin", "hello2.bin");
 	}
 
+	@Test
+	public void testRequestPartWithListOfPojosAndListOfMultipartFiles() {
+		Hello pojo1 = new Hello(HELLO_WORLD_1);
+		Hello pojo2 = new Hello(OI_TERRA_2);
+		MockMultipartFile file1 = new MockMultipartFile("file1", "hello1.bin", null,
+			"hello".getBytes());
+		MockMultipartFile file2 = new MockMultipartFile("file2", "hello2.bin", null,
+			"hello".getBytes());
+		String response = this.multipartClient
+			.requestPartListOfPojosAndListOfMultipartFiles(Arrays.asList(pojo1, pojo2), Arrays.asList(file1, file2));
+		assertThat(response).isEqualTo("hello world 1oi terra 2hello1.binhello2.bin");
+	}
+
+
 	@Test
 	public void testRequestBodyWithSingleMultipartFile() {
 		String partName = UUID.randomUUID().toString();
@@ -722,6 +736,13 @@ String requestPartListOfMultipartFilesReturnsPartNames(
 		String requestPartListOfMultipartFilesReturnsFileNames(
 				@RequestPart("files") List<MultipartFile> files);
 
+		@RequestMapping(method = RequestMethod.POST, path = "/multipartPojosFiles",
+			consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
+			produces = MediaType.TEXT_PLAIN_VALUE)
+		String requestPartListOfPojosAndListOfMultipartFiles(
+			@RequestPart("pojos") List<Hello> pojos,
+			@RequestPart("files") List<MultipartFile> files);
+
 		@RequestMapping(method = RequestMethod.POST, path = "/multipartNames",
 				consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
 				produces = MediaType.TEXT_PLAIN_VALUE)
@@ -1113,6 +1134,24 @@ String multipartFilenames(HttpServletRequest request) throws Exception {
 					.collect(Collectors.joining(","));
 		}
 
+		@RequestMapping(method = RequestMethod.POST, path = "/multipartPojosFiles",
+			consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
+			produces = MediaType.TEXT_PLAIN_VALUE)
+		String requestPartListOfPojosAndListOfMultipartFiles(
+			@RequestPart("pojos") List<Hello> pojos,
+			@RequestPart("files") List<MultipartFile> files) {
+			StringBuilder result = new StringBuilder();
+
+			for (Hello pojo : pojos) {
+				result.append(pojo.getMessage());
+			}
+
+			for (MultipartFile file : files) {
+				result.append(file.getOriginalFilename());
+			}
+
+			return result.toString();
+		}
 	}
 
 	public static class Hello {