This factory implements {@link InitializingBean}, {@link DisposableBean} - * and {@link Lifecycle} and is expected typically to be declared as a - * Spring-managed bean. - * - *
Notice that after a {@link Lifecycle} stop/restart, new instances of - * the configured {@link LoopResources} and {@link ConnectionProvider} are - * created, so any references to those should be updated. - * - * @author Rossen Stoyanchev - * @author Brian Clozel - * @author Sebastien Deleuze - * @since 5.1 - * @deprecated since 6.1 due to a package change; use {@link org.springframework.http.client.ReactorResourceFactory} instead. - */ -@Deprecated(since = "6.1") -public class ReactorResourceFactory extends org.springframework.http.client.ReactorResourceFactory { -} diff --git a/spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java b/spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java index 89785e0fe2a5..ce3c84e7814c 100644 --- a/spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java +++ b/spring-web/src/main/java/org/springframework/web/client/UnknownContentTypeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -112,15 +112,6 @@ public HttpStatusCode getStatusCode() { return this.statusCode; } - /** - * Return the raw HTTP status code value. - * @deprecated in favor of {@link #getStatusCode()}, for removal in 7.0 - */ - @Deprecated(since = "6.0") - public int getRawStatusCode() { - return this.statusCode.value(); - } - /** * Return the HTTP status text. */ diff --git a/spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java b/spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java index bf07e9c9a057..6f8b05090a0a 100644 --- a/spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java +++ b/spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2025 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. @@ -50,8 +50,6 @@ */ public class ModelAndViewContainer { - private boolean ignoreDefaultModelOnRedirect = true; - private @Nullable Object view; private final ModelMap defaultModel = new BindingAwareModelMap(); @@ -71,25 +69,6 @@ public class ModelAndViewContainer { private boolean requestHandled = false; - /** - * By default, the content of the "default" model is used both during - * rendering and redirect scenarios. Alternatively controller methods - * can declare an argument of type {@code RedirectAttributes} and use - * it to provide attributes to prepare the redirect URL. - *
Setting this flag to {@code true} guarantees the "default" model is - * never used in a redirect scenario even if a RedirectAttributes argument - * is not declared. Setting it to {@code false} means the "default" model - * may be used in a redirect if the controller method doesn't declare a - * RedirectAttributes argument. - *
As of 6.0, this property is set to {@code true} by default. - * @deprecated as of 6.0 without a replacement; once removed, the default - * model will always be ignored on redirect - */ - @Deprecated(since = "6.0") - public void setIgnoreDefaultModelOnRedirect(boolean ignoreDefaultModelOnRedirect) { - this.ignoreDefaultModelOnRedirect = ignoreDefaultModelOnRedirect; - } - /** * Set a view name to be resolved by the DispatcherServlet via a ViewResolver. * Will override any pre-existing view name or View. @@ -137,22 +116,13 @@ public boolean isViewReference() { * a method argument) and {@code ignoreDefaultModelOnRedirect=false}. */ public ModelMap getModel() { - if (useDefaultModel()) { + if (!this.redirectModelScenario) { return this.defaultModel; } - else { - if (this.redirectModel == null) { - this.redirectModel = new ModelMap(); - } - return this.redirectModel; + if (this.redirectModel == null) { + this.redirectModel = new ModelMap(); } - } - - /** - * Whether to use the default model or the redirect model. - */ - private boolean useDefaultModel() { - return (!this.redirectModelScenario || (this.redirectModel == null && !this.ignoreDefaultModelOnRedirect)); + return this.redirectModel; } /** @@ -336,7 +306,7 @@ public String toString() { else { sb.append("View is [").append(this.view).append(']'); } - if (useDefaultModel()) { + if (!this.redirectModelScenario) { sb.append("; default model "); } else { diff --git a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java b/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java deleted file mode 100644 index c334afca5cc7..000000000000 --- a/spring-web/src/main/java/org/springframework/web/util/CookieGenerator.java +++ /dev/null @@ -1,238 +0,0 @@ -/* - * Copyright 2002-2022 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. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.web.util; - -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jspecify.annotations.Nullable; - -import org.springframework.util.Assert; - -/** - * Helper class for cookie generation, carrying cookie descriptor settings - * as bean properties and being able to add and remove cookie to/from a - * given response. - * - *
Can serve as base class for components that generate specific cookies. - * - * @author Juergen Hoeller - * @since 1.1.4 - * @see #addCookie - * @see #removeCookie - * @deprecated as of 6.0 in favor of {@link org.springframework.http.ResponseCookie} for removal in 7.1 - */ -@Deprecated(since = "6.0", forRemoval = true) -public class CookieGenerator { - - /** - * Default path that cookies will be visible to: "/", i.e. the entire server. - */ - public static final String DEFAULT_COOKIE_PATH = "/"; - - - protected final Log logger = LogFactory.getLog(getClass()); - - private @Nullable String cookieName; - - private @Nullable String cookieDomain; - - private String cookiePath = DEFAULT_COOKIE_PATH; - - private @Nullable Integer cookieMaxAge; - - private boolean cookieSecure = false; - - private boolean cookieHttpOnly = false; - - - /** - * Use the given name for cookies created by this generator. - * @see jakarta.servlet.http.Cookie#getName() - */ - public void setCookieName(@Nullable String cookieName) { - this.cookieName = cookieName; - } - - /** - * Return the given name for cookies created by this generator. - */ - public @Nullable String getCookieName() { - return this.cookieName; - } - - /** - * Use the given domain for cookies created by this generator. - * The cookie is only visible to servers in this domain. - * @see jakarta.servlet.http.Cookie#setDomain - */ - public void setCookieDomain(@Nullable String cookieDomain) { - this.cookieDomain = cookieDomain; - } - - /** - * Return the domain for cookies created by this generator, if any. - */ - public @Nullable String getCookieDomain() { - return this.cookieDomain; - } - - /** - * Use the given path for cookies created by this generator. - * The cookie is only visible to URLs in this path and below. - * @see jakarta.servlet.http.Cookie#setPath - */ - public void setCookiePath(String cookiePath) { - this.cookiePath = cookiePath; - } - - /** - * Return the path for cookies created by this generator. - */ - public String getCookiePath() { - return this.cookiePath; - } - - /** - * Use the given maximum age (in seconds) for cookies created by this generator. - * Useful special value: -1 ... not persistent, deleted when client shuts down. - *
Default is no specific maximum age at all, using the Servlet container's - * default. - * @see jakarta.servlet.http.Cookie#setMaxAge - */ - public void setCookieMaxAge(@Nullable Integer cookieMaxAge) { - this.cookieMaxAge = cookieMaxAge; - } - - /** - * Return the maximum age for cookies created by this generator. - */ - public @Nullable Integer getCookieMaxAge() { - return this.cookieMaxAge; - } - - /** - * Set whether the cookie should only be sent using a secure protocol, - * such as HTTPS (SSL). This is an indication to the receiving browser, - * not processed by the HTTP server itself. - *
Default is "false". - * @see jakarta.servlet.http.Cookie#setSecure - */ - public void setCookieSecure(boolean cookieSecure) { - this.cookieSecure = cookieSecure; - } - - /** - * Return whether the cookie should only be sent using a secure protocol, - * such as HTTPS (SSL). - */ - public boolean isCookieSecure() { - return this.cookieSecure; - } - - /** - * Set whether the cookie is supposed to be marked with the "HttpOnly" attribute. - *
Default is "false". - * @see jakarta.servlet.http.Cookie#setHttpOnly - */ - public void setCookieHttpOnly(boolean cookieHttpOnly) { - this.cookieHttpOnly = cookieHttpOnly; - } - - /** - * Return whether the cookie is supposed to be marked with the "HttpOnly" attribute. - */ - public boolean isCookieHttpOnly() { - return this.cookieHttpOnly; - } - - - /** - * Add a cookie with the given value to the response, - * using the cookie descriptor settings of this generator. - *
Delegates to {@link #createCookie} for cookie creation. - * @param response the HTTP response to add the cookie to - * @param cookieValue the value of the cookie to add - * @see #setCookieName - * @see #setCookieDomain - * @see #setCookiePath - * @see #setCookieMaxAge - */ - public void addCookie(HttpServletResponse response, String cookieValue) { - Assert.notNull(response, "HttpServletResponse must not be null"); - Cookie cookie = createCookie(cookieValue); - Integer maxAge = getCookieMaxAge(); - if (maxAge != null) { - cookie.setMaxAge(maxAge); - } - if (isCookieSecure()) { - cookie.setSecure(true); - } - if (isCookieHttpOnly()) { - cookie.setHttpOnly(true); - } - response.addCookie(cookie); - if (logger.isTraceEnabled()) { - logger.trace("Added cookie [" + getCookieName() + "=" + cookieValue + "]"); - } - } - - /** - * Remove the cookie that this generator describes from the response. - * Will generate a cookie with empty value and max age 0. - *
Delegates to {@link #createCookie} for cookie creation. - * @param response the HTTP response to remove the cookie from - * @see #setCookieName - * @see #setCookieDomain - * @see #setCookiePath - */ - public void removeCookie(HttpServletResponse response) { - Assert.notNull(response, "HttpServletResponse must not be null"); - Cookie cookie = createCookie(""); - cookie.setMaxAge(0); - if (isCookieSecure()) { - cookie.setSecure(true); - } - if (isCookieHttpOnly()) { - cookie.setHttpOnly(true); - } - response.addCookie(cookie); - if (logger.isTraceEnabled()) { - logger.trace("Removed cookie '" + getCookieName() + "'"); - } - } - - /** - * Create a cookie with the given value, using the cookie descriptor - * settings of this generator (except for "cookieMaxAge"). - * @param cookieValue the value of the cookie to crate - * @return the cookie - * @see #setCookieName - * @see #setCookieDomain - * @see #setCookiePath - */ - protected Cookie createCookie(String cookieValue) { - Cookie cookie = new Cookie(getCookieName(), cookieValue); - if (getCookieDomain() != null) { - cookie.setDomain(getCookieDomain()); - } - cookie.setPath(getCookiePath()); - return cookie; - } - -} diff --git a/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java b/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java deleted file mode 100644 index eb05b1545d05..000000000000 --- a/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2002-2023 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. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.web.util; - -import jakarta.servlet.ServletException; -import org.jspecify.annotations.Nullable; - -import org.springframework.core.NestedExceptionUtils; - -/** - * Legacy subclass of {@link ServletException} that handles a root cause in terms - * of message and stacktrace. - * - * @author Juergen Hoeller - * @since 1.2.5 - * @deprecated as of 6.0, in favor of standard {@link ServletException} nesting - */ -@Deprecated(since = "6.0") -public class NestedServletException extends ServletException { - - /** Use serialVersionUID from Spring 1.2 for interoperability. */ - private static final long serialVersionUID = -5292377985529381145L; - - static { - // Eagerly load the NestedExceptionUtils class to avoid classloader deadlock - // issues on OSGi when calling getMessage(). Reported by Don Brown; SPR-5607. - NestedExceptionUtils.class.getName(); - } - - - /** - * Construct a {@code NestedServletException} with the specified detail message. - * @param msg the detail message - */ - public NestedServletException(String msg) { - super(msg); - } - - /** - * Construct a {@code NestedServletException} with the specified detail message - * and nested exception. - * @param msg the detail message - * @param cause the nested exception - */ - public NestedServletException(@Nullable String msg, @Nullable Throwable cause) { - super(NestedExceptionUtils.buildMessage(msg, cause), cause); - } - -} diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java index c1d9930043ac..32273ee20ef1 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -216,27 +216,6 @@ public static UriComponentsBuilder fromUriString(String uri, ParserType parserTy }; } - /** - * Create a URI components builder from the given HTTP URL String. - *
Note: The presence of reserved characters can prevent - * correct parsing of the URI string. For example if a query parameter - * contains {@code '='} or {@code '&'} characters, the query string cannot - * be parsed unambiguously. Such values should be substituted for URI - * variables to enable correct parsing: - *
- * String urlString = "https://example.com/hotels/42?filter={value}";
- * UriComponentsBuilder.fromHttpUrl(urlString).buildAndExpand("hot&cold");
- *
- * @param httpUrl the source URI
- * @return the URI components of the URI
- * @deprecated as of 6.2, in favor of {@link #fromUriString(String)};
- * scheduled for removal in 7.0.
- */
- @Deprecated(since = "6.2")
- public static UriComponentsBuilder fromHttpUrl(String httpUrl) throws InvalidUrlException {
- return fromUriString(httpUrl);
- }
-
// Encode methods
diff --git a/spring-web/src/test/java/org/springframework/http/HttpStatusTests.java b/spring-web/src/test/java/org/springframework/http/HttpStatusTests.java
index 39fbc3e4b871..2a7328fcd232 100644
--- a/spring-web/src/test/java/org/springframework/http/HttpStatusTests.java
+++ b/spring-web/src/test/java/org/springframework/http/HttpStatusTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -168,7 +168,6 @@ void codeWithDeprecatedAlias(int code, HttpStatus expected, HttpStatus outdated)
@SuppressWarnings("deprecation")
static ListSetting this flag to {@code true} guarantees the "default" model is - * never used in a redirect scenario even if a RedirectAttributes argument - * is not declared. Setting it to {@code false} means the "default" model - * may be used in a redirect if the controller method doesn't declare a - * RedirectAttributes argument. - *
As of 6.0, this property is set to {@code true} by default. - * @see RedirectAttributes - * @deprecated as of 6.0 without a replacement; once removed, the default - * model will always be ignored on redirect - */ - @Deprecated(since = "6.0") - public void setIgnoreDefaultModelOnRedirect(boolean ignoreDefaultModelOnRedirect) { - this.ignoreDefaultModelOnRedirect = ignoreDefaultModelOnRedirect; - } - /** * Specify the strategy to store session attributes with. The default is * {@link org.springframework.web.bind.support.DefaultSessionAttributeStore}, @@ -947,7 +925,6 @@ private SessionAttributesHandler getSessionAttributesHandler(HandlerMethod handl ModelAndViewContainer mavContainer = new ModelAndViewContainer(); mavContainer.addAllAttributes(RequestContextUtils.getInputFlashMap(request)); modelFactory.initModel(webRequest, mavContainer, invocableMethod); - mavContainer.setIgnoreDefaultModelOnRedirect(this.ignoreDefaultModelOnRedirect); if (asyncManager.hasConcurrentResult()) { Object result = asyncManager.getConcurrentResult();