root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-06-02 14:19:52 +01:00
parent 2090bef08e a347383111
commit 8353843006
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartProperties.java
View File

@ -25,19 +25,18 @@ import org.springframework.util.StringUtils;
/** /**
* Properties to be used in configuring a {@link MultipartConfigElement}. * Properties to be used in configuring a {@link MultipartConfigElement}.
* <ul> * <ul>
* <li>{@link #getLocation() location} specifies the directory where files will be stored. * <li>{@link #getLocation() location} specifies the directory where uploaded files will
* The default is "". A common value is to use the system's temporary directory</li> * be stored. When not specified, a temporary directory will be used.</li>
* <li>{@link #getMaxFileSize() max-file-size} specifies the maximum size permitted for * <li>{@link #getMaxFileSize() max-file-size} specifies the maximum size permitted for
* uploaded files. The default is 1MB</li> * uploaded files. The default is 1MB</li>
* <li>{@link #getMaxRequestSize() max-request-size} specifies the maximum size allowed * <li>{@link #getMaxRequestSize() max-request-size} specifies the maximum size allowed
* for {@literal multipart/form-data} requests. The default is 10MB</li> * for {@literal multipart/form-data} requests. The default is 10MB.</li>
* <li>{@link #getFileSizeThreshold() file-size-threshold} specifies the size threshold * <li>{@link #getFileSizeThreshold() file-size-threshold} specifies the size threshold
* after which files will be written to disk. Default is 0, which means that the file will * after which files will be written to disk. The default is 0.</li>
* be written to disk immediately</li>
* </ul> * </ul>
* <p> * <p>
* These properties are ultimately passed through {@link MultipartConfigFactory} which * These properties are ultimately passed to {@link MultipartConfigFactory} which means
* means you may specify the values using {@literal long} values or using more readable * you may specify numeric values using {@literal long} values or using more readable
* {@literal String} variants that accept {@literal KB} or {@literal MB} suffixes. * {@literal String} variants that accept {@literal KB} or {@literal MB} suffixes.
* *
* @author Josh Long * @author Josh Long