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

Add getResource to MultipartFile

Browse Source 
Issue: SPR-16808
This commit is contained in:
Rossen Stoyanchev
2018-05-13 22:21:40 -04:00
parent ab6a6f4e17
commit f7d60b7f58
3 changed files with 153 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
spring-web/src/test/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequestTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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,12 +16,20 @@
package org.springframework.web.multipart.support;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import org.junit.Test;
import org.springframework.http.MockHttpOutputMessage;
import org.springframework.http.converter.FormHttpMessageConverter;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.mock.web.test.MockPart;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.multipart.MultipartFile;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
@@ -33,8 +41,8 @@ public class StandardMultipartHttpServletRequestTests {
@Test
public void filename() throws Exception {
StandardMultipartHttpServletRequest request = getRequest(
"file", "form-data; name=\"file\"; filename=\"myFile.txt\"");
String disposition = "form-data; name=\"file\"; filename=\"myFile.txt\"";
StandardMultipartHttpServletRequest request = requestWithPart("file", disposition, "");
MultipartFile multipartFile = request.getFile("file");
assertNotNull(multipartFile);
@@ -43,8 +51,8 @@ public class StandardMultipartHttpServletRequestTests {
@Test // SPR-13319
public void filenameRfc5987() throws Exception {
StandardMultipartHttpServletRequest request = getRequest(
"file", "form-data; name=\"file\"; filename*=\"UTF-8''foo-%c3%a4-%e2%82%ac.html\"");
String disposition = "form-data; name=\"file\"; filename*=\"UTF-8''foo-%c3%a4-%e2%82%ac.html\"";
StandardMultipartHttpServletRequest request = requestWithPart("file", disposition, "");
MultipartFile multipartFile = request.getFile("file");
assertNotNull(multipartFile);
@@ -53,19 +61,42 @@ public class StandardMultipartHttpServletRequestTests {
@Test // SPR-15205
public void filenameRfc2047() throws Exception {
StandardMultipartHttpServletRequest request = getRequest(
"file", "form-data; name=\"file\"; filename=\"=?UTF-8?Q?Declara=C3=A7=C3=A3o.pdf?=\"");
String disposition = "form-data; name=\"file\"; filename=\"=?UTF-8?Q?Declara=C3=A7=C3=A3o.pdf?=\"";
StandardMultipartHttpServletRequest request = requestWithPart("file", disposition, "");
MultipartFile multipartFile = request.getFile("file");
assertNotNull(multipartFile);
assertEquals("Declaração.pdf", multipartFile.getOriginalFilename());
}
@Test
public void multipartFileResource() throws IOException {
String name = "file";
String disposition = "form-data; name=\"" + name + "\"; filename=\"myFile.txt\"";
StandardMultipartHttpServletRequest request = requestWithPart(name, disposition, "myBody");
MultipartFile multipartFile = request.getFile(name);
private StandardMultipartHttpServletRequest getRequest(String name, String dispositionValue) {
assertNotNull(multipartFile);
MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
map.add(name, multipartFile.getResource());
MockHttpOutputMessage output = new MockHttpOutputMessage();
new FormHttpMessageConverter().write(map, null, output);
assertThat(output.getBodyAsString(StandardCharsets.UTF_8), containsString(
"Content-Disposition: form-data; name=\"file\"; filename=\"myFile.txt\"\r\n" +
"Content-Type: text/plain\r\n" +
"Content-Length: 6\r\n" +
"\r\n" +
"myBody\r\n"));
}
private StandardMultipartHttpServletRequest requestWithPart(String name, String disposition, String content) {
MockHttpServletRequest request = new MockHttpServletRequest();
MockPart part = new MockPart(name, null);
part.getHeaders().set("Content-Disposition", dispositionValue);
MockPart part = new MockPart(name, null, content.getBytes(StandardCharsets.UTF_8));
part.getHeaders().set("Content-Disposition", disposition);
request.addPart(part);
return new StandardMultipartHttpServletRequest(request);
}