Merge branch '6.2.x'

This commit is contained in:
Sam Brannen
2025-08-26 11:06:24 +02:00
@@ -209,7 +209,7 @@ public final class ResponseCookie extends HttpCookie {
* @return a builder to create the cookie with
* @since 6.0
*/
public static ResponseCookieBuilder from(final String name) {
public static ResponseCookieBuilder from(String name) {
return new DefaultResponseCookieBuilder(name, null, false);
}
@@ -220,7 +220,7 @@ public final class ResponseCookie extends HttpCookie {
* @param value the cookie value
* @return a builder to create the cookie with
*/
public static ResponseCookieBuilder from(final String name, final String value) {
public static ResponseCookieBuilder from(String name, @Nullable String value) {
return new DefaultResponseCookieBuilder(name, value, false);
}
@@ -234,7 +234,7 @@ public final class ResponseCookie extends HttpCookie {
* @return a builder to create the cookie with
* @since 5.2.5
*/
public static ResponseCookieBuilder fromClientResponse(final String name, final String value) {
public static ResponseCookieBuilder fromClientResponse(String name, @Nullable String value) {
return new DefaultResponseCookieBuilder(name, value, true);
}
@@ -461,7 +461,7 @@ public final class ResponseCookie extends HttpCookie {
private @Nullable String sameSite;
public DefaultResponseCookieBuilder(String name, @Nullable String value, boolean lenient) {
DefaultResponseCookieBuilder(String name, @Nullable String value, boolean lenient) {
this.name = name;
this.value = value;
this.lenient = lenient;