Add missing @⁠Override annotations

... and suppress "serial" warnings

spring-expression/src/main/java/org/springframework/expression/ExpressionException.java

@@ -117,10 +117,11 @@ public class ExpressionException extends RuntimeException {
 
 	/**
 	 * Return the exception message.
-	 * As of Spring 4.0, this method returns the same result as {@link #toDetailedString()}.
+	 * <p>This method returns the same result as {@link #toDetailedString()}.
 	 * @see #getSimpleMessage()
 	 * @see java.lang.Throwable#getMessage()
 	 */
+	@Override
 	public String getMessage() {
 		return toDetailedString();
 	}

spring-jms/src/main/java/org/springframework/jms/core/DefaultJmsClient.java

@@ -70,10 +70,12 @@ class DefaultJmsClient implements JmsClient {
 	}
 
 
+	@Override
 	public OperationSpec destination(Destination destination) {
 		return new DefaultOperationSpec(destination);
 	}
 
+	@Override
 	public OperationSpec destination(String destinationName) {
 		return new DefaultOperationSpec(destinationName);
 	}

spring-messaging/src/test/java/org/springframework/messaging/core/MessageSendingTemplateTests.java

@@ -50,6 +50,7 @@ class MessageSendingTemplateTests {
 
 	private final TestMessagePostProcessor postProcessor = new TestMessagePostProcessor();
 
+	@SuppressWarnings("serial")
 	private final Map<String, Object> headers = new HashMap<>() {{
 		put("key", "value");
 	}};

spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java

@@ -284,6 +284,7 @@ public class LocalSessionFactoryBuilder extends Configuration {
 	 * @see #addPackage
 	 * @see #scanPackages
 	 */
+	@Override
 	public LocalSessionFactoryBuilder addPackages(String... annotatedPackages) {
 		for (String annotatedPackage : annotatedPackages) {
 			addPackage(annotatedPackage);

spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java

@@ -642,7 +642,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		sendRedirect(url, HttpServletResponse.SC_MOVED_TEMPORARILY, true);
 	}
 
-	// @Override - on Servlet 6.1
+	@Override
 	public void sendRedirect(String url, int sc, boolean clearBuffer) throws IOException {
 		Assert.state(!isCommitted(), "Cannot send redirect - response is already committed");
 		Assert.notNull(url, "Redirect URL must not be null");

spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClientBuilder.java

@@ -173,6 +173,7 @@ class DefaultRestTestClientBuilder<B extends RestTestClient.Builder<B>> implemen
 			this.mockMvcBuilder = mockMvcBuilder;
 		}
 
+		@Override
 		public <T extends S> T configureServer(Consumer<M> consumer) {
 			consumer.accept(this.mockMvcBuilder);
 			return self();

spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java

@@ -41,6 +41,7 @@ class FilterTests {
 	@Test
 	void filter() {
 
+		@SuppressWarnings("serial")
 		Filter filter = new HttpFilter() {
 			@Override
 			protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterChain chain) throws IOException {

spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java

@@ -370,6 +370,7 @@ public abstract class AbstractTransactionAspectTests {
 	protected void doTestRollbackOnException(
 			final Exception ex, final boolean shouldRollback, boolean rollbackException) throws Exception {
 
+		@SuppressWarnings("serial")
 		TransactionAttribute txatt = new DefaultTransactionAttribute() {
 			@Override
 			public boolean rollbackOn(Throwable t) {

spring-web/src/main/java/org/springframework/http/client/reactive/JdkResponseCookieParser.java

@@ -23,7 +23,6 @@ import java.util.regex.Pattern;
 
 import org.springframework.http.ResponseCookie;
 
-
 /**
  * Parser that delegates to {@link java.net.HttpCookie#parse(String)} for parsing,
  * but also extracts and sets {@code sameSite}.
@@ -39,6 +38,7 @@ final class JdkResponseCookieParser implements ResponseCookie.Parser {
 	/**
 	 * Parse the given headers.
 	 */
+	@Override
 	public List<ResponseCookie> parse(String header) {
 		Matcher matcher = SAME_SITE_PATTERN.matcher(header);
 		String sameSite = (matcher.matches() ? matcher.group(1) : null);

spring-web/src/main/java/org/springframework/web/accept/DefaultApiVersionStrategy.java

@@ -163,6 +163,7 @@ public class DefaultApiVersionStrategy implements ApiVersionStrategy {
 		return this.versionParser.parseVersion(version);
 	}
 
+	@Override
 	public void validateVersion(@Nullable Comparable<?> requestVersion, HttpServletRequest request)
 			throws MissingApiVersionException, InvalidApiVersionException {
 

spring-web/src/main/java/org/springframework/web/client/DefaultApiVersionInserterBuilder.java

@@ -84,6 +84,7 @@ final class DefaultApiVersionInserterBuilder implements ApiVersionInserter.Build
 		return this;
 	}
 
+	@Override
 	public ApiVersionInserter build() {
 		return new DefaultApiVersionInserter(
 				this.header, this.queryParam, this.mediaTypeParam, this.pathSegmentIndex,

spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java

@@ -389,6 +389,7 @@ public class StandardServletAsyncWebRequest extends ServletWebRequest implements
 			}
 		}
 
+		@Override
 		public void write(byte[] buf, int offset, int len) throws IOException {
 			int level = this.response.obtainLockOrRaiseException();
 			try {

spring-web/src/test/java/org/springframework/web/client/support/RestClientProxyRegistryIntegrationTests.java

@@ -117,6 +117,7 @@ public class RestClientProxyRegistryIntegrationTests {
 	void beansAreCreatedUsingBeanClassLoader() {
 		ClassLoader beanClassLoader = new OverridingClassLoader(getClass().getClassLoader()) {
 
+			@Override
 			protected boolean isEligibleForOverriding(String className) {
 				return className.contains("EchoA");
 			};

spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java

@@ -137,6 +137,7 @@ class WebAsyncManagerTests {
 	}
 
 	@Test // gh-30232
+	@SuppressWarnings("serial")
 	void startCallableProcessingSubmitException() throws Exception {
 		RuntimeException ex = new RuntimeException();
 

spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java

@@ -50,6 +50,7 @@ class OncePerRequestFilterTests {
 
 
 	@BeforeEach
+	@SuppressWarnings("serial")
 	public void setup() throws Exception {
 		this.request = new MockHttpServletRequest();
 		this.request.setScheme("http");

spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java

@@ -642,7 +642,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		sendRedirect(url, HttpServletResponse.SC_MOVED_TEMPORARILY, true);
 	}
 
-	// @Override - on Servlet 6.1
+	@Override
 	public void sendRedirect(String url, int sc, boolean clearBuffer) throws IOException {
 		Assert.state(!isCommitted(), "Cannot send redirect - response is already committed");
 		Assert.notNull(url, "Redirect URL must not be null");

spring-webflux/src/main/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategy.java

@@ -164,6 +164,7 @@ public class DefaultApiVersionStrategy implements ApiVersionStrategy {
 		return this.versionParser.parseVersion(version);
 	}
 
+	@Override
 	public void validateVersion(@Nullable Comparable<?> requestVersion, ServerWebExchange exchange)
 			throws MissingApiVersionException, InvalidApiVersionException {
 

spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java

@@ -693,7 +693,7 @@ class DefaultServerRequest implements ServerRequest {
 			throw new UnsupportedOperationException();
 		}
 
-		// @Override - on Servlet 6.1
+		@Override
 		public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException {
 			throw new UnsupportedOperationException();
 		}

spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java

@@ -222,6 +222,7 @@ public class HandlerMappingIntrospector
 	 * @throws NoHandlerFoundException if no handler matches the request
 	 * @since 6.2
 	 */
+	@Override
 	public void handlePreFlight(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		Assert.state(this.handlerMappings != null, "Not yet initialized via afterPropertiesSet.");
 		Assert.state(CorsUtils.isPreFlightRequest(request), "Not a pre-flight request.");

spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java

@@ -791,6 +791,7 @@ class DispatcherServletTests {
 		assertThat(servlet.getEnvironment()).isSameAs(env1);
 		assertThatIllegalArgumentException().isThrownBy(() -> servlet.setEnvironment(mock(Environment.class)));
 		class CustomServletEnvironment extends StandardServletEnvironment { }
+		@SuppressWarnings("serial")
 		DispatcherServlet custom = new DispatcherServlet() {
 			@Override
 			protected ConfigurableWebEnvironment createEnvironment() {

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java

@@ -439,6 +439,7 @@ class WebMvcConfigurationSupportExtensionTests {
 		}
 
 		@Override
+		@SuppressWarnings("serial")
 		public MessageCodesResolver getMessageCodesResolver() {
 			return new DefaultMessageCodesResolver() {
 				@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CglibProxyControllerTests.java

@@ -80,6 +80,7 @@ class CglibProxyControllerTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	private void initServlet(final Class<?> controllerClass) throws ServletException {
 		servlet = new DispatcherServlet() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyControllerTests.java

@@ -78,6 +78,7 @@ class JdkProxyControllerTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	private void initServlet(final Class<?> controllerclass) throws ServletException {
 		servlet = new DispatcherServlet() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java

@@ -67,6 +67,7 @@ public abstract class AbstractServletHandlerMethodTests {
 		return initDispatcherServlet(controllerClass, usePathPatterns, null);
 	}
 
+	@SuppressWarnings("serial")
 	WebApplicationContext initDispatcherServlet(
 			@Nullable Class<?> controllerClass, boolean usePathPatterns,
 			@Nullable ApplicationContextInitializer<GenericWebApplicationContext> initializer)

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java

@@ -1004,6 +1004,7 @@ class BindTagTests extends AbstractTagTests {
 		binder.registerCustomEditor(Date.class, l);
 		pc.getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "tb", binder.getBindingResult());
 
+		@SuppressWarnings("serial")
 		FormTag formTag = new FormTag() {
 			@Override
 			protected TagWriter createTagWriter() {

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java

@@ -31,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Juergen Hoeller
  * @author Alef Arendsen
  */
+@SuppressWarnings("serial")
 class HtmlEscapeTagTests extends AbstractTagTests {
 
 	@Test

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java

@@ -39,6 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Alef Arendsen
  * @author Nicholas Williams
  */
+@SuppressWarnings("serial")
 class MessageTagTests extends AbstractTagTests {
 
 	@Test

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java

@@ -85,6 +85,7 @@ class ButtonTagTests extends AbstractFormTagTests {
 		assertThat(output).as("Tag not opened properly").startsWith("<button ");
 	}
 
+	@SuppressWarnings("serial")
 	protected ButtonTag createTag(final Writer writer) {
 		return new ButtonTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java

@@ -54,6 +54,7 @@ class CheckboxTagTests extends AbstractFormTagTests {
 	private TestBean bean;
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new CheckboxTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java

@@ -62,6 +62,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 	private TestBean bean;
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new CheckboxesTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java

@@ -54,6 +54,7 @@ public class ErrorsTagTests extends AbstractFormTagTests {
 
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new ErrorsTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java

@@ -49,6 +49,7 @@ class FormTagTests extends AbstractHtmlElementTagTests {
 
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new FormTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java

@@ -35,6 +35,7 @@ class HiddenInputTagTests extends AbstractFormTagTests {
 	private TestBean bean;
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new HiddenInputTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java

@@ -395,6 +395,7 @@ class InputTagTests extends AbstractFormTagTests {
 		assertThat(output).as("Tag not opened properly").startsWith("<input ");
 	}
 
+	@SuppressWarnings("serial")
 	protected InputTag createTag(final Writer writer) {
 		return new InputTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java

@@ -38,6 +38,7 @@ class LabelTagTests extends AbstractFormTagTests {
 
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new LabelTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java

@@ -36,6 +36,7 @@ class OptionTagEnumTests extends AbstractHtmlElementTagTests {
 	private SelectTag parentTag;
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new OptionTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java

@@ -57,6 +57,7 @@ class OptionTagTests extends AbstractHtmlElementTagTests {
 	private SelectTag parentTag;
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new OptionTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java

@@ -60,6 +60,7 @@ class OptionsTagTests extends AbstractHtmlElementTagTests {
 	private OptionsTag tag;
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new OptionsTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java

@@ -46,6 +46,7 @@ class RadioButtonTagTests extends AbstractFormTagTests {
 	private TestBean bean;
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new RadioButtonTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java

@@ -58,6 +58,7 @@ public class RadioButtonsTagTests extends AbstractFormTagTests {
 	private TestBean bean;
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new RadioButtonsTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java

@@ -67,6 +67,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new SelectTag() {
 			@Override

spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java

@@ -37,6 +37,7 @@ class TextareaTagTests extends AbstractFormTagTests {
 	private TestBean rob;
 
 	@Override
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new TextareaTag() {
 			@Override