diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java index 872357efcf..3862d46408 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java @@ -72,12 +72,14 @@ public class AdvisedSupport extends ProxyConfig implements Advised { /** Package-protected to allow direct access for efficiency. */ + @SuppressWarnings("serial") TargetSource targetSource = EMPTY_TARGET_SOURCE; /** Whether the Advisors are already filtered for the specific target class. */ private boolean preFiltered = false; /** The AdvisorChainFactory to use. */ + @SuppressWarnings("serial") AdvisorChainFactory advisorChainFactory = new DefaultAdvisorChainFactory(); /** Cache with Method as key and advisor chain List as value. */ @@ -87,12 +89,14 @@ public class AdvisedSupport extends ProxyConfig implements Advised { * Interfaces to be implemented by the proxy. Held in List to keep the order * of registration, to create JDK proxy with specified order of interfaces. */ + @SuppressWarnings("serial") private List> interfaces = new ArrayList<>(); /** * List of Advisors. If an Advice is added, it will be wrapped * in an Advisor before being added to this List. */ + @SuppressWarnings("serial") private List advisors = new ArrayList<>(); diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java index 9a259b16a2..61b9e9fcbb 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java @@ -46,8 +46,10 @@ public class ComposablePointcut implements Pointcut, Serializable { /** use serialVersionUID from Spring 1.2 for interoperability. */ private static final long serialVersionUID = -2743223737633663832L; + @SuppressWarnings("serial") private ClassFilter classFilter; + @SuppressWarnings("serial") private MethodMatcher methodMatcher; diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java index 78c6d3abf6..743e4c7bc1 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java @@ -54,7 +54,7 @@ public abstract class AbstractBeanFactoryBasedTargetSource implements TargetSour /** Logger available to subclasses. */ - protected final Log logger = LogFactory.getLog(getClass()); + protected final transient Log logger = LogFactory.getLog(getClass()); /** Name of the target bean we will create on each invocation. */ private String targetBeanName; @@ -66,6 +66,7 @@ public abstract class AbstractBeanFactoryBasedTargetSource implements TargetSour * BeanFactory that owns this TargetSource. We need to hold onto this * reference so that we can create new prototype instances as necessary. */ + @SuppressWarnings("serial") private BeanFactory beanFactory; diff --git a/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java index 5d85f50438..5bfda76d8e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java @@ -42,6 +42,7 @@ public class HotSwappableTargetSource implements TargetSource, Serializable { /** The current target object. */ + @SuppressWarnings("serial") private Object target; diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java index 216b7c0648..5e1cafc1b6 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java @@ -42,6 +42,7 @@ public class SingletonTargetSource implements TargetSource, Serializable { /** Target cached and invoked using reflection. */ + @SuppressWarnings("serial") private final Object target; diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java index 24af32140c..d2dcf75ee9 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java @@ -71,7 +71,7 @@ public class PrototypeBasedTargetSourceTests { * Nonserializable test field to check that subclass * state can't prevent serialization from working */ - @SuppressWarnings("unused") + @SuppressWarnings({"unused", "serial"}) private TestBean thisFieldIsNotSerializable = new TestBean(); @Override diff --git a/spring-core/src/main/java/org/springframework/util/MimeType.java b/spring-core/src/main/java/org/springframework/util/MimeType.java index d428886082..30c115a000 100644 --- a/spring-core/src/main/java/org/springframework/util/MimeType.java +++ b/spring-core/src/main/java/org/springframework/util/MimeType.java @@ -102,6 +102,7 @@ public class MimeType implements Comparable, Serializable { private final String subtype; + @SuppressWarnings("serial") private final Map parameters; @Nullable diff --git a/spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java b/spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java index 067a64250a..72822fcf07 100644 --- a/spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java +++ b/spring-core/src/main/java/org/springframework/util/UnmodifiableMultiValueMap.java @@ -47,7 +47,7 @@ final class UnmodifiableMultiValueMap implements MultiValueMap, Serial private static final long serialVersionUID = -8697084563854098920L; - + @SuppressWarnings("serial") private final MultiValueMap delegate; @Nullable @@ -266,7 +266,7 @@ final class UnmodifiableMultiValueMap implements MultiValueMap, Serial private static final long serialVersionUID = 2407578793783925203L; - + @SuppressWarnings("serial") private final Set>> delegate; @@ -531,6 +531,7 @@ final class UnmodifiableMultiValueMap implements MultiValueMap, Serial private static final long serialVersionUID = 5518377583904339588L; + @SuppressWarnings("serial") private final Collection> delegate; diff --git a/spring-core/src/test/java/org/springframework/core/serializer/SerializationConverterTests.java b/spring-core/src/test/java/org/springframework/core/serializer/SerializationConverterTests.java index c383732ae0..7b75825d0c 100644 --- a/spring-core/src/test/java/org/springframework/core/serializer/SerializationConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/serializer/SerializationConverterTests.java @@ -71,7 +71,7 @@ class SerializationConverterTests { private static final long serialVersionUID = 1L; - @SuppressWarnings("unused") + @SuppressWarnings({"unused", "serial"}) private Object object; } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java index c399afa961..eaca52ef4b 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java @@ -67,11 +67,13 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet { /** use serialVersionUID from Spring 1.2 for interoperability. */ private static final long serialVersionUID = -4688694393146734764L; - + @SuppressWarnings("serial") private final ResultSet resultSet; + @SuppressWarnings("serial") private final SqlRowSetMetaData rowSetMetaData; + @SuppressWarnings("serial") private final Map columnLabelMap; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java b/spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java index 8fd2b3f94a..74eb829106 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java @@ -115,7 +115,7 @@ public class MessageHeaders implements Map, Serializable { @Nullable private static volatile IdGenerator idGenerator; - + @SuppressWarnings("serial") private final Map headers; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java index ea38f8f85f..e119e08215 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java @@ -104,6 +104,7 @@ public class StompHeaders implements MultiValueMap, Serializable public static final String RECEIPT_ID = "receipt-id"; + @SuppressWarnings("serial") private final Map> headers; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/ErrorMessage.java b/spring-messaging/src/main/java/org/springframework/messaging/support/ErrorMessage.java index d46df67cf9..c4ae07d424 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/support/ErrorMessage.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/support/ErrorMessage.java @@ -46,6 +46,7 @@ public class ErrorMessage extends GenericMessage { private static final long serialVersionUID = -5470210965279837728L; @Nullable + @SuppressWarnings("serial") private final Message originalMessage; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java b/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java index 62053d5edf..88595b61c4 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/support/GenericMessage.java @@ -38,7 +38,7 @@ public class GenericMessage implements Message, Serializable { private static final long serialVersionUID = 4268801052358035098L; - + @SuppressWarnings("serial") private final T payload; private final MessageHeaders headers; diff --git a/spring-messaging/src/test/java/org/springframework/messaging/protobuf/Msg.java b/spring-messaging/src/test/java/org/springframework/messaging/protobuf/Msg.java index 41784343ae..75488b17f9 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/protobuf/Msg.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/protobuf/Msg.java @@ -22,6 +22,7 @@ package org.springframework.messaging.protobuf; /** * Protobuf type {@code Msg} */ +@SuppressWarnings("serial") public final class Msg extends com.google.protobuf.GeneratedMessage implements MsgOrBuilder { diff --git a/spring-messaging/src/test/java/org/springframework/messaging/protobuf/SecondMsg.java b/spring-messaging/src/test/java/org/springframework/messaging/protobuf/SecondMsg.java index 5567d4e784..d2630a320d 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/protobuf/SecondMsg.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/protobuf/SecondMsg.java @@ -6,6 +6,7 @@ package org.springframework.messaging.protobuf; /** * Protobuf type {@code SecondMsg} */ +@SuppressWarnings("serial") public final class SecondMsg extends com.google.protobuf.GeneratedMessage implements SecondMsgOrBuilder { diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java index 3f6fec3f07..26e476fd71 100644 --- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java +++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java @@ -530,9 +530,9 @@ class DefaultDatabaseClient implements DatabaseClient { private static final long serialVersionUID = -8994138383301201380L; - final Connection connection; + final transient Connection connection; - final Function> closeFunction; + final transient Function> closeFunction; ConnectionCloseHolder(Connection connection, Function> closeFunction) { diff --git a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java index 57a15e7561..cee892eec8 100644 --- a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java +++ b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java @@ -84,6 +84,7 @@ public class MergedContextConfiguration implements Serializable { private final Class[] classes; + @SuppressWarnings("serial") private final Set>> contextInitializerClasses; private final String[] activeProfiles; @@ -92,11 +93,14 @@ public class MergedContextConfiguration implements Serializable { private final String[] propertySourceProperties; + @SuppressWarnings("serial") private final Set contextCustomizers; + @SuppressWarnings("serial") private final ContextLoader contextLoader; @Nullable + @SuppressWarnings("serial") private final CacheAwareContextLoaderDelegate cacheAwareContextLoaderDelegate; @Nullable diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java b/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java index 86ec4441be..c137275176 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java @@ -40,6 +40,7 @@ import org.springframework.util.StringUtils; * @author Rob Harrop * @since 4.0 */ +@SuppressWarnings("serial") public class DefaultTestContext implements TestContext { private static final long serialVersionUID = -5827157174866681233L; diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java index 8f508cf044..92e9cdec4e 100644 --- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java +++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java @@ -420,6 +420,7 @@ public class HttpHeaders implements MultiValueMap, Serializable }; + @SuppressWarnings("serial") final MultiValueMap headers; diff --git a/spring-web/src/main/java/org/springframework/http/ReadOnlyHttpHeaders.java b/spring-web/src/main/java/org/springframework/http/ReadOnlyHttpHeaders.java index 299ff406f9..2d95a9db16 100644 --- a/spring-web/src/main/java/org/springframework/http/ReadOnlyHttpHeaders.java +++ b/spring-web/src/main/java/org/springframework/http/ReadOnlyHttpHeaders.java @@ -43,6 +43,7 @@ class ReadOnlyHttpHeaders extends HttpHeaders { private MediaType cachedContentType; @Nullable + @SuppressWarnings("serial") private List cachedAccept; diff --git a/spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java b/spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java index f8747f0d7f..d74e4e2279 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java @@ -54,6 +54,7 @@ public class RestClientResponseException extends RestClientException { private final String responseCharset; @Nullable + @SuppressWarnings("serial") private Function bodyConvertFunction; 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 ce47aedbd8..99fc367686 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 @@ -36,7 +36,7 @@ public class UnknownContentTypeException extends RestClientException { private static final long serialVersionUID = 2759516676367274084L; - + @SuppressWarnings("serial") private final Type targetType; private final MediaType contentType; diff --git a/spring-web/src/test/java/org/springframework/protobuf/Msg.java b/spring-web/src/test/java/org/springframework/protobuf/Msg.java index 878d8392c4..4ea6bdcb61 100644 --- a/spring-web/src/test/java/org/springframework/protobuf/Msg.java +++ b/spring-web/src/test/java/org/springframework/protobuf/Msg.java @@ -22,6 +22,7 @@ package org.springframework.protobuf; /** * Protobuf type {@code Msg} */ +@SuppressWarnings("serial") public final class Msg extends com.google.protobuf.GeneratedMessage implements MsgOrBuilder { diff --git a/spring-web/src/test/java/org/springframework/protobuf/SecondMsg.java b/spring-web/src/test/java/org/springframework/protobuf/SecondMsg.java index efd418e346..dedeee4a55 100644 --- a/spring-web/src/test/java/org/springframework/protobuf/SecondMsg.java +++ b/spring-web/src/test/java/org/springframework/protobuf/SecondMsg.java @@ -6,6 +6,7 @@ package org.springframework.protobuf; /** * Protobuf type {@code SecondMsg} */ +@SuppressWarnings("serial") public final class SecondMsg extends com.google.protobuf.GeneratedMessage implements SecondMsgOrBuilder { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java index 55a135bba0..f09d6d8edf 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java @@ -52,6 +52,7 @@ public class WebClientResponseException extends WebClientException { private final HttpHeaders headers; @Nullable + @SuppressWarnings("serial") private final Charset responseCharset; @Nullable diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/Msg.java b/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/Msg.java index e6edc2648d..dd4d32df0b 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/Msg.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/Msg.java @@ -22,6 +22,7 @@ package org.springframework.web.reactive.protobuf; /** * Protobuf type {@code Msg} */ +@SuppressWarnings("serial") public final class Msg extends com.google.protobuf.GeneratedMessage implements MsgOrBuilder { diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/SecondMsg.java b/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/SecondMsg.java index 98b91f4550..480798a0a2 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/SecondMsg.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/SecondMsg.java @@ -6,6 +6,7 @@ package org.springframework.web.reactive.protobuf; /** * Protobuf type {@code SecondMsg} */ +@SuppressWarnings("serial") public final class SecondMsg extends com.google.protobuf.GeneratedMessage implements SecondMsgOrBuilder { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index 4b546a2a8f..6866eab072 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -2765,6 +2765,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Controller @RequestMapping("/myPath.do") + @SuppressWarnings("serial") static class MyParameterDispatchingController implements Serializable { private static final long serialVersionUID = 1L;