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

Merge branch '6.0.x'

This commit is contained in:
Sébastien Deleuze 2023-07-11 19:58:44 +02:00
parent 3a481a7d7f 8ecedb81b3
commit 3a8c40fd2f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-web/src/main/java/org/springframework/http/ContentDisposition.java
View File

@ -704,7 +704,7 @@ public final class ContentDisposition {
/** /**
* Set the value of the {@literal name} parameter. * Set the value of the {@literal name} parameter.
*/ */
Builder name(String name); Builder name(@Nullable String name);
/** /**
* Set the value of the {@literal filename} parameter. The given * Set the value of the {@literal filename} parameter. The given
@ -713,7 +713,7 @@ public final class ContentDisposition {
* be escaped with a backslash, e.g. {@code "foo\"bar.txt"} becomes * be escaped with a backslash, e.g. {@code "foo\"bar.txt"} becomes
* {@code "foo\\\"bar.txt"}. * {@code "foo\\\"bar.txt"}.
*/ */
Builder filename(String filename); Builder filename(@Nullable String filename);
/** /**
* Set the value of the {@code filename} that will be encoded as * Set the value of the {@code filename} that will be encoded as
@ -724,7 +724,7 @@ public final class ContentDisposition {
* <a href="https://tools.ietf.org/html/rfc7578#section-4.2">RFC 7578, Section 4.2</a> * <a href="https://tools.ietf.org/html/rfc7578#section-4.2">RFC 7578, Section 4.2</a>
* and also RFC 5987 mention it does not apply to multipart requests. * and also RFC 5987 mention it does not apply to multipart requests.
*/ */
Builder filename(String filename, Charset charset); Builder filename(@Nullable String filename, @Nullable Charset charset);
/** /**
* Set the value of the {@literal size} parameter. * Set the value of the {@literal size} parameter.
@ -733,7 +733,7 @@ public final class ContentDisposition {
* to be removed in a future release. * to be removed in a future release.
*/ */
@Deprecated @Deprecated
Builder size(Long size); Builder size(@Nullable Long size);
/** /**
* Set the value of the {@literal creation-date} parameter. * Set the value of the {@literal creation-date} parameter.
@ -742,7 +742,7 @@ public final class ContentDisposition {
* to be removed in a future release. * to be removed in a future release.
*/ */
@Deprecated @Deprecated
Builder creationDate(ZonedDateTime creationDate); Builder creationDate(@Nullable ZonedDateTime creationDate);
/** /**
* Set the value of the {@literal modification-date} parameter. * Set the value of the {@literal modification-date} parameter.
@ -751,7 +751,7 @@ public final class ContentDisposition {
* to be removed in a future release. * to be removed in a future release.
*/ */
@Deprecated @Deprecated
Builder modificationDate(ZonedDateTime modificationDate); Builder modificationDate(@Nullable ZonedDateTime modificationDate);
/** /**
* Set the value of the {@literal read-date} parameter. * Set the value of the {@literal read-date} parameter.
@ -760,7 +760,7 @@ public final class ContentDisposition {
* to be removed in a future release. * to be removed in a future release.
*/ */
@Deprecated @Deprecated
Builder readDate(ZonedDateTime readDate); Builder readDate(@Nullable ZonedDateTime readDate);
/** /**
* Build the content disposition. * Build the content disposition.