Remove deprecated APIs in spring-web

See gh-33809

spring-web/src/main/java/org/springframework/http/HttpStatus.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.
@@ -56,14 +56,6 @@ public enum HttpStatus implements HttpStatusCode {
 	 * @since 6.0.5
 	 */
 	EARLY_HINTS(103, Series.INFORMATIONAL, "Early Hints"),
-	/**
-	 * {@code 103 Checkpoint}.
-	 * @see <a href="https://code.google.com/p/gears/wiki/ResumableHttpRequestsProposal">A proposal for supporting
-	 * resumable POST/PUT HTTP requests in HTTP/1.0</a>
-	 * @deprecated in favor of {@link #EARLY_HINTS} which will be returned from {@code HttpStatus.valueOf(103)}
-	 */
-	@Deprecated(since = "6.0.5")
-	CHECKPOINT(103, Series.INFORMATIONAL, "Checkpoint"),
 
 	// 2xx Success
 

spring-web/src/main/java/org/springframework/http/ResponseEntity.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.
@@ -183,18 +183,6 @@ public HttpStatusCode getStatusCode() {
 		return this.status;
 	}
 
-	/**
-	 * Return the HTTP status code of the response.
-	 * @return the HTTP status as an int value
-	 * @since 4.3
-	 * @deprecated as of 6.0, in favor of {@link #getStatusCode()}; scheduled
-	 * for removal in 7.0
-	 */
-	@Deprecated(since = "6.0")
-	public int getStatusCodeValue() {
-		return getStatusCode().value();
-	}
-
 
 	@Override
 	public boolean equals(@Nullable Object other) {

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.
 	 */

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.
-	 * <p>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.
-	 * <p>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 {