diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java index 2d63f21eb1a..f4cb9173abe 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java +++ b/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()}. + *

This method returns the same result as {@link #toDetailedString()}. * @see #getSimpleMessage() * @see java.lang.Throwable#getMessage() */ + @Override public String getMessage() { return toDetailedString(); } diff --git a/spring-jms/src/main/java/org/springframework/jms/core/DefaultJmsClient.java b/spring-jms/src/main/java/org/springframework/jms/core/DefaultJmsClient.java index ac8d13af801..06677d492e4 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/DefaultJmsClient.java +++ b/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); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/core/MessageSendingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/core/MessageSendingTemplateTests.java index d544ee1b824..89542bf4468 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/core/MessageSendingTemplateTests.java +++ b/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 headers = new HashMap<>() {{ put("key", "value"); }}; diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java index 338f235752d..928c1d52064 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBuilder.java +++ b/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); diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java index c2aa11fbb89..75db6c99eae 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java +++ b/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"); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClientBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClientBuilder.java index 484ebbf698a..86daf781231 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClientBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClientBuilder.java @@ -173,6 +173,7 @@ class DefaultRestTestClientBuilder> implemen this.mockMvcBuilder = mockMvcBuilder; } + @Override public T configureServer(Consumer consumer) { consumer.accept(this.mockMvcBuilder); return self(); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java index c59fdd5f8c1..59f02d7fcc5 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java +++ b/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 { diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java index 070f2eef9f5..e5fdb0aaaa7 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java +++ b/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) { diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkResponseCookieParser.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkResponseCookieParser.java index d162962a54e..d5d1ee4114b 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkResponseCookieParser.java +++ b/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 parse(String header) { Matcher matcher = SAME_SITE_PATTERN.matcher(header); String sameSite = (matcher.matches() ? matcher.group(1) : null); diff --git a/spring-web/src/main/java/org/springframework/web/accept/DefaultApiVersionStrategy.java b/spring-web/src/main/java/org/springframework/web/accept/DefaultApiVersionStrategy.java index bb65d4c0a31..070433f777f 100644 --- a/spring-web/src/main/java/org/springframework/web/accept/DefaultApiVersionStrategy.java +++ b/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 { diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultApiVersionInserterBuilder.java b/spring-web/src/main/java/org/springframework/web/client/DefaultApiVersionInserterBuilder.java index 5b8e6017620..b0e306d9cb6 100644 --- a/spring-web/src/main/java/org/springframework/web/client/DefaultApiVersionInserterBuilder.java +++ b/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, diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java index c28d1c2413a..5197e9971f8 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java +++ b/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 { diff --git a/spring-web/src/test/java/org/springframework/web/client/support/RestClientProxyRegistryIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/support/RestClientProxyRegistryIntegrationTests.java index 566196991e7..1d415f724c1 100644 --- a/spring-web/src/test/java/org/springframework/web/client/support/RestClientProxyRegistryIntegrationTests.java +++ b/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"); }; diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java index ef3270bda15..d38c3e73403 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java +++ b/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(); diff --git a/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java index 9eb2c80968e..ab2a206c527 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java +++ b/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"); diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java index 5e22d218f6c..f36bea5ef85 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java +++ b/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"); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategy.java index da7ce06b2dd..709e75c8026 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/accept/DefaultApiVersionStrategy.java +++ b/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 { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java index ca4e100bab8..2342b0ced90 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java +++ b/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(); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java index 239864b8bf7..47d28d847e1 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java +++ b/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."); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java index baf454092c6..f7a9e83b9ad 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java +++ b/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() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java index 8ab56bdafde..aaa55448b03 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java +++ b/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 diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CglibProxyControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CglibProxyControllerTests.java index 4edb671798d..17f25934314 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CglibProxyControllerTests.java +++ b/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 diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyControllerTests.java index 4f13168d513..06220f4ba44 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyControllerTests.java +++ b/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 diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java index 5236b0d7ccd..a2c66bd1a3c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java +++ b/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 initializer) diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java index 13d1012ee0f..a34ddcc7e97 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java +++ b/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() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java index a400d553c2b..a07a6b065c3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java +++ b/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 diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java index 65763704c6f..6db01e4fd5c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java +++ b/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 diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java index c79175ba4df..c4c3431fccb 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java +++ b/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("