From 731d5be6440a400aca2fb92c5c6d6b17d252879e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 18 Dec 2012 18:13:46 -0800 Subject: [PATCH 1/9] Fix warnings due to unused import statements --- .../java/org/springframework/beans/BeanWrapperImpl.java | 2 -- .../org/springframework/beans/DirectFieldAccessor.java | 1 - .../beans/factory/xml/DelegatingEntityResolverTests.java | 2 -- .../xml/SimpleConstructorNamespaceHandlerTests.java | 1 - .../beans/support/PagedListHolderTests.java | 8 -------- .../context/annotation/AutoProxyRegistrar.java | 1 - .../springframework/context/annotation/DependsOn.java | 1 - .../support/AbstractRefreshableApplicationContext.java | 1 - .../context/support/GenericApplicationContext.java | 1 - .../remoting/support/RemoteInvocationUtils.java | 2 -- .../scheduling/concurrent/ConcurrentTaskExecutor.java | 4 ---- .../aop/config/MethodLocatingFactoryBeanTests.java | 2 +- .../annotation/AnnotationScopeMetadataResolverTests.java | 1 - .../configuration/BeanMethodQualificationTests.java | 2 -- .../springframework/context/annotation5/OtherFooDao.java | 4 ---- .../context/event/EventPublicationInterceptorTests.java | 1 - .../export/assembler/AbstractMetadataAssemblerTests.java | 1 - .../InterfaceBasedMBeanInfoAssemblerCustomTests.java | 2 -- .../InterfaceBasedMBeanInfoAssemblerMappedTests.java | 2 -- .../mock/jndi/ExpectedLookupTemplate.java | 1 - .../concurrent/ScheduledExecutorFactoryBeanTests.java | 3 +++ .../scripting/support/ResourceScriptSourceTests.java | 3 +-- .../core/PrioritizedParameterNameDiscoverer.java | 1 - .../main/java/org/springframework/core/io/Resource.java | 1 - .../LocalVariableTableParameterNameDiscovererTests.java | 3 +-- .../core/type/CachingMetadataReaderLeakTest.java | 1 - .../util/xml/AbstractStaxXMLReaderTestCase.java | 1 - .../springframework/expression/spel/ast/AstUtils.java | 1 - .../org/springframework/jdbc/core/JdbcTemplateTests.java | 1 - .../CustomSQLExceptionTranslatorRegistrarTests.java | 3 --- .../AbstractPollingMessageListenerContainer.java | 1 - .../listener/adapter/MessageListenerAdapterTests.java | 1 - ...ResponsiveJmsTextMessageReturningMessageDelegate.java | 6 ------ .../orm/hibernate3/support/AbstractLobType.java | 5 ----- .../orm/ibatis/SqlMapClientOperations.java | 1 - .../mock/jndi/ExpectedLookupTemplate.java | 1 - .../orm/hibernate3/HibernateJtaTransactionTests.java | 1 - .../orm/hibernate3/support/OpenSessionInViewTests.java | 6 ------ .../ApplicationManagedEntityManagerIntegrationTests.java | 1 - .../ContainerManagedEntityManagerIntegrationTests.java | 1 - .../java/org/springframework/orm/jpa/domain/Person.java | 1 - ...bstractTransactionalDataSourceSpringContextTests.java | 1 - .../springframework/oxm/xmlbeans/XmlBeansMarshaller.java | 3 --- .../oxm/castor/CastorMarshallerTests.java | 1 - .../springframework/oxm/jaxb/Jaxb2MarshallerTests.java | 1 - .../jca/work/WorkManagerTaskExecutor.java | 1 - .../mock/jndi/ExpectedLookupTemplate.java | 1 - .../org/springframework/web/client/RestTemplate.java | 1 - .../web/filter/HttpPutFormContentFilter.java | 1 - .../web/filter/ShallowEtagHeaderFilter.java | 2 -- .../web/multipart/commons/CommonsMultipartFile.java | 3 --- .../java/org/springframework/web/util/UrlPathHelper.java | 1 - .../http/converter/FormHttpMessageConverterTests.java | 1 - .../http/converter/HttpMessageConverterTests.java | 9 --------- .../springframework/mock/web/test/MockMultipartFile.java | 3 --- .../mvc/annotation/DefaultAnnotationHandlerMapping.java | 2 -- .../org/springframework/mock/web/MockMultipartFile.java | 3 --- .../context/AbstractXmlWebApplicationContextTests.java | 3 --- .../web/portlet/context/PortletWebRequestTests.java | 1 - .../org/springframework/web/servlet/HttpServletBean.java | 1 - .../config/AnnotationDrivenBeanDefinitionParser.java | 1 - .../config/annotation/WebMvcConfigurationSupport.java | 1 - .../AbstractMessageConverterMethodArgumentResolver.java | 5 +---- .../method/annotation/RequestMappingHandlerAdapter.java | 1 - .../web/servlet/tags/form/AbstractHtmlElementTag.java | 1 - .../web/servlet/tags/form/OptionWriter.java | 6 ------ .../web/servlet/tags/form/OptionsTag.java | 2 -- .../view/tiles2/AbstractSpringPreparerFactory.java | 3 --- .../web/servlet/config/MvcNamespaceTests.java | 2 -- .../WebMvcConfigurationSupportExtensionTests.java | 2 -- .../handler/PathMatchingUrlHandlerMappingTests.java | 2 -- .../servlet/handler/SimpleUrlHandlerMappingTests.java | 2 -- .../web/servlet/mvc/WebContentInterceptorTests.java | 6 ------ .../condition/RequestMethodsRequestConditionTests.java | 5 ----- .../PathVariableMapMethodArgumentResolverTests.java | 1 - .../method/annotation/RequestPartIntegrationTests.java | 1 - .../RequestResponseBodyMethodProcessorMockTests.java | 5 ----- .../RequestResponseBodyMethodProcessorTests.java | 1 - .../springframework/web/servlet/tags/EvalTagTests.java | 1 - .../springframework/web/servlet/tags/UrlTagTests.java | 2 -- .../web/servlet/tags/form/FormTagTests.java | 3 --- 81 files changed, 7 insertions(+), 168 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java index 85d7fb00930..bac8df4ce6d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java @@ -19,7 +19,6 @@ package org.springframework.beans; import java.beans.PropertyChangeEvent; import java.beans.PropertyDescriptor; import java.lang.reflect.Array; -import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -41,7 +40,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.core.CollectionFactory; import org.springframework.core.GenericCollectionTypeResolver; -import org.springframework.core.MethodParameter; import org.springframework.core.convert.ConversionException; import org.springframework.core.convert.ConverterNotFoundException; import org.springframework.core.convert.Property; diff --git a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java index 4aafd433565..d7913aa9069 100644 --- a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java @@ -16,7 +16,6 @@ package org.springframework.beans; -import org.springframework.core.MethodParameter; import org.springframework.core.convert.ConversionException; import org.springframework.core.convert.ConverterNotFoundException; import org.springframework.core.convert.TypeDescriptor; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java index 59753651615..ec52dfaa8c7 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java @@ -16,8 +16,6 @@ package org.springframework.beans.factory.xml; -import junit.framework.TestCase; - import org.junit.Test; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java index 8cc4596a33d..173fe926421 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.springframework.beans.factory.BeanDefinitionStoreException; -import org.springframework.core.LocalVariableTableParameterNameDiscoverer; import org.springframework.core.io.ClassPathResource; import test.beans.DummyBean; diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java index 4e478abb6db..7050c656b97 100644 --- a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java @@ -17,17 +17,9 @@ package org.springframework.beans.support; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.Locale; -import java.util.Map; - import junit.framework.TestCase; -import org.springframework.beans.BeanWrapper; -import org.springframework.beans.BeanWrapperImpl; - import test.beans.TestBean; /** diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java b/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java index 804dbca526b..f166faac358 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java @@ -18,7 +18,6 @@ package org.springframework.context.annotation; import static org.springframework.context.annotation.MetadataUtils.attributesFor; -import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; diff --git a/spring-context/src/main/java/org/springframework/context/annotation/DependsOn.java b/spring-context/src/main/java/org/springframework/context/annotation/DependsOn.java index 4b05e14b287..88d06dc6c08 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/DependsOn.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/DependsOn.java @@ -20,7 +20,6 @@ import java.lang.annotation.Target; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Inherited; import java.lang.annotation.Documented; /** diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java index 9cbfcdddb0d..547f7519eec 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java @@ -24,7 +24,6 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextException; -import org.springframework.core.LocalVariableTableParameterNameDiscoverer; /** * Base class for {@link org.springframework.context.ApplicationContext} diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java index 83c6db1b522..a1e4fdababb 100644 --- a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.ApplicationContext; -import org.springframework.core.LocalVariableTableParameterNameDiscoverer; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.support.ResourcePatternResolver; diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java index 9649c2f99c0..7ed9e72b6e5 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java @@ -19,8 +19,6 @@ package org.springframework.remoting.support; import java.util.HashSet; import java.util.Set; -import org.springframework.core.JdkVersion; - /** * General utilities for handling remote invocations. * diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java index 10bb80bae62..bc9cf37b9f5 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java @@ -18,13 +18,9 @@ package org.springframework.scheduling.concurrent; import java.util.concurrent.Callable; import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.concurrent.FutureTask; -import java.util.concurrent.RejectedExecutionException; -import org.springframework.core.task.TaskRejectedException; import org.springframework.core.task.support.TaskExecutorAdapter; import org.springframework.scheduling.SchedulingTaskExecutor; diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java index 26c0f0cd3fe..7f5d93833fc 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java @@ -19,8 +19,8 @@ package org.springframework.aop.config; import java.lang.reflect.Method; import static org.easymock.EasyMock.*; -import org.junit.After; import static org.junit.Assert.*; +import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java index 7d31e003d02..8e8cf870959 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java @@ -16,7 +16,6 @@ package org.springframework.context.annotation; -import java.lang.annotation.Documented; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Retention; import java.lang.annotation.ElementType; diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java index 5e6fc1b125a..0db15b1d7fd 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanMethodQualificationTests.java @@ -24,12 +24,10 @@ import test.beans.TestBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import static org.hamcrest.CoreMatchers.*; diff --git a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java index 5434c4f4b5c..67f07601774 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java +++ b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java @@ -18,10 +18,6 @@ package org.springframework.context.annotation5; import example.scannable.FooDao; -import org.springframework.context.annotation.Lazy; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Repository; - /** * @author Juergen Hoeller */ diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java index 2d8d8f4bd05..b87a8c3ff78 100644 --- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java @@ -19,7 +19,6 @@ package org.springframework.context.event; import static org.easymock.EasyMock.*; import static org.junit.Assert.assertTrue; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java index bfbd928382f..9100215b83c 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java @@ -18,7 +18,6 @@ package org.springframework.jmx.export.assembler; import java.util.HashMap; import java.util.Map; -import java.util.Arrays; import javax.management.Descriptor; import javax.management.MBeanInfo; diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java index bb9dc939122..2e48d506107 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java @@ -19,8 +19,6 @@ package org.springframework.jmx.export.assembler; import javax.management.modelmbean.ModelMBeanAttributeInfo; import javax.management.modelmbean.ModelMBeanInfo; -import org.junit.Ignore; - /** * @author Rob Harrop */ diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java index d7db96a9618..666f877b807 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java @@ -22,8 +22,6 @@ import javax.management.MBeanAttributeInfo; import javax.management.modelmbean.ModelMBeanAttributeInfo; import javax.management.modelmbean.ModelMBeanInfo; -import org.junit.Ignore; - /** * @author Rob Harrop */ diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index f372307e58c..10ae6d42837 100644 --- a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import javax.naming.NamingException; -import org.springframework.core.CollectionFactory; import org.springframework.jndi.JndiTemplate; /** diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java index 5619cf1367d..b09bae9980e 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java @@ -31,6 +31,9 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.core.task.NoOpRunnable; +import static org.mockito.Mockito.*; + + /** * @author Rick Evans * @author Juergen Hoeller diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java index 1bcb119b096..d77ff160840 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java @@ -17,12 +17,11 @@ package org.springframework.scripting.support; import java.io.ByteArrayInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import junit.framework.TestCase; -import org.easymock.MockControl; +import org.easymock.MockControl; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; diff --git a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java index 0e522dacc88..de3da1b5407 100644 --- a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java +++ b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java @@ -18,7 +18,6 @@ package org.springframework.core; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; diff --git a/spring-core/src/main/java/org/springframework/core/io/Resource.java b/spring-core/src/main/java/org/springframework/core/io/Resource.java index ecd739fa98c..cc6eef308f7 100644 --- a/spring-core/src/main/java/org/springframework/core/io/Resource.java +++ b/spring-core/src/main/java/org/springframework/core/io/Resource.java @@ -18,7 +18,6 @@ package org.springframework.core.io; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.net.URI; import java.net.URL; diff --git a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java index 4239e38e29b..b346e6176bd 100644 --- a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java +++ b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java @@ -20,7 +20,6 @@ import java.awt.Component; import java.io.PrintStream; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import java.util.Arrays; import java.util.Date; import junit.framework.TestCase; @@ -317,4 +316,4 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { return date; } } -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java index c3cc1a806fe..63a7b9e6941 100644 --- a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java +++ b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java @@ -27,7 +27,6 @@ import org.springframework.core.io.UrlResource; import org.springframework.core.type.classreading.CachingMetadataReaderFactory; import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.core.type.classreading.SimpleMetadataReaderFactory; /** * Unit test checking the behaviour of {@link CachingMetadataReaderFactory under load. diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java index c4fe7632b5b..e2fec15d1ba 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java +++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java @@ -25,7 +25,6 @@ import javax.xml.stream.XMLStreamException; import org.easymock.AbstractMatcher; import org.easymock.MockControl; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java index 900270b62ea..7f5bdd6d6a6 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.springframework.expression.PropertyAccessor; -import org.springframework.expression.spel.ExpressionState; /** * Utilities methods for use in the Ast classes. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java index 636a2348592..62d3c66cf4e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java @@ -26,7 +26,6 @@ import java.sql.SQLWarning; import java.sql.Statement; import java.sql.Types; import java.util.ArrayList; -import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrarTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrarTests.java index 21ed920479e..1b3bbd75eaa 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrarTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrarTests.java @@ -17,9 +17,6 @@ package org.springframework.jdbc.support; import java.sql.SQLException; -import java.util.HashMap; -import java.util.Map; - import org.junit.Before; import org.junit.Test; diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java index d1d6ab289a9..e899ca12cde 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java @@ -24,7 +24,6 @@ import javax.jms.MessageConsumer; import javax.jms.Session; import javax.jms.Topic; -import org.springframework.beans.factory.BeanNameAware; import org.springframework.jms.connection.ConnectionFactoryUtils; import org.springframework.jms.connection.JmsResourceHolder; import org.springframework.jms.connection.SingleConnectionFactory; diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java index 59838f8136f..a1e6e3dc711 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java @@ -33,7 +33,6 @@ import javax.jms.QueueSession; import javax.jms.Session; import javax.jms.TextMessage; -import junit.framework.TestCase; import org.easymock.MockControl; import org.junit.Test; diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java index ffa07f4f294..3bd333d3b37 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java @@ -17,12 +17,6 @@ package org.springframework.jms.listener.adapter; import javax.jms.TextMessage; -import javax.jms.MapMessage; -import javax.jms.BytesMessage; -import javax.jms.ObjectMessage; - -import java.util.Map; -import java.io.Serializable; /** * See the MessageListenerAdapterTests class for usage. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java index 2cf7e05a0a0..93620c30af4 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java @@ -22,7 +22,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import javax.transaction.Status; import javax.transaction.TransactionManager; import org.apache.commons.logging.Log; @@ -31,14 +30,10 @@ import org.hibernate.HibernateException; import org.hibernate.usertype.UserType; import org.hibernate.util.EqualsHelper; -import org.springframework.dao.DataAccessResourceFailureException; -import org.springframework.jdbc.support.lob.JtaLobCreatorSynchronization; import org.springframework.jdbc.support.lob.LobCreator; import org.springframework.jdbc.support.lob.LobHandler; -import org.springframework.jdbc.support.lob.SpringLobCreatorSynchronization; import org.springframework.jdbc.support.lob.LobCreatorUtils; import org.springframework.orm.hibernate3.LocalSessionFactoryBean; -import org.springframework.transaction.support.TransactionSynchronizationManager; /** * Abstract base class for Hibernate UserType implementations that map to LOBs. diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java index 91ac466c5b2..5dd0b4c6075 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java +++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java @@ -19,7 +19,6 @@ package org.springframework.orm.ibatis; import java.util.List; import java.util.Map; -import com.ibatis.common.util.PaginatedList; import com.ibatis.sqlmap.client.event.RowHandler; import org.springframework.dao.DataAccessException; diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index f372307e58c..10ae6d42837 100644 --- a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import javax.naming.NamingException; -import org.springframework.core.CollectionFactory; import org.springframework.jndi.JndiTemplate; /** diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java index 76f05bbf687..5b84f9a6f00 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java @@ -40,7 +40,6 @@ import org.hibernate.SessionFactory; import org.hibernate.classic.Session; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.junit.Ignore; import org.junit.Test; import org.springframework.dao.DataAccessException; import org.springframework.transaction.MockJtaTransaction; diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java index 2c7c2d4f8aa..e0273f10742 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java @@ -17,12 +17,6 @@ package org.springframework.orm.hibernate3.support; import static org.easymock.EasyMock.*; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.createStrictMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.reset; -import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java index fb5b06616e4..e82060c9a05 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java @@ -23,7 +23,6 @@ import javax.persistence.EntityManager; import javax.persistence.Query; import javax.persistence.TransactionRequiredException; -import org.springframework.aop.support.AopUtils; import org.springframework.orm.jpa.domain.Person; import org.springframework.orm.jpa.AbstractEntityManagerFactoryIntegrationTests; import org.springframework.test.annotation.NotTransactional; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java index eeb89a614d6..9d9ac1bb804 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java @@ -24,7 +24,6 @@ import javax.persistence.PersistenceException; import javax.persistence.Query; import javax.persistence.TransactionRequiredException; -import org.springframework.aop.support.AopUtils; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.PersistenceExceptionTranslator; import org.springframework.orm.jpa.domain.Person; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java index 5e5e7f917f4..4c5ba65c63a 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java @@ -25,7 +25,6 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; -import javax.persistence.Table; import org.springframework.beans.TestBean; import org.springframework.beans.factory.annotation.Configurable; diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java index b3bdb4d9aaa..f159866bc06 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java @@ -29,7 +29,6 @@ import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.jdbc.JdbcTestUtils; -import org.springframework.util.StringUtils; /** * Subclass of AbstractTransactionalSpringContextTests that adds some convenience diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java index 2be053ad5fc..6d9604dde84 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java @@ -21,7 +21,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; import java.io.Writer; -import java.io.FilterInputStream; import java.util.ArrayList; import java.util.List; import java.lang.ref.WeakReference; @@ -38,8 +37,6 @@ import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; import org.apache.xmlbeans.XmlSaxHandler; import org.apache.xmlbeans.XmlValidationError; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java index ea3b9e3c8cf..0c574a4df15 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java @@ -28,7 +28,6 @@ import org.custommonkey.xmlunit.SimpleNamespaceContext; import org.custommonkey.xmlunit.XMLUnit; import org.custommonkey.xmlunit.XpathEngine; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java index 1471b5fd410..a550a4daedb 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java @@ -52,7 +52,6 @@ import org.springframework.util.ReflectionUtils; import static org.custommonkey.xmlunit.XMLAssert.assertFalse; import static org.custommonkey.xmlunit.XMLAssert.*; -import static org.custommonkey.xmlunit.XMLAssert.fail; import static org.easymock.EasyMock.*; import static org.junit.Assert.assertTrue; diff --git a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java index 6f174ca7172..c6f4cb4c4e3 100644 --- a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java +++ b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java @@ -29,7 +29,6 @@ import javax.resource.spi.work.WorkManager; import javax.resource.spi.work.WorkRejectedException; import org.springframework.beans.factory.InitializingBean; -import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.core.task.TaskRejectedException; import org.springframework.core.task.TaskTimeoutException; import org.springframework.jca.context.BootstrapContextAware; diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index f372307e58c..10ae6d42837 100644 --- a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import javax.naming.NamingException; -import org.springframework.core.CollectionFactory; import org.springframework.jndi.JndiTemplate; /** diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java index a7f0350f381..1ddf80fa5f6 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java @@ -48,7 +48,6 @@ import org.springframework.http.converter.json.MappingJacksonHttpMessageConverte import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; -import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.web.util.UriTemplate; diff --git a/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java index 51d2b60fe7a..efeab78ce19 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java @@ -39,7 +39,6 @@ import org.springframework.http.HttpInputMessage; import org.springframework.http.MediaType; import org.springframework.http.converter.FormHttpMessageConverter; import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; -import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; diff --git a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java index 37d21f1aab7..700e524a9f2 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/ShallowEtagHeaderFilter.java @@ -32,8 +32,6 @@ import javax.servlet.http.HttpServletResponseWrapper; import org.springframework.util.Assert; import org.springframework.util.DigestUtils; import org.springframework.util.FileCopyUtils; -import org.springframework.web.context.request.async.WebAsyncManager; -import org.springframework.web.context.request.async.WebAsyncUtils; import org.springframework.web.util.WebUtils; /** diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java index 91c26212fad..28efebe6c85 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java @@ -21,9 +21,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; -import java.util.Collections; -import java.util.Iterator; - import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.disk.DiskFileItem; diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java index 6d6ef4b44a7..ea8382ee019 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java +++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java @@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.util.Assert; import org.springframework.util.StringUtils; /** diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java index 7293a4690c3..0771b1f4c73 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java @@ -41,7 +41,6 @@ import org.springframework.http.MediaType; import org.springframework.http.MockHttpInputMessage; import org.springframework.http.MockHttpOutputMessage; import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; -import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; diff --git a/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java index e3c5072f1bb..803bd80d240 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java @@ -17,15 +17,6 @@ package org.springframework.http.converter; import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import javax.xml.namespace.QName; - import static org.junit.Assert.*; import org.junit.Test; diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java index 5a556d145ab..c9bf0742967 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java @@ -20,9 +20,6 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.Collections; -import java.util.Iterator; - import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java index 1d0d32d3f22..7558a92bec7 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java @@ -18,10 +18,8 @@ package org.springframework.web.portlet.mvc.annotation; import java.lang.reflect.Method; import java.util.Arrays; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; -import java.util.Map; import java.util.Set; import javax.portlet.ActionRequest; import javax.portlet.ClientDataRequest; diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java index 24518968c38..f71992aed7e 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java @@ -20,9 +20,6 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.Collections; -import java.util.Iterator; - import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java index 4c9447b34ba..98f3b178582 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java @@ -16,7 +16,6 @@ package org.springframework.web.portlet.context; -import java.util.Locale; import javax.servlet.ServletException; import org.springframework.beans.TestBean; @@ -24,10 +23,8 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.AbstractApplicationContextTests; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.NoSuchMessageException; import org.springframework.context.TestListener; import org.springframework.web.context.ConfigurableWebApplicationContext; -import org.springframework.web.context.support.XmlWebApplicationContext; /** * Should ideally be eliminated. Copied when splitting .testsuite up into individual bundles. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java index f1a92dd1701..5ae98802923 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java @@ -30,7 +30,6 @@ import static org.junit.Assert.*; import org.junit.Test; import org.springframework.mock.web.portlet.MockPortletRequest; -import org.springframework.mock.web.portlet.MockPortletResponse; import org.springframework.mock.web.portlet.MockRenderRequest; import org.springframework.mock.web.portlet.MockRenderResponse; import org.springframework.web.multipart.MultipartRequest; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java index eadec870221..044b56d2aea 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java @@ -35,7 +35,6 @@ import org.springframework.beans.PropertyAccessorFactory; import org.springframework.beans.PropertyValue; import org.springframework.beans.PropertyValues; import org.springframework.context.EnvironmentAware; -import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Environment; import org.springframework.core.env.EnvironmentCapable; import org.springframework.core.io.Resource; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java index a13aeacf4d0..9d409a3fec5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java @@ -42,7 +42,6 @@ import org.springframework.http.converter.json.MappingJacksonHttpMessageConverte import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; -import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.util.ClassUtils; import org.springframework.util.xml.DomUtils; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java index 8e45b4dcf11..e85f1891260 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java @@ -49,7 +49,6 @@ import org.springframework.http.converter.json.MappingJacksonHttpMessageConverte import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; -import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.util.ClassUtils; import org.springframework.validation.Errors; import org.springframework.validation.MessageCodesResolver; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java index b462214e024..48d2d30788c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java @@ -17,9 +17,6 @@ package org.springframework.web.servlet.mvc.method.annotation; import java.io.IOException; -import java.lang.reflect.Array; -import java.lang.reflect.GenericArrayType; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.util.ArrayList; @@ -163,4 +160,4 @@ public abstract class AbstractMessageConverterMethodArgumentResolver implements return new ServletServerHttpRequest(servletRequest); } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java index f4bb235b093..d79a9ef5db0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java @@ -47,7 +47,6 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.http.converter.xml.SourceHttpMessageConverter; -import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.ui.ModelMap; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java index 90e441c0066..658ea25b7e2 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java @@ -21,7 +21,6 @@ import java.util.Map; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.DynamicAttributes; -import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java index 3f7c6a8614b..1c47096591e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java @@ -20,18 +20,12 @@ import java.beans.PropertyEditor; import java.util.Collection; import java.util.Map; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; - import org.springframework.beans.BeanWrapper; import org.springframework.beans.PropertyAccessorFactory; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.web.servlet.support.BindStatus; -import org.springframework.web.servlet.support.RequestDataValueProcessor; -import org.springframework.web.servlet.support.RequestContext; /** * Provides supporting functionality to render a list of '{@code option}' diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java index e57b0ea6773..ac75e9998e0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java @@ -17,8 +17,6 @@ package org.springframework.web.servlet.tags.form; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.TagSupport; - import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java index 776032c42b1..84fe7d1d030 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java @@ -20,10 +20,7 @@ import org.apache.tiles.TilesException; import org.apache.tiles.context.TilesRequestContext; import org.apache.tiles.preparer.PreparerFactory; import org.apache.tiles.preparer.ViewPreparer; -import org.apache.tiles.servlet.context.ServletTilesRequestContext; - import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; import org.springframework.web.servlet.DispatcherServlet; /** diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index 639d503d0e0..9ced7b5ddd9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -30,8 +30,6 @@ import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Locale; -import java.util.Map; - import javax.servlet.RequestDispatcher; import javax.validation.constraints.NotNull; 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 b5a4ca51a71..c14ad7735ca 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 @@ -21,8 +21,6 @@ import static org.junit.Assert.assertNotNull; import java.util.Arrays; import java.util.List; -import java.util.Map; - import org.junit.Before; import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java index 3be63ed6bc2..25b8d4a7ded 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java @@ -16,8 +16,6 @@ package org.springframework.web.servlet.handler; -import junit.framework.TestCase; - import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.mock.web.test.MockServletContext; import org.springframework.web.context.ConfigurableWebApplicationContext; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java index e2d017609d4..e2d2e695a3d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java @@ -19,8 +19,6 @@ package org.springframework.web.servlet.handler; import java.util.Map; import java.util.LinkedHashMap; -import junit.framework.TestCase; - import org.springframework.beans.FatalBeanException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.mock.web.test.MockHttpServletRequest; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java index 73528894df1..61321e11f26 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java @@ -19,21 +19,15 @@ package org.springframework.web.servlet.mvc; import java.util.List; import java.util.Properties; -import junit.framework.TestCase; - import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.mock.web.test.MockHttpServletResponse; import org.springframework.web.servlet.support.WebContentGenerator; import org.junit.Before; import org.junit.Test; -import org.junit.Assert; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.*; -import static org.junit.Assert.*; -import static org.junit.Assert.*; -import static org.junit.Assert.*; /** * @author Rick Evans diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java index 97f7768dfff..d198523e85b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java @@ -17,11 +17,6 @@ package org.springframework.web.servlet.mvc.condition; import static org.junit.Assert.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import org.junit.Test; import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java index f991d2859c8..9a5bc84a6e5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java @@ -30,7 +30,6 @@ import org.junit.Test; import org.springframework.core.MethodParameter; import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.mock.web.test.MockHttpServletResponse; -import org.springframework.web.bind.ServletRequestBindingException; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.support.ModelAndViewContainer; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java index 315bfec3fc5..43c8c22dd6d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java @@ -42,7 +42,6 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.ResourceHttpMessageConverter; import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; -import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.stereotype.Controller; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java index f26fa8bb284..85ab677a0a7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java @@ -32,7 +32,6 @@ import static org.junit.Assert.fail; import java.io.IOException; import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -46,11 +45,7 @@ import org.springframework.core.MethodParameter; import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpOutputMessage; import org.springframework.http.MediaType; -import org.springframework.http.converter.ByteArrayHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.HttpMessageNotReadableException; -import org.springframework.http.converter.StringHttpMessageConverter; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.mock.web.test.MockHttpServletResponse; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java index 4e99948e4f2..e42a2aa9679 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java @@ -33,7 +33,6 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; -import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter; import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.mock.web.test.MockHttpServletResponse; import org.springframework.util.MultiValueMap; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java index a8a3167c56e..9dbbf6416f2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java @@ -24,7 +24,6 @@ import javax.servlet.jsp.tagext.Tag; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.env.MapPropertySource; -import org.springframework.core.env.PropertySource; import org.springframework.format.annotation.NumberFormat; import org.springframework.format.annotation.NumberFormat.Style; import org.springframework.format.support.FormattingConversionServiceFactoryBean; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java index 85839b405ff..3937e95dc10 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java @@ -16,9 +16,7 @@ package org.springframework.web.servlet.tags; -import java.io.UnsupportedEncodingException; import java.lang.reflect.Method; -import java.net.URLDecoder; import java.util.HashSet; import java.util.LinkedList; import java.util.List; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java index 81710ed789a..70cb210e801 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java @@ -16,7 +16,6 @@ package org.springframework.web.servlet.tags.form; -import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @@ -27,8 +26,6 @@ import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.Tag; import org.springframework.mock.web.test.MockHttpServletRequest; -import org.springframework.web.context.support.StaticWebApplicationContext; -import org.springframework.web.servlet.support.RequestContextUtils; import org.springframework.web.servlet.support.RequestDataValueProcessor; /** From 7f0aa5cfb2f4e332ac821d3d25a7fc8dd8618c3a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 19 Dec 2012 14:40:17 -0800 Subject: [PATCH 2/9] Fix [varargs] compiler warnings Remove unnecessary 'null' argument from calls to vararg supported methods and fix cast in ValidationUtils.invokeValidator(). --- .../support/security/CallbacksSecurityTests.java | 4 ++-- .../validation/ValidationUtils.java | 2 +- .../MethodExclusionMBeanInfoAssemblerTests.java | 2 +- ...lVariableTableParameterNameDiscovererTests.java | 4 ++-- .../core/style/ToStringCreatorTests.java | 2 +- .../org/springframework/util/ClassUtilsTests.java | 14 +++++++------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java index ea14f4c875e..cac02472cab 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java @@ -314,14 +314,14 @@ public class CallbacksSecurityTests { } final CustomCallbackBean bean = new CustomCallbackBean(); - final Method method = bean.getClass().getMethod("destroy", null); + final Method method = bean.getClass().getMethod("destroy"); method.setAccessible(true); try { AccessController.doPrivileged(new PrivilegedExceptionAction() { public Object run() throws Exception { - method.invoke(bean, null); + method.invoke(bean); return null; } }, acc); diff --git a/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java b/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java index 07d14c681f7..0e5004e5bd9 100644 --- a/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java +++ b/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java @@ -52,7 +52,7 @@ public abstract class ValidationUtils { * the validation of the supplied object's type */ public static void invokeValidator(Validator validator, Object obj, Errors errors) { - invokeValidator(validator, obj, errors, (Class[]) null); + invokeValidator(validator, obj, errors, (Object[]) null); } /** diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java index 3363f4f5853..2370488f80c 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java @@ -72,7 +72,7 @@ public class MethodExclusionMBeanInfoAssemblerTests extends AbstractJmxAssembler Properties ignored = new Properties(); ignored.setProperty(beanKey, "dontExposeMe,setSuperman"); assembler.setIgnoredMethodMappings(ignored); - Method method = JmxTestBean.class.getMethod("dontExposeMe", null); + Method method = JmxTestBean.class.getMethod("dontExposeMe"); assertFalse(assembler.isNotIgnored(method, beanKey)); // this bean does not have any ignored methods on it, so must obviously not be ignored... assertTrue(assembler.isNotIgnored(method, "someOtherBeanKey")); diff --git a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java index b346e6176bd..da27d69e71b 100644 --- a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java +++ b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java @@ -185,7 +185,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { assertEquals("x", names[1]); assertEquals("i", names[2]); - m = clazz.getMethod("getDate", null); + m = clazz.getMethod("getDate"); names = discoverer.getParameterNames(m); assertEquals(0, names.length); @@ -202,7 +202,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { Class clazz = Component.class; String methodName = "list"; - Method m = clazz.getMethod(methodName, null); + Method m = clazz.getMethod(methodName); String[] names = discoverer.getParameterNames(m); assertNull(names); diff --git a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java index 928486b3962..f8db4e7fd9e 100644 --- a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java @@ -111,7 +111,7 @@ public class ToStringCreatorTests extends TestCase { } public void testMethod() throws Exception { - String str = new ToStringCreator(this).append("myMethod", this.getClass().getMethod("testMethod", null)) + String str = new ToStringCreator(this).append("myMethod", this.getClass().getMethod("testMethod")) .toString(); assertEquals("[ToStringCreatorTests@" + ObjectUtils.getIdentityHexString(this) + " myMethod = testMethod@ToStringCreatorTests]", str); diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java index 64a24084ba0..8b7fdff79ae 100644 --- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java @@ -171,14 +171,14 @@ public class ClassUtilsTests extends TestCase { } public void testHasMethod() throws Exception { - assertTrue(ClassUtils.hasMethod(Collection.class, "size", null)); - assertTrue(ClassUtils.hasMethod(Collection.class, "remove", new Class[] {Object.class})); - assertFalse(ClassUtils.hasMethod(Collection.class, "remove", null)); - assertFalse(ClassUtils.hasMethod(Collection.class, "someOtherMethod", null)); + assertTrue(ClassUtils.hasMethod(Collection.class, "size")); + assertTrue(ClassUtils.hasMethod(Collection.class, "remove", Object.class)); + assertFalse(ClassUtils.hasMethod(Collection.class, "remove")); + assertFalse(ClassUtils.hasMethod(Collection.class, "someOtherMethod")); } public void testGetMethodIfAvailable() throws Exception { - Method method = ClassUtils.getMethodIfAvailable(Collection.class, "size", null); + Method method = ClassUtils.getMethodIfAvailable(Collection.class, "size"); assertNotNull(method); assertEquals("size", method.getName()); @@ -186,8 +186,8 @@ public class ClassUtilsTests extends TestCase { assertNotNull(method); assertEquals("remove", method.getName()); - assertNull(ClassUtils.getMethodIfAvailable(Collection.class, "remove", null)); - assertNull(ClassUtils.getMethodIfAvailable(Collection.class, "someOtherMethod", null)); + assertNull(ClassUtils.getMethodIfAvailable(Collection.class, "remove")); + assertNull(ClassUtils.getMethodIfAvailable(Collection.class, "someOtherMethod")); } public void testGetMethodCountForName() { From b0986049a3ef78b9901fd37a42b9d481a899d72f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 19 Dec 2012 14:35:57 -0800 Subject: [PATCH 3/9] Fix [serial] compiler warnings Fix serialization warnings by applying @SuppressWarnings("serial") when appropriate. In certain cases and for unknown reasons, a correctly-placed @SuppressWarnings("serial") annotation will fix the warning at the javac level (i.e. the Gradle command-line), but will produce an "unnecessary @SuppressWarnings" warning within Eclipse. In these cases, a private static final serialVersionUID field has been added with the default value of 1L. --- .../aop/AopInvocationException.java | 1 + .../springframework/aop/TrueClassFilter.java | 1 + .../aop/TrueMethodMatcher.java | 1 + .../org/springframework/aop/TruePointcut.java | 1 + .../AspectJAdviceParameterNameDiscoverer.java | 1 + .../aspectj/AspectJExpressionPointcut.java | 1 + .../AspectJExpressionPointcutAdvisor.java | 1 + ...nnotationAwareAspectJAutoProxyCreator.java | 1 + .../annotation/AspectJProxyFactory.java | 1 + .../annotation/NotAnAtAspectException.java | 1 + .../AspectJAwareAdvisorAutoProxyCreator.java | 1 + .../AbstractAdvisingBeanPostProcessor.java | 1 + .../aop/framework/AopConfigException.java | 1 + .../framework/DefaultAdvisorChainFactory.java | 1 + .../aop/framework/DefaultAopProxyFactory.java | 1 + .../aop/framework/ProxyCreatorSupport.java | 1 + .../aop/framework/ProxyFactory.java | 1 + .../aop/framework/ProxyFactoryBean.java | 1 + .../adapter/AfterReturningAdviceAdapter.java | 1 + .../AfterReturningAdviceInterceptor.java | 1 + .../DefaultAdvisorAdapterRegistry.java | 1 + .../adapter/MethodBeforeAdviceAdapter.java | 1 + .../MethodBeforeAdviceInterceptor.java | 1 + .../adapter/ThrowsAdviceAdapter.java | 1 + .../adapter/UnknownAdviceTypeException.java | 1 + .../AbstractAdvisorAutoProxyCreator.java | 1 + .../autoproxy/AbstractAutoProxyCreator.java | 1 + .../autoproxy/BeanNameAutoProxyCreator.java | 1 + .../DefaultAdvisorAutoProxyCreator.java | 1 + ...InfrastructureAdvisorAutoProxyCreator.java | 1 + .../AbstractMonitoringInterceptor.java | 1 + .../interceptor/AbstractTraceInterceptor.java | 1 + .../ConcurrencyThrottleInterceptor.java | 1 + .../CustomizableTraceInterceptor.java | 1 + .../aop/interceptor/DebugInterceptor.java | 1 + .../interceptor/ExposeBeanNameAdvisors.java | 1 + .../ExposeInvocationInterceptor.java | 1 + .../JamonPerformanceMonitorInterceptor.java | 1 + .../PerformanceMonitorInterceptor.java | 1 + .../interceptor/SimpleTraceInterceptor.java | 1 + .../aop/scope/DefaultScopedObject.java | 1 + .../aop/scope/ScopedProxyFactoryBean.java | 1 + .../AbstractBeanFactoryPointcutAdvisor.java | 1 + .../support/AbstractExpressionPointcut.java | 1 + .../AbstractGenericPointcutAdvisor.java | 1 + .../aop/support/AbstractPointcutAdvisor.java | 1 + .../support/AbstractRegexpMethodPointcut.java | 1 + .../aop/support/ClassFilters.java | 2 ++ .../aop/support/ControlFlowPointcut.java | 1 + .../DefaultBeanFactoryPointcutAdvisor.java | 1 + .../aop/support/DefaultPointcutAdvisor.java | 1 + ...erTargetObjectIntroductionInterceptor.java | 1 + .../DelegatingIntroductionInterceptor.java | 1 + .../aop/support/IntroductionInfoSupport.java | 1 + .../aop/support/JdkRegexpMethodPointcut.java | 1 + .../aop/support/MethodMatchers.java | 3 +++ .../aop/support/NameMatchMethodPointcut.java | 1 + .../NameMatchMethodPointcutAdvisor.java | 1 + .../aop/support/Pointcuts.java | 2 ++ .../support/RegexpMethodPointcutAdvisor.java | 1 + .../aop/support/RootClassFilter.java | 1 + .../aop/target/CommonsPoolTargetSource.java | 2 ++ .../aop/target/LazyInitTargetSource.java | 1 + .../aop/target/PrototypeTargetSource.java | 2 ++ .../aop/target/SimpleBeanTargetSource.java | 1 + .../aop/target/ThreadLocalTargetSource.java | 2 ++ .../TrickyAspectJPointcutExpressionTests.java | 1 + .../aop/target/LazyInitTargetSourceTests.java | 1 + .../PrototypeBasedTargetSourceTests.java | 4 +++- .../org/springframework/beans/Colour.java | 3 ++- .../beans/DerivedTestBean.java | 3 ++- .../aspectj/AbstractBeanConfigurerTests.java | 9 +++++++++ .../CallCountingTransactionManager.java | 1 + .../beans/BeanInstantiationException.java | 1 + .../beans/BeanMetadataAttributeAccessor.java | 1 + .../springframework/beans/BeansException.java | 1 + .../ConversionNotSupportedException.java | 1 + .../beans/FatalBeanException.java | 1 + .../beans/InvalidPropertyException.java | 1 + .../beans/MethodInvocationException.java | 1 + .../beans/MutablePropertyValues.java | 1 + .../beans/NotReadablePropertyException.java | 1 + .../beans/NotWritablePropertyException.java | 1 + .../beans/NullValueInNestedPathException.java | 1 + .../beans/PropertyAccessException.java | 1 + .../beans/PropertyBatchUpdateException.java | 1 + .../springframework/beans/PropertyValue.java | 1 + .../beans/TypeMismatchException.java | 1 + .../beans/factory/BeanCreationException.java | 1 + .../BeanCreationNotAllowedException.java | 1 + .../BeanCurrentlyInCreationException.java | 1 + .../factory/BeanDefinitionStoreException.java | 1 + .../factory/BeanExpressionException.java | 3 ++- .../factory/BeanInitializationException.java | 1 + .../factory/BeanIsAbstractException.java | 1 + .../factory/BeanIsNotAFactoryException.java | 1 + .../BeanNotOfRequiredTypeException.java | 1 + .../factory/CannotLoadBeanClassException.java | 1 + .../FactoryBeanNotInitializedException.java | 1 + .../UnsatisfiedDependencyException.java | 1 + .../factory/access/BootstrapException.java | 1 + .../factory/config/DependencyDescriptor.java | 1 + .../ObjectFactoryCreatingFactoryBean.java | 1 + .../config/ProviderCreatingFactoryBean.java | 1 + .../BeanDefinitionParsingException.java | 1 + .../AbstractAutowireCapableBeanFactory.java | 1 + .../support/AbstractBeanDefinition.java | 1 + .../support/AutowireCandidateQualifier.java | 1 + .../beans/factory/support/AutowireUtils.java | 1 + .../BeanDefinitionValidationException.java | 1 + .../factory/support/ChildBeanDefinition.java | 1 + .../support/DefaultListableBeanFactory.java | 4 +--- .../support/GenericBeanDefinition.java | 1 + .../beans/factory/support/ManagedArray.java | 1 + .../beans/factory/support/ManagedList.java | 1 + .../beans/factory/support/ManagedMap.java | 1 + .../factory/support/ManagedProperties.java | 1 + .../beans/factory/support/ManagedSet.java | 1 + .../factory/support/RootBeanDefinition.java | 1 + .../xml/XmlBeanDefinitionStoreException.java | 1 + .../beans/factory/xml/XmlBeanFactory.java | 1 + .../beans/support/MutableSortDefinition.java | 1 + .../beans/support/PagedListHolder.java | 1 + .../beans/BeanWrapperTests.java | 1 + ...wiredAnnotationBeanPostProcessorTests.java | 1 + ...njectAnnotationBeanPostProcessorTests.java | 6 ++++++ ...DefinitionMetadataEqualsHashCodeTests.java | 2 ++ .../xml/ConstructorDependenciesBean.java | 1 + .../src/test/java/test/beans/Colour.java | 3 ++- .../test/java/test/beans/DerivedTestBean.java | 1 + .../mail/MailAuthenticationException.java | 1 + .../springframework/mail/MailException.java | 1 + .../mail/MailParseException.java | 1 + .../mail/MailPreparationException.java | 1 + .../mail/MailSendException.java | 1 + .../mail/SimpleMailMessage.java | 1 + .../scheduling/quartz/CronTriggerBean.java | 1 + .../scheduling/quartz/JobDetailBean.java | 1 + .../JobMethodInvocationFailedException.java | 1 + .../scheduling/quartz/SimpleTriggerBean.java | 1 + .../org/springframework/beans/Colour.java | 3 ++- .../cache/concurrent/ConcurrentMapCache.java | 1 + .../context/ApplicationContextException.java | 1 + .../context/NoSuchMessageException.java | 1 + .../event/ApplicationContextEvent.java | 1 + .../context/event/ContextClosedEvent.java | 1 + .../context/event/ContextRefreshedEvent.java | 1 + .../context/event/ContextStartedEvent.java | 1 + .../context/event/ContextStoppedEvent.java | 1 + .../context/expression/MapAccessor.java | 1 + .../DefaultMessageSourceResolvable.java | 1 + .../ejb/access/EjbAccessException.java | 1 + .../ejb/support/AbstractEnterpriseBean.java | 1 + .../support/AbstractJmsMessageDrivenBean.java | 1 + .../support/AbstractMessageDrivenBean.java | 1 + .../ejb/support/AbstractSessionBean.java | 1 + .../support/AbstractStatefulSessionBean.java | 1 + .../support/AbstractStatelessSessionBean.java | 1 + .../org/springframework/jmx/JmxException.java | 1 + .../jmx/MBeanServerNotFoundException.java | 1 + .../access/InvalidInvocationException.java | 1 + .../access/InvocationFailureException.java | 1 + .../access/MBeanConnectFailureException.java | 1 + .../access/MBeanInfoRetrievalException.java | 1 + .../jmx/export/MBeanExportException.java | 1 + .../jmx/export/MBeanExporter.java | 1 + .../UnableToRegisterMBeanException.java | 1 + .../metadata/InvalidMetadataException.java | 1 + .../UnableToSendNotificationException.java | 1 + .../jndi/JndiLookupFailureException.java | 1 + .../jndi/TypeMismatchNamingException.java | 1 + .../RemoteConnectFailureException.java | 1 + .../RemoteInvocationFailureException.java | 1 + .../RemoteLookupFailureException.java | 1 + .../remoting/RemoteProxyFailureException.java | 1 + .../remoting/soap/SoapFaultException.java | 1 + .../scheduling/SchedulingException.java | 1 + .../CustomizableThreadFactory.java | 1 + .../ThreadPoolTaskExecutor.java | 1 + .../concurrent/CustomizableThreadFactory.java | 1 + .../ExecutorConfigurationSupport.java | 1 + .../ScheduledExecutorFactoryBean.java | 1 + .../ThreadPoolExecutorFactoryBean.java | 1 + .../concurrent/ThreadPoolTaskExecutor.java | 1 + .../concurrent/ThreadPoolTaskScheduler.java | 1 + .../scripting/ScriptCompilationException.java | 1 + .../scripting/bsh/BshScriptUtils.java | 1 + .../scripting/jruby/JRubyScriptUtils.java | 1 + .../java/org/springframework/ui/ModelMap.java | 1 + .../support/BindingAwareModelMap.java | 1 + .../org/springframework/beans/Colour.java | 3 ++- .../beans/DerivedTestBean.java | 3 ++- .../beans/SerializablePerson.java | 3 ++- .../beans/factory/config/SimpleMapScope.java | 1 + .../AbstractApplicationContextTests.java | 1 + .../event/ApplicationContextEventTests.java | 2 ++ .../EventPublicationInterceptorTests.java | 2 ++ .../ApplicationContextExpressionTests.java | 1 + .../ScheduledExecutorFactoryBeanTests.java | 4 ++++ .../scripting/bsh/BshScriptFactoryTests.java | 1 + .../scripting/groovy/TestException.java | 1 + .../advice/TimestampIntroductionAdvisor.java | 1 + .../SerializableNopInterceptor.java | 3 ++- .../TimestampIntroductionInterceptor.java | 1 + .../src/test/java/test/mixin/LockMixin.java | 3 ++- .../java/test/mixin/LockMixinAdvisor.java | 1 + .../test/java/test/mixin/LockedException.java | 3 ++- .../core/AttributeAccessorSupport.java | 1 + .../core/CollectionFactory.java | 1 + .../core/ConstantException.java | 1 + .../core/NestedIOException.java | 1 + .../AbstractCachingLabeledEnumResolver.java | 1 + .../enums/AbstractGenericLabeledEnum.java | 1 + .../core/enums/AbstractLabeledEnum.java | 1 + .../core/enums/LetterCodedLabeledEnum.java | 1 + .../core/enums/ShortCodedLabeledEnum.java | 2 ++ .../core/enums/StaticLabeledEnum.java | 1 + .../core/enums/StringCodedLabeledEnum.java | 1 + .../support/SerializationFailedException.java | 1 + .../core/task/SimpleAsyncTaskExecutor.java | 1 + .../core/task/SyncTaskExecutor.java | 1 + .../core/task/TaskRejectedException.java | 1 + .../core/task/TaskTimeoutException.java | 1 + .../CachingMetadataReaderFactory.java | 1 + .../util/AutoPopulatingList.java | 1 + .../util/CachingMapDecorator.java | 1 + .../springframework/util/CollectionUtils.java | 1 + .../util/ConcurrencyThrottleSupport.java | 1 + .../util/CustomizableThreadCreator.java | 1 + .../util/LinkedCaseInsensitiveMap.java | 1 + .../util/comparator/BooleanComparator.java | 1 + .../org/springframework/beans/Colour.java | 3 ++- .../beans/DerivedTestBean.java | 3 ++- .../core/AttributeAccessorSupportTests.java | 1 + .../core/ExceptionDepthComparatorTests.java | 5 +++++ .../core/NestedExceptionTests.java | 4 ++++ .../support/DefaultConversionTests.java | 1 + .../support/MapToMapConverterTests.java | 1 + .../core/enums/LabeledEnumTests.java | 3 +++ .../util/CachingMapDecoratorTests.java | 1 + .../xml/AbstractStaxXMLReaderTestCase.java | 1 + .../expression/AccessException.java | 1 + .../expression/EvaluationException.java | 3 ++- .../expression/ExpressionException.java | 1 + .../ExpressionInvocationTargetException.java | 1 + .../expression/ParseException.java | 1 + .../spel/InternalParseException.java | 1 + .../spel/SpelEvaluationException.java | 1 + .../expression/spel/SpelParseException.java | 1 + .../spel/ConstructorInvocationTests.java | 1 + .../spel/testresources/Inventor.java | 1 + .../jdbc/BadSqlGrammarException.java | 1 + .../CannotGetJdbcConnectionException.java | 1 + ...ncorrectResultSetColumnCountException.java | 1 + .../jdbc/InvalidResultSetAccessException.java | 1 + ...ffectedIncorrectNumberOfRowsException.java | 1 + .../jdbc/LobRetrievalFailureException.java | 1 + .../jdbc/SQLWarningException.java | 1 + .../jdbc/UncategorizedSQLException.java | 1 + .../NamedParameterJdbcTemplate.java | 1 + .../DataSourceTransactionManager.java | 1 + .../DataSourceLookupFailureException.java | 1 + .../jdbc/support/MetaDataAccessException.java | 1 + .../SqlXmlFeatureNotImplementedException.java | 1 + .../org/springframework/beans/Colour.java | 3 ++- .../DataSourceJtaTransactionTests.java | 1 + .../jdbc/object/StoredProcedureTests.java | 1 + ...LErrorCodeSQLExceptionTranslatorTests.java | 1 + .../jms/IllegalStateException.java | 1 + .../jms/InvalidClientIDException.java | 1 + .../jms/InvalidDestinationException.java | 1 + .../jms/InvalidSelectorException.java | 1 + .../org/springframework/jms/JmsException.java | 1 + .../jms/JmsSecurityException.java | 1 + .../jms/MessageEOFException.java | 1 + .../jms/MessageFormatException.java | 1 + .../jms/MessageNotReadableException.java | 1 + .../jms/MessageNotWriteableException.java | 1 + .../jms/ResourceAllocationException.java | 1 + .../jms/TransactionInProgressException.java | 1 + .../jms/TransactionRolledBackException.java | 1 + .../jms/UncategorizedJmsException.java | 1 + .../connection/JmsTransactionManager102.java | 1 + ...ynchedLocalTransactionFailedException.java | 1 + .../ListenerExecutionFailedException.java | 1 + .../endpoint/JmsMessageEndpointFactory.java | 1 + .../converter/MessageConversionException.java | 1 + .../DestinationResolutionException.java | 1 + .../org/springframework/beans/Colour.java | 3 ++- .../adapter/MessageListenerAdapterTests.java | 1 + .../MappingJackson2MessageConverterTests.java | 1 + .../MappingJacksonMessageConverterTests.java | 1 + .../CallCountingTransactionManager.java | 1 + .../hibernate4/ConfigurableJtaPlatform.java | 1 + .../hibernate4/HibernateJdbcException.java | 1 + ...ernateObjectRetrievalFailureException.java | 1 + ...nateOptimisticLockingFailureException.java | 1 + .../hibernate4/HibernateQueryException.java | 1 + .../hibernate4/HibernateSystemException.java | 1 + .../hibernate4/SpringJtaSessionContext.java | 1 + ...jectOptimisticLockingFailureException.java | 1 + .../orm/ObjectRetrievalFailureException.java | 1 + .../hibernate3/HibernateJdbcException.java | 1 + ...ernateObjectRetrievalFailureException.java | 1 + ...nateOptimisticLockingFailureException.java | 1 + .../hibernate3/HibernateQueryException.java | 1 + .../hibernate3/HibernateSystemException.java | 1 + .../HibernateTransactionManager.java | 1 + .../orm/hibernate3/SpringSessionContext.java | 1 + .../IdTransferringMergeEventListener.java | 1 + .../support/ScopedBeanInterceptor.java | 1 + .../JdoObjectRetrievalFailureException.java | 1 + .../JdoOptimisticLockingFailureException.java | 1 + .../orm/jdo/JdoResourceFailureException.java | 1 + .../orm/jdo/JdoSystemException.java | 1 + .../orm/jdo/JdoTransactionManager.java | 1 + .../orm/jdo/JdoUsageException.java | 1 + .../jpa/AbstractEntityManagerFactoryBean.java | 2 ++ .../orm/jpa/DefaultJpaDialect.java | 1 + .../orm/jpa/ExtendedEntityManagerCreator.java | 1 + .../JpaObjectRetrievalFailureException.java | 1 + .../JpaOptimisticLockingFailureException.java | 1 + .../orm/jpa/JpaSystemException.java | 1 + .../orm/jpa/JpaTransactionManager.java | 1 + ...ocalContainerEntityManagerFactoryBean.java | 2 ++ .../jpa/LocalEntityManagerFactoryBean.java | 2 ++ .../orm/jpa/SharedEntityManagerCreator.java | 1 + .../orm/jpa/vendor/EclipseLinkJpaDialect.java | 1 + .../orm/jpa/vendor/HibernateJpaDialect.java | 1 + .../orm/jpa/vendor/OpenJpaDialect.java | 1 + .../orm/jpa/vendor/TopLinkJpaDialect.java | 1 + .../org/springframework/beans/Colour.java | 3 ++- .../beans/factory/config/SimpleMapScope.java | 1 + .../LocalSessionFactoryBeanTests.java | 15 ++++++++++++++ ...AbstractEntityManagerFactoryBeanTests.java | 2 ++ .../jpa/EntityManagerFactoryUtilsTests.java | 1 + .../support/PersistenceInjectionTests.java | 4 ++++ .../oxm/MarshallingException.java | 1 + .../oxm/MarshallingFailureException.java | 1 + .../oxm/UncategorizedMappingException.java | 1 + .../oxm/UnmarshallingFailureException.java | 1 + .../oxm/ValidationFailureException.java | 1 + .../oxm/XmlMappingException.java | 1 + .../oxm/castor/CastorMappingException.java | 1 + .../web/struts/SpringBindingActionForm.java | 1 + .../web/struts/StrutsSupportTests.java | 9 +++++++++ .../dao/CannotAcquireLockException.java | 1 + .../CannotSerializeTransactionException.java | 1 + .../CleanupFailureDataAccessException.java | 1 + .../dao/ConcurrencyFailureException.java | 1 + .../dao/DataAccessException.java | 1 + .../DataAccessResourceFailureException.java | 1 + .../dao/DataIntegrityViolationException.java | 1 + .../dao/DataRetrievalFailureException.java | 1 + .../dao/DeadlockLoserDataAccessException.java | 1 + .../dao/DuplicateKeyException.java | 3 ++- .../dao/EmptyResultDataAccessException.java | 1 + ...ectUpdateSemanticsDataAccessException.java | 1 + .../InvalidDataAccessApiUsageException.java | 1 + ...validDataAccessResourceUsageException.java | 1 + .../dao/NonTransientDataAccessException.java | 1 + ...nTransientDataAccessResourceException.java | 1 + .../OptimisticLockingFailureException.java | 1 + .../PermissionDeniedDataAccessException.java | 1 + .../PessimisticLockingFailureException.java | 1 + .../dao/QueryTimeoutException.java | 1 + .../dao/RecoverableDataAccessException.java | 1 + .../dao/TransientDataAccessException.java | 1 + .../TransientDataAccessResourceException.java | 1 + .../dao/TypeMismatchDataAccessException.java | 1 + .../dao/UncategorizedDataAccessException.java | 1 + ...ersistenceExceptionTranslationAdvisor.java | 1 + .../jca/cci/CannotCreateRecordException.java | 1 + .../cci/CannotGetCciConnectionException.java | 1 + .../CciOperationNotSupportedException.java | 1 + .../cci/InvalidResultSetAccessException.java | 1 + .../cci/RecordTypeNotSupportedException.java | 1 + .../CciLocalTransactionManager.java | 1 + ...onnectionSpecConnectionFactoryAdapter.java | 1 + .../DelegatingConnectionFactory.java | 1 + .../connection/SingleConnectionFactory.java | 1 + ...ransactionAwareConnectionFactoryProxy.java | 1 + .../jca/cci/core/support/CommAreaRecord.java | 1 + .../GenericMessageEndpointFactory.java | 1 + .../CannotCreateTransactionException.java | 1 + .../HeuristicCompletionException.java | 1 + .../IllegalTransactionStateException.java | 1 + .../InvalidIsolationLevelException.java | 1 + .../transaction/InvalidTimeoutException.java | 1 + ...estedTransactionNotSupportedException.java | 1 + .../transaction/NoTransactionException.java | 1 + .../transaction/TransactionException.java | 1 + ...actionSuspensionNotSupportedException.java | 1 + .../TransactionSystemException.java | 1 + .../TransactionTimedOutException.java | 1 + .../TransactionUsageException.java | 1 + .../UnexpectedRollbackException.java | 1 + .../AnnotationTransactionAttributeSource.java | 1 + .../Ejb3TransactionAnnotationParser.java | 1 + .../SpringTransactionAnnotationParser.java | 1 + ...toryTransactionAttributeSourceAdvisor.java | 1 + .../CompositeTransactionAttributeSource.java | 1 + .../DefaultTransactionAttribute.java | 1 + .../DelegatingTransactionAttribute.java | 1 + ...MatchAlwaysTransactionAttributeSource.java | 1 + .../NameMatchTransactionAttributeSource.java | 1 + .../interceptor/NoRollbackRuleAttribute.java | 1 + .../interceptor/RollbackRuleAttribute.java | 1 + .../RuleBasedTransactionAttribute.java | 1 + .../interceptor/TransactionAspectSupport.java | 1 + .../TransactionAttributeSourceAdvisor.java | 1 + .../TransactionAttributeSourcePointcut.java | 1 + .../jta/JtaTransactionManager.java | 1 + .../jta/OC4JJtaTransactionManager.java | 1 + .../jta/WebLogicJtaTransactionManager.java | 1 + .../jta/WebSphereUowTransactionManager.java | 1 + .../AbstractPlatformTransactionManager.java | 1 + .../support/DefaultTransactionDefinition.java | 1 + .../DelegatingTransactionDefinition.java | 1 + .../support/TransactionTemplate.java | 1 + .../org/springframework/beans/Colour.java | 3 ++- .../beans/DerivedTestBean.java | 3 ++- .../CallCountingTransactionManager.java | 1 + .../transaction/TestTransactionManager.java | 1 + .../transaction/TransactionSupportTests.java | 1 + ...tationTransactionAttributeSourceTests.java | 1 + .../config/AnnotationDrivenTests.java | 1 + .../config/TransactionalService.java | 1 + .../AbstractTransactionAspectTests.java | 1 + .../TransactionInterceptorTests.java | 1 + .../HttpMessageConversionException.java | 1 + .../HttpMessageNotReadableException.java | 1 + .../HttpMessageNotWritableException.java | 3 ++- .../jaxrpc/JaxRpcSoapFaultException.java | 1 + .../jaxws/JaxWsSoapFaultException.java | 1 + .../web/HttpMediaTypeException.java | 1 + .../HttpMediaTypeNotAcceptableException.java | 1 + .../HttpMediaTypeNotSupportedException.java | 1 + ...ttpRequestMethodNotSupportedException.java | 1 + .../web/HttpSessionRequiredException.java | 1 + .../bind/MethodArgumentNotValidException.java | 1 + ...ssingServletRequestParameterException.java | 1 + .../bind/ServletRequestBindingException.java | 1 + ...ServletRequestParameterPropertyValues.java | 1 + ...sfiedServletRequestParameterException.java | 1 + .../HandlerMethodInvocationException.java | 1 + .../web/client/RestTemplate.java | 1 + .../DestructionCallbackBindingListener.java | 1 + .../support/HttpRequestHandlerServlet.java | 1 + .../context/support/RequestHandledEvent.java | 1 + .../support/ServletRequestHandledEvent.java | 1 + .../DelegatingPhaseListenerMulticaster.java | 1 + .../MaxUploadSizeExceededException.java | 1 + .../web/multipart/MultipartException.java | 1 + .../commons/CommonsMultipartFile.java | 1 + .../web/util/HttpSessionMutexListener.java | 1 + .../springframework/web/util/UriTemplate.java | 1 + .../org/springframework/beans/Colour.java | 3 ++- .../beans/DerivedTestBean.java | 3 ++- .../beans/SerializablePerson.java | 3 ++- .../httpinvoker/HttpInvokerTests.java | 3 +++ .../jaxws/OrderNotFoundException.java | 1 + .../client/RestTemplateIntegrationTests.java | 6 ++++++ .../ServletRequestAttributesTests.java | 1 + .../context/request/SessionScopeTests.java | 1 + .../web/jsf/DelegatingPhaseListenerTests.java | 2 ++ .../CommonsMultipartResolverTests.java | 1 + .../web/util/TagUtilsTests.java | 3 +++ .../ModelAndViewDefiningException.java | 1 + .../web/portlet/NoHandlerFoundException.java | 1 + ...ssingPortletRequestParameterException.java | 1 + .../bind/PortletRequestBindingException.java | 1 + ...PortletRequestParameterPropertyValues.java | 1 + .../PortletApplicationContextUtils.java | 3 +++ .../context/PortletRequestHandledEvent.java | 1 + ...letRequestMethodNotSupportedException.java | 3 ++- .../PortletSessionRequiredException.java | 1 + .../org/springframework/beans/Colour.java | 3 ++- .../beans/DerivedTestBean.java | 3 ++- .../AbstractApplicationContextTests.java | 1 + .../SimpleMappingExceptionResolverTests.java | 4 ++++ .../PortletAnnotationControllerTests.java | 2 +- .../ModelAndViewDefiningException.java | 1 + .../web/servlet/ResourceServlet.java | 1 + .../web/servlet/ViewRendererServlet.java | 1 + .../NoSuchRequestHandlingMethodException.java | 1 + .../web/servlet/tags/BindErrorsTag.java | 1 + .../web/servlet/tags/BindTag.java | 1 + .../web/servlet/tags/EscapeBodyTag.java | 1 + .../web/servlet/tags/EvalTag.java | 1 + .../web/servlet/tags/HtmlEscapeTag.java | 1 + .../servlet/tags/HtmlEscapingAwareTag.java | 1 + .../web/servlet/tags/MessageTag.java | 1 + .../web/servlet/tags/NestedPathTag.java | 1 + .../web/servlet/tags/ParamTag.java | 1 + .../servlet/tags/RequestContextAwareTag.java | 1 + .../web/servlet/tags/ThemeTag.java | 1 + .../web/servlet/tags/TransformTag.java | 1 + .../web/servlet/tags/UrlTag.java | 1 + .../tags/form/AbstractCheckedElementTag.java | 1 + .../form/AbstractDataBoundFormElementTag.java | 1 + .../servlet/tags/form/AbstractFormTag.java | 1 + .../tags/form/AbstractHtmlElementBodyTag.java | 1 + .../tags/form/AbstractHtmlElementTag.java | 1 + .../form/AbstractHtmlInputElementTag.java | 1 + .../form/AbstractMultiCheckedElementTag.java | 1 + .../form/AbstractSingleCheckedElementTag.java | 1 + .../web/servlet/tags/form/CheckboxTag.java | 1 + .../web/servlet/tags/form/CheckboxesTag.java | 1 + .../web/servlet/tags/form/ErrorsTag.java | 1 + .../web/servlet/tags/form/FormTag.java | 1 + .../web/servlet/tags/form/LabelTag.java | 1 + .../web/servlet/tags/form/OptionTag.java | 1 + .../web/servlet/tags/form/OptionsTag.java | 1 + .../servlet/tags/form/PasswordInputTag.java | 1 + .../web/servlet/tags/form/RadioButtonTag.java | 1 + .../servlet/tags/form/RadioButtonsTag.java | 1 + .../web/servlet/tags/form/SelectTag.java | 1 + .../web/servlet/tags/form/TextareaTag.java | 1 + .../view/AbstractCachingViewResolver.java | 1 + .../view/freemarker/FreeMarkerView.java | 1 + .../org/springframework/beans/Colour.java | 3 ++- .../beans/DerivedTestBean.java | 3 ++- .../beans/SerializablePerson.java | 3 ++- .../SimpleMappingExceptionResolverTests.java | 2 ++ .../CgLibProxyServletAnnotationTests.java | 3 ++- .../JdkProxyServletAnnotationTests.java | 1 + .../ResponseStatusExceptionResolverTests.java | 2 ++ .../ServletAnnotationControllerTests.java | 14 +++++++++++++ ...plateServletAnnotationControllerTests.java | 4 ++++ .../web/servlet/tags/BindTagTests.java | 1 + .../web/servlet/tags/HtmlEscapeTagTests.java | 5 +++++ .../web/servlet/tags/MessageTagTests.java | 20 +++++++++++++++++++ .../web/servlet/tags/ParamTagTests.java | 1 + .../web/servlet/tags/ThemeTagTests.java | 1 + .../servlet/tags/form/CheckboxTagTests.java | 1 + .../servlet/tags/form/CheckboxesTagTests.java | 1 + .../web/servlet/tags/form/ErrorsTagTests.java | 1 + .../web/servlet/tags/form/FormTagTests.java | 1 + .../web/servlet/tags/form/InputTagTests.java | 1 + .../web/servlet/tags/form/LabelTagTests.java | 1 + .../servlet/tags/form/OptionTagEnumTests.java | 1 + .../web/servlet/tags/form/OptionTagTests.java | 2 ++ .../servlet/tags/form/OptionsTagTests.java | 1 + .../tags/form/PasswordInputTagTests.java | 1 + .../tags/form/RadioButtonTagTests.java | 1 + .../tags/form/RadioButtonsTagTests.java | 1 + .../web/servlet/tags/form/SelectTagTests.java | 1 + .../servlet/tags/form/TextareaTagTests.java | 1 + .../CallCountingTransactionManager.java | 1 + 550 files changed, 705 insertions(+), 36 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java b/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java index fa23500793e..404a1d08452 100644 --- a/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java +++ b/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java @@ -25,6 +25,7 @@ import org.springframework.core.NestedRuntimeException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class AopInvocationException extends NestedRuntimeException { /** diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java index b510df206fa..2d09d4f6906 100644 --- a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java +++ b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java @@ -23,6 +23,7 @@ import java.io.Serializable; * * @author Rod Johnson */ +@SuppressWarnings("serial") class TrueClassFilter implements ClassFilter, Serializable { public static final TrueClassFilter INSTANCE = new TrueClassFilter(); diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java index d6d67efc72a..a97872ab320 100644 --- a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java +++ b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java @@ -24,6 +24,7 @@ import java.lang.reflect.Method; * * @author Rod Johnson */ +@SuppressWarnings("serial") class TrueMethodMatcher implements MethodMatcher, Serializable { public static final TrueMethodMatcher INSTANCE = new TrueMethodMatcher(); diff --git a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java index c286cb18098..4416fe866db 100644 --- a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java @@ -23,6 +23,7 @@ import java.io.Serializable; * * @author Rod Johnson */ +@SuppressWarnings("serial") class TruePointcut implements Pointcut, Serializable { public static final TruePointcut INSTANCE = new TruePointcut(); diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java index 66a04dc022e..1eab7c85208 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java @@ -790,6 +790,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov * Thrown in response to an ambiguous binding being detected when * trying to resolve a method's parameter names. */ + @SuppressWarnings("serial") public static class AmbiguousBindingException extends RuntimeException { /** diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java index 470ed686f30..c4ddcaab9ab 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java @@ -76,6 +76,7 @@ import org.springframework.util.StringUtils; * @author Dave Syer * @since 2.0 */ +@SuppressWarnings("serial") public class AspectJExpressionPointcut extends AbstractExpressionPointcut implements ClassFilter, IntroductionAwareMethodMatcher, BeanFactoryAware { diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java index d17bbce30bf..49fa6da5eb7 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java @@ -25,6 +25,7 @@ import org.springframework.aop.support.AbstractGenericPointcutAdvisor; * @author Rob Harrop * @since 2.0 */ +@SuppressWarnings("serial") public class AspectJExpressionPointcutAdvisor extends AbstractGenericPointcutAdvisor { private final AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut(); diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java index a871be26d3a..62d14147178 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java @@ -45,6 +45,7 @@ import org.springframework.util.Assert; * @since 2.0 * @see org.springframework.aop.aspectj.annotation.AspectJAdvisorFactory */ +@SuppressWarnings("serial") public class AnnotationAwareAspectJAutoProxyCreator extends AspectJAwareAdvisorAutoProxyCreator { private List includePatterns; diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java index f7a264eb37b..b160ded0b8e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java @@ -46,6 +46,7 @@ import org.springframework.util.ClassUtils; * @see #getProxy(ClassLoader) * @see org.springframework.aop.framework.ProxyFactory */ +@SuppressWarnings("serial") public class AspectJProxyFactory extends ProxyCreatorSupport { /** Cache for singleton aspect instances */ diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java index 297286cbf4d..c4401b17cc9 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java @@ -26,6 +26,7 @@ import org.springframework.aop.framework.AopConfigException; * @author Rod Johnson * @since 2.0 */ +@SuppressWarnings("serial") public class NotAnAtAspectException extends AopConfigException { private Class nonAspectClass; diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java index 1a64c9610a7..20765ec960d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java @@ -43,6 +43,7 @@ import org.springframework.util.ClassUtils; * @author Ramnivas Laddad * @since 2.0 */ +@SuppressWarnings("serial") public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProxyCreator { private static final Comparator DEFAULT_PRECEDENCE_COMPARATOR = new AspectJPrecedenceComparator(); diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java index a78e33daf29..9e6baee9327 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java @@ -33,6 +33,7 @@ import org.springframework.util.ClassUtils; * @author Juergen Hoeller * @since 3.2 */ +@SuppressWarnings("serial") public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig implements BeanPostProcessor, BeanClassLoaderAware, Ordered { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java index 46cd1075ac8..33e09ae1d6b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java @@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException; * @author Rod Johnson * @since 13.03.2003 */ +@SuppressWarnings("serial") public class AopConfigException extends NestedRuntimeException { /** diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java index 806e3602bc9..defb0bada9e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java @@ -43,6 +43,7 @@ import org.springframework.aop.support.MethodMatchers; * @author Adrian Colyer * @since 2.0.3 */ +@SuppressWarnings("serial") public class DefaultAdvisorChainFactory implements AdvisorChainFactory, Serializable { public List getInterceptorsAndDynamicInterceptionAdvice( diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java index 43293527e6d..8b95e3303b3 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java @@ -45,6 +45,7 @@ import org.springframework.aop.SpringProxy; * @see AdvisedSupport#setProxyTargetClass * @see AdvisedSupport#setInterfaces */ +@SuppressWarnings("serial") public class DefaultAopProxyFactory implements AopProxyFactory, Serializable { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java index c34bb113ab0..4adef07407e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java @@ -29,6 +29,7 @@ import org.springframework.util.Assert; * @since 2.0.3 * @see #createAopProxy() */ +@SuppressWarnings("serial") public class ProxyCreatorSupport extends AdvisedSupport { private AopProxyFactory aopProxyFactory; diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java index acc4b690548..67e89eeefd2 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java @@ -32,6 +32,7 @@ import org.springframework.util.ClassUtils; * @author Rob Harrop * @since 14.03.2003 */ +@SuppressWarnings("serial") public class ProxyFactory extends ProxyCreatorSupport { /** diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java index 6cd0d151550..257f2f2190b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java @@ -88,6 +88,7 @@ import org.springframework.util.ObjectUtils; * @see org.springframework.aop.Advisor * @see Advised */ +@SuppressWarnings("serial") public class ProxyFactoryBean extends ProxyCreatorSupport implements FactoryBean, BeanClassLoaderAware, BeanFactoryAware { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java index 10f86133000..07257fecb72 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java @@ -31,6 +31,7 @@ import org.springframework.aop.AfterReturningAdvice; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") class AfterReturningAdviceAdapter implements AdvisorAdapter, Serializable { public boolean supportsAdvice(Advice advice) { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java index 1e0b0b6417e..9b6dfa3fd95 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java @@ -32,6 +32,7 @@ import org.springframework.util.Assert; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class AfterReturningAdviceInterceptor implements MethodInterceptor, AfterAdvice, Serializable { private final AfterReturningAdvice advice; diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java index 8ac6e5c3e86..da5f7025edf 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java @@ -37,6 +37,7 @@ import org.springframework.aop.support.DefaultPointcutAdvisor; * @author Rob Harrop * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class DefaultAdvisorAdapterRegistry implements AdvisorAdapterRegistry, Serializable { private final List adapters = new ArrayList(3); diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java index 6757ab65f5b..222a63129d6 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java @@ -31,6 +31,7 @@ import org.springframework.aop.MethodBeforeAdvice; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") class MethodBeforeAdviceAdapter implements AdvisorAdapter, Serializable { public boolean supportsAdvice(Advice advice) { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java index 82f339b3f64..3aebd504845 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java @@ -31,6 +31,7 @@ import org.springframework.util.Assert; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class MethodBeforeAdviceInterceptor implements MethodInterceptor, Serializable { private MethodBeforeAdvice advice; diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java index 0803088e8bb..386d3a75df1 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java @@ -31,6 +31,7 @@ import org.springframework.aop.ThrowsAdvice; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") class ThrowsAdviceAdapter implements AdvisorAdapter, Serializable { public boolean supportsAdvice(Advice advice) { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java index a479fbc8684..c0e840b055b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java @@ -25,6 +25,7 @@ package org.springframework.aop.framework.adapter; * @see org.aopalliance.aop.Advice * @see org.springframework.aop.Advisor */ +@SuppressWarnings("serial") public class UnknownAdviceTypeException extends IllegalArgumentException { /** diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java index dba5d066d51..c9aae651d56 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java @@ -44,6 +44,7 @@ import org.springframework.core.OrderComparator; * @author Juergen Hoeller * @see #findCandidateAdvisors */ +@SuppressWarnings("serial") public abstract class AbstractAdvisorAutoProxyCreator extends AbstractAutoProxyCreator { private BeanFactoryAdvisorRetrievalHelper advisorRetrievalHelper; diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java index bcef35918fa..06010d6710e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java @@ -87,6 +87,7 @@ import org.springframework.util.ClassUtils; * @see BeanNameAutoProxyCreator * @see DefaultAdvisorAutoProxyCreator */ +@SuppressWarnings("serial") public abstract class AbstractAutoProxyCreator extends ProxyConfig implements SmartInstantiationAwareBeanPostProcessor, BeanClassLoaderAware, BeanFactoryAware, Ordered, AopInfrastructureBean { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java index a7b01b573c7..7b517282c8d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java @@ -42,6 +42,7 @@ import org.springframework.util.StringUtils; * @see #setInterceptorNames * @see AbstractAutoProxyCreator */ +@SuppressWarnings("serial") public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator { private List beanNames; diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java index 741cd1ae1a5..f84bf4f55db 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java @@ -33,6 +33,7 @@ import org.springframework.beans.factory.BeanNameAware; * @author Rod Johnson * @author Rob Harrop */ +@SuppressWarnings("serial") public class DefaultAdvisorAutoProxyCreator extends AbstractAdvisorAutoProxyCreator implements BeanNameAware { /** Separator between prefix and remainder of bean name */ diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java index 35ad24e1c74..d48716f9d00 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java @@ -26,6 +26,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; * @author Juergen Hoeller * @since 2.0.7 */ +@SuppressWarnings("serial") public class InfrastructureAdvisorAutoProxyCreator extends AbstractAdvisorAutoProxyCreator { private ConfigurableListableBeanFactory beanFactory; diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java index 2f5bf13495f..82db223aa35 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java @@ -36,6 +36,7 @@ import org.aopalliance.intercept.MethodInvocation; * @see #setSuffix * @see #createInvocationTraceName */ +@SuppressWarnings("serial") public abstract class AbstractMonitoringInterceptor extends AbstractTraceInterceptor { private String prefix = ""; diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java index 0defe95a519..438fa3cff76 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java @@ -43,6 +43,7 @@ import org.springframework.aop.support.AopUtils; * @see #setUseDynamicLogger * @see #invokeUnderTrace(org.aopalliance.intercept.MethodInvocation, org.apache.commons.logging.Log) */ +@SuppressWarnings("serial") public abstract class AbstractTraceInterceptor implements MethodInterceptor, Serializable { /** diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java index b8f5e89833c..4298008d9be 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java @@ -39,6 +39,7 @@ import org.springframework.util.ConcurrencyThrottleSupport; * @since 11.02.2004 * @see #setConcurrencyLimit */ +@SuppressWarnings("serial") public class ConcurrencyThrottleInterceptor extends ConcurrencyThrottleSupport implements MethodInterceptor, Serializable { diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java index 63e7c8d5b1a..93228b1af76 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java @@ -67,6 +67,7 @@ import org.springframework.util.StringUtils; * @see #setExceptionMessage * @see SimpleTraceInterceptor */ +@SuppressWarnings("serial") public class CustomizableTraceInterceptor extends AbstractTraceInterceptor { /** diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java index e027d9a13ba..4f9b95a9197 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java @@ -32,6 +32,7 @@ import org.aopalliance.intercept.MethodInvocation; * @see SimpleTraceInterceptor * @see CustomizableTraceInterceptor */ +@SuppressWarnings("serial") public class DebugInterceptor extends SimpleTraceInterceptor { private volatile long count; diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java index 42750137aca..bffad2c4d1f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java @@ -123,6 +123,7 @@ public abstract class ExposeBeanNameAdvisors { /** * Introduction that exposes the specified bean name as invocation attribute. */ + @SuppressWarnings("serial") private static class ExposeBeanNameIntroduction extends DelegatingIntroductionInterceptor implements NamedBean { private final String beanName; diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java index 51de80ec0fa..9d25008e912 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java @@ -40,6 +40,7 @@ import org.springframework.core.Ordered; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class ExposeInvocationInterceptor implements MethodInterceptor, Ordered, Serializable { /** Singleton instance of this class */ diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java index 29b9f4620a8..8f14116ac8c 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java @@ -35,6 +35,7 @@ import org.apache.commons.logging.Log; * @see com.jamonapi.MonitorFactory * @see PerformanceMonitorInterceptor */ +@SuppressWarnings("serial") public class JamonPerformanceMonitorInterceptor extends AbstractMonitoringInterceptor { private boolean trackAllInvocations = false; diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java index 7db0a7ed3dd..fd3f5375604 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java @@ -33,6 +33,7 @@ import org.springframework.util.StopWatch; * @see org.springframework.util.StopWatch * @see JamonPerformanceMonitorInterceptor */ +@SuppressWarnings("serial") public class PerformanceMonitorInterceptor extends AbstractMonitoringInterceptor { /** diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java index 6a7fb5c171c..ec794cb5fd6 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java @@ -32,6 +32,7 @@ import org.apache.commons.logging.Log; * @since 1.2 * @see CustomizableTraceInterceptor */ +@SuppressWarnings("serial") public class SimpleTraceInterceptor extends AbstractTraceInterceptor { /** diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java index 05a041aeec7..cc07afc997b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java +++ b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java @@ -34,6 +34,7 @@ import org.springframework.util.Assert; * @see org.springframework.beans.factory.BeanFactory#getBean * @see org.springframework.beans.factory.config.ConfigurableBeanFactory#destroyScopedBean */ +@SuppressWarnings("serial") public class DefaultScopedObject implements ScopedObject, Serializable { private final ConfigurableBeanFactory beanFactory; diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java index a1cf5db4a82..2193d8b6746 100644 --- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java +++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java @@ -49,6 +49,7 @@ import org.springframework.util.ClassUtils; * @since 2.0 * @see #setProxyTargetClass */ +@SuppressWarnings("serial") public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean, BeanFactoryAware { /** The TargetSource that manages scoping */ diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java index 0d11ab36a74..938a7cb7421 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java @@ -38,6 +38,7 @@ import org.springframework.util.Assert; * @see #setAdviceBeanName * @see DefaultBeanFactoryPointcutAdvisor */ +@SuppressWarnings("serial") public abstract class AbstractBeanFactoryPointcutAdvisor extends AbstractPointcutAdvisor implements BeanFactoryAware { private String adviceBeanName; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java index db654b56a0e..dc48762686b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java @@ -28,6 +28,7 @@ import java.io.Serializable; * @see #setLocation * @see #setExpression */ +@SuppressWarnings("serial") public abstract class AbstractExpressionPointcut implements ExpressionPointcut, Serializable { private String location; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java index 66ed6ff0ca9..c0fcb7c791b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java @@ -26,6 +26,7 @@ import org.aopalliance.aop.Advice; * @see #setAdvice * @see DefaultPointcutAdvisor */ +@SuppressWarnings("serial") public abstract class AbstractGenericPointcutAdvisor extends AbstractPointcutAdvisor { private Advice advice; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java index a9031bcc3c0..4b362c8407e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java @@ -34,6 +34,7 @@ import org.springframework.util.ObjectUtils; * @since 1.1.2 * @see AbstractGenericPointcutAdvisor */ +@SuppressWarnings("serial") public abstract class AbstractPointcutAdvisor implements PointcutAdvisor, Ordered, Serializable { private Integer order; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java index 39676915562..b7527ca6af6 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java @@ -47,6 +47,7 @@ import org.springframework.util.StringUtils; * @since 1.1 * @see JdkRegexpMethodPointcut */ +@SuppressWarnings("serial") public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPointcut implements Serializable { diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java b/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java index e8fd0213ea3..4abb43c8f22 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java @@ -87,6 +87,7 @@ public abstract class ClassFilters { /** * ClassFilter implementation for a union of the given ClassFilters. */ + @SuppressWarnings("serial") private static class UnionClassFilter implements ClassFilter, Serializable { private ClassFilter[] filters; @@ -120,6 +121,7 @@ public abstract class ClassFilters { /** * ClassFilter implementation for an intersection of the given ClassFilters. */ + @SuppressWarnings("serial") private static class IntersectionClassFilter implements ClassFilter, Serializable { private ClassFilter[] filters; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java index e0d0b6dc33d..008e9105c90 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java @@ -36,6 +36,7 @@ import org.springframework.util.ObjectUtils; * @author Rob Harrop * @see org.springframework.core.ControlFlow */ +@SuppressWarnings("serial") public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher, Serializable { private Class clazz; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java index 9059a866691..1324847e126 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java @@ -32,6 +32,7 @@ import org.springframework.aop.Pointcut; * @see #setPointcut * @see #setAdviceBeanName */ +@SuppressWarnings("serial") public class DefaultBeanFactoryPointcutAdvisor extends AbstractBeanFactoryPointcutAdvisor { private Pointcut pointcut = Pointcut.TRUE; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java index 7cb9ffb44e0..64d6651af55 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java @@ -34,6 +34,7 @@ import org.springframework.aop.Pointcut; * @see #setPointcut * @see #setAdvice */ +@SuppressWarnings("serial") public class DefaultPointcutAdvisor extends AbstractGenericPointcutAdvisor implements Serializable { private Pointcut pointcut = Pointcut.TRUE; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java index 7e0747ab863..ac0199a69ea 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java @@ -50,6 +50,7 @@ import org.springframework.aop.ProxyMethodInvocation; * @see #suppressInterface * @see DelegatingIntroductionInterceptor */ +@SuppressWarnings("serial") public class DelegatePerTargetObjectIntroductionInterceptor extends IntroductionInfoSupport implements IntroductionInterceptor { diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java index 738c336643b..53211519e38 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java @@ -48,6 +48,7 @@ import org.springframework.util.Assert; * @see #suppressInterface * @see DelegatePerTargetObjectIntroductionInterceptor */ +@SuppressWarnings("serial") public class DelegatingIntroductionInterceptor extends IntroductionInfoSupport implements IntroductionInterceptor { diff --git a/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java b/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java index c04c049163e..1279087de17 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java @@ -40,6 +40,7 @@ import org.springframework.util.ClassUtils; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class IntroductionInfoSupport implements IntroductionInfo, Serializable { protected final Set publishedInterfaces = new HashSet(); diff --git a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java index af1b41c7115..82409fc0091 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java @@ -37,6 +37,7 @@ import java.util.regex.PatternSyntaxException; * @author Rob Harrop * @since 1.1 */ +@SuppressWarnings("serial") public class JdkRegexpMethodPointcut extends AbstractRegexpMethodPointcut { /** diff --git a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java index 54c612d4cb6..75d56678adb 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java @@ -99,6 +99,7 @@ public abstract class MethodMatchers { /** * MethodMatcher implementation for a union of two given MethodMatchers. */ + @SuppressWarnings("serial") private static class UnionMethodMatcher implements IntroductionAwareMethodMatcher, Serializable { private MethodMatcher mm1; @@ -163,6 +164,7 @@ public abstract class MethodMatchers { * MethodMatcher implementation for a union of two given MethodMatchers, * supporting an associated ClassFilter per MethodMatcher. */ + @SuppressWarnings("serial") private static class ClassFilterAwareUnionMethodMatcher extends UnionMethodMatcher { private final ClassFilter cf1; @@ -201,6 +203,7 @@ public abstract class MethodMatchers { /** * MethodMatcher implementation for an intersection of two given MethodMatchers. */ + @SuppressWarnings("serial") private static class IntersectionMethodMatcher implements IntroductionAwareMethodMatcher, Serializable { private MethodMatcher mm1; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java index 0cb2e94d5c4..ddbec48ffeb 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java @@ -35,6 +35,7 @@ import org.springframework.util.PatternMatchUtils; * @since 11.02.2004 * @see #isMatch */ +@SuppressWarnings("serial") public class NameMatchMethodPointcut extends StaticMethodMatcherPointcut implements Serializable { private List mappedNames = new LinkedList(); diff --git a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java index 46e4f9b876e..ef939cfb553 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java @@ -29,6 +29,7 @@ import org.springframework.aop.Pointcut; * @author Rob Harrop * @see NameMatchMethodPointcut */ +@SuppressWarnings("serial") public class NameMatchMethodPointcutAdvisor extends AbstractGenericPointcutAdvisor { private final NameMatchMethodPointcut pointcut = new NameMatchMethodPointcut(); diff --git a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java index cdeb21e8b91..267083cc703 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java @@ -91,6 +91,7 @@ public abstract class Pointcuts { /** * Pointcut implementation that matches bean property setters. */ + @SuppressWarnings("serial") private static class SetterPointcut extends StaticMethodMatcherPointcut implements Serializable { public static SetterPointcut INSTANCE = new SetterPointcut(); @@ -110,6 +111,7 @@ public abstract class Pointcuts { /** * Pointcut implementation that matches bean property getters. */ + @SuppressWarnings("serial") private static class GetterPointcut extends StaticMethodMatcherPointcut implements Serializable { public static GetterPointcut INSTANCE = new GetterPointcut(); diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java index 74a71b6937b..5cc14d909bf 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java @@ -41,6 +41,7 @@ import org.springframework.util.ObjectUtils; * @see #setPatterns * @see JdkRegexpMethodPointcut */ +@SuppressWarnings("serial") public class RegexpMethodPointcutAdvisor extends AbstractGenericPointcutAdvisor { private String[] patterns; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java index 83866afb50e..955f92ef03e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java @@ -24,6 +24,7 @@ import org.springframework.aop.ClassFilter; * Simple ClassFilter implementation that passes classes (and optionally subclasses) * @author Rod Johnson */ +@SuppressWarnings("serial") public class RootClassFilter implements ClassFilter, Serializable { private Class clazz; diff --git a/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java index 24920b39872..096fd2f46fa 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java @@ -58,6 +58,8 @@ import org.springframework.core.Constants; public class CommonsPoolTargetSource extends AbstractPoolingTargetSource implements PoolableObjectFactory { + private static final long serialVersionUID = 1L; + private static final Constants constants = new Constants(GenericObjectPool.class); diff --git a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java index a87f92092a9..37f5b99d46f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java @@ -56,6 +56,7 @@ import org.springframework.beans.BeansException; * @see org.springframework.beans.factory.BeanFactory#getBean * @see #postProcessTargetObject */ +@SuppressWarnings("serial") public class LazyInitTargetSource extends AbstractBeanFactoryBasedTargetSource { private Object target; diff --git a/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java index 14f2f285014..ed372d085ec 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java @@ -31,6 +31,8 @@ import org.springframework.beans.BeansException; */ public class PrototypeTargetSource extends AbstractPrototypeBasedTargetSource { + private static final long serialVersionUID = 1L; + /** * Obtain a new prototype instance for every call. * @see #newPrototypeInstance() diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java index 656a88088d8..911eb837f11 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java @@ -27,6 +27,7 @@ package org.springframework.aop.target; * @author Juergen Hoeller * @since 2.0.3 */ +@SuppressWarnings("serial") public class SimpleBeanTargetSource extends AbstractBeanFactoryBasedTargetSource { public Object getTarget() throws Exception { diff --git a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java index ca20b2ceeab..7b100fe0daa 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java @@ -50,6 +50,8 @@ import org.springframework.core.NamedThreadLocal; public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource implements ThreadLocalTargetSourceStats, DisposableBean { + private static final long serialVersionUID = 1L; + /** * ThreadLocal holding the target associated with the current * thread. Unlike most ThreadLocals, which are static, this variable diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java index 18e0bd56ad3..c10c50ddf8a 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java @@ -115,6 +115,7 @@ public class TrickyAspectJPointcutExpressionTests { } + @SuppressWarnings("serial") public static class TestException extends RuntimeException { public TestException(String string) { diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java index 52919dc0631..d08d6f5357c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java @@ -80,6 +80,7 @@ public final class LazyInitTargetSourceTests { } + @SuppressWarnings("serial") public static class CustomLazyInitTargetSource extends LazyInitTargetSource { protected void postProcessTargetObject(Object targetObject) { 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 daecd1b5e87..3fe1c3ca709 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 @@ -62,6 +62,8 @@ public final class PrototypeBasedTargetSourceTests { private static class TestTargetSource extends AbstractPrototypeBasedTargetSource { + private static final long serialVersionUID = 1L; + /** * Nonserializable test field to check that subclass * state can't prevent serialization from working @@ -77,4 +79,4 @@ public final class PrototypeBasedTargetSourceTests { } } -} \ No newline at end of file +} diff --git a/spring-aspects/src/test/java/org/springframework/beans/Colour.java b/spring-aspects/src/test/java/org/springframework/beans/Colour.java index 60dc333e0b4..17fd24fec79 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/Colour.java +++ b/spring-aspects/src/test/java/org/springframework/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java index 2bb41a9d5b6..0940539f54a 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean; * @author Juergen Hoeller * @since 21.08.2003 */ +@SuppressWarnings("serial") public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean { private String beanName; @@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA return destroyed; } -} \ No newline at end of file +} diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java index c3f6386fe62..b92077767bb 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java +++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java @@ -248,6 +248,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase { @Configurable("beanOne") + @SuppressWarnings("serial") protected static class ShouldBeConfiguredBySpring implements Serializable { private String name; @@ -263,6 +264,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase { @Configurable("beanOne") + @SuppressWarnings("serial") private static class ShouldBeConfiguredBySpringContainsPublicReadResolve implements Serializable { private String name; @@ -317,6 +319,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase { } + @SuppressWarnings("serial") private static class SerializableThatShouldNotBeConfiguredBySpring implements Serializable { private String name; @@ -444,6 +447,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase { } @Configurable + @SuppressWarnings("serial") private static class BaseSerializableBean implements Serializable { public int setterCount; @@ -457,6 +461,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase { } + @SuppressWarnings("serial") private static class SubSerializableBean extends BaseSerializableBean { } @@ -551,6 +556,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase { } } + @SuppressWarnings("serial") public static class Order implements MailSenderClient, Serializable { private transient MailSender mailSender; @@ -577,6 +583,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase { } @Configurable + @SuppressWarnings("serial") private static class PreOrPostConstructionConfiguredBean implements Serializable { private transient String name; protected transient boolean preConstructionConfigured; @@ -597,11 +604,13 @@ public abstract class AbstractBeanConfigurerTests extends TestCase { @Configurable(preConstruction=true) + @SuppressWarnings("serial") public static class PreConstructionConfiguredBean extends PreOrPostConstructionConfiguredBean { } @Configurable(preConstruction=false) + @SuppressWarnings("serial") private static class PostConstructionConfiguredBean extends PreOrPostConstructionConfiguredBean { } diff --git a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 563d6107149..0c0b3cb81cf 100644 --- a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -23,6 +23,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class CallCountingTransactionManager extends AbstractPlatformTransactionManager { public TransactionDefinition lastDefinition; diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java b/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java index 46e45ba1efd..9fbac3fef8a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java @@ -23,6 +23,7 @@ package org.springframework.beans; * @author Juergen Hoeller * @since 1.2.8 */ +@SuppressWarnings("serial") public class BeanInstantiationException extends FatalBeanException { private Class beanClass; diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java index d059f8e2fa9..ca62f6fa3ca 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java @@ -26,6 +26,7 @@ import org.springframework.core.AttributeAccessorSupport; * @author Juergen Hoeller * @since 2.5 */ +@SuppressWarnings("serial") public class BeanMetadataAttributeAccessor extends AttributeAccessorSupport implements BeanMetadataElement { private Object source; diff --git a/spring-beans/src/main/java/org/springframework/beans/BeansException.java b/spring-beans/src/main/java/org/springframework/beans/BeansException.java index a2c0834d36a..2aae901c722 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeansException.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeansException.java @@ -29,6 +29,7 @@ import org.springframework.util.ObjectUtils; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public abstract class BeansException extends NestedRuntimeException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java index 7ea4ed901ab..fc44cd572d4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java +++ b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java @@ -25,6 +25,7 @@ import java.beans.PropertyChangeEvent; * @author Juergen Hoeller * @since 3.0 */ +@SuppressWarnings("serial") public class ConversionNotSupportedException extends TypeMismatchException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java b/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java index 43feaa766cd..d1d30a5e2fa 100644 --- a/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java +++ b/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java @@ -22,6 +22,7 @@ package org.springframework.beans; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class FatalBeanException extends BeansException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java index d1c976a5a20..51ff5161f18 100644 --- a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java @@ -23,6 +23,7 @@ package org.springframework.beans; * @author Juergen Hoeller * @since 1.0.2 */ +@SuppressWarnings("serial") public class InvalidPropertyException extends FatalBeanException { private Class beanClass; diff --git a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java index 49d1398d7bc..467c595ed60 100644 --- a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java @@ -24,6 +24,7 @@ import java.beans.PropertyChangeEvent; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class MethodInvocationException extends PropertyAccessException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java index 94ba9a1af65..7a21fbf0e1f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java +++ b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java @@ -35,6 +35,7 @@ import org.springframework.util.StringUtils; * @author Rob Harrop * @since 13 May 2001 */ +@SuppressWarnings("serial") public class MutablePropertyValues implements PropertyValues, Serializable { private final List propertyValueList; diff --git a/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java index 49ba7d795a3..cba93573fe0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java @@ -23,6 +23,7 @@ package org.springframework.beans; * @author Juergen Hoeller * @since 1.0.2 */ +@SuppressWarnings("serial") public class NotReadablePropertyException extends InvalidPropertyException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java index 73b607edb11..2a5042c94f1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java @@ -24,6 +24,7 @@ package org.springframework.beans; * @author Alef Arendsen * @author Arjen Poutsma */ +@SuppressWarnings("serial") public class NotWritablePropertyException extends InvalidPropertyException { private String[] possibleMatches = null; diff --git a/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java b/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java index 40c593c4440..6ed4d3c578a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java +++ b/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java @@ -25,6 +25,7 @@ package org.springframework.beans; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class NullValueInNestedPathException extends InvalidPropertyException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java index 004310ac8d2..b2eafd44339 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java @@ -27,6 +27,7 @@ import org.springframework.core.ErrorCoded; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public abstract class PropertyAccessException extends BeansException implements ErrorCoded { private transient PropertyChangeEvent propertyChangeEvent; diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java index 378315bea78..9768d25a26e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java @@ -35,6 +35,7 @@ import org.springframework.util.ObjectUtils; * @author Juergen Hoeller * @since 18 April 2001 */ +@SuppressWarnings("serial") public class PropertyBatchUpdateException extends BeansException { /** List of PropertyAccessException objects */ diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java index 426476b89b9..f08d0291089 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java @@ -39,6 +39,7 @@ import org.springframework.util.ObjectUtils; * @see PropertyValues * @see BeanWrapper */ +@SuppressWarnings("serial") public class PropertyValue extends BeanMetadataAttributeAccessor implements Serializable { private final String name; diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java index 0e1930bbb2b..bac7fc93ba1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java +++ b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java @@ -26,6 +26,7 @@ import org.springframework.util.ClassUtils; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class TypeMismatchException extends PropertyAccessException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java index 15235f21069..bd5998cc7f2 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java @@ -30,6 +30,7 @@ import org.springframework.core.NestedRuntimeException; * * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class BeanCreationException extends FatalBeanException { private String beanName; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java index 2a078c5fb1e..cb270e619c1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java @@ -24,6 +24,7 @@ package org.springframework.beans.factory; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class BeanCreationNotAllowedException extends BeanCreationException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java index 1e014c85631..9e3d1a59060 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java @@ -23,6 +23,7 @@ package org.springframework.beans.factory; * @author Juergen Hoeller * @since 1.1 */ +@SuppressWarnings("serial") public class BeanCurrentlyInCreationException extends BeanCreationException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java index 9536dec6df1..1ba73bbde06 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java @@ -26,6 +26,7 @@ import org.springframework.beans.FatalBeanException; * @author Juergen Hoeller * @author Rob Harrop */ +@SuppressWarnings("serial") public class BeanDefinitionStoreException extends FatalBeanException { private String resourceDescription; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java index ab2f2531b0d..f4b5be3df28 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java @@ -24,6 +24,7 @@ import org.springframework.beans.FatalBeanException; * @author Juergen Hoeller * @since 3.0 */ +@SuppressWarnings("serial") public class BeanExpressionException extends FatalBeanException { /** @@ -44,4 +45,4 @@ public class BeanExpressionException extends FatalBeanException { super(msg, cause); } -} \ No newline at end of file +} diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java index 297e9be094f..aaace2cf34b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java @@ -31,6 +31,7 @@ import org.springframework.beans.FatalBeanException; * @see BeanFactoryAware#setBeanFactory * @see InitializingBean#afterPropertiesSet */ +@SuppressWarnings("serial") public class BeanInitializationException extends FatalBeanException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java index 26a5e8f3f3c..46a99fc5a24 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java @@ -24,6 +24,7 @@ package org.springframework.beans.factory; * @since 1.1 * @see org.springframework.beans.factory.support.AbstractBeanDefinition#setAbstract */ +@SuppressWarnings("serial") public class BeanIsAbstractException extends BeanCreationException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java index a741715a3b8..43b2bddc756 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java @@ -25,6 +25,7 @@ package org.springframework.beans.factory; * @since 10.03.2003 * @see org.springframework.beans.factory.FactoryBean */ +@SuppressWarnings("serial") public class BeanIsNotAFactoryException extends BeanNotOfRequiredTypeException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java index efdea3ab3d0..b853cec073a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java @@ -24,6 +24,7 @@ import org.springframework.beans.BeansException; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class BeanNotOfRequiredTypeException extends BeansException { /** The name of the instance that was of the wrong type */ diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java b/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java index 3b15815ea68..e620437b532 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java @@ -25,6 +25,7 @@ import org.springframework.beans.FatalBeanException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class CannotLoadBeanClassException extends FatalBeanException { private String resourceDescription; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java index 66b317222fe..791b30557e6 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java @@ -34,6 +34,7 @@ import org.springframework.beans.FatalBeanException; * @since 30.10.2003 * @see FactoryBean#getObject() */ +@SuppressWarnings("serial") public class FactoryBeanNotInitializedException extends FatalBeanException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java index ae2cc0de0ae..f700515bec4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java @@ -28,6 +28,7 @@ import org.springframework.util.ClassUtils; * @author Juergen Hoeller * @since 03.09.2003 */ +@SuppressWarnings("serial") public class UnsatisfiedDependencyException extends BeanCreationException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java index 9a607de3efd..2fb454543e5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java @@ -24,6 +24,7 @@ import org.springframework.beans.FatalBeanException; * @author Rod Johnson * @since 02.12.2002 */ +@SuppressWarnings("serial") public class BootstrapException extends FatalBeanException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java index 67559bea8eb..2693f8246c5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java @@ -37,6 +37,7 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 2.5 */ +@SuppressWarnings("serial") public class DependencyDescriptor implements Serializable { private transient MethodParameter methodParameter; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java index c9bf53b3ba0..710eeddae68 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java @@ -131,6 +131,7 @@ public class ObjectFactoryCreatingFactoryBean extends AbstractFactoryBean { /** * Independent inner class - for serialization purposes. */ + @SuppressWarnings("serial") private static class TargetBeanProvider implements Provider, Serializable { private final BeanFactory beanFactory; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java index 43b537dd05f..7e3d6b68a21 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java @@ -26,6 +26,7 @@ import org.springframework.beans.factory.BeanDefinitionStoreException; * @author Rob Harrop * @since 2.0 */ +@SuppressWarnings("serial") public class BeanDefinitionParsingException extends BeanDefinitionStoreException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java index 92c74dde608..c112676ea1d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java @@ -1643,6 +1643,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * Special DependencyDescriptor variant for autowire="byType". * Always optional; never considering the parameter name for choosing a primary candidate. */ + @SuppressWarnings("serial") private static class AutowireByTypeDependencyDescriptor extends DependencyDescriptor { public AutowireByTypeDependencyDescriptor(MethodParameter methodParameter, boolean eager) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java index db41eb00021..f93ea1b4080 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java @@ -52,6 +52,7 @@ import org.springframework.util.StringUtils; * @see RootBeanDefinition * @see ChildBeanDefinition */ +@SuppressWarnings("serial") public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccessor implements BeanDefinition, Cloneable { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java index 6723fed6c69..964f7d83e66 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java @@ -29,6 +29,7 @@ import org.springframework.util.Assert; * @since 2.5 * @see org.springframework.beans.factory.annotation.Qualifier */ +@SuppressWarnings("serial") public class AutowireCandidateQualifier extends BeanMetadataAttributeAccessor { public static String VALUE_KEY = "value"; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java index cb1bce28eee..6ea25abcc6b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java @@ -153,6 +153,7 @@ abstract class AutowireUtils { /** * Reflective InvocationHandler for lazy access to the current target object. */ + @SuppressWarnings("serial") private static class ObjectFactoryDelegatingInvocationHandler implements InvocationHandler, Serializable { private final ObjectFactory objectFactory; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java index 79d0d1e0058..57f4ddbb801 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java @@ -25,6 +25,7 @@ import org.springframework.beans.FatalBeanException; * @since 21.11.2003 * @see AbstractBeanDefinition#validate() */ +@SuppressWarnings("serial") public class BeanDefinitionValidationException extends FatalBeanException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java index 6effd4031e0..a09d69ddedf 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java @@ -43,6 +43,7 @@ import org.springframework.util.ObjectUtils; * @see GenericBeanDefinition * @see RootBeanDefinition */ +@SuppressWarnings("serial") public class ChildBeanDefinition extends AbstractBeanDefinition { private String parentName; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index ced19e9326f..824caaaec5e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -94,6 +94,7 @@ import org.springframework.util.StringUtils; * @see PropertiesBeanDefinitionReader * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader */ +@SuppressWarnings("serial") public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFactory implements ConfigurableListableBeanFactory, BeanDefinitionRegistry, Serializable { @@ -992,7 +993,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto * Minimal id reference to the factory. * Resolved to the actual factory instance on deserialization. */ - @SuppressWarnings("serial") private static class SerializedBeanFactoryReference implements Serializable { private final String id; @@ -1020,7 +1020,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto /** * Serializable ObjectFactory for lazy resolution of a dependency. */ - @SuppressWarnings("serial") private class DependencyObjectFactory implements ObjectFactory, Serializable { private final DependencyDescriptor descriptor; @@ -1042,7 +1041,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto /** * Serializable ObjectFactory for lazy resolution of a dependency. */ - @SuppressWarnings("serial") private class DependencyProvider extends DependencyObjectFactory implements Provider { public DependencyProvider(DependencyDescriptor descriptor, String beanName) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java index 9ebb74b632c..d3206fdc998 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java @@ -35,6 +35,7 @@ import org.springframework.beans.factory.config.BeanDefinition; * @see RootBeanDefinition * @see ChildBeanDefinition */ +@SuppressWarnings("serial") public class GenericBeanDefinition extends AbstractBeanDefinition { private String parentName; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java index 2be0e4152d8..bac4697f187 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java @@ -25,6 +25,7 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 3.0 */ +@SuppressWarnings("serial") public class ManagedArray extends ManagedList { /** Resolved element type for runtime creation of the target array */ diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java index 353538c9919..bac7a2a4fc8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java @@ -31,6 +31,7 @@ import org.springframework.beans.Mergeable; * @author Juergen Hoeller * @since 27.05.2003 */ +@SuppressWarnings("serial") public class ManagedList extends ArrayList implements Mergeable, BeanMetadataElement { private Object source; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java index 0a0bd10a151..e4459d02967 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java @@ -30,6 +30,7 @@ import org.springframework.beans.Mergeable; * @author Rob Harrop * @since 27.05.2003 */ +@SuppressWarnings("serial") public class ManagedMap extends LinkedHashMap implements Mergeable, BeanMetadataElement { private Object source; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java index a90f86dce91..b947affe435 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java @@ -29,6 +29,7 @@ import org.springframework.beans.Mergeable; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class ManagedProperties extends Properties implements Mergeable, BeanMetadataElement { private Object source; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java index a60272d12e7..7efcba32043 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java @@ -30,6 +30,7 @@ import org.springframework.beans.Mergeable; * @author Rob Harrop * @since 21.01.2004 */ +@SuppressWarnings("serial") public class ManagedSet extends LinkedHashSet implements Mergeable, BeanMetadataElement { private Object source; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java index 2e5e49ac948..7eaba17a546 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java @@ -45,6 +45,7 @@ import org.springframework.util.Assert; * @see GenericBeanDefinition * @see ChildBeanDefinition */ +@SuppressWarnings("serial") public class RootBeanDefinition extends AbstractBeanDefinition { // using a ConcurrentHashMap as a Set diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java index 87c4617c4de..cba28b06415 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java @@ -31,6 +31,7 @@ import org.springframework.beans.factory.BeanDefinitionStoreException; * @see #getLineNumber() * @see org.xml.sax.SAXParseException */ +@SuppressWarnings("serial") public class XmlBeanDefinitionStoreException extends BeanDefinitionStoreException { /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java index 077d76cdaeb..2ff16bbbaee 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java @@ -51,6 +51,7 @@ import org.springframework.core.io.Resource; * {@link XmlBeanDefinitionReader} */ @Deprecated +@SuppressWarnings({"serial", "all"}) public class XmlBeanFactory extends DefaultListableBeanFactory { private final XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this); diff --git a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java index 2f7892a9635..89490a664af 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java @@ -29,6 +29,7 @@ import org.springframework.util.StringUtils; * @since 26.05.2003 * @see #setToggleAscendingOnProperty */ +@SuppressWarnings("serial") public class MutableSortDefinition implements SortDefinition, Serializable { private String property = ""; diff --git a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java index 9d09ca22a21..13a81da8092 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java @@ -47,6 +47,7 @@ import org.springframework.util.Assert; * @see #getPageList() * @see org.springframework.beans.support.MutableSortDefinition */ +@SuppressWarnings("serial") public class PagedListHolder implements Serializable { public static final int DEFAULT_PAGE_SIZE = 10; diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index b584e4a51ea..f97a686dfbe 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -1851,6 +1851,7 @@ public final class BeanWrapperTests { } + @SuppressWarnings("serial") public static class TypedReadOnlyMap extends ReadOnlyMap { public TypedReadOnlyMap() { diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java index 37fc30a4ee2..a24c78d9893 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java @@ -1346,6 +1346,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests { } + @SuppressWarnings("serial") public static class ObjectFactoryInjectionBean implements Serializable { @Autowired diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java index 7ef18579bff..fdaa110f360 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java @@ -938,6 +938,7 @@ public class InjectAnnotationBeanPostProcessorTests { } + @SuppressWarnings("serial") public static class ObjectFactoryFieldInjectionBean implements Serializable { @Inject @@ -949,6 +950,7 @@ public class InjectAnnotationBeanPostProcessorTests { } + @SuppressWarnings("serial") public static class ObjectFactoryMethodInjectionBean implements Serializable { private Provider testBeanFactory; @@ -992,6 +994,7 @@ public class InjectAnnotationBeanPostProcessorTests { } + @SuppressWarnings("serial") public static class ObjectFactoryListFieldInjectionBean implements Serializable { @Inject @@ -1007,6 +1010,7 @@ public class InjectAnnotationBeanPostProcessorTests { } + @SuppressWarnings("serial") public static class ObjectFactoryListMethodInjectionBean implements Serializable { private Provider> testBeanFactory; @@ -1022,6 +1026,7 @@ public class InjectAnnotationBeanPostProcessorTests { } + @SuppressWarnings("serial") public static class ObjectFactoryMapFieldInjectionBean implements Serializable { @Inject @@ -1037,6 +1042,7 @@ public class InjectAnnotationBeanPostProcessorTests { } + @SuppressWarnings("serial") public static class ObjectFactoryMapMethodInjectionBean implements Serializable { private Provider> testBeanFactory; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java index 884b2bc2325..e0f0875403e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java @@ -28,6 +28,7 @@ import test.beans.TestBean; */ public class DefinitionMetadataEqualsHashCodeTests extends TestCase { + @SuppressWarnings("serial") public void testRootBeanDefinitionEqualsAndHashCode() throws Exception { RootBeanDefinition master = new RootBeanDefinition(TestBean.class); RootBeanDefinition equal = new RootBeanDefinition(TestBean.class); @@ -42,6 +43,7 @@ public class DefinitionMetadataEqualsHashCodeTests extends TestCase { assertEquals("Hash code for equal instances should match", master.hashCode(), equal.hashCode()); } + @SuppressWarnings("serial") public void testChildBeanDefinitionEqualsAndHashCode() throws Exception { ChildBeanDefinition master = new ChildBeanDefinition("foo"); ChildBeanDefinition equal = new ChildBeanDefinition("foo"); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java index d16ff925c5f..8b7d179e9e3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java @@ -27,6 +27,7 @@ import test.beans.TestBean; * @author Juergen Hoeller * @since 09.11.2003 */ +@SuppressWarnings("serial") public class ConstructorDependenciesBean implements Serializable { private int age; diff --git a/spring-beans/src/test/java/test/beans/Colour.java b/spring-beans/src/test/java/test/beans/Colour.java index f67b96cc0a6..5be4dfa761a 100644 --- a/spring-beans/src/test/java/test/beans/Colour.java +++ b/spring-beans/src/test/java/test/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-beans/src/test/java/test/beans/DerivedTestBean.java b/spring-beans/src/test/java/test/beans/DerivedTestBean.java index 74aebf75159..fbc9fb50900 100644 --- a/spring-beans/src/test/java/test/beans/DerivedTestBean.java +++ b/spring-beans/src/test/java/test/beans/DerivedTestBean.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean; * @author Juergen Hoeller * @since 21.08.2003 */ +@SuppressWarnings("serial") public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean { private String beanName; diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java b/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java index 6a54761ebcf..f7474155f84 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java @@ -22,6 +22,7 @@ package org.springframework.mail; * @author Dmitriy Kopylenko * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class MailAuthenticationException extends MailException { /** diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailException.java b/spring-context-support/src/main/java/org/springframework/mail/MailException.java index 407a42a838c..bcbdd3cfb16 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailException.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailException.java @@ -23,6 +23,7 @@ import org.springframework.core.NestedRuntimeException; * * @author Dmitriy Kopylenko */ +@SuppressWarnings("serial") public abstract class MailException extends NestedRuntimeException { /** diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java b/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java index b09676e22c1..de58b7613a0 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java @@ -22,6 +22,7 @@ package org.springframework.mail; * @author Dmitriy Kopylenko * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class MailParseException extends MailException { /** diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java b/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java index 7068c0f94c0..5b77c3825ea 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java @@ -25,6 +25,7 @@ package org.springframework.mail; * @see org.springframework.ui.velocity.VelocityEngineUtils#mergeTemplateIntoString * @see org.springframework.ui.freemarker.FreeMarkerTemplateUtils#processTemplateIntoString */ +@SuppressWarnings("serial") public class MailPreparationException extends MailException { /** diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java index faefe649827..d86944fc16d 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java @@ -30,6 +30,7 @@ import org.springframework.util.ObjectUtils; * @author Dmitriy Kopylenko * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class MailSendException extends MailException { private transient final Map failedMessages; diff --git a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java index 4691c85e0ba..1abeaa6a4f3 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java +++ b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java @@ -39,6 +39,7 @@ import org.springframework.util.Assert; * @see org.springframework.mail.javamail.MimeMessageHelper * @see org.springframework.mail.javamail.MimeMailMessage */ +@SuppressWarnings("serial") public class SimpleMailMessage implements MailMessage, Serializable { private String from; diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java index a8beff8ebae..eb1d1b6087b 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java @@ -61,6 +61,7 @@ import org.springframework.util.Assert; * @see SchedulerFactoryBean#setJobDetails * @see SimpleTriggerBean */ +@SuppressWarnings("serial") public class CronTriggerBean extends CronTrigger implements JobDetailAwareTrigger, BeanNameAware, InitializingBean { diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java index 44830fea5d4..1da0bb9b10f 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java @@ -48,6 +48,7 @@ import org.springframework.context.ApplicationContextAware; * @see org.springframework.beans.factory.BeanNameAware * @see org.quartz.Scheduler#DEFAULT_GROUP */ +@SuppressWarnings("serial") public class JobDetailBean extends JobDetail implements BeanNameAware, ApplicationContextAware, InitializingBean { diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java index 2b04f76d8d0..701b5c6ca09 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java @@ -28,6 +28,7 @@ import org.springframework.util.MethodInvoker; * @since 2.5.3 * @see MethodInvokingJobDetailFactoryBean */ +@SuppressWarnings("serial") public class JobMethodInvocationFailedException extends NestedRuntimeException { /** diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java index 045478804fa..06b273eb246 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java @@ -60,6 +60,7 @@ import org.springframework.core.Constants; * @see SchedulerFactoryBean#setJobDetails * @see CronTriggerBean */ +@SuppressWarnings("serial") public class SimpleTriggerBean extends SimpleTrigger implements JobDetailAwareTrigger, BeanNameAware, InitializingBean { diff --git a/spring-context-support/src/test/java/org/springframework/beans/Colour.java b/spring-context-support/src/test/java/org/springframework/beans/Colour.java index 60dc333e0b4..17fd24fec79 100644 --- a/spring-context-support/src/test/java/org/springframework/beans/Colour.java +++ b/spring-context-support/src/test/java/org/springframework/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java index 11891d48bb2..54b9b6ef142 100644 --- a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java +++ b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java @@ -140,6 +140,7 @@ public class ConcurrentMapCache implements Cache { } + @SuppressWarnings("serial") private static class NullHolder implements Serializable { } diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java index 9956972b12a..1068bb9126c 100644 --- a/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java +++ b/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java @@ -23,6 +23,7 @@ import org.springframework.beans.FatalBeanException; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class ApplicationContextException extends FatalBeanException { /** diff --git a/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java b/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java index 38bb09b9351..980464d36f1 100644 --- a/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java +++ b/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java @@ -23,6 +23,7 @@ import java.util.Locale; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class NoSuchMessageException extends RuntimeException { /** diff --git a/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java index 9e79349feb5..822f3667f59 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java +++ b/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java @@ -25,6 +25,7 @@ import org.springframework.context.ApplicationEvent; * @author Juergen Hoeller * @since 2.5 */ +@SuppressWarnings("serial") public abstract class ApplicationContextEvent extends ApplicationEvent { /** diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java index 82a5b47ebae..abd68238384 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java +++ b/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java @@ -25,6 +25,7 @@ import org.springframework.context.ApplicationContext; * @since 12.08.2003 * @see ContextRefreshedEvent */ +@SuppressWarnings("serial") public class ContextClosedEvent extends ApplicationContextEvent { /** diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java index bc6d2255b7c..b8f97520a4e 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java +++ b/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java @@ -25,6 +25,7 @@ import org.springframework.context.ApplicationContext; * @since 04.03.2003 * @see ContextClosedEvent */ +@SuppressWarnings("serial") public class ContextRefreshedEvent extends ApplicationContextEvent { /** diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java index edef2350db5..d314430eeda 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java +++ b/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java @@ -26,6 +26,7 @@ import org.springframework.context.ApplicationContext; * @since 2.5 * @see ContextStoppedEvent */ +@SuppressWarnings("serial") public class ContextStartedEvent extends ApplicationContextEvent { /** diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java index 5e995ab6c3c..4e089149c5f 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java +++ b/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java @@ -26,6 +26,7 @@ import org.springframework.context.ApplicationContext; * @since 2.5 * @see ContextStartedEvent */ +@SuppressWarnings("serial") public class ContextStoppedEvent extends ApplicationContextEvent { /** diff --git a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java index efd11eb77da..ac517852959 100644 --- a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java +++ b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java @@ -66,6 +66,7 @@ public class MapAccessor implements PropertyAccessor { * Exception thrown from {@code read} in order to reset a cached * PropertyAccessor, allowing other accessors to have a try. */ + @SuppressWarnings("serial") private static class MapAccessException extends AccessException { private final String key; diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java index 67c9bc99c61..b05eeaa4e79 100644 --- a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java +++ b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java @@ -31,6 +31,7 @@ import org.springframework.util.StringUtils; * @since 13.02.2004 * @see org.springframework.context.MessageSource#getMessage(MessageSourceResolvable, java.util.Locale) */ +@SuppressWarnings("serial") public class DefaultMessageSourceResolvable implements MessageSourceResolvable, Serializable { private final String[] codes; diff --git a/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java b/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java index 26d0a174ad6..e3332791d5b 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java @@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class EjbAccessException extends NestedRuntimeException { /** diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java index 897ffd30235..801ffcd0427 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java @@ -54,6 +54,7 @@ import org.springframework.util.WeakReferenceMonitor; * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style */ @Deprecated +@SuppressWarnings("serial") public abstract class AbstractEnterpriseBean implements EnterpriseBean { public static final String BEAN_FACTORY_PATH_ENVIRONMENT_KEY = "java:comp/env/ejb/BeanFactoryPath"; diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java index cf7240d90bb..26bdd8b79b0 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java @@ -26,6 +26,7 @@ import javax.jms.MessageListener; * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style */ @Deprecated +@SuppressWarnings("serial") public abstract class AbstractJmsMessageDrivenBean extends AbstractMessageDrivenBean implements MessageListener { // Empty: The purpose of this class is to ensure diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java index b17f95f7e6b..e87447b648c 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java @@ -43,6 +43,7 @@ import org.apache.commons.logging.LogFactory; * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style */ @Deprecated +@SuppressWarnings("serial") public abstract class AbstractMessageDrivenBean extends AbstractEnterpriseBean implements MessageDrivenBean { diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java index 80343310fc4..edf66f329ce 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java @@ -31,6 +31,7 @@ import javax.ejb.SessionContext; * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style */ @Deprecated +@SuppressWarnings("serial") public abstract class AbstractSessionBean extends AbstractEnterpriseBean implements SmartSessionBean { /** The SessionContext passed to this EJB */ diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java index 1a708e4f8b6..bbd9079b263 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java @@ -44,6 +44,7 @@ import org.springframework.beans.FatalBeanException; * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style */ @Deprecated +@SuppressWarnings("serial") public abstract class AbstractStatefulSessionBean extends AbstractSessionBean { /** diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java index 187965bea56..2f91d248a4a 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java @@ -48,6 +48,7 @@ import org.apache.commons.logging.LogFactory; * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style */ @Deprecated +@SuppressWarnings("serial") public abstract class AbstractStatelessSessionBean extends AbstractSessionBean { /** Logger available to subclasses */ diff --git a/spring-context/src/main/java/org/springframework/jmx/JmxException.java b/spring-context/src/main/java/org/springframework/jmx/JmxException.java index b431ca9f621..bbddbc3ec23 100644 --- a/spring-context/src/main/java/org/springframework/jmx/JmxException.java +++ b/spring-context/src/main/java/org/springframework/jmx/JmxException.java @@ -25,6 +25,7 @@ import org.springframework.core.NestedRuntimeException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class JmxException extends NestedRuntimeException { /** diff --git a/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java b/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java index 002f59a2cd4..231fcfec8d8 100644 --- a/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java +++ b/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java @@ -25,6 +25,7 @@ package org.springframework.jmx; * @since 1.2 * @see org.springframework.jmx.support.JmxUtils#locateMBeanServer */ +@SuppressWarnings("serial") public class MBeanServerNotFoundException extends JmxException { /** diff --git a/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java index dc802df679b..fb1f10b411c 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java @@ -27,6 +27,7 @@ import javax.management.JMRuntimeException; * @since 1.2 * @see MBeanClientInterceptor */ +@SuppressWarnings("serial") public class InvalidInvocationException extends JMRuntimeException { /** diff --git a/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java index b1a65e4c75f..a52413179b9 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java @@ -26,6 +26,7 @@ import org.springframework.jmx.JmxException; * @since 1.2 * @see MBeanClientInterceptor */ +@SuppressWarnings("serial") public class InvocationFailureException extends JmxException { /** diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java index 3591725b068..2e2a9588d26 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java @@ -26,6 +26,7 @@ import org.springframework.jmx.JmxException; * @since 2.5.6 * @see MBeanClientInterceptor */ +@SuppressWarnings("serial") public class MBeanConnectFailureException extends JmxException { /** diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java index 8a6fa34b8e7..b14e4d98d1b 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java @@ -28,6 +28,7 @@ import org.springframework.jmx.JmxException; * @see MBeanClientInterceptor * @see MBeanProxyFactoryBean */ +@SuppressWarnings("serial") public class MBeanInfoRetrievalException extends JmxException { /** diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java index ab8cf1676c1..2d31820e7b1 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java @@ -25,6 +25,7 @@ import org.springframework.jmx.JmxException; * @since 2.0 * @see MBeanExportOperations */ +@SuppressWarnings("serial") public class MBeanExportException extends JmxException { /** diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java index d26d1de70c3..9969b74383f 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java @@ -1069,6 +1069,7 @@ public class MBeanExporter extends MBeanRegistrationSupport * {@link org.springframework.jmx.export.notification.NotificationPublisher} * into the lazy resource as it is created if required. */ + @SuppressWarnings("serial") private class NotificationPublisherAwareLazyTargetSource extends LazyInitTargetSource { private ModelMBean modelMBean; diff --git a/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java b/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java index 45cbac17baf..821d0cafb4c 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java @@ -23,6 +23,7 @@ package org.springframework.jmx.export; * @author Rob Harrop * @since 2.0 */ +@SuppressWarnings("serial") public class UnableToRegisterMBeanException extends MBeanExportException { /** diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java index e3e5d3616e3..7c6c59c0066 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java @@ -27,6 +27,7 @@ import org.springframework.jmx.JmxException; * @see JmxAttributeSource * @see org.springframework.jmx.export.assembler.MetadataMBeanInfoAssembler */ +@SuppressWarnings("serial") public class InvalidMetadataException extends JmxException { /** diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java index 251904c3d49..7c2c98f0f44 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java @@ -28,6 +28,7 @@ import org.springframework.jmx.JmxException; * @since 2.0 * @see NotificationPublisher */ +@SuppressWarnings("serial") public class UnableToSendNotificationException extends JmxException { /** diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java b/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java index e4299b0a260..9eb73086abd 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java @@ -29,6 +29,7 @@ import org.springframework.core.NestedRuntimeException; * @author Juergen Hoeller * @since 2.0.3 */ +@SuppressWarnings("serial") public class JndiLookupFailureException extends NestedRuntimeException { /** diff --git a/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java b/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java index 6303b62a138..16e1d15cc48 100644 --- a/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java +++ b/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java @@ -26,6 +26,7 @@ import javax.naming.NamingException; * @since 1.2.8 * @see JndiTemplate#lookup(String, Class) */ +@SuppressWarnings("serial") public class TypeMismatchNamingException extends NamingException { private Class requiredType; diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java index cb0b5cb9837..063c94826a0 100644 --- a/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java +++ b/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java @@ -23,6 +23,7 @@ package org.springframework.remoting; * @author Juergen Hoeller * @since 1.1 */ +@SuppressWarnings("serial") public class RemoteConnectFailureException extends RemoteAccessException { /** diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java index f7e8afb0a44..027ca75078e 100644 --- a/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java +++ b/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java @@ -25,6 +25,7 @@ package org.springframework.remoting; * @since 2.5 * @see RemoteProxyFailureException */ +@SuppressWarnings("serial") public class RemoteInvocationFailureException extends RemoteAccessException { /** diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java index 0d1b69e26b7..48ba3ccab39 100644 --- a/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java +++ b/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java @@ -23,6 +23,7 @@ package org.springframework.remoting; * @author Juergen Hoeller * @since 1.1 */ +@SuppressWarnings("serial") public class RemoteLookupFailureException extends RemoteAccessException { /** diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java index c6d92fac803..c1bd8f080fd 100644 --- a/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java +++ b/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java @@ -25,6 +25,7 @@ package org.springframework.remoting; * @since 1.2.8 * @see RemoteInvocationFailureException */ +@SuppressWarnings("serial") public class RemoteProxyFailureException extends RemoteAccessException { /** diff --git a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java index 2a6da0b4fcb..7a3dc51aa49 100644 --- a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java +++ b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java @@ -29,6 +29,7 @@ import org.springframework.remoting.RemoteInvocationFailureException; * @see javax.xml.rpc.soap.SOAPFaultException * @see javax.xml.ws.soap.SOAPFaultException */ +@SuppressWarnings("serial") public abstract class SoapFaultException extends RemoteInvocationFailureException { /** diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java index f5a198952f3..4d59efa3907 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java +++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java @@ -26,6 +26,7 @@ import org.springframework.core.NestedRuntimeException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class SchedulingException extends NestedRuntimeException { /** diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java index 43f86ee55d6..8fe217f52b0 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java +++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java @@ -34,6 +34,7 @@ import org.springframework.util.CustomizableThreadCreator; * @see #setThreadPriority * @deprecated as of Spring 3.2, in favor of using the native JDK 6 concurrent support */ +@SuppressWarnings("serial") @Deprecated public class CustomizableThreadFactory extends CustomizableThreadCreator implements ThreadFactory { diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java index 9015d05489d..b24b0935e7b 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java @@ -75,6 +75,7 @@ import org.springframework.util.Assert; * @deprecated as of Spring 3.2, in favor of using the native JDK 6 concurrent support */ @Deprecated +@SuppressWarnings("serial") public class ThreadPoolTaskExecutor extends CustomizableThreadFactory implements SchedulingTaskExecutor, Executor, BeanNameAware, InitializingBean, DisposableBean { diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java index 83eb452190c..6665e3836ec 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java @@ -32,6 +32,7 @@ import org.springframework.util.CustomizableThreadCreator; * @see #setThreadNamePrefix * @see #setThreadPriority */ +@SuppressWarnings("serial") public class CustomizableThreadFactory extends CustomizableThreadCreator implements ThreadFactory { /** diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java index d29dc2d90db..92d7d2007d0 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java @@ -40,6 +40,7 @@ import org.springframework.beans.factory.InitializingBean; * @see java.util.concurrent.Executors * @see java.util.concurrent.ThreadPoolExecutor */ +@SuppressWarnings("serial") public abstract class ExecutorConfigurationSupport extends CustomizableThreadFactory implements BeanNameAware, InitializingBean, DisposableBean { diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java index 61915d2c76f..911ecd99229 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java @@ -60,6 +60,7 @@ import org.springframework.util.ObjectUtils; * @see java.util.concurrent.ScheduledExecutorService * @see java.util.concurrent.ScheduledThreadPoolExecutor */ +@SuppressWarnings("serial") public class ScheduledExecutorFactoryBean extends ExecutorConfigurationSupport implements FactoryBean { diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java index a289179733a..ae9a96ec741 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java @@ -49,6 +49,7 @@ import org.springframework.beans.factory.InitializingBean; * @see java.util.concurrent.Executors * @see java.util.concurrent.ThreadPoolExecutor */ +@SuppressWarnings("serial") public class ThreadPoolExecutorFactoryBean extends ExecutorConfigurationSupport implements FactoryBean, InitializingBean, DisposableBean { diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java index 9ce2bc6b0d4..1a7da1d6163 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java @@ -63,6 +63,7 @@ import org.springframework.util.Assert; * @see java.util.concurrent.ThreadPoolExecutor * @see ConcurrentTaskExecutor */ +@SuppressWarnings("serial") public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport implements SchedulingTaskExecutor { private final Object poolSizeMonitor = new Object(); diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java index b346ec2adf5..4d03d5c57cd 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java @@ -48,6 +48,7 @@ import org.springframework.util.ErrorHandler; * @see #setThreadFactory * @see #setErrorHandler */ +@SuppressWarnings("serial") public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport implements TaskScheduler, SchedulingTaskExecutor { diff --git a/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java b/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java index 58586c3e38c..e6a5cf238f7 100644 --- a/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java +++ b/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java @@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class ScriptCompilationException extends NestedRuntimeException { private ScriptSource scriptSource; diff --git a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java index b473a4eb350..6c8f6ea616f 100644 --- a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java +++ b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java @@ -212,6 +212,7 @@ public abstract class BshScriptUtils { /** * Exception to be thrown on script execution failure. */ + @SuppressWarnings("serial") public static class BshExecutionException extends NestedRuntimeException { private BshExecutionException(EvalError ex) { diff --git a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java index 644bd9f64d6..318b83e1a5e 100644 --- a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java +++ b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java @@ -233,6 +233,7 @@ public abstract class JRubyScriptUtils { * have useful {@link Object#toString()}, {@link Throwable#getMessage()}, * and {@link Throwable#printStackTrace} implementations. */ + @SuppressWarnings("serial") public static class JRubyExecutionException extends NestedRuntimeException { /** diff --git a/spring-context/src/main/java/org/springframework/ui/ModelMap.java b/spring-context/src/main/java/org/springframework/ui/ModelMap.java index 60c89c7bb4e..28a6a687b5e 100644 --- a/spring-context/src/main/java/org/springframework/ui/ModelMap.java +++ b/spring-context/src/main/java/org/springframework/ui/ModelMap.java @@ -38,6 +38,7 @@ import org.springframework.util.Assert; * @see org.springframework.web.servlet.ModelAndView * @see org.springframework.web.portlet.ModelAndView */ +@SuppressWarnings("serial") public class ModelMap extends LinkedHashMap { /** diff --git a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java index 4f6e20e318b..452867a8b2f 100644 --- a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java +++ b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java @@ -33,6 +33,7 @@ import org.springframework.validation.BindingResult; * @since 2.5.6 * @see org.springframework.validation.BindingResult */ +@SuppressWarnings("serial") public class BindingAwareModelMap extends ExtendedModelMap { @Override diff --git a/spring-context/src/test/java/org/springframework/beans/Colour.java b/spring-context/src/test/java/org/springframework/beans/Colour.java index 60dc333e0b4..17fd24fec79 100644 --- a/spring-context/src/test/java/org/springframework/beans/Colour.java +++ b/spring-context/src/test/java/org/springframework/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java index 2bb41a9d5b6..0940539f54a 100644 --- a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean; * @author Juergen Hoeller * @since 21.08.2003 */ +@SuppressWarnings("serial") public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean { private String beanName; @@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA return destroyed; } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java index 34d05120aaa..13c2c5447a5 100644 --- a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java @@ -25,6 +25,7 @@ import org.springframework.util.ObjectUtils; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class SerializablePerson implements Person, Serializable { private String name; @@ -61,4 +62,4 @@ public class SerializablePerson implements Person, Serializable { return p.age == age && ObjectUtils.nullSafeEquals(name, p.name); } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java index 42fb9fd89d5..b149254bfd7 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java @@ -28,6 +28,7 @@ import org.springframework.beans.factory.ObjectFactory; /** * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class SimpleMapScope implements Scope, Serializable { private final Map map = new HashMap(); diff --git a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index 619bfba6fbd..84ade3b7ddd 100644 --- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -147,6 +147,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe } + @SuppressWarnings("serial") public static class MyEvent extends ApplicationEvent { public MyEvent(Object source) { diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index 9baa31dc2f2..789fb09defc 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -190,6 +190,7 @@ public class ApplicationContextEventTests { } + @SuppressWarnings("serial") public static class MyEvent extends ApplicationEvent { public MyEvent(Object source) { @@ -198,6 +199,7 @@ public class ApplicationContextEventTests { } + @SuppressWarnings("serial") public static class MyOtherEvent extends ApplicationEvent { public MyOtherEvent(Object source) { diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java index b87a8c3ff78..d8bc82ee111 100644 --- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java @@ -120,6 +120,7 @@ public class EventPublicationInterceptorTests { } + @SuppressWarnings("serial") public static class TestEvent extends ApplicationEvent { public TestEvent(Object source) { @@ -128,6 +129,7 @@ public class EventPublicationInterceptorTests { } + @SuppressWarnings("serial") public static final class TestEventWithNoValidOneArgObjectCtor extends ApplicationEvent { public TestEventWithNoValidOneArgObjectCtor() { diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java index 5eac00f54e6..393e71d5d54 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java @@ -296,6 +296,7 @@ public class ApplicationContextExpressionTests { } + @SuppressWarnings("serial") public static class ValueTestBean implements Serializable { @Autowired @Value("XXX#{tb0.name}YYY#{mySpecialAttr}ZZZ") diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java index b09bae9980e..0b0f791cc54 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java @@ -56,6 +56,7 @@ public class ScheduledExecutorFactoryBeanTests { } @Test + @SuppressWarnings("serial") public void testShutdownNowIsPropagatedToTheExecutorOnDestroy() throws Exception { MockControl mockScheduledExecutorService = MockControl.createNiceControl(ScheduledExecutorService.class); final ScheduledExecutorService executor = (ScheduledExecutorService) mockScheduledExecutorService.getMock(); @@ -78,6 +79,7 @@ public class ScheduledExecutorFactoryBeanTests { } @Test + @SuppressWarnings("serial") public void testShutdownIsPropagatedToTheExecutorOnDestroy() throws Exception { MockControl mockScheduledExecutorService = MockControl.createNiceControl(ScheduledExecutorService.class); final ScheduledExecutorService executor = (ScheduledExecutorService) mockScheduledExecutorService.getMock(); @@ -228,6 +230,7 @@ public class ScheduledExecutorFactoryBeanTests { } @Test + @SuppressWarnings("serial") public void testSettingThreadFactoryToNullForcesUseOfDefaultButIsOtherwiseCool() throws Exception { ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { @@ -244,6 +247,7 @@ public class ScheduledExecutorFactoryBeanTests { } @Test + @SuppressWarnings("serial") public void testSettingRejectedExecutionHandlerToNullForcesUseOfDefaultButIsOtherwiseCool() throws Exception { ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java index d3ecec1760e..9dfbf55a77f 100644 --- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java @@ -312,6 +312,7 @@ public class BshScriptFactoryTests extends TestCase { } + @SuppressWarnings("serial") private static class MyEvent extends ApplicationEvent { public MyEvent(Object source) { diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java index d5b47efb9ff..95b21bcda2a 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java @@ -20,6 +20,7 @@ package org.springframework.scripting.groovy; * @author Dave Syer * */ +@SuppressWarnings("serial") public class TestException extends RuntimeException { public TestException(String string) { diff --git a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java b/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java index fc0794c17f7..284cfc51931 100644 --- a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java +++ b/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java @@ -25,6 +25,7 @@ import test.interceptor.TimestampIntroductionInterceptor; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class TimestampIntroductionAdvisor extends DefaultIntroductionAdvisor { /** diff --git a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java index b706cc47955..3b8350e4c83 100644 --- a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java +++ b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java @@ -25,6 +25,7 @@ import java.io.Serializable; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class SerializableNopInterceptor extends NopInterceptor implements Serializable { /** @@ -42,4 +43,4 @@ public class SerializableNopInterceptor extends NopInterceptor implements Serial ++count; } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java index 4039d228391..83761c2d3c2 100644 --- a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java +++ b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java @@ -20,6 +20,7 @@ import org.springframework.aop.support.DelegatingIntroductionInterceptor; import test.util.TimeStamped; +@SuppressWarnings("serial") public class TimestampIntroductionInterceptor extends DelegatingIntroductionInterceptor implements TimeStamped { diff --git a/spring-context/src/test/java/test/mixin/LockMixin.java b/spring-context/src/test/java/test/mixin/LockMixin.java index bdfafc45e5f..b038bff1fdc 100644 --- a/spring-context/src/test/java/test/mixin/LockMixin.java +++ b/spring-context/src/test/java/test/mixin/LockMixin.java @@ -28,6 +28,7 @@ import org.springframework.aop.support.DelegatingIntroductionInterceptor; * @author Rod Johnson * @since 10.07.2003 */ +@SuppressWarnings("serial") public class LockMixin extends DelegatingIntroductionInterceptor implements Lockable { /** This field demonstrates additional state in the mixin */ @@ -61,4 +62,4 @@ public class LockMixin extends DelegatingIntroductionInterceptor implements Lock return super.invoke(invocation); } -} \ No newline at end of file +} diff --git a/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java b/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java index f82eef32947..7ee37ed6846 100644 --- a/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java +++ b/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java @@ -23,6 +23,7 @@ import org.springframework.aop.support.DefaultIntroductionAdvisor; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class LockMixinAdvisor extends DefaultIntroductionAdvisor { public LockMixinAdvisor() { diff --git a/spring-context/src/test/java/test/mixin/LockedException.java b/spring-context/src/test/java/test/mixin/LockedException.java index 68d428fece6..1ca010f1649 100644 --- a/spring-context/src/test/java/test/mixin/LockedException.java +++ b/spring-context/src/test/java/test/mixin/LockedException.java @@ -17,8 +17,9 @@ package test.mixin; +@SuppressWarnings("serial") public class LockedException extends RuntimeException { public LockedException() { } -} \ No newline at end of file +} diff --git a/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java index bd598c2f8ae..a170bb10d73 100644 --- a/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java +++ b/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java @@ -32,6 +32,7 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public abstract class AttributeAccessorSupport implements AttributeAccessor, Serializable { /** Map with String keys and Object values */ diff --git a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java index 4c1daf0f5fd..5e5cddf49de 100644 --- a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java +++ b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java @@ -334,6 +334,7 @@ public abstract class CollectionFactory { * ConcurrentMap adapter for the JDK ConcurrentHashMap class. */ @Deprecated + @SuppressWarnings("serial") private static class JdkConcurrentHashMap extends ConcurrentHashMap implements ConcurrentMap { private JdkConcurrentHashMap(int initialCapacity) { diff --git a/spring-core/src/main/java/org/springframework/core/ConstantException.java b/spring-core/src/main/java/org/springframework/core/ConstantException.java index 454a8abb5af..577464fe290 100644 --- a/spring-core/src/main/java/org/springframework/core/ConstantException.java +++ b/spring-core/src/main/java/org/springframework/core/ConstantException.java @@ -24,6 +24,7 @@ package org.springframework.core; * @since 28.04.2003 * @see org.springframework.core.Constants */ +@SuppressWarnings("serial") public class ConstantException extends IllegalArgumentException { /** diff --git a/spring-core/src/main/java/org/springframework/core/NestedIOException.java b/spring-core/src/main/java/org/springframework/core/NestedIOException.java index df9be8c0dba..536d5c299a8 100644 --- a/spring-core/src/main/java/org/springframework/core/NestedIOException.java +++ b/spring-core/src/main/java/org/springframework/core/NestedIOException.java @@ -35,6 +35,7 @@ import java.io.IOException; * @see org.springframework.core.NestedCheckedException * @see org.springframework.core.NestedRuntimeException */ +@SuppressWarnings("serial") public class NestedIOException extends IOException { static { diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java index 72df710897f..2cb57adc3a1 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java +++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java @@ -99,6 +99,7 @@ public abstract class AbstractCachingLabeledEnumResolver implements LabeledEnumR /** * Inner cache class that implements lazy building of LabeledEnum Maps. */ + @SuppressWarnings("serial") private class LabeledEnumCache extends CachingMapDecorator> { public LabeledEnumCache() { diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java index d8679525b9a..f63f0126c1a 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java @@ -23,6 +23,7 @@ package org.springframework.core.enums; * @since 1.2.6 * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ +@SuppressWarnings("serial") public abstract class AbstractGenericLabeledEnum extends AbstractLabeledEnum { /** diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java index 8f04acd89fb..6bcdb72ec0f 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java @@ -26,6 +26,7 @@ package org.springframework.core.enums; * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ @Deprecated +@SuppressWarnings("serial") public abstract class AbstractLabeledEnum implements LabeledEnum { /** diff --git a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java index e78a7eab99d..0cf24130912 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java @@ -30,6 +30,7 @@ import org.springframework.util.Assert; * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ @Deprecated +@SuppressWarnings("serial") public class LetterCodedLabeledEnum extends AbstractGenericLabeledEnum { /** diff --git a/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java index eeb4022b740..ca74beac923 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java @@ -30,6 +30,8 @@ package org.springframework.core.enums; @Deprecated public class ShortCodedLabeledEnum extends AbstractGenericLabeledEnum { + private static final long serialVersionUID = 1L; + /** * The unique code of this enum. */ diff --git a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java index 26dd2df6e06..1fd9da9f03f 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java @@ -44,6 +44,7 @@ package org.springframework.core.enums; * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ @Deprecated +@SuppressWarnings("serial") public abstract class StaticLabeledEnum extends AbstractLabeledEnum { /** diff --git a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java index 7dfc3b23644..3eff20f4d2f 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java @@ -32,6 +32,7 @@ import org.springframework.util.Assert; * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ @Deprecated +@SuppressWarnings("serial") public class StringCodedLabeledEnum extends AbstractGenericLabeledEnum { /** diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java index a13007fb8de..60de9d1e3f0 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java @@ -28,6 +28,7 @@ import org.springframework.core.NestedRuntimeException; * @author Juergen Hoeller * @since 3.0.5 */ +@SuppressWarnings("serial") public class SerializationFailedException extends NestedRuntimeException { /** diff --git a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java index 92c37bc758e..36c9b04ce7f 100644 --- a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java +++ b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java @@ -44,6 +44,7 @@ import org.springframework.util.CustomizableThreadCreator; * @see org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor */ +@SuppressWarnings("serial") public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator implements AsyncTaskExecutor, Serializable { /** diff --git a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java index 4b12d67dd81..054e921ccf0 100644 --- a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java +++ b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java @@ -36,6 +36,7 @@ import org.springframework.util.Assert; * @since 2.0 * @see SimpleAsyncTaskExecutor */ +@SuppressWarnings("serial") public class SyncTaskExecutor implements TaskExecutor, Serializable { /** diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java index 4429d0ca9fe..d1067fb1131 100644 --- a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java +++ b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java @@ -27,6 +27,7 @@ import java.util.concurrent.RejectedExecutionException; * @see TaskExecutor#execute(Runnable) * @see TaskTimeoutException */ +@SuppressWarnings("serial") public class TaskRejectedException extends RejectedExecutionException { /** diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java index 49a218d3543..4cda4266be7 100644 --- a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java +++ b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java @@ -25,6 +25,7 @@ package org.springframework.core.task; * @see AsyncTaskExecutor#execute(Runnable, long) * @see TaskRejectedException */ +@SuppressWarnings("serial") public class TaskTimeoutException extends TaskRejectedException { /** diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java b/spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java index 5f9bd68ee6e..ef8201d6b54 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java @@ -40,6 +40,7 @@ public class CachingMetadataReaderFactory extends SimpleMetadataReaderFactory { private volatile int cacheLimit = DEFAULT_CACHE_LIMIT; + @SuppressWarnings("serial") private final Map metadataReaderCache = new LinkedHashMap(DEFAULT_CACHE_LIMIT, 0.75f, true) { @Override diff --git a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java index 7aec04a0322..f51c6c8ad33 100644 --- a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java +++ b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java @@ -39,6 +39,7 @@ import java.util.ListIterator; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class AutoPopulatingList implements List, Serializable { /** diff --git a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java index 6fa38ca7bbd..bd6e7dfc1c6 100644 --- a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java +++ b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java @@ -44,6 +44,7 @@ import java.util.WeakHashMap; * @deprecated as of Spring 3.2, to be removed along with LabeledEnum support */ @Deprecated +@SuppressWarnings("serial") public abstract class CachingMapDecorator implements Map, Serializable { private static Object NULL_VALUE = new Object(); diff --git a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java index 8f74a05c489..5ce5e847f99 100644 --- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java +++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java @@ -386,6 +386,7 @@ public abstract class CollectionUtils { /** * Adapts a Map to the MultiValueMap contract. */ + @SuppressWarnings("serial") private static class MultiValueMapAdapter implements MultiValueMap, Serializable { private final Map> map; diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java index 11c844ffd7f..a961f0ff648 100644 --- a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java +++ b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java @@ -43,6 +43,7 @@ import org.apache.commons.logging.LogFactory; * @see org.springframework.aop.interceptor.ConcurrencyThrottleInterceptor * @see java.io.Serializable */ +@SuppressWarnings("serial") public abstract class ConcurrencyThrottleSupport implements Serializable { /** diff --git a/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java b/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java index e21dbd3fcaa..97d277208fb 100644 --- a/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java +++ b/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java @@ -29,6 +29,7 @@ import java.io.Serializable; * @since 2.0.3 * @see org.springframework.scheduling.concurrent.CustomizableThreadFactory */ +@SuppressWarnings("serial") public class CustomizableThreadCreator implements Serializable { private String threadNamePrefix; diff --git a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java index 3d5f47da6f5..62921593a1c 100644 --- a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java +++ b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java @@ -33,6 +33,7 @@ import java.util.Map; * @author Juergen Hoeller * @since 3.0 */ +@SuppressWarnings("serial") public class LinkedCaseInsensitiveMap extends LinkedHashMap { private final Map caseInsensitiveKeys; diff --git a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java index 9b5417c38c3..82fa3f7aa6d 100644 --- a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java +++ b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java @@ -25,6 +25,7 @@ import java.util.Comparator; * @author Keith Donald * @since 1.2.2 */ +@SuppressWarnings("serial") public final class BooleanComparator implements Comparator, Serializable { /** diff --git a/spring-core/src/test/java/org/springframework/beans/Colour.java b/spring-core/src/test/java/org/springframework/beans/Colour.java index 60dc333e0b4..17fd24fec79 100644 --- a/spring-core/src/test/java/org/springframework/beans/Colour.java +++ b/spring-core/src/test/java/org/springframework/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java index 8e309e0b418..c4681d4f4ca 100644 --- a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -22,6 +22,7 @@ import java.io.Serializable; * @author Juergen Hoeller * @since 21.08.2003 */ +@SuppressWarnings("serial") public class DerivedTestBean extends TestBean implements Serializable { private String beanName; @@ -79,4 +80,4 @@ public class DerivedTestBean extends TestBean implements Serializable { return destroyed; } -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java index d35b1b34fd9..03a192119d0 100644 --- a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java +++ b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java @@ -32,6 +32,7 @@ public class AttributeAccessorSupportTests extends TestCase { private AttributeAccessor attributeAccessor; + @SuppressWarnings("serial") protected void setUp() throws Exception { this.attributeAccessor = new AttributeAccessorSupport() { }; diff --git a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java index 196f2e65771..bb3c7989047 100644 --- a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java @@ -87,18 +87,23 @@ public class ExceptionDepthComparatorTests { return ExceptionDepthComparator.findClosestMatch(Arrays.asList(classes), new TargetException()); } + @SuppressWarnings("serial") public class HighestDepthException extends Throwable { } + @SuppressWarnings("serial") public class LowestDepthException extends HighestDepthException { } + @SuppressWarnings("serial") public class TargetException extends LowestDepthException { } + @SuppressWarnings("serial") public class SameDepthException extends LowestDepthException { } + @SuppressWarnings("serial") public class NoDepthException extends TargetException { } diff --git a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java index 4873105ce22..ddcc26e705d 100644 --- a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java +++ b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java @@ -28,6 +28,7 @@ import junit.framework.Assert; */ public class NestedExceptionTests extends TestCase { + @SuppressWarnings("serial") public void testNestedRuntimeExceptionWithNoRootCause() { String mesg = "mesg of mine"; // Making a class abstract doesn't _really_ prevent instantiation :-) @@ -44,6 +45,7 @@ public class NestedExceptionTests extends TestCase { assertFalse(stackTrace.indexOf(mesg) == -1); } + @SuppressWarnings("serial") public void testNestedRuntimeExceptionWithRootCause() { String myMessage = "mesg for this exception"; String rootCauseMesg = "this is the obscure message of the root cause"; @@ -64,6 +66,7 @@ public class NestedExceptionTests extends TestCase { assertFalse(stackTrace.indexOf(rootCauseMesg) == -1); } + @SuppressWarnings("serial") public void testNestedCheckedExceptionWithNoRootCause() { String mesg = "mesg of mine"; // Making a class abstract doesn't _really_ prevent instantiation :-) @@ -80,6 +83,7 @@ public class NestedExceptionTests extends TestCase { assertFalse(stackTrace.indexOf(mesg) == -1); } + @SuppressWarnings("serial") public void testNestedCheckedExceptionWithRootCause() { String myMessage = "mesg for this exception"; String rootCauseMesg = "this is the obscure message of the root cause"; diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java index e1fdb3dee0e..c9c936af903 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java @@ -240,6 +240,7 @@ public class DefaultConversionTests { conversionService.convert(Integer.valueOf(1), CustomNumber.class); } + @SuppressWarnings("serial") public static class CustomNumber extends Number { @Override diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java index 635382e7c77..9f3ca159cc5 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java @@ -217,6 +217,7 @@ public class MapToMapConverterTests { assertEquals(NoDefaultConstructorMap.class, result.getClass()); } + @SuppressWarnings("serial") public static class NoDefaultConstructorMap extends HashMap { public NoDefaultConstructorMap(Map m) { super(m); diff --git a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java index 0e57814ac56..f3d6258fbb7 100644 --- a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java +++ b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java @@ -118,6 +118,7 @@ public class LabeledEnumTests extends TestCase { } + @SuppressWarnings("serial") private static class Other extends StaticLabeledEnum { public static final Other THING1 = new Other(1, "Thing1"); @@ -130,6 +131,7 @@ public class LabeledEnumTests extends TestCase { } + @SuppressWarnings("serial") private static class Dog extends StaticLabeledEnum { public static final Dog GOLDEN_RETRIEVER = new Dog(11, null) { @@ -159,6 +161,7 @@ public class LabeledEnumTests extends TestCase { } + @SuppressWarnings("serial") private static abstract class ValuedEnum extends StaticLabeledEnum { public static final ValuedEnum ONE = new ValuedEnum(1, "one") { diff --git a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java index 1a1a7ef85dd..57a2998e0bb 100644 --- a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java +++ b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java @@ -94,6 +94,7 @@ public class CachingMapDecoratorTests extends TestCase { } + @SuppressWarnings("serial") private static class MyCachingMap extends CachingMapDecorator { private boolean createCalled; diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java index e2fec15d1ba..3ab6a1655b8 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java +++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java @@ -144,6 +144,7 @@ public abstract class AbstractStaxXMLReaderTestCase { protected abstract AbstractStaxXMLReader createStaxXmlReader(InputStream inputStream) throws XMLStreamException; /** Easymock {@code AbstractMatcher} implementation that matches SAX arguments. */ + @SuppressWarnings("serial") protected static class SaxArgumentMatcher extends AbstractMatcher { @Override diff --git a/spring-expression/src/main/java/org/springframework/expression/AccessException.java b/spring-expression/src/main/java/org/springframework/expression/AccessException.java index 09efbbe45d5..996a4f1c8b8 100644 --- a/spring-expression/src/main/java/org/springframework/expression/AccessException.java +++ b/spring-expression/src/main/java/org/springframework/expression/AccessException.java @@ -22,6 +22,7 @@ package org.springframework.expression; * @author Andy Clement * @since 3.0 */ +@SuppressWarnings("serial") public class AccessException extends Exception { /** diff --git a/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java index e082baec660..5d6761acd5b 100644 --- a/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java +++ b/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java @@ -22,6 +22,7 @@ package org.springframework.expression; * @author Andy Clement * @since 3.0 */ +@SuppressWarnings("serial") public class EvaluationException extends ExpressionException { /** @@ -64,4 +65,4 @@ public class EvaluationException extends ExpressionException { super(message,cause); } -} \ No newline at end of file +} 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 c04d03ae28d..93144dc3555 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java +++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java @@ -23,6 +23,7 @@ package org.springframework.expression; * @author Andy Clement * @since 3.0 */ +@SuppressWarnings("serial") public class ExpressionException extends RuntimeException { protected String expressionString; diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java index 00caf12c4f2..c531fa139ee 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java +++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java @@ -24,6 +24,7 @@ package org.springframework.expression; * @author Andy Clement * @since 3.0.3 */ +@SuppressWarnings("serial") public class ExpressionInvocationTargetException extends EvaluationException { public ExpressionInvocationTargetException(int position, String message, Throwable cause) { diff --git a/spring-expression/src/main/java/org/springframework/expression/ParseException.java b/spring-expression/src/main/java/org/springframework/expression/ParseException.java index 722eb4d88e6..b1421215164 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ParseException.java +++ b/spring-expression/src/main/java/org/springframework/expression/ParseException.java @@ -22,6 +22,7 @@ package org.springframework.expression; * @author Andy Clement * @since 3.0 */ +@SuppressWarnings("serial") public class ParseException extends ExpressionException { /** diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java index 7af1d21c8cd..2f34515b3a5 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java @@ -25,6 +25,7 @@ import org.springframework.expression.spel.SpelParseException; * @author Andy Clement * @since 3.0 */ +@SuppressWarnings("serial") public class InternalParseException extends RuntimeException { public InternalParseException(SpelParseException cause) { diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java index e5bb78e995b..6fbe1c12f99 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java @@ -25,6 +25,7 @@ import org.springframework.expression.EvaluationException; * @author Andy Clement * @since 3.0 */ +@SuppressWarnings("serial") public class SpelEvaluationException extends EvaluationException { private SpelMessage message; diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java index 86499273f8a..82231d775af 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java @@ -26,6 +26,7 @@ import org.springframework.expression.ParseException; * @author Andy Clement * @since 3.0 */ +@SuppressWarnings("serial") public class SpelParseException extends ParseException { private SpelMessage message; diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java index aa3f27509f5..bbf14c12272 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java @@ -49,6 +49,7 @@ public class ConstructorInvocationTests extends ExpressionTestCase { evaluateAndCheckError("new FooBar()",SpelMessage.CONSTRUCTOR_INVOCATION_PROBLEM); } + @SuppressWarnings("serial") static class TestException extends Exception { } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java index 2869a366bff..87f63a39146 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Inventor.java @@ -111,6 +111,7 @@ public class Inventor { return valueIn; } + @SuppressWarnings("serial") static class TestException extends Exception {} public String throwException(PlaceOfBirth pob) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java index e63d65216c4..e7b55177a91 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java @@ -31,6 +31,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException; * @author Rod Johnson * @see InvalidResultSetAccessException */ +@SuppressWarnings("serial") public class BadSqlGrammarException extends InvalidDataAccessResourceUsageException { private String sql; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java index 518c4d881b5..324030032d8 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java @@ -25,6 +25,7 @@ import org.springframework.dao.DataAccessResourceFailureException; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class CannotGetJdbcConnectionException extends DataAccessResourceFailureException { /** diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java index a11eee5b7c2..95a45a79ab8 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java @@ -26,6 +26,7 @@ import org.springframework.dao.DataRetrievalFailureException; * @since 2.0 * @see org.springframework.dao.IncorrectResultSizeDataAccessException */ +@SuppressWarnings("serial") public class IncorrectResultSetColumnCountException extends DataRetrievalFailureException { private int expectedCount; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java index 637886a5e2c..29e615413b5 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java @@ -32,6 +32,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException; * @see BadSqlGrammarException * @see org.springframework.jdbc.support.rowset.SqlRowSet */ +@SuppressWarnings("serial") public class InvalidResultSetAccessException extends InvalidDataAccessResourceUsageException { private String sql; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java index 9a613cc0fe0..d8bb30d76fc 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java @@ -26,6 +26,7 @@ import org.springframework.dao.IncorrectUpdateSemanticsDataAccessException; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class JdbcUpdateAffectedIncorrectNumberOfRowsException extends IncorrectUpdateSemanticsDataAccessException { /** Number of rows that should have been affected */ diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java index f80ab4fbef3..ddd3e26632a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java @@ -26,6 +26,7 @@ import org.springframework.dao.DataRetrievalFailureException; * @author Juergen Hoeller * @since 1.0.2 */ +@SuppressWarnings("serial") public class LobRetrievalFailureException extends DataRetrievalFailureException { /** diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java index 68a8d25c39a..1dc4f511d32 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java @@ -32,6 +32,7 @@ import org.springframework.dao.UncategorizedDataAccessException; * @author Juergen Hoeller * @see org.springframework.jdbc.core.JdbcTemplate#setIgnoreWarnings */ +@SuppressWarnings("serial") public class SQLWarningException extends UncategorizedDataAccessException { /** diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java index 658ec04b324..8d26855fb22 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java @@ -27,6 +27,7 @@ import org.springframework.dao.UncategorizedDataAccessException; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class UncategorizedSQLException extends UncategorizedDataAccessException { /** SQL that led to the problem */ diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java index 66131de8a74..48b252098c6 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java @@ -70,6 +70,7 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations private volatile int cacheLimit = DEFAULT_CACHE_LIMIT; /** Cache of original SQL String to ParsedSql representation */ + @SuppressWarnings("serial") private final Map parsedSqlCache = new LinkedHashMap(DEFAULT_CACHE_LIMIT, 0.75f, true) { @Override diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java index 83aa4c44458..aa3d5c9e715 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java @@ -99,6 +99,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager * @see LazyConnectionDataSourceProxy * @see org.springframework.jdbc.core.JdbcTemplate */ +@SuppressWarnings("serial") public class DataSourceTransactionManager extends AbstractPlatformTransactionManager implements ResourceTransactionManager, InitializingBean { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java index cc62b9b9991..48afad16aa0 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java @@ -25,6 +25,7 @@ import org.springframework.dao.NonTransientDataAccessException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class DataSourceLookupFailureException extends NonTransientDataAccessException { /** diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java index e4870e97c73..1637b89d295 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java @@ -28,6 +28,7 @@ import org.springframework.core.NestedCheckedException; * @author Thomas Risberg * @since 1.0.1 */ +@SuppressWarnings("serial") public class MetaDataAccessException extends NestedCheckedException { /** diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java index 9281373924d..c32ecfa99e6 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java @@ -25,6 +25,7 @@ import org.springframework.dao.InvalidDataAccessApiUsageException; * @author Thomas Risberg * @since 2.5.5 */ +@SuppressWarnings("serial") public class SqlXmlFeatureNotImplementedException extends InvalidDataAccessApiUsageException { /** diff --git a/spring-jdbc/src/test/java/org/springframework/beans/Colour.java b/spring-jdbc/src/test/java/org/springframework/beans/Colour.java index 60dc333e0b4..17fd24fec79 100644 --- a/spring-jdbc/src/test/java/org/springframework/beans/Colour.java +++ b/spring-jdbc/src/test/java/org/springframework/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java index 3dcee9661cf..8acf5aa045a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java @@ -651,6 +651,7 @@ public class DataSourceJtaTransactionTests extends TestCase { MockControl conControl = MockControl.createControl(Connection.class); Connection con = (Connection) conControl.getMock(); + @SuppressWarnings("serial") JtaTransactionManager ptm = new JtaTransactionManager(ut) { protected void doRegisterAfterCompletionWithJtaTransaction( JtaTransactionObject txObject, final List synchronizations) { diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java index 13ceba3fed8..48ec7f2b12c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java @@ -1047,6 +1047,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { } + @SuppressWarnings("serial") private static class CustomDataException extends DataAccessException { public CustomDataException(String s) { diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java index 8293d5c98d3..2a016ef6e6d 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java @@ -100,6 +100,7 @@ public class SQLErrorCodeSQLExceptionTranslatorTests extends TestCase { } + @SuppressWarnings("serial") public void testCustomTranslateMethodTranslation() { final String TASK = "TASK"; final String SQL = "SQL SELECT *"; diff --git a/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java b/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java index 20dde5d45ec..1a01a993da2 100644 --- a/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java +++ b/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.IllegalStateException */ +@SuppressWarnings("serial") public class IllegalStateException extends JmsException { public IllegalStateException(javax.jms.IllegalStateException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java index 07607f7381f..b3901d4dc41 100644 --- a/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java +++ b/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.InvalidClientIDException */ +@SuppressWarnings("serial") public class InvalidClientIDException extends JmsException { public InvalidClientIDException(javax.jms.InvalidClientIDException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java index 6d794927ced..94bbc434711 100644 --- a/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java +++ b/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.InvalidDestinationException */ +@SuppressWarnings("serial") public class InvalidDestinationException extends JmsException { public InvalidDestinationException(javax.jms.InvalidDestinationException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java index 797dee10a39..4c05894eb17 100644 --- a/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java +++ b/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.InvalidSelectorException */ +@SuppressWarnings("serial") public class InvalidSelectorException extends JmsException { public InvalidSelectorException(javax.jms.InvalidSelectorException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsException.java b/spring-jms/src/main/java/org/springframework/jms/JmsException.java index 702b5cb09ad..5572cb415bb 100644 --- a/spring-jms/src/main/java/org/springframework/jms/JmsException.java +++ b/spring-jms/src/main/java/org/springframework/jms/JmsException.java @@ -28,6 +28,7 @@ import org.springframework.core.NestedRuntimeException; * @author Juergen Hoeller * @since 1.1 */ +@SuppressWarnings("serial") public abstract class JmsException extends NestedRuntimeException { /** diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java b/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java index 123a42d4e5f..bbc6f3041eb 100644 --- a/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java +++ b/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.JMSSecurityException */ +@SuppressWarnings("serial") public class JmsSecurityException extends JmsException { public JmsSecurityException(javax.jms.JMSSecurityException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java b/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java index cc3aaf1b5db..221cce2bae6 100644 --- a/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java +++ b/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.MessageEOFException */ +@SuppressWarnings("serial") public class MessageEOFException extends JmsException { public MessageEOFException(javax.jms.MessageEOFException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java b/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java index 4366d5376e7..b0fc75475c0 100644 --- a/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java +++ b/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.MessageFormatException */ +@SuppressWarnings("serial") public class MessageFormatException extends JmsException { public MessageFormatException(javax.jms.MessageFormatException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java index 307e6adb490..1acb0a05ed5 100644 --- a/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java +++ b/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.MessageNotReadableException */ +@SuppressWarnings("serial") public class MessageNotReadableException extends JmsException { public MessageNotReadableException(javax.jms.MessageNotReadableException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java index 6cf3b464db5..dcf41400b88 100644 --- a/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java +++ b/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.MessageNotWriteableException */ +@SuppressWarnings("serial") public class MessageNotWriteableException extends JmsException { public MessageNotWriteableException(javax.jms.MessageNotWriteableException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java b/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java index f143aa93f0d..fff7028c679 100644 --- a/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java +++ b/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.ResourceAllocationException */ +@SuppressWarnings("serial") public class ResourceAllocationException extends JmsException { public ResourceAllocationException(javax.jms.ResourceAllocationException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java index 77afc211532..191a74d5517 100644 --- a/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java +++ b/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.TransactionInProgressException */ +@SuppressWarnings("serial") public class TransactionInProgressException extends JmsException { public TransactionInProgressException(javax.jms.TransactionInProgressException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java index e493d3d7548..a49029e463f 100644 --- a/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java +++ b/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java @@ -23,6 +23,7 @@ package org.springframework.jms; * @since 1.1 * @see javax.jms.TransactionRolledBackException */ +@SuppressWarnings("serial") public class TransactionRolledBackException extends JmsException { public TransactionRolledBackException(javax.jms.TransactionRolledBackException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java b/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java index 6dd076bb5a5..fbc4bbd969c 100644 --- a/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java +++ b/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java @@ -22,6 +22,7 @@ package org.springframework.jms; * @author Juergen Hoeller * @since 1.1 */ +@SuppressWarnings("serial") public class UncategorizedJmsException extends JmsException { /** diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java index dd3bb77342d..53ee2c09560 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java @@ -42,6 +42,7 @@ import javax.jms.TopicConnectionFactory; * @deprecated as of Spring 3.0, in favor of the JMS 1.1 based {@link JmsTransactionManager} */ @Deprecated +@SuppressWarnings("serial") public class JmsTransactionManager102 extends JmsTransactionManager { private boolean pubSubDomain = false; diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java b/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java index 16a30f3ca1e..06e060daca0 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java @@ -28,6 +28,7 @@ import org.springframework.jms.JmsException; * @since 2.0 * @see ConnectionFactoryUtils */ +@SuppressWarnings("serial") public class SynchedLocalTransactionFailedException extends JmsException { /** diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java index 4cdfdb8f209..5b64b616f30 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java @@ -25,6 +25,7 @@ import org.springframework.jms.JmsException; * @since 2.0 * @see MessageListenerAdapter */ +@SuppressWarnings("serial") public class ListenerExecutionFailedException extends JmsException { /** diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java index e2cec097a18..dace0d10a23 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java @@ -116,6 +116,7 @@ public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory { * directly, leavng it up to the concrete endpoint to apply those - * and to handle any ResourceExceptions thrown from them. */ + @SuppressWarnings("serial") public static class JmsResourceException extends RuntimeException { public JmsResourceException(ResourceException cause) { diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java index 29af514957b..9eb8d813a60 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java @@ -26,6 +26,7 @@ import org.springframework.jms.JmsException; * @since 1.1 * @see MessageConverter */ +@SuppressWarnings("serial") public class MessageConversionException extends JmsException { /** diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java index 3372151333e..3fa407b7378 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java @@ -25,6 +25,7 @@ import org.springframework.jms.JmsException; * @since 1.1 * @see DestinationResolver */ +@SuppressWarnings("serial") public class DestinationResolutionException extends JmsException { /** diff --git a/spring-jms/src/test/java/org/springframework/beans/Colour.java b/spring-jms/src/test/java/org/springframework/beans/Colour.java index 60dc333e0b4..17fd24fec79 100644 --- a/spring-jms/src/test/java/org/springframework/beans/Colour.java +++ b/spring-jms/src/test/java/org/springframework/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java index a1e6e3dc711..2afee39fefc 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java @@ -670,6 +670,7 @@ public class MessageListenerAdapterTests { } + @SuppressWarnings("serial") private static class SerializableObject implements Serializable { } diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java index 48bc55913d9..025ba22fc79 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java @@ -74,6 +74,7 @@ public class MappingJackson2MessageConverterTests { "bar"); final byte[] bytes = "{\"foo\":\"bar\"}".getBytes(); + @SuppressWarnings("serial") Capture captured = new Capture() { @Override public void setValue(byte[] value) { diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java index bf682af4135..63ea2aa3fc7 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java @@ -67,6 +67,7 @@ public class MappingJacksonMessageConverterTests { } @Test + @SuppressWarnings("serial") public void fromBytesMessage() throws Exception { BytesMessage bytesMessageMock = createMock(BytesMessage.class); Map unmarshalled = Collections.singletonMap("foo", diff --git a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 563d6107149..0c0b3cb81cf 100644 --- a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -23,6 +23,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class CallCountingTransactionManager extends AbstractPlatformTransactionManager { public TransactionDefinition lastDefinition; diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/ConfigurableJtaPlatform.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/ConfigurableJtaPlatform.java index 76d1fc63b83..4eaa935fc17 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/ConfigurableJtaPlatform.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/ConfigurableJtaPlatform.java @@ -31,6 +31,7 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 3.1.2 */ +@SuppressWarnings("serial") class ConfigurableJtaPlatform extends AbstractJtaPlatform { private final TransactionManager transactionManager; diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java index a7888faf073..96c1a5f4b2a 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java @@ -30,6 +30,7 @@ import org.springframework.dao.UncategorizedDataAccessException; * @since 3.1 * @see SessionFactoryUtils#convertHibernateAccessException */ +@SuppressWarnings("serial") public class HibernateJdbcException extends UncategorizedDataAccessException { public HibernateJdbcException(JDBCException ex) { diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java index b74453cc425..ce496de76d0 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java @@ -29,6 +29,7 @@ import org.springframework.orm.ObjectRetrievalFailureException; * @since 3.1 * @see SessionFactoryUtils#convertHibernateAccessException */ +@SuppressWarnings("serial") public class HibernateObjectRetrievalFailureException extends ObjectRetrievalFailureException { public HibernateObjectRetrievalFailureException(UnresolvableObjectException ex) { diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java index ae97b307332..a58b98fda3d 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java @@ -29,6 +29,7 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException; * @since 3.1 * @see SessionFactoryUtils#convertHibernateAccessException */ +@SuppressWarnings("serial") public class HibernateOptimisticLockingFailureException extends ObjectOptimisticLockingFailureException { public HibernateOptimisticLockingFailureException(StaleObjectStateException ex) { diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java index 171465089f6..b9d65161279 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java @@ -28,6 +28,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException; * @since 3.1 * @see SessionFactoryUtils#convertHibernateAccessException */ +@SuppressWarnings("serial") public class HibernateQueryException extends InvalidDataAccessResourceUsageException { public HibernateQueryException(QueryException ex) { diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java index 9fbc1574e73..358aa72a2c8 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java @@ -29,6 +29,7 @@ import org.springframework.dao.UncategorizedDataAccessException; * @since 3.1 * @see SessionFactoryUtils#convertHibernateAccessException */ +@SuppressWarnings("serial") public class HibernateSystemException extends UncategorizedDataAccessException { /** diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java index 92850dbe966..2b2ad05893f 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java @@ -30,6 +30,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager * @author Juergen Hoeller * @since 3.1 */ +@SuppressWarnings("serial") public class SpringJtaSessionContext extends JTASessionContext { public SpringJtaSessionContext(SessionFactoryImplementor factory) { diff --git a/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java index 4cd1dc8da7b..92d78f342c2 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java @@ -25,6 +25,7 @@ import org.springframework.dao.OptimisticLockingFailureException; * @author Juergen Hoeller * @since 13.10.2003 */ +@SuppressWarnings("serial") public class ObjectOptimisticLockingFailureException extends OptimisticLockingFailureException { private Object persistentClass; diff --git a/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java index b9151890fc2..806eda51a5d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java @@ -25,6 +25,7 @@ import org.springframework.dao.DataRetrievalFailureException; * @author Juergen Hoeller * @since 13.10.2003 */ +@SuppressWarnings("serial") public class ObjectRetrievalFailureException extends DataRetrievalFailureException { private Object persistentClass; diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java index c6cf41537f0..871d8a4af4a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java @@ -30,6 +30,7 @@ import org.springframework.dao.UncategorizedDataAccessException; * @since 1.2 * @see SessionFactoryUtils#convertHibernateAccessException */ +@SuppressWarnings("serial") public class HibernateJdbcException extends UncategorizedDataAccessException { public HibernateJdbcException(JDBCException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java index 726430889c4..bab18adca8d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java @@ -29,6 +29,7 @@ import org.springframework.orm.ObjectRetrievalFailureException; * @since 1.2 * @see SessionFactoryUtils#convertHibernateAccessException */ +@SuppressWarnings("serial") public class HibernateObjectRetrievalFailureException extends ObjectRetrievalFailureException { public HibernateObjectRetrievalFailureException(UnresolvableObjectException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java index fb58c8efcc8..a63b93f4db1 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java @@ -29,6 +29,7 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException; * @since 1.2 * @see SessionFactoryUtils#convertHibernateAccessException */ +@SuppressWarnings("serial") public class HibernateOptimisticLockingFailureException extends ObjectOptimisticLockingFailureException { public HibernateOptimisticLockingFailureException(StaleObjectStateException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java index a1e72bcc3c8..cdbdd49ec89 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java @@ -28,6 +28,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException; * @since 1.2 * @see SessionFactoryUtils#convertHibernateAccessException */ +@SuppressWarnings("serial") public class HibernateQueryException extends InvalidDataAccessResourceUsageException { public HibernateQueryException(QueryException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java index 6497a12ed38..e4987e2206d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java @@ -29,6 +29,7 @@ import org.springframework.dao.UncategorizedDataAccessException; * @since 1.2 * @see SessionFactoryUtils#convertHibernateAccessException */ +@SuppressWarnings("serial") public class HibernateSystemException extends UncategorizedDataAccessException { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java index 94fd197e00d..208c88f60d7 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java @@ -129,6 +129,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager * @see org.springframework.jdbc.datasource.DataSourceTransactionManager * @see org.springframework.transaction.jta.JtaTransactionManager */ +@SuppressWarnings("serial") public class HibernateTransactionManager extends AbstractPlatformTransactionManager implements ResourceTransactionManager, BeanFactoryAware, InitializingBean { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java index e914c19fe4b..1953a84326b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java @@ -38,6 +38,7 @@ import org.hibernate.engine.SessionFactoryImplementor; * @see SessionFactoryUtils#doGetSession * @see LocalSessionFactoryBean#setExposeTransactionAwareSessionFactory */ +@SuppressWarnings("serial") public class SpringSessionContext implements CurrentSessionContext { private final SessionFactoryImplementor sessionFactory; diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java index d4a31646f3e..2328205a9e9 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java @@ -49,6 +49,7 @@ import org.hibernate.persister.entity.EntityPersister; * @since 1.2 * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setEventListeners(java.util.Map) */ +@SuppressWarnings("serial") public class IdTransferringMergeEventListener extends DefaultMergeEventListener { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java index e2bc17731f0..d48200c270e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java @@ -42,6 +42,7 @@ import org.springframework.aop.support.AopUtils; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class ScopedBeanInterceptor extends EmptyInterceptor { @Override diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java index 76b040d7e2c..c2e5b8b2e9b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java @@ -29,6 +29,7 @@ import org.springframework.orm.ObjectRetrievalFailureException; * @since 1.1 * @see PersistenceManagerFactoryUtils#convertJdoAccessException */ +@SuppressWarnings("serial") public class JdoObjectRetrievalFailureException extends ObjectRetrievalFailureException { public JdoObjectRetrievalFailureException(JDOObjectNotFoundException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java index 721ccd22567..1b7e752999c 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java @@ -29,6 +29,7 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException; * @since 1.1 * @see PersistenceManagerFactoryUtils#convertJdoAccessException */ +@SuppressWarnings("serial") public class JdoOptimisticLockingFailureException extends ObjectOptimisticLockingFailureException { public JdoOptimisticLockingFailureException(JDOOptimisticVerificationException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java index c34591573f1..30a3f2bdeec 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java @@ -29,6 +29,7 @@ import org.springframework.dao.DataAccessResourceFailureException; * @since 1.1 * @see PersistenceManagerFactoryUtils#convertJdoAccessException */ +@SuppressWarnings("serial") public class JdoResourceFailureException extends DataAccessResourceFailureException { public JdoResourceFailureException(JDODataStoreException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java index bd293b51a7a..868ad6050ff 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java @@ -29,6 +29,7 @@ import org.springframework.dao.UncategorizedDataAccessException; * @since 03.06.2003 * @see PersistenceManagerFactoryUtils#convertJdoAccessException */ +@SuppressWarnings("serial") public class JdoSystemException extends UncategorizedDataAccessException { public JdoSystemException(JDOException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java index 2bd4b8b79fe..62a1670ff16 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java @@ -99,6 +99,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager * @see org.springframework.jdbc.datasource.DataSourceTransactionManager * @see org.springframework.transaction.jta.JtaTransactionManager */ +@SuppressWarnings("serial") public class JdoTransactionManager extends AbstractPlatformTransactionManager implements ResourceTransactionManager, InitializingBean { diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java index c7114178f61..918007b6a78 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java @@ -29,6 +29,7 @@ import org.springframework.dao.InvalidDataAccessApiUsageException; * @since 03.06.2003 * @see PersistenceManagerFactoryUtils#convertJdoAccessException */ +@SuppressWarnings("serial") public class JdoUsageException extends InvalidDataAccessApiUsageException { public JdoUsageException(JDOUserException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java index bf49c8aa40b..cdd4f423306 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java @@ -467,6 +467,7 @@ public abstract class AbstractEntityManagerFactoryBean implements * Minimal bean reference to the surrounding AbstractEntityManagerFactoryBean. * Resolved to the actual AbstractEntityManagerFactoryBean instance on deserialization. */ + @SuppressWarnings("serial") private static class SerializedEntityManagerFactoryBeanReference implements Serializable { private final BeanFactory beanFactory; @@ -489,6 +490,7 @@ public abstract class AbstractEntityManagerFactoryBean implements * return a proxy EntityManager if necessary from createEntityManager() * methods. */ + @SuppressWarnings("serial") private static class ManagedEntityManagerFactoryInvocationHandler implements InvocationHandler, Serializable { private final AbstractEntityManagerFactoryBean entityManagerFactoryBean; diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java index ecf62bb2328..c71b63f214c 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java @@ -41,6 +41,7 @@ import org.springframework.transaction.TransactionException; * @see JpaAccessor#setJpaDialect * @see JpaTransactionManager#setJpaDialect */ +@SuppressWarnings("serial") public class DefaultJpaDialect implements JpaDialect, Serializable { //------------------------------------------------------------------------- diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java index 21a844ed4a6..0dfd3c9b51a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java @@ -272,6 +272,7 @@ public abstract class ExtendedEntityManagerCreator { /** * InvocationHandler for extended EntityManagers as defined in the JPA spec. */ + @SuppressWarnings("serial") private static class ExtendedEntityManagerInvocationHandler implements InvocationHandler, Serializable { private static final Log logger = LogFactory.getLog(ExtendedEntityManagerInvocationHandler.class); diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java index ef5a04f151e..1f0d8db5a0a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java @@ -28,6 +28,7 @@ import org.springframework.orm.ObjectRetrievalFailureException; * @since 2.0 * @see EntityManagerFactoryUtils#convertJpaAccessExceptionIfPossible */ +@SuppressWarnings("serial") public class JpaObjectRetrievalFailureException extends ObjectRetrievalFailureException { public JpaObjectRetrievalFailureException(EntityNotFoundException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java index eb77c4154b6..b69740301c3 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java @@ -28,6 +28,7 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException; * @since 2.0 * @see EntityManagerFactoryUtils#convertJpaAccessExceptionIfPossible */ +@SuppressWarnings("serial") public class JpaOptimisticLockingFailureException extends ObjectOptimisticLockingFailureException { public JpaOptimisticLockingFailureException(OptimisticLockException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java index a1742e2d3fb..be71b0153d1 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java @@ -29,6 +29,7 @@ import org.springframework.dao.UncategorizedDataAccessException; * @since 2.0 * @see EntityManagerFactoryUtils#convertJpaAccessExceptionIfPossible */ +@SuppressWarnings("serial") public class JpaSystemException extends UncategorizedDataAccessException { public JpaSystemException(PersistenceException ex) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java index 1fc50517133..714a28fdb99 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java @@ -108,6 +108,7 @@ import org.springframework.util.CollectionUtils; * @see org.springframework.jdbc.datasource.DataSourceTransactionManager * @see org.springframework.transaction.jta.JtaTransactionManager */ +@SuppressWarnings("serial") public class JpaTransactionManager extends AbstractPlatformTransactionManager implements ResourceTransactionManager, BeanFactoryAware, InitializingBean { diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java index 2779211fed5..7cef875f285 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java @@ -81,6 +81,8 @@ import org.springframework.util.ClassUtils; public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean implements ResourceLoaderAware, LoadTimeWeaverAware { + private static final long serialVersionUID = 1L; + private PersistenceUnitManager persistenceUnitManager; private final DefaultPersistenceUnitManager internalPersistenceUnitManager = diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java index 7896175a2a4..065431b7ea6 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java @@ -67,6 +67,8 @@ import javax.persistence.spi.PersistenceProvider; */ public class LocalEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean { + private static final long serialVersionUID = 1L; + /** * Initialize the EntityManagerFactory for the given configuration. * @throws javax.persistence.PersistenceException in case of JPA initialization errors diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java index 6b2dac821a9..32133baa822 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java @@ -126,6 +126,7 @@ public abstract class SharedEntityManagerCreator { * transactional EntityManager, if any; else, it will fall back * to a newly created EntityManager per operation. */ + @SuppressWarnings("serial") private static class SharedEntityManagerInvocationHandler implements InvocationHandler, Serializable { private final Log logger = LogFactory.getLog(getClass()); diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java index bbc9526e0a7..9d0160f436e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java @@ -55,6 +55,7 @@ import org.springframework.transaction.TransactionException; * @see #setLazyDatabaseTransaction * @see org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy */ +@SuppressWarnings("serial") public class EclipseLinkJpaDialect extends DefaultJpaDialect { private boolean lazyDatabaseTransaction = false; diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java index c3cda31f446..e7faa52d246 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java @@ -47,6 +47,7 @@ import org.springframework.util.ReflectionUtils; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class HibernateJpaDialect extends DefaultJpaDialect { @Override diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java index ebcdae313d5..1ab02f213eb 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java @@ -40,6 +40,7 @@ import org.springframework.transaction.TransactionException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class OpenJpaDialect extends DefaultJpaDialect { @Override diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java index bbaef3c3d0f..16c789efb54 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java @@ -53,6 +53,7 @@ import org.springframework.transaction.TransactionException; * Spring's corresponding {@link EclipseLinkJpaDialect} */ @Deprecated +@SuppressWarnings("serial") public class TopLinkJpaDialect extends DefaultJpaDialect { private boolean lazyDatabaseTransaction = false; diff --git a/spring-orm/src/test/java/org/springframework/beans/Colour.java b/spring-orm/src/test/java/org/springframework/beans/Colour.java index 60dc333e0b4..17fd24fec79 100644 --- a/spring-orm/src/test/java/org/springframework/beans/Colour.java +++ b/spring-orm/src/test/java/org/springframework/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java index 42fb9fd89d5..b149254bfd7 100644 --- a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java +++ b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java @@ -28,6 +28,7 @@ import org.springframework.beans.factory.ObjectFactory; /** * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class SimpleMapScope implements Scope, Serializable { private final Map map = new HashMap(); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java index 25ba32f690f..95fb2af9309 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java @@ -62,6 +62,7 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource; */ public class LocalSessionFactoryBeanTests extends TestCase { + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithDataSource() throws Exception { final DriverManagerDataSource ds = new DriverManagerDataSource(); final List invocations = new ArrayList(); @@ -93,6 +94,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { assertEquals("newSessionFactory", invocations.get(0)); } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithCacheRegionFactory() throws Exception { final RegionFactory regionFactory = new NoCachingRegionFactory(null); final List invocations = new ArrayList(); @@ -124,6 +126,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { assertEquals("newSessionFactory", invocations.get(0)); } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithCacheProvider() throws Exception { final CacheProvider cacheProvider = new NoCacheProvider(); final List invocations = new ArrayList(); @@ -156,6 +159,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { assertEquals("newSessionFactory", invocations.get(0)); } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithTransactionAwareDataSource() throws Exception { final DriverManagerDataSource ds = new DriverManagerDataSource(); final List invocations = new ArrayList(); @@ -189,6 +193,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { assertEquals("newSessionFactory", invocations.get(0)); } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithDataSourceAndMappingResources() throws Exception { final DriverManagerDataSource ds = new DriverManagerDataSource(); MockControl tmControl = MockControl.createControl(TransactionManager.class); @@ -232,6 +237,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { assertEquals("newSessionFactory", invocations.get(2)); } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithDataSourceAndMappingJarLocations() throws Exception { final DriverManagerDataSource ds = new DriverManagerDataSource(); final Set invocations = new HashSet(); @@ -263,6 +269,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { assertTrue(invocations.contains("newSessionFactory")); } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithDataSourceAndProperties() throws Exception { final DriverManagerDataSource ds = new DriverManagerDataSource(); final Set invocations = new HashSet(); @@ -368,6 +375,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { factoryControl.verify(); } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithEntityInterceptor() throws Exception { LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { protected Configuration newConfiguration() { @@ -394,6 +402,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { } } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithNamingStrategy() throws Exception { LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { protected Configuration newConfiguration() { @@ -417,6 +426,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { } } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithCacheStrategies() throws Exception { final Properties registeredClassCache = new Properties(); final Properties registeredCollectionCache = new Properties(); @@ -452,6 +462,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { assertEquals(collectionCache, registeredCollectionCache); } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithCacheStrategiesAndRegions() throws Exception { final Properties registeredClassCache = new Properties(); final Properties registeredCollectionCache = new Properties(); @@ -486,6 +497,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { assertEquals(collectionCache, registeredCollectionCache); } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithEventListeners() throws Exception { final Map registeredListeners = new HashMap(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { @@ -510,6 +522,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { assertEquals(listeners, registeredListeners); } + @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithEventListenerSet() throws Exception { final Map registeredListeners = new HashMap(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { @@ -576,6 +589,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { } + @SuppressWarnings("serial") public static class FilterTestLocalSessionFactoryBean extends LocalSessionFactoryBean { public List registeredFilterDefinitions = new LinkedList(); @@ -605,6 +619,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { } + @SuppressWarnings("serial") public static class DummyMergeEventListener implements MergeEventListener { public void onMerge(MergeEvent event) throws HibernateException { diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java index 52e7ac53d1c..177734aee69 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java @@ -67,6 +67,8 @@ public abstract class AbstractEntityManagerFactoryBeanTests extends TestCase { protected static class DummyEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean { + private static final long serialVersionUID = 1L; + private final EntityManagerFactory emf; public DummyEntityManagerFactoryBean(EntityManagerFactory emf) { diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java index 91978604146..c9ba5d1d464 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java @@ -120,6 +120,7 @@ public class EntityManagerFactoryUtilsTests extends TestCase { * Test method for * 'org.springframework.orm.jpa.EntityManagerFactoryUtils.convertJpaAccessException(PersistenceException)' */ + @SuppressWarnings("serial") public void testConvertJpaPersistenceException() { EntityNotFoundException entityNotFound = new EntityNotFoundException(); assertSame(JpaObjectRetrievalFailureException.class, diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java index 51d1ff93b1c..3c5fbe2d492 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java @@ -705,6 +705,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT } + @SuppressWarnings("serial") private static class MockPersistenceAnnotationBeanPostProcessor extends PersistenceAnnotationBeanPostProcessor { @Override @@ -762,6 +763,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Repository + @SuppressWarnings("serial") public static class DefaultPublicPersistenceContextSetter implements Serializable { private EntityManager em; @@ -780,6 +782,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT } + @SuppressWarnings("serial") public static class SpecificPublicPersistenceContextSetter extends DefaultPublicPersistenceContextSetter { @PersistenceContext(unitName="unit2", type = PersistenceContextType.EXTENDED) @@ -872,6 +875,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT } + @SuppressWarnings("serial") private static class DummyInvocationHandler implements InvocationHandler, Serializable { public static boolean closed; diff --git a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java index f7c35abc87e..925558f7ae2 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java @@ -25,6 +25,7 @@ package org.springframework.oxm; * @see MarshallingFailureException * @see UnmarshallingFailureException */ +@SuppressWarnings("serial") public abstract class MarshallingException extends XmlMappingException { /** diff --git a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java index 5a157834d9a..f7eba5c93bc 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java @@ -22,6 +22,7 @@ package org.springframework.oxm; * @author Arjen Poutsma * @since 3.0 */ +@SuppressWarnings("serial") public class MarshallingFailureException extends MarshallingException { /** diff --git a/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java index 11100c6f467..9986ad58b28 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java @@ -22,6 +22,7 @@ package org.springframework.oxm; * @author Arjen Poutsma * @since 3.0 */ +@SuppressWarnings("serial") public class UncategorizedMappingException extends XmlMappingException { /** diff --git a/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java index 0477f163de1..350cdb2b0eb 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java @@ -22,6 +22,7 @@ package org.springframework.oxm; * @author Arjen Poutsma * @since 3.0 */ +@SuppressWarnings("serial") public class UnmarshallingFailureException extends MarshallingException { /** diff --git a/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java index 50f9947b47c..f39ddfd6d37 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java @@ -22,6 +22,7 @@ package org.springframework.oxm; * @author Arjen Poutsma * @since 3.0 */ +@SuppressWarnings("serial") public class ValidationFailureException extends XmlMappingException { /** diff --git a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java index 9f40146bd8c..dff92dd3095 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java @@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException; * @author Arjen Poutsma * @since 3.0 */ +@SuppressWarnings("serial") public abstract class XmlMappingException extends NestedRuntimeException { /** diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java index 0834991061c..6139df1f2af 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java @@ -24,6 +24,7 @@ import org.springframework.oxm.XmlMappingException; * @author Juergen Hoeller * @since 3.0 */ +@SuppressWarnings("serial") public class CastorMappingException extends XmlMappingException { /** diff --git a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java index b2496b9d967..65bcd408b77 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java @@ -88,6 +88,7 @@ import org.springframework.validation.ObjectError; * @deprecated as of Spring 3.0 */ @Deprecated +@SuppressWarnings("serial") public class SpringBindingActionForm extends ActionForm { private static final Log logger = LogFactory.getLog(SpringBindingActionForm.class); diff --git a/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java b/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java index 93394707022..5e77137f534 100644 --- a/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java +++ b/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java @@ -43,6 +43,7 @@ import org.springframework.web.context.support.StaticWebApplicationContext; public class StrutsSupportTests { @Test + @SuppressWarnings("serial") public void actionSupportWithContextLoaderPlugIn() throws ServletException { StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.addMessage("test", Locale.getDefault(), "testmessage"); @@ -69,6 +70,7 @@ public class StrutsSupportTests { } @Test + @SuppressWarnings("serial") public void actionSupportWithRootContext() throws ServletException { StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.addMessage("test", Locale.getDefault(), "testmessage"); @@ -95,6 +97,7 @@ public class StrutsSupportTests { } @Test + @SuppressWarnings("serial") public void dispatchActionSupportWithContextLoaderPlugIn() throws ServletException { StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.addMessage("test", Locale.getDefault(), "testmessage"); @@ -121,6 +124,7 @@ public class StrutsSupportTests { } @Test + @SuppressWarnings("serial") public void dispatchActionSupportWithRootContext() throws ServletException { StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.addMessage("test", Locale.getDefault(), "testmessage"); @@ -147,6 +151,7 @@ public class StrutsSupportTests { } @Test + @SuppressWarnings("serial") public void lookupDispatchActionSupportWithContextLoaderPlugIn() throws ServletException { StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.addMessage("test", Locale.getDefault(), "testmessage"); @@ -177,6 +182,7 @@ public class StrutsSupportTests { } @Test + @SuppressWarnings("serial") public void lookupDispatchActionSupportWithRootContext() throws ServletException { StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.addMessage("test", Locale.getDefault(), "testmessage"); @@ -207,6 +213,7 @@ public class StrutsSupportTests { } @Test + @SuppressWarnings("serial") public void testDelegatingActionProxy() throws Exception { final MockServletContext servletContext = new MockServletContext("/org/springframework/web/struts/"); ContextLoaderPlugIn plugin = new ContextLoaderPlugIn(); @@ -247,6 +254,7 @@ public class StrutsSupportTests { } @Test + @SuppressWarnings("serial") public void delegatingActionProxyWithModule() throws Exception { final MockServletContext servletContext = new MockServletContext("/org/springframework/web/struts/WEB-INF"); ContextLoaderPlugIn plugin = new ContextLoaderPlugIn(); @@ -289,6 +297,7 @@ public class StrutsSupportTests { } @Test + @SuppressWarnings("serial") public void delegatingActionProxyWithModuleAndDefaultContext() throws Exception { final MockServletContext servletContext = new MockServletContext("/org/springframework/web/struts/WEB-INF"); ContextLoaderPlugIn plugin = new ContextLoaderPlugIn(); diff --git a/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java b/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java index 53079733181..b9c8aa80e99 100644 --- a/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java +++ b/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java @@ -22,6 +22,7 @@ package org.springframework.dao; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class CannotAcquireLockException extends PessimisticLockingFailureException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java b/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java index fcfd3ebc289..b75a74281ea 100644 --- a/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java +++ b/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java @@ -22,6 +22,7 @@ package org.springframework.dao; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class CannotSerializeTransactionException extends PessimisticLockingFailureException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java index bff2b23978e..4e77ce5a162 100644 --- a/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java @@ -29,6 +29,7 @@ package org.springframework.dao; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class CleanupFailureDataAccessException extends NonTransientDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java b/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java index f2cbb67030b..48404930548 100644 --- a/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java +++ b/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java @@ -29,6 +29,7 @@ package org.springframework.dao; * @see CannotAcquireLockException * @see DeadlockLoserDataAccessException */ +@SuppressWarnings("serial") public class ConcurrencyFailureException extends TransientDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java index 5c04df5d632..4ee94c17aed 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java @@ -35,6 +35,7 @@ import org.springframework.core.NestedRuntimeException; * * @author Rod Johnson */ +@SuppressWarnings("serial") public abstract class DataAccessException extends NestedRuntimeException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java index 87c1f759294..c1af3068a71 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java @@ -23,6 +23,7 @@ package org.springframework.dao; * @author Rod Johnson * @author Thomas Risberg */ +@SuppressWarnings("serial") public class DataAccessResourceFailureException extends NonTransientDataAccessResourceException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java b/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java index ce99a6980c8..445e7e5171b 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java @@ -24,6 +24,7 @@ package org.springframework.dao; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class DataIntegrityViolationException extends NonTransientDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java b/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java index c9d7a93f60f..c28811f4cce 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java @@ -24,6 +24,7 @@ package org.springframework.dao; * @author Juergen Hoeller * @since 13.10.2003 */ +@SuppressWarnings("serial") public class DataRetrievalFailureException extends NonTransientDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java index 6ba9b553625..17592afe479 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java @@ -22,6 +22,7 @@ package org.springframework.dao; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class DeadlockLoserDataAccessException extends PessimisticLockingFailureException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java b/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java index 5267f2ec3c8..08de0dbaca7 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java @@ -24,6 +24,7 @@ package org.springframework.dao; * * @author Thomas Risberg */ +@SuppressWarnings("serial") public class DuplicateKeyException extends DataIntegrityViolationException { /** @@ -43,4 +44,4 @@ public class DuplicateKeyException extends DataIntegrityViolationException { super(msg, cause); } -} \ No newline at end of file +} diff --git a/spring-tx/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java index dfbb86d54bc..625a3765323 100644 --- a/spring-tx/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java @@ -24,6 +24,7 @@ package org.springframework.dao; * @since 2.0 * @see IncorrectResultSizeDataAccessException */ +@SuppressWarnings("serial") public class EmptyResultDataAccessException extends IncorrectResultSizeDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java index 57ddae53795..cec38dc16bf 100644 --- a/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java @@ -24,6 +24,7 @@ package org.springframework.dao; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class IncorrectUpdateSemanticsDataAccessException extends InvalidDataAccessResourceUsageException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java index 9a442632cf9..7a401c24d37 100644 --- a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java +++ b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java @@ -25,6 +25,7 @@ package org.springframework.dao; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class InvalidDataAccessApiUsageException extends NonTransientDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java index 735acdc3482..fc29c8a0c16 100644 --- a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java +++ b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java @@ -23,6 +23,7 @@ package org.springframework.dao; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class InvalidDataAccessResourceUsageException extends NonTransientDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java index 480b7701fa8..7970724c43e 100644 --- a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java @@ -25,6 +25,7 @@ package org.springframework.dao; * @since 2.5 * @see java.sql.SQLNonTransientException */ +@SuppressWarnings("serial") public abstract class NonTransientDataAccessException extends DataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java index 45eb06f9e27..5bf9e388782 100644 --- a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java +++ b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java @@ -23,6 +23,7 @@ package org.springframework.dao; * @since 2.5 * @see java.sql.SQLNonTransientConnectionException */ +@SuppressWarnings("serial") public class NonTransientDataAccessResourceException extends NonTransientDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java b/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java index ae036293ddb..f42faa26a39 100644 --- a/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java +++ b/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java @@ -26,6 +26,7 @@ package org.springframework.dao; * @author Rod Johnson * @see PessimisticLockingFailureException */ +@SuppressWarnings("serial") public class OptimisticLockingFailureException extends ConcurrencyFailureException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java index 71529ae477b..ce08465ae4e 100644 --- a/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java @@ -23,6 +23,7 @@ package org.springframework.dao; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class PermissionDeniedDataAccessException extends NonTransientDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java b/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java index f022b3dc2e6..698e3d07d03 100644 --- a/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java +++ b/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java @@ -30,6 +30,7 @@ package org.springframework.dao; * @see DeadlockLoserDataAccessException * @see OptimisticLockingFailureException */ +@SuppressWarnings("serial") public class PessimisticLockingFailureException extends ConcurrencyFailureException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/QueryTimeoutException.java b/spring-tx/src/main/java/org/springframework/dao/QueryTimeoutException.java index 5df9cb3c3f5..5268b80e934 100644 --- a/spring-tx/src/main/java/org/springframework/dao/QueryTimeoutException.java +++ b/spring-tx/src/main/java/org/springframework/dao/QueryTimeoutException.java @@ -27,6 +27,7 @@ package org.springframework.dao; * @author Thomas Risberg * @since 3.1 */ +@SuppressWarnings("serial") public class QueryTimeoutException extends TransientDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java index 973feb2fd4e..5c30bd6bafa 100644 --- a/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java @@ -27,6 +27,7 @@ package org.springframework.dao; * @since 2.5 * @see java.sql.SQLRecoverableException */ +@SuppressWarnings("serial") public class RecoverableDataAccessException extends DataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java index 9c3b2397ee0..94f31e0bfb6 100644 --- a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java @@ -25,6 +25,7 @@ package org.springframework.dao; * @since 2.5 * @see java.sql.SQLTransientException */ +@SuppressWarnings("serial") public abstract class TransientDataAccessException extends DataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java index c2c37d004f3..032abe67f44 100644 --- a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java +++ b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java @@ -24,6 +24,7 @@ package org.springframework.dao; * @since 2.5 * @see java.sql.SQLTransientConnectionException */ +@SuppressWarnings("serial") public class TransientDataAccessResourceException extends TransientDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java index 073bf188a71..875db8c3194 100644 --- a/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java @@ -23,6 +23,7 @@ package org.springframework.dao; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class TypeMismatchDataAccessException extends InvalidDataAccessResourceUsageException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java index 9ae9674ca68..0b5d532c33c 100644 --- a/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java @@ -23,6 +23,7 @@ package org.springframework.dao; * * @author Rod Johnson */ +@SuppressWarnings("serial") public abstract class UncategorizedDataAccessException extends NonTransientDataAccessException { /** diff --git a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java index 90c35fc6cc5..19b5cba0a19 100644 --- a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java +++ b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java @@ -38,6 +38,7 @@ import org.springframework.dao.support.PersistenceExceptionTranslator; * @see org.springframework.dao.DataAccessException * @see org.springframework.dao.support.PersistenceExceptionTranslator */ +@SuppressWarnings("serial") public class PersistenceExceptionTranslationAdvisor extends AbstractPointcutAdvisor { private final PersistenceExceptionTranslationInterceptor advice; diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java index 7ddd2b03f87..71025dbf6f7 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java @@ -27,6 +27,7 @@ import org.springframework.dao.DataAccessResourceFailureException; * @author Juergen Hoeller * @since 1.2 */ +@SuppressWarnings("serial") public class CannotCreateRecordException extends DataAccessResourceFailureException { /** diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java index f35273b6277..d977f44576d 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java @@ -27,6 +27,7 @@ import org.springframework.dao.DataAccessResourceFailureException; * @author Juergen Hoeller * @since 1.2 */ +@SuppressWarnings("serial") public class CannotGetCciConnectionException extends DataAccessResourceFailureException { /** diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java index b9e668d4142..8ecf30261d3 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java @@ -26,6 +26,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException; * @author Juergen Hoeller * @since 1.2 */ +@SuppressWarnings("serial") public class CciOperationNotSupportedException extends InvalidDataAccessResourceUsageException { /** diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java index 809812823cc..14185f79200 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java @@ -31,6 +31,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException; * @since 1.2 * @see javax.resource.cci.ResultSet */ +@SuppressWarnings("serial") public class InvalidResultSetAccessException extends InvalidDataAccessResourceUsageException { /** diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java index 19dd0fc660c..8eefbd7cc86 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java @@ -27,6 +27,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException; * @author Juergen Hoeller * @since 1.2 */ +@SuppressWarnings("serial") public class RecordTypeNotSupportedException extends InvalidDataAccessResourceUsageException { /** diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java index f5e54bb50fe..e2061896c88 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java @@ -60,6 +60,7 @@ import org.springframework.transaction.support.ResourceTransactionManager; * @see TransactionAwareConnectionFactoryProxy * @see org.springframework.jca.cci.core.CciTemplate */ +@SuppressWarnings("serial") public class CciLocalTransactionManager extends AbstractPlatformTransactionManager implements ResourceTransactionManager, InitializingBean { diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java index 781a308db6a..532f12c007a 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java @@ -62,6 +62,7 @@ import org.springframework.core.NamedThreadLocal; * @since 1.2 * @see #getConnection */ +@SuppressWarnings("serial") public class ConnectionSpecConnectionFactoryAdapter extends DelegatingConnectionFactory { private ConnectionSpec connectionSpec; diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java index b202f829027..24337ad0c0e 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java @@ -39,6 +39,7 @@ import org.springframework.beans.factory.InitializingBean; * @since 1.2 * @see #getConnection */ +@SuppressWarnings("serial") public class DelegatingConnectionFactory implements ConnectionFactory, InitializingBean { private ConnectionFactory targetConnectionFactory; diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java index 2b8d0853a6a..e9d43f4094c 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java @@ -51,6 +51,7 @@ import org.springframework.util.Assert; * @see javax.resource.cci.Connection#close() * @see org.springframework.jca.cci.core.CciTemplate */ +@SuppressWarnings("serial") public class SingleConnectionFactory extends DelegatingConnectionFactory implements DisposableBean { protected final Log logger = LogFactory.getLog(getClass()); diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java index 263fec4dba3..fed1e44a994 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java @@ -64,6 +64,7 @@ import javax.resource.cci.ConnectionFactory; * @see ConnectionFactoryUtils#doGetConnection * @see ConnectionFactoryUtils#doReleaseConnection */ +@SuppressWarnings("serial") public class TransactionAwareConnectionFactoryProxy extends DelegatingConnectionFactory { /** diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java index 223f5daf5f6..f69c1137ac0 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java @@ -33,6 +33,7 @@ import org.springframework.util.FileCopyUtils; * @since 1.2 * @see org.springframework.jca.cci.object.MappingCommAreaOperation */ +@SuppressWarnings("serial") public class CommAreaRecord implements Record, Streamable { private byte[] bytes; diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java index ffb56126f3e..731467a77c0 100644 --- a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java +++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java @@ -148,6 +148,7 @@ public class GenericMessageEndpointFactory extends AbstractMessageEndpointFactor * directly, leavng it up to the concrete endpoint to apply those - * and to handle any ResourceExceptions thrown from them. */ + @SuppressWarnings("serial") public static class InternalResourceException extends RuntimeException { protected InternalResourceException(ResourceException cause) { diff --git a/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java index b926733c8a0..76a84a53414 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java @@ -23,6 +23,7 @@ package org.springframework.transaction; * @author Rod Johnson * @since 17.03.2003 */ +@SuppressWarnings("serial") public class CannotCreateTransactionException extends TransactionException { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java index d640d9b4014..bd4910f1aef 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java @@ -24,6 +24,7 @@ package org.springframework.transaction; * @author Juergen Hoeller * @since 17.03.2003 */ +@SuppressWarnings("serial") public class HeuristicCompletionException extends TransactionException { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java b/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java index 087fe98e751..c234ec1a185 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java @@ -24,6 +24,7 @@ package org.springframework.transaction; * @author Juergen Hoeller * @since 21.01.2004 */ +@SuppressWarnings("serial") public class IllegalTransactionStateException extends TransactionUsageException { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java b/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java index 27eb9ce3c4b..5db61b37409 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java @@ -24,6 +24,7 @@ package org.springframework.transaction; * @author Juergen Hoeller * @since 12.05.2003 */ +@SuppressWarnings("serial") public class InvalidIsolationLevelException extends TransactionUsageException { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java b/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java index 705990732fc..2e483881520 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java @@ -24,6 +24,7 @@ package org.springframework.transaction; * @author Juergen Hoeller * @since 12.05.2003 */ +@SuppressWarnings("serial") public class InvalidTimeoutException extends TransactionUsageException { private int timeout; diff --git a/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java b/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java index ba23bc119f2..a237550a017 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java @@ -23,6 +23,7 @@ package org.springframework.transaction; * @author Juergen Hoeller * @since 1.1 */ +@SuppressWarnings("serial") public class NestedTransactionNotSupportedException extends CannotCreateTransactionException { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java index 193bdda3b5d..57ebb3804b3 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java @@ -25,6 +25,7 @@ package org.springframework.transaction; * @author Rod Johnson * @since 17.03.2003 */ +@SuppressWarnings("serial") public class NoTransactionException extends TransactionUsageException { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java index 3040eea3e1b..8facfc5a6c2 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java @@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException; * @author Rod Johnson * @since 17.03.2003 */ +@SuppressWarnings("serial") public abstract class TransactionException extends NestedRuntimeException { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java index 297b695ce93..f3274c2e920 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java @@ -23,6 +23,7 @@ package org.springframework.transaction; * @author Juergen Hoeller * @since 1.1 */ +@SuppressWarnings("serial") public class TransactionSuspensionNotSupportedException extends CannotCreateTransactionException { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java index 63013c81aa7..88713688991 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java @@ -25,6 +25,7 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 24.03.2003 */ +@SuppressWarnings("serial") public class TransactionSystemException extends TransactionException { private Throwable applicationException; diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java index 2228af4bff0..e98eb1c4f43 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java @@ -42,6 +42,7 @@ package org.springframework.transaction; * @see java.sql.Statement#setQueryTimeout * @see java.sql.SQLException */ +@SuppressWarnings("serial") public class TransactionTimedOutException extends TransactionException { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java index ef28675b743..5c757474a07 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java @@ -23,6 +23,7 @@ package org.springframework.transaction; * @author Rod Johnson * @since 22.03.2003 */ +@SuppressWarnings("serial") public class TransactionUsageException extends TransactionException { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java b/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java index 6201cb11abc..1a48ca044ec 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java @@ -23,6 +23,7 @@ package org.springframework.transaction; * @author Rod Johnson * @since 17.03.2003 */ +@SuppressWarnings("serial") public class UnexpectedRollbackException extends TransactionException { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java index d8dde88147d..461dbe4e065 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java @@ -49,6 +49,7 @@ import org.springframework.util.ClassUtils; * @see org.springframework.transaction.interceptor.TransactionInterceptor#setTransactionAttributeSource * @see org.springframework.transaction.interceptor.TransactionProxyFactoryBean#setTransactionAttributeSource */ +@SuppressWarnings("serial") public class AnnotationTransactionAttributeSource extends AbstractFallbackTransactionAttributeSource implements Serializable { diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java index 7171b5318b7..f7122b3742b 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java @@ -31,6 +31,7 @@ import org.springframework.transaction.interceptor.TransactionAttribute; * @author Juergen Hoeller * @since 2.5 */ +@SuppressWarnings("serial") public class Ejb3TransactionAnnotationParser implements TransactionAnnotationParser, Serializable { public TransactionAttribute parseTransactionAnnotation(AnnotatedElement ae) { diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java index 4e9db4f3f7a..d9024f1a1f1 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java @@ -32,6 +32,7 @@ import org.springframework.transaction.interceptor.TransactionAttribute; * @author Juergen Hoeller * @since 2.5 */ +@SuppressWarnings("serial") public class SpringTransactionAnnotationParser implements TransactionAnnotationParser, Serializable { public TransactionAttribute parseTransactionAnnotation(AnnotatedElement ae) { diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java index cae5ca7aa72..514dd625e6c 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java @@ -30,6 +30,7 @@ import org.springframework.aop.support.AbstractBeanFactoryPointcutAdvisor; * @see TransactionInterceptor * @see TransactionAttributeSourceAdvisor */ +@SuppressWarnings("serial") public class BeanFactoryTransactionAttributeSourceAdvisor extends AbstractBeanFactoryPointcutAdvisor { private TransactionAttributeSource transactionAttributeSource; diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java index 6b5d0173181..8837a05eb4a 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java @@ -28,6 +28,7 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class CompositeTransactionAttributeSource implements TransactionAttributeSource, Serializable { private final TransactionAttributeSource[] transactionAttributeSources; diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java index 41edb94f57a..eea06e27065 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java @@ -25,6 +25,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition; * @author Rod Johnson * @since 16.03.2003 */ +@SuppressWarnings("serial") public class DefaultTransactionAttribute extends DefaultTransactionDefinition implements TransactionAttribute { private String qualifier; diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java index 9fd02d5a9eb..c4ef1953f5c 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java @@ -29,6 +29,7 @@ import org.springframework.transaction.support.DelegatingTransactionDefinition; * @author Juergen Hoeller * @since 1.2 */ +@SuppressWarnings("serial") public abstract class DelegatingTransactionAttribute extends DelegatingTransactionDefinition implements TransactionAttribute, Serializable { diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java index c807119f761..fbf824f5c54 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java @@ -33,6 +33,7 @@ import org.springframework.util.ObjectUtils; * @see org.springframework.transaction.interceptor.TransactionProxyFactoryBean * @see org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator */ +@SuppressWarnings("serial") public class MatchAlwaysTransactionAttributeSource implements TransactionAttributeSource, Serializable { private TransactionAttribute transactionAttribute = new DefaultTransactionAttribute(); diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java index 8a69517e0be..9d52c141b5b 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java @@ -38,6 +38,7 @@ import org.springframework.util.PatternMatchUtils; * @see #isMatch * @see MethodMapTransactionAttributeSource */ +@SuppressWarnings("serial") public class NameMatchTransactionAttributeSource implements TransactionAttributeSource, Serializable { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java index 92519c4de19..2588187ddd8 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java @@ -23,6 +23,7 @@ package org.springframework.transaction.interceptor; * @author Rod Johnson * @since 09.04.2003 */ +@SuppressWarnings("serial") public class NoRollbackRuleAttribute extends RollbackRuleAttribute { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java index 31920a2ca19..5e7021b0f2f 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java @@ -31,6 +31,7 @@ import java.io.Serializable; * @since 09.04.2003 * @see NoRollbackRuleAttribute */ +@SuppressWarnings("serial") public class RollbackRuleAttribute implements Serializable{ /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java index 8740233271e..eeb0046baba 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java @@ -37,6 +37,7 @@ import org.apache.commons.logging.LogFactory; * @since 09.04.2003 * @see TransactionAttributeEditor */ +@SuppressWarnings("serial") public class RuleBasedTransactionAttribute extends DefaultTransactionAttribute implements Serializable { /** Prefix for rollback-on-exception rules in description strings */ diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java index b9ca3c7c995..8d15342c02d 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java @@ -315,6 +315,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init * tell if there was a transaction created. * @see #getTransactionAttributeSource() */ + @SuppressWarnings("serial") protected TransactionInfo createTransactionIfNecessary( PlatformTransactionManager tm, TransactionAttribute txAttr, final String joinpointIdentification) { diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java index 1aaee3b3937..f253c2a8b56 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java @@ -35,6 +35,7 @@ import org.springframework.aop.support.AbstractPointcutAdvisor; * @see #setTransactionInterceptor * @see TransactionProxyFactoryBean */ +@SuppressWarnings("serial") public class TransactionAttributeSourceAdvisor extends AbstractPointcutAdvisor { private TransactionInterceptor transactionInterceptor; diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java index 64dea121a9f..53f78b9a535 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java @@ -29,6 +29,7 @@ import org.springframework.util.ObjectUtils; * @author Juergen Hoeller * @since 2.5.5 */ +@SuppressWarnings("serial") abstract class TransactionAttributeSourcePointcut extends StaticMethodMatcherPointcut implements Serializable { public boolean matches(Method method, Class targetClass) { diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java index 9cb77789cdf..47e6773bd4f 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java @@ -117,6 +117,7 @@ import org.springframework.util.StringUtils; * @see #setTransactionManager * @see WebLogicJtaTransactionManager */ +@SuppressWarnings("serial") public class JtaTransactionManager extends AbstractPlatformTransactionManager implements TransactionFactory, InitializingBean, Serializable { diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java index 2c1ef8a0f8a..738dcec8abc 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java @@ -65,6 +65,7 @@ import org.springframework.util.ClassUtils; * since Oracle end-of-lifed OC4J in favor of WebLogic */ @Deprecated +@SuppressWarnings("serial") public class OC4JJtaTransactionManager extends JtaTransactionManager { private static final String TRANSACTION_UTILITY_CLASS_NAME = diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java index 0e0e67bd00f..6381bea66d4 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java @@ -65,6 +65,7 @@ import org.springframework.transaction.TransactionSystemException; * @see weblogic.transaction.TransactionManager#forceResume * @see weblogic.transaction.TransactionHelper */ +@SuppressWarnings("serial") public class WebLogicJtaTransactionManager extends JtaTransactionManager { private static final String USER_TRANSACTION_CLASS_NAME = "weblogic.transaction.UserTransaction"; diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java index fbb4e6c15b9..d622ff97998 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java @@ -77,6 +77,7 @@ import org.springframework.util.ReflectionUtils; * @see #setUowManagerName * @see com.ibm.wsspi.uow.UOWManager */ +@SuppressWarnings("serial") public class WebSphereUowTransactionManager extends JtaTransactionManager implements CallbackPreferringPlatformTransactionManager { diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java index 33d1969d3c9..6d0f16f8eda 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java @@ -78,6 +78,7 @@ import org.springframework.transaction.UnexpectedRollbackException; * @see TransactionSynchronizationManager * @see org.springframework.transaction.jta.JtaTransactionManager */ +@SuppressWarnings("serial") public abstract class AbstractPlatformTransactionManager implements PlatformTransactionManager, Serializable { /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java index c844a249300..b7e77b6f608 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java @@ -32,6 +32,7 @@ import org.springframework.transaction.TransactionDefinition; * @author Juergen Hoeller * @since 08.05.2003 */ +@SuppressWarnings("serial") public class DefaultTransactionDefinition implements TransactionDefinition, Serializable { /** Prefix for the propagation constants defined in TransactionDefinition */ diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java index d3e111f5bdb..30bfd66a02e 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java @@ -30,6 +30,7 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 3.0 */ +@SuppressWarnings("serial") public abstract class DelegatingTransactionDefinition implements TransactionDefinition, Serializable { private final TransactionDefinition targetDefinition; diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java index 12d285a94c7..8d7df115f91 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java @@ -59,6 +59,7 @@ import org.springframework.transaction.TransactionSystemException; * @see #setTransactionManager * @see org.springframework.transaction.PlatformTransactionManager */ +@SuppressWarnings("serial") public class TransactionTemplate extends DefaultTransactionDefinition implements TransactionOperations, InitializingBean { diff --git a/spring-tx/src/test/java/org/springframework/beans/Colour.java b/spring-tx/src/test/java/org/springframework/beans/Colour.java index 60dc333e0b4..17fd24fec79 100644 --- a/spring-tx/src/test/java/org/springframework/beans/Colour.java +++ b/spring-tx/src/test/java/org/springframework/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java index 2bb41a9d5b6..0940539f54a 100644 --- a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean; * @author Juergen Hoeller * @since 21.08.2003 */ +@SuppressWarnings("serial") public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean { private String beanName; @@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA return destroyed; } -} \ No newline at end of file +} diff --git a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 563d6107149..0c0b3cb81cf 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -23,6 +23,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class CallCountingTransactionManager extends AbstractPlatformTransactionManager { public TransactionDefinition lastDefinition; diff --git a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java index 1cd39725b04..1fdd0659ebe 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java @@ -23,6 +23,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus; * @author Juergen Hoeller * @since 29.04.2003 */ +@SuppressWarnings("serial") class TestTransactionManager extends AbstractPlatformTransactionManager { private static final Object TRANSACTION = "transaction"; diff --git a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java index a2ec8a3b7c5..13646322584 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java @@ -181,6 +181,7 @@ public class TransactionSupportTests extends TestCase { } } + @SuppressWarnings("serial") public void testTransactionTemplateWithRollbackException() { final TransactionSystemException tex = new TransactionSystemException("system exception"); TestTransactionManager tm = new TestTransactionManager(false, true) { diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java index 6d61e66360c..1dfd6a1bb1c 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java @@ -329,6 +329,7 @@ public class AnnotationTransactionAttributeSourceTests { } + @SuppressWarnings("serial") public static class TestBean1 implements ITestBean, Serializable { private String name; diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java index f72e3bd4abb..ec6f49fe145 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java @@ -84,6 +84,7 @@ public class AnnotationDrivenTests extends TestCase { } + @SuppressWarnings("serial") public static class TransactionCheckingInterceptor implements MethodInterceptor, Serializable { public Object invoke(MethodInvocation methodInvocation) throws Throwable { diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java index e5d05728156..4ae36b3c1dd 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java +++ b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java @@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional; * @author Rob Harrop * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class TransactionalService implements Serializable { @Transactional("synch") 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 5d787bec1e8..59947292cfd 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 @@ -381,6 +381,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { * @param ex exception to be thrown by the target * @param shouldRollback whether this should cause a transaction rollback */ + @SuppressWarnings("serial") protected void doTestRollbackOnException( final Exception ex, final boolean shouldRollback, boolean rollbackException) throws Exception { diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java index 5447995f5f6..5255b972ac8 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java @@ -108,6 +108,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests /** * We won't use this: we just want to know it's serializable. */ + @SuppressWarnings("serial") public static class SerializableTransactionManager implements PlatformTransactionManager, Serializable { public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException { diff --git a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java index 8f0cedc1251..600082bfe43 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java +++ b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java @@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException; * @author Arjen Poutsma * @since 3.0 */ +@SuppressWarnings("serial") public class HttpMessageConversionException extends NestedRuntimeException { /** diff --git a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java index cba5bbe909c..4b7b747d2f4 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java +++ b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java @@ -23,6 +23,7 @@ package org.springframework.http.converter; * @author Arjen Poutsma * @since 3.0 */ +@SuppressWarnings("serial") public class HttpMessageNotReadableException extends HttpMessageConversionException { /** diff --git a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java index 29f8dc4fe9a..5c2cebb357c 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java +++ b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java @@ -24,6 +24,7 @@ package org.springframework.http.converter; * @author Arjen Poutsma * @since 3.0 */ +@SuppressWarnings("serial") public class HttpMessageNotWritableException extends HttpMessageConversionException { /** @@ -44,4 +45,4 @@ public class HttpMessageNotWritableException extends HttpMessageConversionExcept public HttpMessageNotWritableException(String msg, Throwable cause) { super(msg, cause); } -} \ No newline at end of file +} diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java index dd625ec9315..1242cad1218 100644 --- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java +++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java @@ -30,6 +30,7 @@ import org.springframework.remoting.soap.SoapFaultException; * @deprecated in favor of JAX-WS support in {@code org.springframework.remoting.jaxws} */ @Deprecated +@SuppressWarnings("serial") public class JaxRpcSoapFaultException extends SoapFaultException { /** diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java index 0dcc3e68374..cf2cb7d2216 100644 --- a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java +++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java @@ -29,6 +29,7 @@ import org.springframework.remoting.soap.SoapFaultException; * @author Juergen Hoeller * @since 2.5 */ +@SuppressWarnings("serial") public class JaxWsSoapFaultException extends SoapFaultException { /** diff --git a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java index 9ed8c13134a..b9f2357dcaf 100644 --- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java +++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java @@ -28,6 +28,7 @@ import org.springframework.http.MediaType; * @author Arjen Poutsma * @since 3.0 */ +@SuppressWarnings("serial") public abstract class HttpMediaTypeException extends ServletException { private final List supportedMediaTypes; diff --git a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java index 3d2a4362da3..2c015834c3b 100644 --- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java +++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java @@ -26,6 +26,7 @@ import org.springframework.http.MediaType; * @author Arjen Poutsma * @since 3.0 */ +@SuppressWarnings("serial") public class HttpMediaTypeNotAcceptableException extends HttpMediaTypeException { /** diff --git a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java index 731c64ac305..ed820c7043f 100644 --- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java +++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java @@ -27,6 +27,7 @@ import org.springframework.http.MediaType; * @author Arjen Poutsma * @since 3.0 */ +@SuppressWarnings("serial") public class HttpMediaTypeNotSupportedException extends HttpMediaTypeException { private final MediaType contentType; diff --git a/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java index 34134c16c53..97be2859205 100644 --- a/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java +++ b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java @@ -31,6 +31,7 @@ import org.springframework.http.HttpMethod; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class HttpRequestMethodNotSupportedException extends ServletException { private String method; diff --git a/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java b/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java index 1f056a21ab0..84880225b54 100644 --- a/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java +++ b/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java @@ -24,6 +24,7 @@ import javax.servlet.ServletException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class HttpSessionRequiredException extends ServletException { /** diff --git a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java index ed19bc9cd29..71619890579 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java @@ -26,6 +26,7 @@ import org.springframework.validation.ObjectError; * @author Rossen Stoyanchev * @since 3.1 */ +@SuppressWarnings("serial") public class MethodArgumentNotValidException extends Exception { private final MethodParameter parameter; diff --git a/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java index fdd22f97547..d27a5dd6286 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java @@ -22,6 +22,7 @@ package org.springframework.web.bind; * @author Juergen Hoeller * @since 2.0.2 */ +@SuppressWarnings("serial") public class MissingServletRequestParameterException extends ServletRequestBindingException { private final String parameterName; diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java index 8165950107e..2c28431a4cf 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java @@ -29,6 +29,7 @@ import org.springframework.web.util.NestedServletException; * @author Rod Johnson * @author Juergen Hoeller */ +@SuppressWarnings("serial") public class ServletRequestBindingException extends NestedServletException { /** diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java index 2ced6ea8471..febc333f2b7 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java +++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java @@ -36,6 +36,7 @@ import org.springframework.web.util.WebUtils; * @author Juergen Hoeller * @see org.springframework.web.util.WebUtils#getParametersStartingWith */ +@SuppressWarnings("serial") public class ServletRequestParameterPropertyValues extends MutablePropertyValues { /** Default prefix separator */ diff --git a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java index e6d84912830..c74a8584b5c 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java @@ -31,6 +31,7 @@ import org.springframework.util.StringUtils; * @since 3.0 * @see org.springframework.web.bind.annotation.RequestMapping#params() */ +@SuppressWarnings("serial") public class UnsatisfiedServletRequestParameterException extends ServletRequestBindingException { private final String[] paramConditions; diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java index bfbb1ac5303..b6c07ee59af 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java @@ -27,6 +27,7 @@ import org.springframework.core.NestedRuntimeException; * @since 2.5.6 * @see HandlerMethodInvoker#invokeHandlerMethod */ +@SuppressWarnings("serial") public class HandlerMethodInvocationException extends NestedRuntimeException { /** diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java index 1ddf80fa5f6..cd729964f4d 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java @@ -707,6 +707,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat /** * HTTP-specific subclass of UriTemplate, overriding the encode method. */ + @SuppressWarnings("serial") private static class HttpUrlTemplate extends UriTemplate { public HttpUrlTemplate(String uriTemplate) { diff --git a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java index 04789512aa0..46dc4234380 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java @@ -29,6 +29,7 @@ import javax.servlet.http.HttpSessionBindingListener; * @see RequestAttributes#registerDestructionCallback * @see ServletRequestAttributes#registerSessionDestructionCallback */ +@SuppressWarnings("serial") public class DestructionCallbackBindingListener implements HttpSessionBindingListener, Serializable { private final Runnable destructionCallback; diff --git a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java index eed5597a3d9..a34c8381954 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java @@ -46,6 +46,7 @@ import org.springframework.web.context.WebApplicationContext; * @see org.springframework.web.HttpRequestHandler * @see org.springframework.web.servlet.DispatcherServlet */ +@SuppressWarnings("serial") public class HttpRequestHandlerServlet extends HttpServlet { private HttpRequestHandler target; diff --git a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java index cf1d0455360..685a0571429 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java @@ -33,6 +33,7 @@ import org.springframework.context.ApplicationEvent; * @see org.springframework.web.servlet.FrameworkServlet * @see org.springframework.context.ApplicationContext#publishEvent */ +@SuppressWarnings("serial") public class RequestHandledEvent extends ApplicationEvent { /** Session id that applied to the request, if any */ diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java index 8e6e21747bf..37e5d2519d5 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java @@ -25,6 +25,7 @@ package org.springframework.web.context.support; * @see org.springframework.web.servlet.FrameworkServlet * @see org.springframework.context.ApplicationContext#publishEvent */ +@SuppressWarnings("serial") public class ServletRequestHandledEvent extends RequestHandledEvent { /** URL that the triggered the request */ diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java index 19f524233c7..84c41caa592 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java @@ -59,6 +59,7 @@ import org.springframework.web.context.WebApplicationContext; * @author Colin Sampaleanu * @since 1.2.7 */ +@SuppressWarnings("serial") public class DelegatingPhaseListenerMulticaster implements PhaseListener { public PhaseId getPhaseId() { diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java b/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java index fe9892dcfc5..94aa67671e6 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java @@ -23,6 +23,7 @@ package org.springframework.web.multipart; * @author Juergen Hoeller * @since 1.0.1 */ +@SuppressWarnings("serial") public class MaxUploadSizeExceededException extends MultipartException { private final long maxUploadSize; diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java index 64360f4d8d9..6aec889ab6a 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java @@ -27,6 +27,7 @@ import org.springframework.core.NestedRuntimeException; * @see MultipartResolver#resolveMultipart * @see org.springframework.web.multipart.support.MultipartFilter */ +@SuppressWarnings("serial") public class MultipartException extends NestedRuntimeException { /** diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java index 28efebe6c85..677613a61ad 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java @@ -37,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile; * @since 29.09.2003 * @see CommonsMultipartResolver */ +@SuppressWarnings("serial") public class CommonsMultipartFile implements MultipartFile, Serializable { protected static final Log logger = LogFactory.getLog(CommonsMultipartFile.class); diff --git a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java index 32147df7d65..cb0367c2e23 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java +++ b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java @@ -58,6 +58,7 @@ public class HttpSessionMutexListener implements HttpSessionListener { * Doesn't need to be anything but a plain Object to synchronize on. * Should be serializable to allow for HttpSession persistence. */ + @SuppressWarnings("serial") private static class Mutex implements Serializable { } diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java index a2b00dded68..6682a0a0098 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java @@ -41,6 +41,7 @@ import org.springframework.util.Assert; * @since 3.0 * @see URI Templates */ +@SuppressWarnings("serial") public class UriTemplate implements Serializable { /** Captures URI template variable names. */ diff --git a/spring-web/src/test/java/org/springframework/beans/Colour.java b/spring-web/src/test/java/org/springframework/beans/Colour.java index 60dc333e0b4..17fd24fec79 100644 --- a/spring-web/src/test/java/org/springframework/beans/Colour.java +++ b/spring-web/src/test/java/org/springframework/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java index 2bb41a9d5b6..0940539f54a 100644 --- a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean; * @author Juergen Hoeller * @since 21.08.2003 */ +@SuppressWarnings("serial") public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean { private String beanName; @@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA return destroyed; } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java index 34d05120aaa..13c2c5447a5 100644 --- a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java @@ -25,6 +25,7 @@ import org.springframework.util.ObjectUtils; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class SerializablePerson implements Person, Serializable { private String name; @@ -61,4 +62,4 @@ public class SerializablePerson implements Person, Serializable { return p.age == age && ObjectUtils.nullSafeEquals(name, p.name); } -} \ No newline at end of file +} diff --git a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java index 262580b2f8d..56569a8e042 100644 --- a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java +++ b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java @@ -450,6 +450,7 @@ public class HttpInvokerTests extends TestCase { } + @SuppressWarnings("serial") private static class TestRemoteInvocation extends RemoteInvocation { public TestRemoteInvocation(MethodInvocation methodInvocation) { @@ -458,6 +459,7 @@ public class HttpInvokerTests extends TestCase { } + @SuppressWarnings("serial") private static class TestRemoteInvocationWrapper implements Serializable { private final RemoteInvocation remoteInvocation; @@ -468,6 +470,7 @@ public class HttpInvokerTests extends TestCase { } + @SuppressWarnings("serial") private static class TestRemoteInvocationResultWrapper implements Serializable { private final RemoteInvocationResult remoteInvocationResult; diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java index 3a43306153a..6fec403c7e4 100644 --- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java +++ b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java @@ -22,6 +22,7 @@ import javax.xml.ws.WebFault; * @author Juergen Hoeller */ @WebFault +@SuppressWarnings("serial") public class OrderNotFoundException extends Exception { private String faultInfo; diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java index 00306c05316..8c8686df691 100644 --- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java @@ -264,6 +264,7 @@ public class RestTemplateIntegrationTests { } /** Servlet that sets the given status code. */ + @SuppressWarnings("serial") private static class StatusCodeServlet extends GenericServlet { private final int sc; @@ -279,6 +280,7 @@ public class RestTemplateIntegrationTests { } /** Servlet that returns an error message for a given status code. */ + @SuppressWarnings("serial") private static class ErrorServlet extends GenericServlet { private final int sc; @@ -293,6 +295,7 @@ public class RestTemplateIntegrationTests { } } + @SuppressWarnings("serial") private static class GetServlet extends HttpServlet { private final byte[] buf; @@ -315,6 +318,7 @@ public class RestTemplateIntegrationTests { } } + @SuppressWarnings("serial") private static class PostServlet extends HttpServlet { private final String s; @@ -347,6 +351,7 @@ public class RestTemplateIntegrationTests { } } + @SuppressWarnings("serial") private static class UriServlet extends HttpServlet { @Override @@ -357,6 +362,7 @@ public class RestTemplateIntegrationTests { } } + @SuppressWarnings("serial") private static class MultipartServlet extends HttpServlet { @Override diff --git a/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java b/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java index 11e9c2cc970..dc6ea054101 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java @@ -34,6 +34,7 @@ public class ServletRequestAttributesTests { private static final String KEY = "ThatThingThatThing"; + @SuppressWarnings("serial") private static final Serializable VALUE = new Serializable() { }; diff --git a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java index b0b44135ca9..cb45ad363a1 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java @@ -175,6 +175,7 @@ public class SessionScopeTests extends TestCase { } + @SuppressWarnings("serial") private static class CustomSerializableDestructionAwareBeanPostProcessor implements DestructionAwareBeanPostProcessor, Serializable { diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java index 48af11100d6..e106045cf92 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java @@ -36,6 +36,7 @@ public class DelegatingPhaseListenerTests extends TestCase { private StaticListableBeanFactory beanFactory; private DelegatingPhaseListenerMulticaster delPhaseListener; + @SuppressWarnings("serial") protected void setUp() { facesContext = new MockFacesContext(); beanFactory = new StaticListableBeanFactory(); @@ -80,6 +81,7 @@ public class DelegatingPhaseListenerTests extends TestCase { } + @SuppressWarnings("serial") public static class TestListener implements PhaseListener { boolean beforeCalled = false; diff --git a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java index 6352a497583..ae2f318b4ce 100644 --- a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java @@ -397,6 +397,7 @@ public class CommonsMultipartResolverTests { } + @SuppressWarnings("serial") private static class MockFileItem implements FileItem { private String fieldName; diff --git a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java index e93aa884fad..3803551a63e 100644 --- a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java @@ -133,14 +133,17 @@ public final class TagUtilsTests { TagUtils.assertHasAncestorOfType(a, TagC.class, "a", "c"); } + @SuppressWarnings("serial") private static final class TagA extends TagSupport { } + @SuppressWarnings("serial") private static final class TagB extends TagSupport { } + @SuppressWarnings("serial") private static final class TagC extends TagSupport { } diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java index ce35bb669f6..0893d4be7f9 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java @@ -30,6 +30,7 @@ import javax.portlet.PortletException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class ModelAndViewDefiningException extends PortletException { private ModelAndView modelAndView; diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java index 8c24356729b..64fefc1f733 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java @@ -28,6 +28,7 @@ import org.springframework.core.style.StylerUtils; * @author Juergen Hoeller * @since 3.0.5 */ +@SuppressWarnings("serial") public class NoHandlerFoundException extends PortletException { /** diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java index 34a1510dd1d..693c33643b6 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java @@ -22,6 +22,7 @@ package org.springframework.web.portlet.bind; * @author Juergen Hoeller * @since 2.0.2 */ +@SuppressWarnings("serial") public class MissingPortletRequestParameterException extends PortletRequestBindingException { private final String parameterName; diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java index e460ce577c1..3ac235dcaf2 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java @@ -26,6 +26,7 @@ import javax.portlet.PortletException; * @author John A. Lewis * @since 2.0 */ +@SuppressWarnings("serial") public class PortletRequestBindingException extends PortletException { /** diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java index 5e4234e0b74..32420d02e41 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java @@ -37,6 +37,7 @@ import org.springframework.web.portlet.util.PortletUtils; * @since 2.0 * @see org.springframework.web.portlet.util.PortletUtils#getParametersStartingWith */ +@SuppressWarnings("serial") public class PortletRequestParameterPropertyValues extends MutablePropertyValues { /** Default prefix separator */ diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java index c1db0fa1c3a..40d39905e1d 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java @@ -241,6 +241,7 @@ public abstract class PortletApplicationContextUtils { /** * Factory that exposes the current request object on demand. */ + @SuppressWarnings("serial") private static class RequestObjectFactory implements ObjectFactory, Serializable { public PortletRequest getObject() { @@ -257,6 +258,7 @@ public abstract class PortletApplicationContextUtils { /** * Factory that exposes the current session object on demand. */ + @SuppressWarnings("serial") private static class SessionObjectFactory implements ObjectFactory, Serializable { public PortletSession getObject() { @@ -273,6 +275,7 @@ public abstract class PortletApplicationContextUtils { /** * Factory that exposes the current WebRequest object on demand. */ + @SuppressWarnings("serial") private static class WebRequestObjectFactory implements ObjectFactory, Serializable { public WebRequest getObject() { diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java index 3bb0eb787f3..4d3c6e5277a 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java @@ -28,6 +28,7 @@ import org.springframework.web.context.support.RequestHandledEvent; * @see org.springframework.web.portlet.FrameworkPortlet * @see org.springframework.context.ApplicationContext#publishEvent */ +@SuppressWarnings("serial") public class PortletRequestHandledEvent extends RequestHandledEvent { /** Name of the portlet that handled the request */ diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java index b9c9718a6e2..53ead92e54f 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java @@ -27,6 +27,7 @@ import org.springframework.util.StringUtils; * @author Juergen Hoeller * @since 3.0 */ +@SuppressWarnings("serial") public class PortletRequestMethodNotSupportedException extends PortletException { private String method; @@ -78,4 +79,4 @@ public class PortletRequestMethodNotSupportedException extends PortletException return this.supportedMethods; } -} \ No newline at end of file +} diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java index 0b0b5bab47b..7c4b8687e3a 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java @@ -25,6 +25,7 @@ import javax.portlet.PortletException; * @since 2.0 * @see org.springframework.web.portlet.handler.PortletContentGenerator */ +@SuppressWarnings("serial") public class PortletSessionRequiredException extends PortletException { /** diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java index 60dc333e0b4..17fd24fec79 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java index 2bb41a9d5b6..0940539f54a 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean; * @author Juergen Hoeller * @since 21.08.2003 */ +@SuppressWarnings("serial") public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean { private String beanName; @@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA return destroyed; } -} \ No newline at end of file +} diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index 619bfba6fbd..84ade3b7ddd 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -147,6 +147,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe } + @SuppressWarnings("serial") public static class MyEvent extends ApplicationEvent { public MyEvent(Object source) { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java index 5539c8eb937..aecf7ef773a 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java @@ -255,21 +255,25 @@ public class SimpleMappingExceptionResolverTests extends TestCase { } + @SuppressWarnings("serial") private static class SomeOddException extends Exception { } + @SuppressWarnings("serial") private static class SomeOddExceptionChild extends SomeOddException { } + @SuppressWarnings("serial") private static class NoSubstringMatchesThisException extends SomeOddException { } + @SuppressWarnings("serial") private static class AnotherOddException extends Exception { } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java index 6225c2cf703..88cec558020 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java @@ -440,7 +440,7 @@ public class PortletAnnotationControllerTests extends TestCase { } public void testMavResolver() throws Exception { - @SuppressWarnings("serial") DispatcherPortlet portlet = new DispatcherPortlet() { + DispatcherPortlet portlet = new DispatcherPortlet() { @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java index 52f3d7c29eb..08bd4f6abdc 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java @@ -32,6 +32,7 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @since 22.11.2003 */ +@SuppressWarnings("serial") public class ModelAndViewDefiningException extends ServletException { private ModelAndView modelAndView; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java index 272edb45b01..d280c8229cb 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java @@ -88,6 +88,7 @@ import org.springframework.web.context.support.ServletContextResource; * @see #setAllowedResources * @see #setApplyLastModified */ +@SuppressWarnings("serial") public class ResourceServlet extends HttpServletBean { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java index 137f727aff3..db6f31186c7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java @@ -43,6 +43,7 @@ import org.springframework.web.util.NestedServletException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class ViewRendererServlet extends HttpServlet { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java index 2e110ed9df6..5dc2d264fa8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java @@ -32,6 +32,7 @@ import org.springframework.web.util.UrlPathHelper; * @author Juergen Hoeller * @see MethodNameResolver#getHandlerMethodName(javax.servlet.http.HttpServletRequest) */ +@SuppressWarnings("serial") public class NoSuchRequestHandlingMethodException extends ServletException { private String methodName; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java index bdace3fcb56..28e5aa57227 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java @@ -33,6 +33,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils; * @see BindTag * @see org.springframework.validation.Errors */ +@SuppressWarnings("serial") public class BindErrorsTag extends HtmlEscapingAwareTag { public static final String ERRORS_VARIABLE_NAME = "errors"; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java index 004882b42fd..0b6e91eb023 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java @@ -46,6 +46,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils; * @author Juergen Hoeller * @see #setPath */ +@SuppressWarnings("serial") public class BindTag extends HtmlEscapingAwareTag implements EditorAwareTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java index bf76754db38..73cf45267f6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java @@ -43,6 +43,7 @@ import org.springframework.web.util.JavaScriptUtils; * @see org.springframework.web.util.HtmlUtils * @see org.springframework.web.util.JavaScriptUtils */ +@SuppressWarnings("serial") public class EscapeBodyTag extends HtmlEscapingAwareTag implements BodyTag { private boolean javaScriptEscape = false; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java index 4c455506897..dbf878f047a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java @@ -49,6 +49,7 @@ import org.springframework.web.util.TagUtils; * @author Juergen Hoeller * @since 3.0.1 */ +@SuppressWarnings("serial") public class EvalTag extends HtmlEscapingAwareTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java index 9107a16d0b4..578c9e69cef 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java @@ -31,6 +31,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils; * @since 04.03.2003 * @see HtmlEscapingAwareTag#setHtmlEscape */ +@SuppressWarnings("serial") public class HtmlEscapeTag extends RequestContextAwareTag { private String defaultHtmlEscape; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java index 8bf8ddf4ea2..6e72f1f91d1 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java @@ -35,6 +35,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils; * @see org.springframework.web.servlet.support.RequestContext#isDefaultHtmlEscape * @see org.springframework.web.util.WebUtils#isDefaultHtmlEscape */ +@SuppressWarnings("serial") public abstract class HtmlEscapingAwareTag extends RequestContextAwareTag { private Boolean htmlEscape; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java index 14553135727..c195208d980 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java @@ -51,6 +51,7 @@ import org.springframework.web.util.TagUtils; * @see HtmlEscapeTag#setDefaultHtmlEscape * @see org.springframework.web.util.WebUtils#HTML_ESCAPE_CONTEXT_PARAM */ +@SuppressWarnings("serial") public class MessageTag extends HtmlEscapingAwareTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java index c4ccaddbe97..bc3ee3b24f6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java @@ -40,6 +40,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils; * @author Juergen Hoeller * @since 1.1 */ +@SuppressWarnings("serial") public class NestedPathTag extends TagSupport implements TryCatchFinally { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java index b502de7fe35..8b222e3d3a4 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java @@ -30,6 +30,7 @@ import javax.servlet.jsp.tagext.BodyTagSupport; * @see Param * @see UrlTag */ +@SuppressWarnings("serial") public class ParamTag extends BodyTagSupport { private String name; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java index 4b5f6e49efa..8e8091f5ff0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java @@ -45,6 +45,7 @@ import org.springframework.web.servlet.support.RequestContext; * @see org.springframework.web.servlet.support.RequestContext * @see org.springframework.web.servlet.DispatcherServlet */ +@SuppressWarnings("serial") public abstract class RequestContextAwareTag extends TagSupport implements TryCatchFinally { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java index 4b9098acda5..370a842360c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java @@ -40,6 +40,7 @@ import org.springframework.context.NoSuchMessageException; * @see HtmlEscapeTag#setDefaultHtmlEscape * @see org.springframework.web.util.WebUtils#HTML_ESCAPE_CONTEXT_PARAM */ +@SuppressWarnings("serial") public class ThemeTag extends MessageTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java index 63136e220de..90f8b3ae569 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java @@ -40,6 +40,7 @@ import org.springframework.web.util.TagUtils; * @since 20.09.2003 * @see BindTag */ +@SuppressWarnings("serial") public class TransformTag extends HtmlEscapingAwareTag { /** the value to transform using the appropriate property editor */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java index 1f8ed098f8f..0bdaef89ceb 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java @@ -75,6 +75,7 @@ import org.springframework.web.util.UriUtils; * @since 3.0 * @see ParamTag */ +@SuppressWarnings("serial") public class UrlTag extends HtmlEscapingAwareTag implements ParamAware { private static final String URL_TEMPLATE_DELIMITER_PREFIX = "{"; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java index 78e4362bcbe..cebf23c64f0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java @@ -28,6 +28,7 @@ import javax.servlet.jsp.JspException; * @author Rossen Stoyanchev * @since 2.5 */ +@SuppressWarnings("serial") public abstract class AbstractCheckedElementTag extends AbstractHtmlInputElementTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java index c601e9d221b..b526096c239 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java @@ -43,6 +43,7 @@ import org.springframework.web.servlet.tags.NestedPathTag; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag implements EditorAwareTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java index 3de558dbe46..08200ab8d92 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java @@ -38,6 +38,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public abstract class AbstractFormTag extends HtmlEscapingAwareTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java index 1d98c4cb86c..f0e48baaae3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java @@ -33,6 +33,7 @@ import org.springframework.util.StringUtils; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public abstract class AbstractHtmlElementBodyTag extends AbstractHtmlElementTag implements BodyTag { private BodyContent bodyContent; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java index 658ea25b7e2..5b70045309d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java @@ -40,6 +40,7 @@ import org.springframework.util.StringUtils; * @author Rossen Stoyanchev * @since 2.0 */ +@SuppressWarnings("serial") public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElementTag implements DynamicAttributes { public static final String CLASS_ATTRIBUTE = "class"; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java index 9075be04d9d..d1d3dcf9ed8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java @@ -29,6 +29,7 @@ import javax.servlet.jsp.JspException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java index b6bc93f96fa..be41b85a6ed 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java @@ -37,6 +37,7 @@ import org.springframework.util.StringUtils; * @author Scott Andrews * @since 2.5.2 */ +@SuppressWarnings("serial") public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElementTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java index b2b6e869f76..71ca75cd65b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java @@ -27,6 +27,7 @@ import javax.servlet.jsp.JspException; * @author Juergen Hoeller * @since 2.5.2 */ +@SuppressWarnings("serial") public abstract class AbstractSingleCheckedElementTag extends AbstractCheckedElementTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java index 07006084c69..8b9f21c2cf5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java @@ -45,6 +45,7 @@ import org.springframework.web.bind.WebDataBinder; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class CheckboxTag extends AbstractSingleCheckedElementTag { @Override diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java index 2e2ecec7f35..29d6e93376e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java @@ -31,6 +31,7 @@ import org.springframework.web.bind.WebDataBinder; * @author Mark Fisher * @since 2.5 */ +@SuppressWarnings("serial") public class CheckboxesTag extends AbstractMultiCheckedElementTag { @Override diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java index 30a98455d3f..60a00ffe326 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java @@ -43,6 +43,7 @@ import org.springframework.util.StringUtils; * @author Rick Evans * @since 2.0 */ +@SuppressWarnings("serial") public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java index b51609d7f9a..4b776488ad9 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java @@ -53,6 +53,7 @@ import org.springframework.web.util.HtmlUtils; * @since 2.0 * @see org.springframework.web.servlet.mvc.SimpleFormController */ +@SuppressWarnings("serial") public class FormTag extends AbstractHtmlElementTag { /** The default HTTP method using which form values are sent to the server: "post" */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java index ee4002dfb52..474f9c913a0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java @@ -34,6 +34,7 @@ import org.springframework.util.StringUtils; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class LabelTag extends AbstractHtmlElementTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java index 55ebc647ac4..278887344a6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java @@ -46,6 +46,7 @@ import org.springframework.web.util.TagUtils; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java index ac75e9998e0..02712da2465 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java @@ -35,6 +35,7 @@ import org.springframework.web.util.TagUtils; * @author Scott Andrews * @since 2.0 */ +@SuppressWarnings("serial") public class OptionsTag extends AbstractHtmlElementTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java index 5ffe563cac8..6ee579519af 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java @@ -27,6 +27,7 @@ import javax.servlet.jsp.JspException; * @author Rossen Stoyanchev * @since 2.0 */ +@SuppressWarnings("serial") public class PasswordInputTag extends InputTag { private boolean showPassword = false; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java index 2eb3e4f194b..facbde6d241 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java @@ -32,6 +32,7 @@ import javax.servlet.jsp.JspException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class RadioButtonTag extends AbstractSingleCheckedElementTag { @Override diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java index 1d0ee7057e4..90033186c92 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java @@ -27,6 +27,7 @@ package org.springframework.web.servlet.tags.form; * @author Juergen Hoeller * @since 2.5 */ +@SuppressWarnings("serial") public class RadioButtonsTag extends AbstractMultiCheckedElementTag { @Override diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java index 10abcf87d00..c840f3e8474 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java @@ -40,6 +40,7 @@ import org.springframework.web.servlet.support.BindStatus; * @since 2.0 * @see OptionTag */ +@SuppressWarnings("serial") public class SelectTag extends AbstractHtmlInputElementTag { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java index 37940fa9409..c2ac715ca83 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java @@ -25,6 +25,7 @@ import javax.servlet.jsp.JspException; * @author Juergen Hoeller * @since 2.0 */ +@SuppressWarnings("serial") public class TextareaTag extends AbstractHtmlInputElementTag { public static final String ROWS_ATTRIBUTE = "rows"; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java index 5d82e56bb35..c0a66c52160 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java @@ -49,6 +49,7 @@ public abstract class AbstractCachingViewResolver extends WebApplicationObjectSu private boolean cacheUnresolved = true; /** Map from view key to View instance */ + @SuppressWarnings("serial") private final Map viewCache = new LinkedHashMap(DEFAULT_CACHE_LIMIT, 0.75f, true) { @Override diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java index a6f25813242..6773d689c84 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java @@ -371,6 +371,7 @@ public class FreeMarkerView extends AbstractTemplateView { * Simple adapter class that extends {@link GenericServlet}. * Needed for JSP access in FreeMarker. */ + @SuppressWarnings("serial") private static class GenericServletAdapter extends GenericServlet { @Override diff --git a/spring-webmvc/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc/src/test/java/org/springframework/beans/Colour.java index 60dc333e0b4..17fd24fec79 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/Colour.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/Colour.java @@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum; /** * @author Rob Harrop */ +@SuppressWarnings("serial") public class Colour extends ShortCodedLabeledEnum { public static final Colour RED = new Colour(0, "RED"); @@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum { super(code, label); } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java index 2bb41a9d5b6..0940539f54a 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean; * @author Juergen Hoeller * @since 21.08.2003 */ +@SuppressWarnings("serial") public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean { private String beanName; @@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA return destroyed; } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java index 34d05120aaa..13c2c5447a5 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java @@ -25,6 +25,7 @@ import org.springframework.util.ObjectUtils; * * @author Rod Johnson */ +@SuppressWarnings("serial") public class SerializablePerson implements Person, Serializable { private String name; @@ -61,4 +62,4 @@ public class SerializablePerson implements Person, Serializable { return p.age == age && ObjectUtils.nullSafeEquals(name, p.name); } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java index 3db32eb3b5b..b673752ecf4 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java @@ -278,11 +278,13 @@ public class SimpleMappingExceptionResolverTests { } + @SuppressWarnings("serial") private static class SomeOddException extends Exception { } + @SuppressWarnings("serial") private static class AnotherOddException extends Exception { } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java index 6735d3d0cf0..3b1b46c6b4d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java @@ -76,6 +76,7 @@ public class CgLibProxyServletAnnotationTests { } + @SuppressWarnings("serial") private void initServlet(final Class controllerclass) throws ServletException { servlet = new DispatcherServlet() { @Override @@ -128,4 +129,4 @@ public class CgLibProxyServletAnnotationTests { } } -} \ No newline at end of file +} diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java index c583751c65d..bac4f505bb2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java @@ -76,6 +76,7 @@ public class JdkProxyServletAnnotationTests { } + @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/ResponseStatusExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java index f1f724c402c..684550e18d3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java @@ -55,11 +55,13 @@ public class ResponseStatusExceptionResolverTests { } @ResponseStatus(HttpStatus.BAD_REQUEST) + @SuppressWarnings("serial") private static class StatusCodeException extends Exception { } @ResponseStatus(value = HttpStatus.GONE, reason = "You suck!") + @SuppressWarnings("serial") private static class StatusCodeAndReasonException extends Exception { } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java index 6ca97221662..8b34815e389 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java @@ -161,6 +161,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void emptyRequestMapping() throws Exception { servlet = new DispatcherServlet() { @Override @@ -185,6 +186,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void emptyValueMapping() throws Exception { servlet = new DispatcherServlet() { @Override @@ -271,6 +273,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void defaultExpressionParameters() throws Exception { servlet = new DispatcherServlet() { @Override @@ -300,6 +303,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void typeNestedSetBinding() throws Exception { servlet = new DispatcherServlet() { @Override @@ -348,6 +352,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void proxiedStandardHandleMethod() throws Exception { DispatcherServlet servlet = new DispatcherServlet() { @Override @@ -560,6 +565,7 @@ public class ServletAnnotationControllerTests { doTestAdaptedHandleMethods(MyAdaptedController3.class); } + @SuppressWarnings("serial") private void initServlet(final Class controllerClass) throws ServletException { servlet = new DispatcherServlet() { @Override @@ -656,6 +662,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void proxiedFormController() throws Exception { DispatcherServlet servlet = new DispatcherServlet() { @Override @@ -1583,6 +1590,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void controllerClassNameNoTypeLevelAnn() throws Exception { servlet = new DispatcherServlet() { @Override @@ -1617,6 +1625,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void simpleUrlHandlerMapping() throws Exception { servlet = new DispatcherServlet() { @Override @@ -1667,6 +1676,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void requestMappingInterfaceWithProxy() throws Exception { DispatcherServlet servlet = new DispatcherServlet() { @Override @@ -1865,6 +1875,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void parameterCsvAsIntegerArray() throws Exception { servlet = new DispatcherServlet() { @Override @@ -1893,6 +1904,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void parameterCsvAsIntegerSet() throws Exception { servlet = new DispatcherServlet() { @Override @@ -1921,6 +1933,7 @@ public class ServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void parameterCsvAsIntegerSetWithCustomSeparator() throws Exception { servlet = new DispatcherServlet() { @Override @@ -2436,6 +2449,7 @@ public class ServletAnnotationControllerTests { } } + @SuppressWarnings("serial") @Controller @RequestMapping("/myPath.do") private static class MyParameterDispatchingController implements Serializable { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java index 208a88957a0..d13a82607b2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java @@ -94,6 +94,7 @@ public class UriTemplateServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void doubles() throws Exception { servlet = new DispatcherServlet() { @Override @@ -266,6 +267,7 @@ public class UriTemplateServletAnnotationControllerTests { } + @SuppressWarnings("serial") private void initServlet(final Class controllerclass) throws ServletException { servlet = new DispatcherServlet() { @Override @@ -281,6 +283,7 @@ public class UriTemplateServletAnnotationControllerTests { } @Test + @SuppressWarnings("serial") public void noDefaultSuffixPattern() throws Exception { servlet = new DispatcherServlet() { @Override @@ -378,6 +381,7 @@ public class UriTemplateServletAnnotationControllerTests { // SPR-6906 @Test + @SuppressWarnings("serial") public void controllerClassName() throws Exception { servlet = new DispatcherServlet() { @Override 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 747ee0e9a1e..03c39fa8def 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 @@ -976,6 +976,7 @@ public class BindTagTests extends AbstractTagTests { /** * SPR-4022 */ + @SuppressWarnings("serial") public void testNestingInFormTag() throws JspException { PageContext pc = createPageContext(); TestBean tb = new TestBean(); 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 95ebe4961a6..51820dc8394 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 @@ -30,6 +30,7 @@ import org.springframework.web.util.WebUtils; */ public class HtmlEscapeTagTests extends AbstractTagTests { + @SuppressWarnings("serial") public void testHtmlEscapeTag() throws JspException { PageContext pc = createPageContext(); HtmlEscapeTag tag = new HtmlEscapeTag(); @@ -107,6 +108,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { assertTrue("Correctly disabled", !tag.getRequestContext().isDefaultHtmlEscape()); } + @SuppressWarnings("serial") public void testEscapeBody() throws JspException { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); @@ -124,6 +126,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { assertEquals("test text", result.toString()); } + @SuppressWarnings("serial") public void testEscapeBodyWithHtmlEscape() throws JspException { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); @@ -142,6 +145,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { assertEquals("test & text", result.toString()); } + @SuppressWarnings("serial") public void testEscapeBodyWithJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); @@ -160,6 +164,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { assertEquals("Correct content", "\\' test & text \\\\", result.toString()); } + @SuppressWarnings("serial") public void testEscapeBodyWithHtmlEscapeAndJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); 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 3d33e75a040..8e737c22578 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 @@ -38,6 +38,7 @@ import org.springframework.web.servlet.support.RequestContextUtils; */ public class MessageTagTests extends AbstractTagTests { + @SuppressWarnings("serial") public void testMessageTagWithMessageSourceResolvable1() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -52,6 +53,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test message", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithMessageSourceResolvable2() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -67,6 +69,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test message", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCode1() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -81,6 +84,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test message", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCode2() throws JspException { PageContext pc = createPageContext(); MockHttpServletRequest request = (MockHttpServletRequest) pc.getRequest(); @@ -99,6 +103,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "Canadian & test message", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithNullCode() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -113,6 +118,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "null", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCodeAndArgument() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -128,6 +134,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test arg1 message {1}", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCodeAndArguments() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -143,6 +150,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test arg1 message arg2", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCodeAndStringArgumentWithCustomSeparator() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -159,6 +167,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test arg1,1 message arg2,2", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCodeAndArrayArgument() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -174,6 +183,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test arg1 message 5", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCodeAndObjectArgument() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -189,6 +199,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test 5 message {1}", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCodeAndExpressionArgument() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -205,6 +216,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test my,value message {1}", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCodeAndExpressionArguments() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -222,6 +234,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test my,value message 5", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCodeAndExpressionArgumentArray() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -238,6 +251,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test my,value message 5", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCodeAndExpressionArgumentFormat() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -255,6 +269,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test my,value message 5.14 X", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithCodeAndText1() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -270,6 +285,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test message", (message.toString())); } + @SuppressWarnings("serial") public void testMessageTagWithCodeAndText2() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -286,6 +302,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test & text", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithText() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -301,6 +318,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test & text", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithTextAndExpressionArgumentFormat() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -318,6 +336,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "test my,value message 5.14 X", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithTextAndJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); @@ -333,6 +352,7 @@ public class MessageTagTests extends AbstractTagTests { assertEquals("Correct message", "\\' test & text \\\\", message.toString()); } + @SuppressWarnings("serial") public void testMessageTagWithTextAndHtmlEscapeAndJavaScriptEscape() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java index 943ebcbd12d..cbd498112e3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java @@ -92,6 +92,7 @@ public class ParamTagTests extends AbstractTagTests { } } + @SuppressWarnings("serial") private class MockParamSupportTag extends TagSupport implements ParamAware { private Param param; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java index be9f385a84c..fc92aeaa46c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java @@ -35,6 +35,7 @@ import org.springframework.web.servlet.support.RequestContext; */ public class ThemeTagTests extends AbstractTagTests { + @SuppressWarnings("serial") public void testThemeTag() throws JspException { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java index bcca71760cd..1ac1ea619e3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java @@ -50,6 +50,7 @@ public class CheckboxTagTests extends AbstractFormTagTests { private TestBean bean; + @SuppressWarnings("serial") protected void onSetUp() { this.tag = new CheckboxTag() { protected TagWriter createTagWriter() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java index 41cf9aa72b7..96bae8946cc 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java @@ -59,6 +59,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests { private TestBean bean; + @SuppressWarnings("serial") protected void onSetUp() { this.tag = new CheckboxesTag() { protected TagWriter createTagWriter() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java index 7cb49c8e25d..90cdd281d20 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java @@ -48,6 +48,7 @@ public class ErrorsTagTests extends AbstractFormTagTests { private ErrorsTag tag; + @SuppressWarnings("serial") protected void onSetUp() { this.tag = new ErrorsTag() { protected TagWriter createTagWriter() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java index 70cb210e801..f8023dffb23 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java @@ -47,6 +47,7 @@ public class FormTagTests extends AbstractHtmlElementTagTests { private MockHttpServletRequest request; + @SuppressWarnings("serial") protected void onSetUp() { this.tag = new FormTag() { protected TagWriter createTagWriter() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java index 82c233b4f93..fc9101e3842 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java @@ -385,6 +385,7 @@ public class InputTagTests extends AbstractFormTagTests { assertTrue("Tag not opened properly", output.startsWith(" Date: Tue, 18 Dec 2012 18:06:44 -0800 Subject: [PATCH 4/9] Fix [cast] compiler warnings --- .../AspectJAdviceParameterNameDiscoverer.java | 2 +- .../AspectJAwareAdvisorAutoProxyCreator.java | 2 +- .../AbstractAspectJAdvisorFactoryTests.java | 2 +- .../AbstractMethodMockingControl.aj | 2 +- .../beans/ExtendedBeanInfo.java | 2 +- .../config/CustomEditorConfigurer.java | 2 +- .../beans/BeanWrapperTests.java | 18 +++++++-------- .../DefaultListableBeanFactoryTests.java | 4 ++-- ...ObjectFactoryCreatingFactoryBeanTests.java | 2 +- .../config/PropertiesFactoryBeanTests.java | 16 +++++++------- .../factory/support/ManagedListTests.java | 6 ++--- .../factory/support/ManagedSetTests.java | 6 ++--- .../scheduling/quartz/QuartzSupportTests.java | 14 ++++++------ .../WebSphereClassLoaderAdapter.java | 2 +- .../validation/AbstractErrors.java | 2 +- .../AfterReturningAdviceBindingTests.java | 2 +- .../AbstractApplicationContextTests.java | 2 +- .../assembler/AbstractJmxAssemblerTests.java | 4 ++-- ...MBeanServerConnectionFactoryBeanTests.java | 6 ++--- ...heduledTasksBeanDefinitionParserTests.java | 2 +- .../scheduling/timer/TimerSupportTests.java | 2 +- .../core/GenericCollectionTypeResolver.java | 4 ++-- .../core/annotation/AnnotationAttributes.java | 2 +- .../CollectionToCollectionConverterTests.java | 4 ++-- .../support/DefaultConversionTests.java | 2 +- .../core/type/AnnotationMetadataTests.java | 2 +- .../expression/spel/EvaluationTests.java | 2 +- .../expression/spel/ParsingTests.java | 2 +- .../lookup/BeanFactoryDataSourceLookup.java | 2 +- .../jdbc/object/SqlQueryTests.java | 6 ++--- .../support/SQLErrorCodesFactoryTests.java | 2 +- .../BeanFactoryDestinationResolver.java | 2 +- .../orm/hibernate3/HibernateAccessor.java | 2 +- .../support/OpenEntityManagerInViewTests.java | 8 +++---- .../support/PersistenceInjectionTests.java | 22 +++++++++---------- .../SharedEntityManagerFactoryTests.java | 2 +- .../oxm/castor/CastorUnmarshallerTests.java | 6 ++--- .../web/struts/DelegatingActionProxy.java | 2 +- .../struts/DelegatingRequestProcessor.java | 2 +- .../DelegatingTilesRequestProcessor.java | 2 +- .../result/FlashAttributeResultMatchers.java | 2 +- .../mock/web/portlet/MockPortletRequest.java | 2 +- .../jca/cci/CciTemplateTests.java | 2 +- .../MappingJackson2HttpMessageConverter.java | 2 +- .../MappingJacksonHttpMessageConverter.java | 2 +- ...sfiedServletRequestParameterException.java | 2 +- .../support/HttpRequestHandlerServlet.java | 4 ++-- .../springframework/web/util/HtmlUtils.java | 2 +- ...b2RootElementHttpMessageConverterTest.java | 6 ++--- .../AbstractApplicationContextTests.java | 2 +- ...essageConverterMethodArgumentResolver.java | 2 +- .../web/servlet/tags/form/CheckboxTag.java | 2 +- .../servlet/view/BeanNameViewResolver.java | 2 +- .../web/servlet/view/XmlViewResolver.java | 2 +- .../AbstractApplicationContextTests.java | 2 +- .../ServletAnnotationControllerTests.java | 2 +- ...nnotationControllerHandlerMethodTests.java | 2 +- .../tags/form/RadioButtonTagTests.java | 2 +- .../web/servlet/tags/form/SelectTagTests.java | 4 ++-- .../web/servlet/view/BaseViewTests.java | 2 +- .../view/InternalResourceViewTests.java | 10 ++++----- .../freemarker/FreeMarkerConfigurerTests.java | 4 ++-- .../velocity/VelocityConfigurerTests.java | 6 ++--- 63 files changed, 122 insertions(+), 122 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java index 1eab7c85208..0ef76eba69d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java @@ -700,7 +700,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov // 1 primitive arg, and one candidate... for (int i = 0; i < this.argumentTypes.length; i++) { if (isUnbound(i) && this.argumentTypes[i].isPrimitive()) { - bindParameterName(i, (String) varNames.get(0)); + bindParameterName(i, varNames.get(0)); break; } } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java index 20765ec960d..9f70ed53a07 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java @@ -77,7 +77,7 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx // sort it List sorted = - (List) PartialOrder.sort(partiallyComparableAdvisors); + PartialOrder.sort(partiallyComparableAdvisors); if (sorted == null) { // TODO: work harder to give a better error message here. throw new IllegalArgumentException("Advice precedence circularity error"); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java index 0a485087c3f..f6f82fb4122 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java @@ -386,7 +386,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests { ), CannotBeUnlocked.class); assertTrue(proxy instanceof Lockable); - Lockable lockable = (Lockable) proxy; + Lockable lockable = proxy; assertTrue("Already locked", lockable.locked()); lockable.lock(); assertTrue("Real target ignores locking", lockable.locked()); diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj index ccc3aa2c692..aa6ad3a9cb6 100644 --- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj +++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj @@ -114,7 +114,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth if (responseType == CallResponse.return_) { return call.returnValue(lastSig, args); } else if(responseType == CallResponse.throw_) { - return (RuntimeException)call.throwException(lastSig, args); + return call.throwException(lastSig, args); } else if(responseType == CallResponse.nothing) { // do nothing } diff --git a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java index c383a52b5b4..76c295490e0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java +++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java @@ -495,7 +495,7 @@ class PropertyDescriptorUtils { // copy all attributes (emulating behavior of private FeatureDescriptor#addTable) Enumeration keys = source.attributeNames(); while (keys.hasMoreElements()) { - String key = (String)keys.nextElement(); + String key = keys.nextElement(); target.setValue(key, source.getValue(key)); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java index d3e6796a7dc..9eff79944ca 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java @@ -197,7 +197,7 @@ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, BeanCla else if (value instanceof String) { Class editorClass = ClassUtils.forName((String) value, this.beanClassLoader); Assert.isAssignable(PropertyEditor.class, editorClass); - beanFactory.registerCustomEditor(requiredType, (Class) editorClass); + beanFactory.registerCustomEditor(requiredType, editorClass); } else { throw new IllegalArgumentException("Mapped value [" + value + "] for custom editor key [" + diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index f97a686dfbe..d420e860c54 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -995,15 +995,15 @@ public final class BeanWrapperTests { bw.setPropertyValues(pvs); assertEquals(tb5, bean.getArray()[0]); assertEquals(tb4, bean.getArray()[1]); - assertEquals(tb3, ((TestBean) bean.getList().get(0))); - assertEquals(tb2, ((TestBean) bean.getList().get(1))); - assertEquals(tb0, ((TestBean) bean.getList().get(2))); - assertEquals(null, ((TestBean) bean.getList().get(3))); - assertEquals(tb1, ((TestBean) bean.getList().get(4))); - assertEquals(tb1, ((TestBean) bean.getMap().get("key1"))); - assertEquals(tb0, ((TestBean) bean.getMap().get("key2"))); - assertEquals(tb4, ((TestBean) bean.getMap().get("key5"))); - assertEquals(tb5, ((TestBean) bean.getMap().get("key9"))); + assertEquals(tb3, (bean.getList().get(0))); + assertEquals(tb2, (bean.getList().get(1))); + assertEquals(tb0, (bean.getList().get(2))); + assertEquals(null, (bean.getList().get(3))); + assertEquals(tb1, (bean.getList().get(4))); + assertEquals(tb1, (bean.getMap().get("key1"))); + assertEquals(tb0, (bean.getMap().get("key2"))); + assertEquals(tb4, (bean.getMap().get("key5"))); + assertEquals(tb5, (bean.getMap().get("key9"))); assertEquals(tb5, bw.getPropertyValue("array[0]")); assertEquals(tb4, bw.getPropertyValue("array[1]")); assertEquals(tb3, bw.getPropertyValue("list[0]")); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index 24d271c47b8..d52f73e510b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -497,7 +497,7 @@ public class DefaultListableBeanFactoryTests { int count = (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p, PREFIX); assertTrue("2 beans registered, not " + count, count == 2); - TestBean kerry = (TestBean) lbf.getBean("kerry", TestBean.class); + TestBean kerry = lbf.getBean("kerry", TestBean.class); assertTrue("Kerry name is Kerry", "Kerry".equals(kerry.getName())); ITestBean spouse = kerry.getSpouse(); assertTrue("Kerry spouse is non null", spouse != null); @@ -516,7 +516,7 @@ public class DefaultListableBeanFactoryTests { assertTrue("1 beans registered, not " + count, count == 1); assertEquals(1, lbf.getBeanDefinitionCount()); - TestBean tb = (TestBean) lbf.getBean("tb", TestBean.class); + TestBean tb = lbf.getBean("tb", TestBean.class); assertEquals("my.value", tb.getSomeMap().get("my.key")); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java index b67861cc281..e02b77f2a1d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java @@ -113,7 +113,7 @@ public class ObjectFactoryCreatingFactoryBeanTests { factory.setTargetBeanName(targetBeanName); factory.setBeanFactory(beanFactory); factory.afterPropertiesSet(); - ObjectFactory objectFactory = (ObjectFactory) factory.getObject(); + ObjectFactory objectFactory = factory.getObject(); Object actualSingleton = objectFactory.getObject(); assertSame(expectedSingleton, actualSingleton); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java index 18fd8bd4210..e4446440b81 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java @@ -42,7 +42,7 @@ public final class PropertiesFactoryBeanTests { PropertiesFactoryBean pfb = new PropertiesFactoryBean(); pfb.setLocation(TEST_PROPS); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("99", props.getProperty("tb.array[0].age")); } @@ -51,7 +51,7 @@ public final class PropertiesFactoryBeanTests { PropertiesFactoryBean pfb = new PropertiesFactoryBean(); pfb.setLocation(TEST_PROPS_XML); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("99", props.getProperty("tb.array[0].age")); } @@ -62,7 +62,7 @@ public final class PropertiesFactoryBeanTests { localProps.setProperty("key2", "value2"); pfb.setProperties(localProps); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("value2", props.getProperty("key2")); } @@ -75,7 +75,7 @@ public final class PropertiesFactoryBeanTests { localProps.setProperty("tb.array[0].age", "0"); pfb.setProperties(localProps); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("99", props.getProperty("tb.array[0].age")); assertEquals("value2", props.getProperty("key2")); } @@ -100,7 +100,7 @@ public final class PropertiesFactoryBeanTests { pfb.setPropertiesArray(new Properties[] {props1, props2, props3}); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("99", props.getProperty("tb.array[0].age")); assertEquals("value2", props.getProperty("key2")); assertEquals("framework", props.getProperty("spring")); @@ -119,7 +119,7 @@ public final class PropertiesFactoryBeanTests { pfb.setProperties(localProps); pfb.setLocalOverride(true); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("0", props.getProperty("tb.array[0].age")); assertEquals("value2", props.getProperty("key2")); } @@ -133,10 +133,10 @@ public final class PropertiesFactoryBeanTests { localProps.setProperty("key2", "value2"); pfb.setProperties(localProps); pfb.afterPropertiesSet(); - Properties props = (Properties) pfb.getObject(); + Properties props = pfb.getObject(); assertEquals("99", props.getProperty("tb.array[0].age")); assertEquals("value2", props.getProperty("key2")); - Properties newProps = (Properties) pfb.getObject(); + Properties newProps = pfb.getObject(); assertTrue(props != newProps); assertEquals("99", newProps.getProperty("tb.array[0].age")); assertEquals("value2", newProps.getProperty("key2")); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java index 9dc27c7f373..36745a65c08 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java @@ -33,7 +33,7 @@ public class ManagedListTests extends TestCase { ManagedList child = new ManagedList(); child.add("three"); child.setMergeEnabled(true); - List mergedList = (List) child.merge(parent); + List mergedList = child.merge(parent); assertEquals("merge() obviously did not work.", 3, mergedList.size()); } @@ -72,7 +72,7 @@ public class ManagedListTests extends TestCase { parent.add("two"); ManagedList child = new ManagedList(); child.setMergeEnabled(true); - List mergedList = (List) child.merge(parent); + List mergedList = child.merge(parent); assertEquals("merge() obviously did not work.", 2, mergedList.size()); } @@ -84,7 +84,7 @@ public class ManagedListTests extends TestCase { ManagedList child = new ManagedList(); child.add("one"); child.setMergeEnabled(true); - List mergedList = (List) child.merge(parent); + List mergedList = child.merge(parent); assertEquals("merge() obviously did not work.", 3, mergedList.size()); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java index 0eea409ab89..22dbf41ba35 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java @@ -33,7 +33,7 @@ public class ManagedSetTests extends TestCase { ManagedSet child = new ManagedSet(); child.add("three"); child.setMergeEnabled(true); - Set mergedSet = (Set) child.merge(parent); + Set mergedSet = child.merge(parent); assertEquals("merge() obviously did not work.", 3, mergedSet.size()); } @@ -72,7 +72,7 @@ public class ManagedSetTests extends TestCase { parent.add("two"); ManagedSet child = new ManagedSet(); child.setMergeEnabled(true); - Set mergedSet = (Set) child.merge(parent); + Set mergedSet = child.merge(parent); assertEquals("merge() obviously did not work.", 2, mergedSet.size()); } @@ -84,7 +84,7 @@ public class ManagedSetTests extends TestCase { ManagedSet child = new ManagedSet(); child.add("one"); child.setMergeEnabled(true); - Set mergedSet = (Set) child.merge(parent); + Set mergedSet = child.merge(parent); assertEquals("merge() obviously did not work.", 2, mergedSet.size()); } diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java index e1bd9a8c639..0607947d6ca 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java @@ -118,7 +118,7 @@ public class QuartzSupportTests { } mijdfb.setTargetMethod("doSomething"); mijdfb.afterPropertiesSet(); - JobDetail jobDetail1 = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail1 = mijdfb.getObject(); SimpleTriggerBean trigger1 = new SimpleTriggerBean(); trigger1.setBeanName("myTrigger1"); @@ -210,7 +210,7 @@ public class QuartzSupportTests { mijdfb.setTargetObject(task1); mijdfb.setTargetMethod("doSomething"); mijdfb.afterPropertiesSet(); - JobDetail jobDetail1 = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail1 = mijdfb.getObject(); SimpleTriggerBean trigger1 = new SimpleTriggerBean(); trigger1.setBeanName("myTrigger1"); @@ -304,7 +304,7 @@ public class QuartzSupportTests { mijdfb.setTargetObject(task1); mijdfb.setTargetMethod("doSomething"); mijdfb.afterPropertiesSet(); - JobDetail jobDetail1 = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail1 = mijdfb.getObject(); SimpleTriggerBean trigger1 = new SimpleTriggerBean(); trigger1.setBeanName("myTrigger1"); @@ -446,7 +446,7 @@ public class QuartzSupportTests { mijdfb.setTargetObject(task1); mijdfb.setTargetMethod("doWait"); mijdfb.afterPropertiesSet(); - JobDetail jobDetail1 = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail1 = mijdfb.getObject(); SimpleTriggerBean trigger0 = new SimpleTriggerBean(); trigger0.setBeanName("myTrigger1"); @@ -532,7 +532,7 @@ public class QuartzSupportTests { mijdfb.setTargetObject(task1); mijdfb.setTargetMethod("doSomething"); mijdfb.afterPropertiesSet(); - JobDetail jobDetail1 = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail1 = mijdfb.getObject(); SimpleTrigger trigger1 = new SimpleTrigger(); trigger1.setName("myTrigger1"); @@ -618,7 +618,7 @@ public class QuartzSupportTests { try { schedulerFactoryBean.afterPropertiesSet(); schedulerFactoryBean.start(); - Scheduler returnedScheduler = (Scheduler) schedulerFactoryBean.getObject(); + Scheduler returnedScheduler = schedulerFactoryBean.getObject(); assertEquals(tb, returnedScheduler.getContext().get("testBean")); assertEquals(ac, returnedScheduler.getContext().get("appCtx")); } @@ -659,7 +659,7 @@ public class QuartzSupportTests { mijdfb.setTargetMethod("doSomething"); mijdfb.setJobListenerNames(names); mijdfb.afterPropertiesSet(); - JobDetail jobDetail = (JobDetail) mijdfb.getObject(); + JobDetail jobDetail = mijdfb.getObject(); List result = Arrays.asList(jobDetail.getJobListenerNames()); assertEquals(Arrays.asList(names), result); } diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java index 26a7b4ec47b..b0004bb1a76 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java @@ -93,7 +93,7 @@ class WebSphereClassLoaderAdapter { public ClassLoader getThrowawayClassLoader() { try { - ClassLoader loader = (ClassLoader) cloneConstructor.newInstance(getClassLoader()); + ClassLoader loader = cloneConstructor.newInstance(getClassLoader()); // clear out the transformers (copied as well) List list = (List) transformerList.get(loader); list.clear(); diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java index 8e8198a6fa9..60d13648882 100644 --- a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java +++ b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java @@ -186,7 +186,7 @@ public abstract class AbstractErrors implements Errors, Serializable { public FieldError getFieldError(String field) { List fieldErrors = getFieldErrors(field); - return (!fieldErrors.isEmpty() ? (FieldError) fieldErrors.get(0) : null); + return (!fieldErrors.isEmpty() ? fieldErrors.get(0) : null); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java index 690e0355a7e..2c8e8a714ba 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java @@ -137,7 +137,7 @@ public final class AfterReturningAdviceBindingTests { @Test public void testReturningBeanArray() { this.testBeanTarget.setSpouse(new TestBean()); - ITestBean[] spouses = (ITestBean[]) this.testBeanTarget.getSpouses(); + ITestBean[] spouses = this.testBeanTarget.getSpouses(); mockCollaborator.testBeanArrayArg(spouses); replay(mockCollaborator); testBeanProxy.getSpouses(); diff --git a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index 84ade3b7ddd..a0493b62ec2 100644 --- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -94,7 +94,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe } public void testGrandparentTypedDefinitionFound() throws Exception { - TestBean dad = (TestBean) applicationContext.getBean("father", TestBean.class); + TestBean dad = applicationContext.getBean("father", TestBean.class); assertTrue("Dad has correct name", dad.getName().equals("Albert")); } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java index e104e7b4663..79da547c136 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java @@ -145,14 +145,14 @@ public abstract class AbstractJmxAssemblerTests extends AbstractJmxTests { ModelMBeanOperationInfo get = info.getOperation("getName"); assertNotNull("get operation should not be null", get); assertEquals("get operation should have visibility of four", - (Integer) get.getDescriptor().getFieldValue("visibility"), + get.getDescriptor().getFieldValue("visibility"), new Integer(4)); assertEquals("get operation should have role \"getter\"", "getter", get.getDescriptor().getFieldValue("role")); ModelMBeanOperationInfo set = info.getOperation("setName"); assertNotNull("set operation should not be null", set); assertEquals("set operation should have visibility of four", - (Integer) set.getDescriptor().getFieldValue("visibility"), + set.getDescriptor().getFieldValue("visibility"), new Integer(4)); assertEquals("set operation should have role \"setter\"", "setter", set.getDescriptor().getFieldValue("role")); } diff --git a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java index 56244c74a4f..d53d8366fe8 100644 --- a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java @@ -62,7 +62,7 @@ public class MBeanServerConnectionFactoryBeanTests extends AbstractMBeanServerTe bean.afterPropertiesSet(); try { - MBeanServerConnection connection = (MBeanServerConnection) bean.getObject(); + MBeanServerConnection connection = bean.getObject(); assertNotNull("Connection should not be null", connection); // perform simple MBean count test @@ -100,7 +100,7 @@ public class MBeanServerConnectionFactoryBeanTests extends AbstractMBeanServerTe bean.setConnectOnStartup(false); bean.afterPropertiesSet(); - MBeanServerConnection connection = (MBeanServerConnection) bean.getObject(); + MBeanServerConnection connection = bean.getObject(); assertTrue(AopUtils.isAopProxy(connection)); JMXConnectorServer connector = null; @@ -122,7 +122,7 @@ public class MBeanServerConnectionFactoryBeanTests extends AbstractMBeanServerTe bean.setConnectOnStartup(false); bean.afterPropertiesSet(); - MBeanServerConnection connection = (MBeanServerConnection) bean.getObject(); + MBeanServerConnection connection = bean.getObject(); assertTrue(AopUtils.isAopProxy(connection)); bean.destroy(); } diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java index 5e8f75a3587..921a5c4e117 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java @@ -52,7 +52,7 @@ public class ScheduledTasksBeanDefinitionParserTests { public void setup() { this.context = new ClassPathXmlApplicationContext( "scheduledTasksContext.xml", ScheduledTasksBeanDefinitionParserTests.class); - this.registrar = (ScheduledTaskRegistrar) this.context.getBeansOfType( + this.registrar = this.context.getBeansOfType( ScheduledTaskRegistrar.class).values().iterator().next(); this.testBean = this.context.getBean("testBean"); } diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java index 620c737c860..5886a912eae 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java @@ -39,7 +39,7 @@ public class TimerSupportTests extends TestCase { mittfb.setTargetObject(task1); mittfb.setTargetMethod("doSomething"); mittfb.afterPropertiesSet(); - final TimerTask timerTask1 = (TimerTask) mittfb.getObject(); + final TimerTask timerTask1 = mittfb.getObject(); final TestRunnable timerTask2 = new TestRunnable(); diff --git a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java index 4782e44bf41..7a243abad74 100644 --- a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java +++ b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java @@ -322,7 +322,7 @@ public abstract class GenericCollectionTypeResolver { Type resolvedType = type; if (type instanceof TypeVariable && typeVariableMap != null) { - Type mappedType = typeVariableMap.get((TypeVariable) type); + Type mappedType = typeVariableMap.get(type); if (mappedType != null) { resolvedType = mappedType; } @@ -383,7 +383,7 @@ public abstract class GenericCollectionTypeResolver { } Type paramType = paramTypes[typeIndex]; if (paramType instanceof TypeVariable && typeVariableMap != null) { - Type mappedType = typeVariableMap.get((TypeVariable) paramType); + Type mappedType = typeVariableMap.get(paramType); if (mappedType != null) { paramType = mappedType; } diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java index 50e13dac06c..40041e8de46 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java @@ -106,7 +106,7 @@ public class AnnotationAttributes extends LinkedHashMap { @SuppressWarnings("unchecked") public Class getClass(String attributeName) { - return (Class)doGet(attributeName, Class.class); + return doGet(attributeName, Class.class); } public Class[] getClassArray(String attributeName) { diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java index 67f5bcf6165..6c16ee75a35 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java @@ -71,8 +71,8 @@ public class CollectionToCollectionConverterTests { @SuppressWarnings("unchecked") List result = (List) conversionService.convert(list, sourceType, targetType); assertFalse(list.equals(result)); - assertEquals((Integer) 9, result.get(0)); - assertEquals((Integer) 37, result.get(1)); + assertEquals(9, result.get(0)); + assertEquals(37, result.get(1)); } public ArrayList scalarListTarget; diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java index c9c936af903..c0495b52137 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java @@ -298,7 +298,7 @@ public class DefaultConversionTests { @Test public void testSpr7766() throws Exception { - ConverterRegistry registry = ((ConverterRegistry) conversionService); + ConverterRegistry registry = (conversionService); registry.addConverter(new ColorConverter()); List colors = (List) conversionService.convert(new String[] { "ffffff", "#000000" }, TypeDescriptor.valueOf(String[].class), new TypeDescriptor(new MethodParameter(getClass().getMethod("handlerMethod", List.class), 0))); assertEquals(2, colors.size()); diff --git a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java index ca52e93e38c..fe1d6c9eed5 100644 --- a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java @@ -147,7 +147,7 @@ public class AnnotationMetadataTests { assertThat(specialAttrs.getString("clazz"), is(String.class.getName())); AnnotationAttributes nestedAnno = specialAttrs.getAnnotation("nestedAnno"); - assertArrayEquals(new String[]{String.class.getName()}, (String[])nestedAnno.getStringArray("classArray")); + assertArrayEquals(new String[]{String.class.getName()}, nestedAnno.getStringArray("classArray")); assertArrayEquals(new String[]{String.class.getName()}, nestedAnno.getStringArray("classArray")); AnnotationAttributes[] nestedAnnoArray = specialAttrs.getAnnotationArray("nestedAnnoArray"); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java index 696c68831d9..56e26f30da5 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java @@ -1312,7 +1312,7 @@ public class EvaluationTests extends ExpressionTestCase { e = parser.parseExpression("#wibble=#wibble+#wibble"); String s = e.getValue(ctx,String.class); assertEquals("hello worldhello world",s); - assertEquals("hello worldhello world",(String)ctx.lookupVariable("wibble")); + assertEquals("hello worldhello world",ctx.lookupVariable("wibble")); ctx.setVariable("wobble", 3); e = parser.parseExpression("#wobble++"); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java index 3c0a3024f5d..b5ca0a2da5b 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java @@ -457,7 +457,7 @@ public class ParsingTests { */ public void parseCheck(String expression, String expectedStringFormOfAST) { try { - SpelExpression e = (SpelExpression) parser.parseRaw(expression); + SpelExpression e = parser.parseRaw(expression); if (e != null && !e.toStringAST().equals(expectedStringFormOfAST)) { SpelUtilities.printAbstractSyntaxTree(System.err, e); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java index c460b906636..e40ddac2a4e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java @@ -70,7 +70,7 @@ public class BeanFactoryDataSourceLookup implements DataSourceLookup, BeanFactor public DataSource getDataSource(String dataSourceName) throws DataSourceLookupFailureException { Assert.state(this.beanFactory != null, "BeanFactory is required"); try { - return (DataSource) this.beanFactory.getBean(dataSourceName, DataSource.class); + return this.beanFactory.getBean(dataSourceName, DataSource.class); } catch (BeansException ex) { throw new DataSourceLookupFailureException( diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java index 1f548759eab..08b71e6fcb2 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java @@ -953,7 +953,7 @@ public class SqlQueryTests extends AbstractJdbcTests { public List findCustomers(List ids) { Map params = new HashMap(); params.put("ids", ids); - return (List) executeByNamedParam(params); + return executeByNamedParam(params); } } @@ -1026,7 +1026,7 @@ public class SqlQueryTests extends AbstractJdbcTests { public List findCustomers(Integer id) { Map params = new HashMap(); params.put("id1", id); - return (List) executeByNamedParam(params); + return executeByNamedParam(params); } } @@ -1067,7 +1067,7 @@ public class SqlQueryTests extends AbstractJdbcTests { public List findCustomers(Integer id1) { Map params = new HashMap(); params.put("id1", id1); - return (List) executeByNamedParam(params); + return executeByNamedParam(params); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java index 6062ab5eb8a..67e9cdc47f1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java @@ -198,7 +198,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { TestSQLErrorCodesFactory sf = new TestSQLErrorCodesFactory(); assertEquals(1, sf.getErrorCodes("Oracle").getCustomTranslations().length); CustomSQLErrorCodesTranslation translation = - (CustomSQLErrorCodesTranslation) sf.getErrorCodes("Oracle").getCustomTranslations()[0]; + sf.getErrorCodes("Oracle").getCustomTranslations()[0]; assertEquals(CustomErrorCodeException.class, translation.getExceptionClass()); assertEquals(1, translation.getErrorCodes().length); } diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java index f28ae3a115b..9da3ed1d6be 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java @@ -73,7 +73,7 @@ public class BeanFactoryDestinationResolver implements DestinationResolver, Bean Assert.state(this.beanFactory != null, "BeanFactory is required"); try { - return (Destination) this.beanFactory.getBean(destinationName, Destination.class); + return this.beanFactory.getBean(destinationName, Destination.class); } catch (BeansException ex) { throw new DestinationResolutionException( diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java index 79403bcf45f..ddc08aed8be 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java @@ -208,7 +208,7 @@ public abstract class HibernateAccessor implements InitializingBean, BeanFactory if (this.beanFactory == null) { throw new IllegalStateException("Cannot get entity interceptor via bean name if no bean factory set"); } - return (Interceptor) this.beanFactory.getBean((String) this.entityInterceptor, Interceptor.class); + return this.beanFactory.getBean((String) this.entityInterceptor, Interceptor.class); } return (Interceptor) this.entityInterceptor; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java index 5fe4923a676..06fdf973115 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java @@ -228,8 +228,8 @@ public class OpenEntityManagerInViewTests extends TestCase { replay(manager, factory); - final EntityManagerFactory factory2 = (EntityManagerFactory) createMock(EntityManagerFactory.class); - final EntityManager manager2 = (EntityManager) createMock(EntityManager.class); + final EntityManagerFactory factory2 = createMock(EntityManagerFactory.class); + final EntityManager manager2 = createMock(EntityManager.class); expect(factory2.createEntityManager()).andReturn(manager2); expect(manager2.isOpen()).andReturn(true); @@ -292,8 +292,8 @@ public class OpenEntityManagerInViewTests extends TestCase { replay(manager, factory); - final EntityManagerFactory factory2 = (EntityManagerFactory) createMock(EntityManagerFactory.class); - final EntityManager manager2 = (EntityManager) createMock(EntityManager.class); + final EntityManagerFactory factory2 = createMock(EntityManagerFactory.class); + final EntityManager manager2 = createMock(EntityManager.class); expect(factory2.createEntityManager()).andReturn(manager2); expect(manager2.isOpen()).andReturn(true); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java index 3c5fbe2d492..f8af85a5845 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java @@ -256,7 +256,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT public void testPublicPersistenceUnitSetterWithOverriding() { EntityManagerFactory mockEmf2 = - (EntityManagerFactory) MockControl.createControl(EntityManagerFactory.class).getMock(); + MockControl.createControl(EntityManagerFactory.class).getMock(); GenericApplicationContext gac = new GenericApplicationContext(); gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf); @@ -274,7 +274,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT public void testPublicPersistenceUnitSetterWithUnitIdentifiedThroughBeanName() { EntityManagerFactory mockEmf2 = - (EntityManagerFactory) MockControl.createControl(EntityManagerFactory.class).getMock(); + MockControl.createControl(EntityManagerFactory.class).getMock(); GenericApplicationContext gac = new GenericApplicationContext(); gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf); @@ -329,7 +329,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @Ignore public void ignoreTestPersistenceUnitsFromJndi() { mockEmf.createEntityManager(); - Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); + Object mockEm = MockControl.createControl(EntityManager.class).getMock(); emfMc.setReturnValue(mockEm, 1); emfMc.replay(); @@ -428,9 +428,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT } public void testPersistenceContextsFromJndi() { - Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); - Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); - Object mockEm3 = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); + Object mockEm = MockControl.createControl(EntityManager.class).getMock(); + Object mockEm2 = MockControl.createControl(EntityManager.class).getMock(); + Object mockEm3 = MockControl.createControl(EntityManager.class).getMock(); Map persistenceContexts = new HashMap(); persistenceContexts.put("", "pc1"); @@ -467,9 +467,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT } public void testPersistenceContextsFromJndiWithDefaultUnit() { - Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); - Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); - Object mockEm3 = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); + Object mockEm = MockControl.createControl(EntityManager.class).getMock(); + Object mockEm2 = MockControl.createControl(EntityManager.class).getMock(); + Object mockEm3 = MockControl.createControl(EntityManager.class).getMock(); Map persistenceContexts = new HashMap(); persistenceContexts.put("System", "pc1"); @@ -507,8 +507,8 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT } public void testSinglePersistenceContextFromJndi() { - Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); - Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock(); + Object mockEm = MockControl.createControl(EntityManager.class).getMock(); + Object mockEm2 = MockControl.createControl(EntityManager.class).getMock(); Map persistenceContexts = new HashMap(); persistenceContexts.put("System", "pc1"); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java index b22527cdab0..93072c225fc 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java @@ -61,7 +61,7 @@ public class SharedEntityManagerFactoryTests { assertTrue(EntityManager.class.isAssignableFrom(proxyFactoryBean.getObjectType())); assertTrue(proxyFactoryBean.isSingleton()); - EntityManager proxy = (EntityManager) proxyFactoryBean.getObject(); + EntityManager proxy = proxyFactoryBean.getObject(); assertSame(proxy, proxyFactoryBean.getObject()); assertFalse(proxy.contains(o)); diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java index 4cd57b33bec..4c5387aaa34 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java @@ -66,7 +66,7 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests { protected void testFlight(Object o) { Flight flight = (Flight) o; assertNotNull("Flight is null", flight); - assertEquals("Number is invalid", 42L, (long) flight.getNumber()); + assertEquals("Number is invalid", 42L, flight.getNumber()); } @Override @@ -104,10 +104,10 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests { assertEquals("Invalid amount of items", 2, order.getOrderItemCount()); OrderItem item = order.getOrderItem(0); assertEquals("Invalid items", "1", item.getId()); - assertEquals("Invalid items", 15, (int)item.getQuantity()); + assertEquals("Invalid items", 15, item.getQuantity()); item = order.getOrderItem(1); assertEquals("Invalid items", "3", item.getId()); - assertEquals("Invalid items", 20, (int)item.getQuantity()); + assertEquals("Invalid items", 20, item.getQuantity()); } @Test diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java index 0375792f225..b43d3f5152b 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java @@ -127,7 +127,7 @@ public class DelegatingActionProxy extends Action { protected Action getDelegateAction(ActionMapping mapping) throws BeansException { WebApplicationContext wac = getWebApplicationContext(getServlet(), mapping.getModuleConfig()); String beanName = determineActionBeanName(mapping); - return (Action) wac.getBean(beanName, Action.class); + return wac.getBean(beanName, Action.class); } /** diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java index 1a6506e05ca..063ad2f9a78 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java @@ -177,7 +177,7 @@ public class DelegatingRequestProcessor extends RequestProcessor { if (!getWebApplicationContext().containsBean(beanName)) { return null; } - return (Action) getWebApplicationContext().getBean(beanName, Action.class); + return getWebApplicationContext().getBean(beanName, Action.class); } /** diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java index 1f765bd4c82..b614dd30b04 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java @@ -126,7 +126,7 @@ public class DelegatingTilesRequestProcessor extends TilesRequestProcessor { if (!getWebApplicationContext().containsBean(beanName)) { return null; } - return (Action) getWebApplicationContext().getBean(beanName, Action.class); + return getWebApplicationContext().getBean(beanName, Action.class); } /** diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java index 65d2dc4644a..61c2f37df67 100644 --- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java +++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java @@ -59,7 +59,7 @@ public class FlashAttributeResultMatchers { return new ResultMatcher() { @SuppressWarnings("unchecked") public void match(MvcResult result) throws Exception { - assertEquals("Flash attribute", value, (T) result.getFlashMap().get(name)); + assertEquals("Flash attribute", value, result.getFlashMap().get(name)); } }; } diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java index 7281894d513..d6ba452f238 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java @@ -269,7 +269,7 @@ public class MockPortletRequest implements PortletRequest { public String getProperty(String key) { Assert.notNull(key, "Property key must not be null"); List list = this.properties.get(key); - return (list != null && list.size() > 0 ? (String) list.get(0) : null); + return (list != null && list.size() > 0 ? list.get(0) : null); } public Enumeration getProperties(String key) { diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java index c8f43b96259..50bdd4c2de7 100644 --- a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java @@ -699,7 +699,7 @@ public class CciTemplateTests { replay(connectionFactory, connection, interaction); CciTemplate ct = new CciTemplate(connectionFactory); - Record tmpOutputRecord = (Record) ct.execute(interactionSpec, + Record tmpOutputRecord = ct.execute(interactionSpec, inputOutputRecord); assertNull(tmpOutputRecord); diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java index a04b3e44f9a..a0b0a2a5b5d 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java @@ -129,7 +129,7 @@ public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConv @Override public boolean canRead(Class clazz, MediaType mediaType) { - return canRead((Type) clazz, null, mediaType); + return canRead(clazz, null, mediaType); } public boolean canRead(Type type, Class contextClass, MediaType mediaType) { diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java index dee7fe78697..448b3be8e8c 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java @@ -127,7 +127,7 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve @Override public boolean canRead(Class clazz, MediaType mediaType) { - return canRead((Type) clazz, null, mediaType); + return canRead(clazz, null, mediaType); } public boolean canRead(Type type, Class contextClass, MediaType mediaType) { diff --git a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java index c74a8584b5c..8adf208b32c 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java @@ -48,7 +48,7 @@ public class UnsatisfiedServletRequestParameterException extends ServletRequestB public UnsatisfiedServletRequestParameterException(String[] paramConditions, Map actualParams) { super(""); this.paramConditions = paramConditions; - this.actualParams = (Map) actualParams; + this.actualParams = actualParams; } diff --git a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java index a34c8381954..c01de6e6fc0 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java @@ -55,7 +55,7 @@ public class HttpRequestHandlerServlet extends HttpServlet { @Override public void init() throws ServletException { WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); - this.target = (HttpRequestHandler) wac.getBean(getServletName(), HttpRequestHandler.class); + this.target = wac.getBean(getServletName(), HttpRequestHandler.class); } @@ -68,7 +68,7 @@ public class HttpRequestHandlerServlet extends HttpServlet { this.target.handleRequest(request, response); } catch (HttpRequestMethodNotSupportedException ex) { - String[] supportedMethods = ((HttpRequestMethodNotSupportedException) ex).getSupportedMethods(); + String[] supportedMethods = ex.getSupportedMethods(); if (supportedMethods != null) { response.setHeader("Allow", StringUtils.arrayToDelimitedString(supportedMethods, ", ")); } diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java index b97d64e6548..23e9a81f669 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java @@ -126,7 +126,7 @@ public abstract class HtmlUtils { char character = input.charAt(i); if (characterEntityReferences.isMappedToReference(character)) { escaped.append(HtmlCharacterEntityReferences.HEX_REFERENCE_START); - escaped.append(Integer.toString((int) character, 16)); + escaped.append(Integer.toString(character, 16)); escaped.append(HtmlCharacterEntityReferences.REFERENCE_END); } else { diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java index 89cbe30df74..5763411e8e2 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java @@ -76,7 +76,7 @@ public class Jaxb2RootElementHttpMessageConverterTest { public void readXmlRootElement() throws Exception { byte[] body = "".getBytes("UTF-8"); MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); - RootElement result = (RootElement) converter.read((Class) RootElement.class, inputMessage); + RootElement result = (RootElement) converter.read(RootElement.class, inputMessage); assertEquals("Invalid result", "Hello World", result.type.s); } @@ -85,7 +85,7 @@ public class Jaxb2RootElementHttpMessageConverterTest { public void readXmlRootElementSubclass() throws Exception { byte[] body = "".getBytes("UTF-8"); MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); - RootElementSubclass result = (RootElementSubclass) converter.read((Class) RootElementSubclass.class, inputMessage); + RootElementSubclass result = (RootElementSubclass) converter.read(RootElementSubclass.class, inputMessage); assertEquals("Invalid result", "Hello World", result.type.s); } @@ -94,7 +94,7 @@ public class Jaxb2RootElementHttpMessageConverterTest { public void readXmlType() throws Exception { byte[] body = "".getBytes("UTF-8"); MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); - Type result = (Type) converter.read((Class) Type.class, inputMessage); + Type result = (Type) converter.read(Type.class, inputMessage); assertEquals("Invalid result", "Hello World", result.s); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index 84ade3b7ddd..a0493b62ec2 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -94,7 +94,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe } public void testGrandparentTypedDefinitionFound() throws Exception { - TestBean dad = (TestBean) applicationContext.getBean("father", TestBean.class); + TestBean dad = applicationContext.getBean("father", TestBean.class); assertTrue("Dad has correct name", dad.getName().equals("Albert")); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java index 48d2d30788c..f271cfe4794 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java @@ -132,7 +132,7 @@ public abstract class AbstractMessageConverterMethodArgumentResolver implements logger.debug("Reading [" + targetType + "] as \"" + contentType + "\" using [" + converter + "]"); } - return (T) genericConverter.read(targetType, contextClass, inputMessage); + return genericConverter.read(targetType, contextClass, inputMessage); } } if (targetClass != null) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java index 8b9f21c2cf5..51a846808fa 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java @@ -86,7 +86,7 @@ public class CheckboxTag extends AbstractSingleCheckedElementTag { if (value == null) { throw new IllegalArgumentException("Attribute 'value' is required when binding to non-boolean values"); } - Object resolvedValue = (value instanceof String ? evaluate("value", (String) value) : value); + Object resolvedValue = (value instanceof String ? evaluate("value", value) : value); renderFromValue(resolvedValue, tagWriter); } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java index 94595d54b9c..066242271d1 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java @@ -72,7 +72,7 @@ public class BeanNameViewResolver extends WebApplicationObjectSupport implements // Allow for ViewResolver chaining. return null; } - return (View) context.getBean(viewName, View.class); + return context.getBean(viewName, View.class); } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java index 35dc231f508..68ecc69edba 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java @@ -106,7 +106,7 @@ public class XmlViewResolver extends AbstractCachingViewResolver protected View loadView(String viewName, Locale locale) throws BeansException { BeanFactory factory = initFactory(); try { - return (View) factory.getBean(viewName, View.class); + return factory.getBean(viewName, View.class); } catch (NoSuchBeanDefinitionException ex) { // to allow for ViewResolver chaining diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java index 2541dfe0520..ce3c45d2e72 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java @@ -100,7 +100,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe } public void testGrandparentTypedDefinitionFound() throws Exception { - TestBean dad = (TestBean) applicationContext.getBean("father", TestBean.class); + TestBean dad = applicationContext.getBean("father", TestBean.class); assertTrue("Dad has correct name", dad.getName().equals("Albert")); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java index 8b34815e389..cd36fa25088 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java @@ -338,7 +338,7 @@ public class ServletAnnotationControllerTests { MockHttpServletResponse response = new MockHttpServletResponse(); servlet.service(request, response); assertEquals("Invalid response status", HttpServletResponse.SC_METHOD_NOT_ALLOWED, response.getStatus()); - String allowHeader = (String) response.getHeader("Allow"); + String allowHeader = response.getHeader("Allow"); assertNotNull("No Allow header", allowHeader); Set allowedMethods = new HashSet(); allowedMethods.addAll(Arrays.asList(StringUtils.delimitedListToStringArray(allowHeader, ", "))); 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 ccc2028efa3..d1872128cbe 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 @@ -292,7 +292,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl MockHttpServletResponse response = new MockHttpServletResponse(); getServlet().service(request, response); assertEquals("Invalid response status", HttpServletResponse.SC_METHOD_NOT_ALLOWED, response.getStatus()); - String allowHeader = (String) response.getHeader("Allow"); + String allowHeader = response.getHeader("Allow"); assertNotNull("No Allow header", allowHeader); Set allowedMethods = new HashSet(); allowedMethods.addAll(Arrays.asList(StringUtils.delimitedListToStringArray(allowHeader, ", "))); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java index 8ff6f889b57..2c372aa6da0 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java @@ -267,7 +267,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests { } public String getAsText() { - return "F" + (Float) getValue(); + return "F" + getValue(); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java index 69a916bcd8b..dc9b9404e2a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java @@ -242,7 +242,7 @@ public class SelectTagTests extends AbstractFormTagTests { if (value==null) { return null; } - return ((Country) value).getName(); + return value.getName(); } }); getPageContext().getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "testBean", bindingResult); @@ -295,7 +295,7 @@ public class SelectTagTests extends AbstractFormTagTests { if (value==null) { return ""; } - return ((Country) value).getName(); + return value.getName(); } }); getPageContext().getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "testBean", bindingResult); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java index 873e98e8e02..d3e02cc7c28 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java @@ -297,7 +297,7 @@ public class BaseViewTests extends TestCase { private void checkContainsAll(Map expected, Map actual) { Set keys = expected.keySet(); for (Iterator iter = keys.iterator(); iter.hasNext();) { - String key = (String) iter.next(); + String key = iter.next(); //System.out.println("Checking model key " + key); assertTrue("Value for model key '" + key + "' must match", actual.get(key) == expected.get(key)); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java index be564fee2d7..46d34e7b335 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java @@ -84,7 +84,7 @@ public class InternalResourceViewTests extends TestCase { Set keys = model.keySet(); for (Iterator it = keys.iterator(); it.hasNext();) { - String key = (String) it.next(); + String key = it.next(); assertEquals(model.get(key), request.getAttribute(key)); } @@ -129,7 +129,7 @@ public class InternalResourceViewTests extends TestCase { Set keys = model.keySet(); for (Iterator it = keys.iterator(); it.hasNext();) { - String key = (String) it.next(); + String key = it.next(); assertEquals(model.get(key), request.getAttribute(key)); } @@ -153,7 +153,7 @@ public class InternalResourceViewTests extends TestCase { expectLastCall().andReturn(null); Set keys = model.keySet(); for (Iterator iter = keys.iterator(); iter.hasNext();) { - String key = (String) iter.next(); + String key = iter.next(); request.setAttribute(key, model.get(key)); expectLastCall().times(1); } @@ -186,7 +186,7 @@ public class InternalResourceViewTests extends TestCase { expectLastCall().andReturn(null); Set keys = model.keySet(); for (Iterator iter = keys.iterator(); iter.hasNext();) { - String key = (String) iter.next(); + String key = iter.next(); request.setAttribute(key, model.get(key)); expectLastCall().times(1); } @@ -220,7 +220,7 @@ public class InternalResourceViewTests extends TestCase { expectLastCall().andReturn(null); Set keys = model.keySet(); for (Iterator iter = keys.iterator(); iter.hasNext();) { - String key = (String) iter.next(); + String key = iter.next(); request.setAttribute(key, model.get(key)); expectLastCall().times(1); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java index dd94064a9ed..8da83022c48 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java @@ -73,7 +73,7 @@ public class FreeMarkerConfigurerTests extends TestCase { FreeMarkerConfigurationFactoryBean fcfb = new FreeMarkerConfigurationFactoryBean(); fcfb.setTemplateLoaderPath("file:/mydir"); fcfb.afterPropertiesSet(); - Configuration cfg = (Configuration) fcfb.getObject(); + Configuration cfg = fcfb.getObject(); assertTrue(cfg.getTemplateLoader() instanceof SpringTemplateLoader); } @@ -97,7 +97,7 @@ public class FreeMarkerConfigurerTests extends TestCase { }); fcfb.afterPropertiesSet(); assertTrue(fcfb.getObject() instanceof Configuration); - Configuration fc = (Configuration) fcfb.getObject(); + Configuration fc = fcfb.getObject(); Template ft = fc.getTemplate("test"); assertEquals("test", FreeMarkerTemplateUtils.processTemplateIntoString(ft, new HashMap())); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java index 08547efa2bc..af090a253bc 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java @@ -69,7 +69,7 @@ public class VelocityConfigurerTests extends TestCase { vefb.setVelocityPropertiesMap(map); vefb.afterPropertiesSet(); assertTrue(vefb.getObject() instanceof VelocityEngine); - VelocityEngine ve = (VelocityEngine) vefb.getObject(); + VelocityEngine ve = vefb.getObject(); assertEquals("/mydir", ve.getProperty("myprop")); assertEquals(value, ve.getProperty("myentry")); } @@ -79,7 +79,7 @@ public class VelocityConfigurerTests extends TestCase { vefb.setResourceLoaderPath("file:/mydir"); vefb.afterPropertiesSet(); assertTrue(vefb.getObject() instanceof VelocityEngine); - VelocityEngine ve = (VelocityEngine) vefb.getObject(); + VelocityEngine ve = vefb.getObject(); assertEquals(new File("/mydir").getAbsolutePath(), ve.getProperty(VelocityEngine.FILE_RESOURCE_LOADER_PATH)); } @@ -104,7 +104,7 @@ public class VelocityConfigurerTests extends TestCase { }); vefb.afterPropertiesSet(); assertTrue(vefb.getObject() instanceof VelocityEngine); - VelocityEngine ve = (VelocityEngine) vefb.getObject(); + VelocityEngine ve = vefb.getObject(); assertEquals("test", VelocityEngineUtils.mergeTemplateIntoString(ve, "test", new HashMap())); } From 4d97ff24799e3f6b015d7391790b4ccfdcdcc7a3 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 19 Dec 2012 11:58:15 +0100 Subject: [PATCH 5/9] Fix [dep-ann] warnings with @Deprecated --- .../beans/factory/xml/BeanDefinitionParserDelegate.java | 2 ++ .../core/convert/support/ConversionServiceFactory.java | 2 ++ .../core/enums/AbstractGenericLabeledEnum.java | 1 + .../AbstractAnnotationAwareTransactionalTests.java | 1 + .../org/springframework/test/jpa/AbstractJpaTests.java | 1 + .../test/web/servlet/result/StatusResultMatchers.java | 3 +++ .../transaction/interceptor/TransactionAspectUtils.java | 2 ++ .../src/main/java/org/springframework/http/HttpStatus.java | 6 +++--- .../converter/xml/XmlAwareFormHttpMessageConverter.java | 1 + .../mvc/annotation/AnnotationMethodHandlerAdapter.java | 1 + .../AnnotationMethodHandlerExceptionResolver.java | 1 + .../mvc/annotation/DefaultAnnotationHandlerMapping.java | 1 + .../mvc/annotation/ServletAnnotationMappingUtils.java | 1 + .../web/servlet/view/ContentNegotiatingViewResolver.java | 7 +++++++ 14 files changed, 27 insertions(+), 3 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java index 7041e4753b2..359975c1ce7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java @@ -90,6 +90,7 @@ public class BeanDefinitionParserDelegate { public static final String MULTI_VALUE_ATTRIBUTE_DELIMITERS = ",; "; /** @deprecated as of Spring 3.1 in favor of {@link #MULTI_VALUE_ATTRIBUTE_DELIMITERS} */ + @Deprecated public static final String BEAN_NAME_DELIMITERS = MULTI_VALUE_ATTRIBUTE_DELIMITERS; /** @@ -343,6 +344,7 @@ public class BeanDefinitionParserDelegate { * @deprecated in Spring 3.1 in favor of * {@link #initDefaults(Element, BeanDefinitionParserDelegate)} */ + @Deprecated public void initDefaults(Element root) { initDefaults(root, null); } diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java index 3772d529965..56d0f2178de 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java @@ -64,6 +64,7 @@ public abstract class ConversionServiceFactory { * Create a new default GenericConversionService instance that can be safely modified. * @deprecated in Spring 3.1 in favor of {@link DefaultConversionService#DefaultConversionService()} */ + @Deprecated public static GenericConversionService createDefaultConversionService() { return new DefaultConversionService(); } @@ -72,6 +73,7 @@ public abstract class ConversionServiceFactory { * Populate the given GenericConversionService instance with the set of default converters. * @deprecated in Spring 3.1 in favor of {@link DefaultConversionService#addDefaultConverters(ConverterRegistry)} */ + @Deprecated public static void addDefaultConverters(GenericConversionService conversionService) { DefaultConversionService.addDefaultConverters(conversionService); } diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java index f63f0126c1a..d0279487183 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java @@ -23,6 +23,7 @@ package org.springframework.core.enums; * @since 1.2.6 * @deprecated as of Spring 3.0, in favor of Java 5 enums. */ +@Deprecated @SuppressWarnings("serial") public abstract class AbstractGenericLabeledEnum extends AbstractLabeledEnum { diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java index 4cad1e1d9e8..93b25efcc51 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java @@ -70,6 +70,7 @@ import org.springframework.util.Assert; * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests}) */ +@Deprecated public abstract class AbstractAnnotationAwareTransactionalTests extends AbstractTransactionalDataSourceSpringContextTests { diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java index 973fbf30aad..f351a00dfa7 100644 --- a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java +++ b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java @@ -80,6 +80,7 @@ import org.springframework.util.StringUtils; * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests}) */ +@Deprecated public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactionalTests { private static final String DEFAULT_ORM_XML_LOCATION = "META-INF/orm.xml"; diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java index 93534aae6f6..88c4083b6cb 100644 --- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java +++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java @@ -384,6 +384,7 @@ public class StatusResultMatchers { * Assert the response status code is {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE} (419). * @deprecated matching the deprecation of HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE */ + @Deprecated public ResultMatcher isInsufficientSpaceOnResource() { return matcher(HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE); } @@ -392,6 +393,7 @@ public class StatusResultMatchers { * Assert the response status code is {@code HttpStatus.METHOD_FAILURE} (420). * @deprecated matching the deprecation of HttpStatus.METHOD_FAILURE */ + @Deprecated public ResultMatcher isMethodFailure() { return matcher(HttpStatus.METHOD_FAILURE); } @@ -400,6 +402,7 @@ public class StatusResultMatchers { * Assert the response status code is {@code HttpStatus.DESTINATION_LOCKED} (421). * @deprecated matching the deprecation of HttpStatus.DESTINATION_LOCKED */ + @Deprecated public ResultMatcher isDestinationLocked() { return matcher(HttpStatus.DESTINATION_LOCKED); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java index e6cdebadd8b..f8f8c83d47a 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java @@ -43,6 +43,7 @@ public abstract class TransactionAspectUtils { * @deprecated as of Spring 3.1.2 in favor of * {@link BeanFactoryAnnotationUtils#qualifiedBeanOfType(BeanFactory, Class, String)} */ + @Deprecated public static PlatformTransactionManager getTransactionManager(BeanFactory beanFactory, String qualifier) { return BeanFactoryAnnotationUtils.qualifiedBeanOfType(beanFactory, PlatformTransactionManager.class, qualifier); } @@ -56,6 +57,7 @@ public abstract class TransactionAspectUtils { * @deprecated as of Spring 3.1.2 in favor of * {@link BeanFactoryAnnotationUtils#qualifiedBeanOfType(BeanFactory, Class, String)} */ + @Deprecated public static PlatformTransactionManager getTransactionManager(ConfigurableListableBeanFactory bf, String qualifier) { return BeanFactoryAnnotationUtils.qualifiedBeanOfType(bf, PlatformTransactionManager.class, qualifier); } diff --git a/spring-web/src/main/java/org/springframework/http/HttpStatus.java b/spring-web/src/main/java/org/springframework/http/HttpStatus.java index 9dbe3ff70e9..74dc2af2c21 100644 --- a/spring-web/src/main/java/org/springframework/http/HttpStatus.java +++ b/spring-web/src/main/java/org/springframework/http/HttpStatus.java @@ -254,15 +254,15 @@ public enum HttpStatus { /** * @deprecated See WebDAV Draft Changes */ - INSUFFICIENT_SPACE_ON_RESOURCE(419, "Insufficient Space On Resource"), + @Deprecated INSUFFICIENT_SPACE_ON_RESOURCE(419, "Insufficient Space On Resource"), /** * @deprecated See WebDAV Draft Changes */ - METHOD_FAILURE(420, "Method Failure"), + @Deprecated METHOD_FAILURE(420, "Method Failure"), /** * @deprecated See WebDAV Draft Changes */ - DESTINATION_LOCKED(421, "Destination Locked"), + @Deprecated DESTINATION_LOCKED(421, "Destination Locked"), /** * {@code 422 Unprocessable Entity}. * @see WebDAV diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java index 83027eabf6f..1aee1d6a05b 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java @@ -27,6 +27,7 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage * @since 3.0.3 * @deprecated in favor of {@link AllEncompassingFormHttpMessageConverter} */ +@Deprecated public class XmlAwareFormHttpMessageConverter extends FormHttpMessageConverter { public XmlAwareFormHttpMessageConverter() { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java index f531044c089..f62226435db 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java @@ -142,6 +142,7 @@ import org.springframework.web.util.WebUtils; * @deprecated in Spring 3.2 in favor of * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter RequestMappingHandlerAdapter} */ +@Deprecated public class AnnotationMethodHandlerAdapter extends WebContentGenerator implements HandlerAdapter, Ordered, BeanFactoryAware { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java index 3683d673928..d4c6cccab32 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java @@ -84,6 +84,7 @@ import org.springframework.web.servlet.support.RequestContextUtils; * @deprecated as of Spring 3.2, in favor of * {@link org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver ExceptionHandlerExceptionResolver} */ +@Deprecated public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExceptionResolver { // dummy method placeholder diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java index 34027fbfe35..f7f1c163d82 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java @@ -83,6 +83,7 @@ import org.springframework.web.servlet.handler.AbstractDetectingUrlHandlerMappin * @deprecated in Spring 3.2 in favor of * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping RequestMappingHandlerMapping} */ +@Deprecated public class DefaultAnnotationHandlerMapping extends AbstractDetectingUrlHandlerMapping { static final String USE_DEFAULT_SUFFIX_PATTERN = DefaultAnnotationHandlerMapping.class.getName() + ".useDefaultSuffixPattern"; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java index c898e413cf5..62bbc4ebc79 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java @@ -35,6 +35,7 @@ import org.springframework.web.util.WebUtils; * @deprecated in 3.2 together with {@link DefaultAnnotationHandlerMapping}, * {@link AnnotationMethodHandlerAdapter}, and {@link AnnotationMethodHandlerExceptionResolver}. */ +@Deprecated abstract class ServletAnnotationMappingUtils { /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java index fa2f02d66fb..cc497262972 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java @@ -132,6 +132,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport * * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)} */ + @Deprecated public void setFavorPathExtension(boolean favorPathExtension) { this.cnManagerFactoryBean.setFavorParameter(favorPathExtension); } @@ -142,6 +143,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport * * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)} */ + @Deprecated public void setUseJaf(boolean useJaf) { this.cnManagerFactoryBean.setUseJaf(useJaf); } @@ -155,6 +157,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport * * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)} */ + @Deprecated public void setFavorParameter(boolean favorParameter) { this.cnManagerFactoryBean.setFavorParameter(favorParameter); } @@ -165,6 +168,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport * * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)} */ + @Deprecated public void setParameterName(String parameterName) { this.cnManagerFactoryBean.setParameterName(parameterName); } @@ -177,6 +181,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport * * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)} */ + @Deprecated public void setIgnoreAcceptHeader(boolean ignoreAcceptHeader) { this.cnManagerFactoryBean.setIgnoreAcceptHeader(ignoreAcceptHeader); } @@ -188,6 +193,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport * * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)} */ + @Deprecated public void setMediaTypes(Map mediaTypes) { if (mediaTypes != null) { this.cnManagerFactoryBean.getMediaTypes().putAll(mediaTypes); @@ -201,6 +207,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport * * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)} */ + @Deprecated public void setDefaultContentType(MediaType defaultContentType) { this.cnManagerFactoryBean.setDefaultContentType(defaultContentType); } From 8d2e125e7b5557ec3a2c76380a4ec0019dbf1b32 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 19 Dec 2012 15:26:57 +0100 Subject: [PATCH 6/9] Fix [rawtypes] compiler warnings - Suppress rawtypes warnings for src/main - Enable rawtypes warnings for src/test This commit attempts to to resolve all rawtypes problems across tests as aggressively as possible, i.e. without regard for binary compatibility, whereas main sources must be treated much more cautiously with an eye toward compatibility. --- .../MethodLocatingFactoryBeanTests.java | 2 + .../aop/framework/AbstractAopProxyTests.java | 34 +++++------ .../aop/framework/CglibProxyTests.java | 26 ++++----- .../aop/framework/JdkDynamicProxyTests.java | 10 ++-- .../aop/framework/ProxyFactoryBeanTests.java | 4 +- .../aop/scope/ScopedProxyTests.java | 2 +- .../beans/IndexedTestBean.java | 43 +++++++------- .../org/springframework/beans/TestBean.java | 44 +++++++------- .../beans/factory/DummyFactory.java | 4 +- .../springframework/beans/factory/HasMap.java | 18 +++--- .../beans/factory/access/TestBean.java | 6 +- .../beans/factory/config/SimpleMapScope.java | 8 +-- .../CollectingReaderEventListener.java | 26 ++++----- .../context/BeanThatListens.java | 4 +- .../springframework/context/TestListener.java | 2 +- ...ommonAnnotationBeanPostProcessorTests.java | 2 +- .../context/annotation/SimpleConfigTests.java | 2 +- .../ConfigurationClassProcessingTests.java | 2 +- .../event/ApplicationContextEventTests.java | 12 ++-- .../EventPublicationInterceptorTests.java | 4 +- .../context/event/LifecycleEventTests.java | 2 +- .../ApplicationContextExpressionTests.java | 2 +- .../ConversionServiceFactoryBeanTests.java | 5 +- .../DefaultLifecycleProcessorTests.java | 4 +- .../FactoryBeanAndApplicationListener.java | 6 +- .../ResourceBundleMessageSourceTests.java | 4 +- .../context/support/Spr7283Tests.java | 2 +- ...ticApplicationContextMulticasterTests.java | 2 +- .../StaticApplicationContextTests.java | 2 +- .../support/StaticMessageSourceTests.java | 4 +- .../LocalSlsbInvokerInterceptorTests.java | 6 +- ...mpleRemoteSlsbInvokerInterceptorTests.java | 2 +- .../jmx/export/MBeanExporterTests.java | 2 +- .../AbstractMetadataAssemblerTests.java | 2 +- ...aceBasedMBeanInfoAssemblerCustomTests.java | 2 +- ...aceBasedMBeanInfoAssemblerMappedTests.java | 2 +- .../remoting/rmi/RmiSupportTests.java | 18 +++--- .../scheduling/timer/TimerSupportTests.java | 2 +- .../scripting/bsh/BshScriptFactoryTests.java | 14 ++--- .../groovy/GroovyClassLoadingTests.java | 8 +-- .../groovy/GroovyScriptFactoryTests.java | 6 +- .../jruby/JRubyScriptFactoryTests.java | 12 ++-- .../scripting/jruby/WrapperAdder.java | 2 +- .../org/springframework/ui/ModelMapTests.java | 2 +- .../DataBinderFieldAccessTests.java | 6 +- .../validation/DataBinderTests.java | 22 +++---- .../validation/ValidationUtilsTests.java | 4 +- .../beanvalidation/ValidatorFactoryTests.java | 2 +- .../core/ConventionsTests.java | 8 +-- ...ableTableParameterNameDiscovererTests.java | 23 +++----- .../org/springframework/util/AssertTests.java | 10 ++-- .../util/AutoPopulatingListTests.java | 14 ++--- .../util/CollectionUtilsTests.java | 58 +++++++++---------- .../util/MethodInvokerTests.java | 16 ++--- 54 files changed, 266 insertions(+), 265 deletions(-) diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java index 7f5d93833fc..e06876b4304 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java @@ -106,6 +106,7 @@ public final class MethodLocatingFactoryBeanTests { } @Test + @SuppressWarnings({ "unchecked", "rawtypes" }) public void testSunnyDayPath() throws Exception { expect((Class) beanFactory.getType(BEAN_NAME)).andReturn(String.class); replay(beanFactory); @@ -121,6 +122,7 @@ public final class MethodLocatingFactoryBeanTests { } @Test(expected=IllegalArgumentException.class) + @SuppressWarnings({ "unchecked", "rawtypes" }) public void testWhereMethodCannotBeResolved() { expect((Class) beanFactory.getType(BEAN_NAME)).andReturn(String.class); replay(beanFactory); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java index 79fcd4e225f..5af410a894b 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java @@ -120,7 +120,7 @@ public abstract class AbstractAopProxyTests { @Test public void testNoInterceptorsAndNoTarget() { - AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); + AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); // Add no interceptors try { AopProxy aop = createAopProxy(pc); @@ -418,7 +418,7 @@ public abstract class AbstractAopProxyTests { return s; } }; - AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); + AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); if (context) { pc.addAdvice(ExposeInvocationInterceptor.INSTANCE); } @@ -445,7 +445,7 @@ public abstract class AbstractAopProxyTests { TestBean raw = new OwnSpouse(); ProxyCreatorSupport pc = new ProxyCreatorSupport(); - pc.setInterfaces(new Class[] {ITestBean.class}); + pc.setInterfaces(new Class[] {ITestBean.class}); pc.setTarget(raw); ITestBean tb = (ITestBean) createProxy(pc); @@ -461,7 +461,7 @@ public abstract class AbstractAopProxyTests { throw expectedException; } }; - AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); + AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); pc.addAdvice(ExposeInvocationInterceptor.INSTANCE); pc.addAdvice(mi); @@ -495,7 +495,7 @@ public abstract class AbstractAopProxyTests { throw unexpectedException; } }; - AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); + AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); pc.addAdvice(ExposeInvocationInterceptor.INSTANCE); pc.addAdvice(mi); @@ -527,7 +527,7 @@ public abstract class AbstractAopProxyTests { throw unexpectedException; } }; - AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); + AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); pc.addAdvice(ExposeInvocationInterceptor.INSTANCE); pc.addAdvice(mi); @@ -555,7 +555,7 @@ public abstract class AbstractAopProxyTests { @Test public void testTargetCanGetInvocationEvenIfNoAdviceChain() throws Throwable { NeedsToSeeProxy target = new NeedsToSeeProxy(); - AdvisedSupport pc = new AdvisedSupport(new Class[] {INeedsToSeeProxy.class}); + AdvisedSupport pc = new AdvisedSupport(new Class[] {INeedsToSeeProxy.class}); pc.setTarget(target); pc.setExposeProxy(true); @@ -570,7 +570,7 @@ public abstract class AbstractAopProxyTests { public void testTargetCanGetInvocation() throws Throwable { final InvocationCheckExposedInvocationTestBean expectedTarget = new InvocationCheckExposedInvocationTestBean(); - AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class, IOther.class}); + AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class, IOther.class}); pc.addAdvice(ExposeInvocationInterceptor.INSTANCE); TrapTargetInterceptor tii = new TrapTargetInterceptor() { public Object invoke(MethodInvocation invocation) throws Throwable { @@ -615,7 +615,7 @@ public abstract class AbstractAopProxyTests { @Test public void testMixinWithIntroductionAdvisor() throws Throwable { TestBean tb = new TestBean(); - ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); + ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); pc.addAdvisor(new LockMixinAdvisor()); pc.setTarget(tb); @@ -625,7 +625,7 @@ public abstract class AbstractAopProxyTests { @Test public void testMixinWithIntroductionInfo() throws Throwable { TestBean tb = new TestBean(); - ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); + ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); // We don't use an IntroductionAdvisor, we can just add an advice that implements IntroductionInfo pc.addAdvice(new LockMixin()); pc.setTarget(tb); @@ -664,7 +664,7 @@ public abstract class AbstractAopProxyTests { @Test public void testReplaceArgument() throws Throwable { TestBean tb = new TestBean(); - ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); + ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); pc.setTarget(tb); pc.addAdvisor(new StringSetterNullReplacementAdvice()); @@ -952,7 +952,7 @@ public abstract class AbstractAopProxyTests { public void testProxyConfigString() { TestBean target = new TestBean(); ProxyFactory pc = new ProxyFactory(target); - pc.setInterfaces(new Class[] {ITestBean.class}); + pc.setInterfaces(new Class[] {ITestBean.class}); pc.addAdvice(new NopInterceptor()); MethodBeforeAdvice mba = new CountingBeforeAdvice(); Advisor advisor = new DefaultPointcutAdvisor(new NameMatchMethodPointcut(), mba); @@ -968,7 +968,7 @@ public abstract class AbstractAopProxyTests { public void testCanPreventCastToAdvisedUsingOpaque() { TestBean target = new TestBean(); ProxyFactory pc = new ProxyFactory(target); - pc.setInterfaces(new Class[] {ITestBean.class}); + pc.setInterfaces(new Class[] {ITestBean.class}); pc.addAdvice(new NopInterceptor()); CountingBeforeAdvice mba = new CountingBeforeAdvice(); Advisor advisor = new DefaultPointcutAdvisor(new NameMatchMethodPointcut().addMethodName("setAge"), mba); @@ -1069,7 +1069,7 @@ public abstract class AbstractAopProxyTests { @Test public void testDynamicMethodPointcutThatAlwaysAppliesStatically() throws Throwable { TestBean tb = new TestBean(); - ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); + ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); TestDynamicPointcutAdvice dp = new TestDynamicPointcutAdvice(new NopInterceptor(), "getAge"); pc.addAdvisor(dp); pc.setTarget(tb); @@ -1085,7 +1085,7 @@ public abstract class AbstractAopProxyTests { @Test public void testDynamicMethodPointcutThatAppliesStaticallyOnlyToSetters() throws Throwable { TestBean tb = new TestBean(); - ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); + ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); // Could apply dynamically to getAge/setAge but not to getName TestDynamicPointcutForSettersOnly dp = new TestDynamicPointcutForSettersOnly(new NopInterceptor(), "Age"); pc.addAdvisor(dp); @@ -1107,7 +1107,7 @@ public abstract class AbstractAopProxyTests { @Test public void testStaticMethodPointcut() throws Throwable { TestBean tb = new TestBean(); - ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); + ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class}); NopInterceptor di = new NopInterceptor(); TestStaticPointcutAdvice sp = new TestStaticPointcutAdvice(di, "getAge"); pc.addAdvisor(sp); @@ -1353,7 +1353,7 @@ public abstract class AbstractAopProxyTests { return invocation.proceed(); } }; - AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); + AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); MapAwareMethodInterceptor mami1 = new MapAwareMethodInterceptor(new HashMap(), new HashMap()); Map firstValuesToAdd = new HashMap(); firstValuesToAdd.put("test", ""); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java index a1abd8e2fe8..a52cbe3cc07 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java @@ -87,7 +87,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri @Test public void testNoTarget() { - AdvisedSupport pc = new AdvisedSupport(new Class[]{ITestBean.class}); + AdvisedSupport pc = new AdvisedSupport(new Class[]{ITestBean.class}); pc.addAdvice(new NopInterceptor()); try { AopProxy aop = createAopProxy(pc); @@ -104,7 +104,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri ProtectedMethodTestBean bean = new ProtectedMethodTestBean(); mockTargetSource.setTarget(bean); - AdvisedSupport as = new AdvisedSupport(new Class[]{}); + AdvisedSupport as = new AdvisedSupport(new Class[]{}); as.setTargetSource(mockTargetSource); as.addAdvice(new NopInterceptor()); AopProxy aop = new CglibAopProxy(as); @@ -158,7 +158,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri CglibTestBean bean = new CglibTestBean(); bean.setName("Rob Harrop"); - AdvisedSupport as = new AdvisedSupport(new Class[]{}); + AdvisedSupport as = new AdvisedSupport(new Class[]{}); as.setTarget(bean); as.addAdvice(new NopInterceptor()); AopProxy aop = new CglibAopProxy(as); @@ -174,7 +174,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri CglibTestBean target = new CglibTestBean(); target.setName("Rob Harrop"); - AdvisedSupport pc = new AdvisedSupport(new Class[]{}); + AdvisedSupport pc = new AdvisedSupport(new Class[]{}); pc.setFrozen(true); pc.setTarget(target); @@ -202,7 +202,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri } private ITestBean getAdvisedProxy(TestBean target) { - ProxyFactory pf = new ProxyFactory(new Class[]{ITestBean.class}); + ProxyFactory pf = new ProxyFactory(new Class[]{ITestBean.class}); pf.setProxyTargetClass(true); MethodInterceptor advice = new NopInterceptor(); @@ -241,7 +241,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri } private ITestBean getIntroductionAdvisorProxy(TestBean target) { - ProxyFactory pf = new ProxyFactory(new Class[]{ITestBean.class}); + ProxyFactory pf = new ProxyFactory(new Class[]{ITestBean.class}); pf.setProxyTargetClass(true); pf.addAdvisor(new LockMixinAdvisor()); @@ -258,11 +258,11 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri target.reset(); mockTargetSource.setTarget(target); - AdvisedSupport pc = new AdvisedSupport(new Class[]{}); + AdvisedSupport pc = new AdvisedSupport(new Class[]{}); pc.setTargetSource(mockTargetSource); CglibAopProxy aop = new CglibAopProxy(pc); aop.setConstructorArguments(new Object[] {"Rob Harrop", new Integer(22)}, - new Class[] {String.class, int.class}); + new Class[] {String.class, int.class}); NoArgCtorTestBean proxy = (NoArgCtorTestBean) aop.getProxy(); proxy = (NoArgCtorTestBean) aop.getProxy(); @@ -275,7 +275,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri ITestBean target = new TestBean(); mockTargetSource.setTarget(target); - AdvisedSupport as = new AdvisedSupport(new Class[]{}); + AdvisedSupport as = new AdvisedSupport(new Class[]{}); as.setTargetSource(mockTargetSource); as.addAdvice(new NopInterceptor()); CglibAopProxy cglib = new CglibAopProxy(as); @@ -283,7 +283,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri ITestBean proxy1 = (ITestBean) cglib.getProxy(); mockTargetSource.setTarget(proxy1); - as = new AdvisedSupport(new Class[]{}); + as = new AdvisedSupport(new Class[]{}); as.setTargetSource(mockTargetSource); as.addAdvice(new NopInterceptor()); cglib = new CglibAopProxy(as); @@ -296,7 +296,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri ITestBean target = new TestBean(); mockTargetSource.setTarget(target); - AdvisedSupport as = new AdvisedSupport(new Class[]{}); + AdvisedSupport as = new AdvisedSupport(new Class[]{}); as.setTargetSource(mockTargetSource); as.addAdvice(new NopInterceptor()); as.addInterface(Serializable.class); @@ -305,7 +305,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri ITestBean proxy1 = (ITestBean) cglib.getProxy(); mockTargetSource.setTarget(proxy1); - as = new AdvisedSupport(new Class[]{}); + as = new AdvisedSupport(new Class[]{}); as.setTargetSource(mockTargetSource); as.addAdvice(new NopInterceptor()); cglib = new CglibAopProxy(as); @@ -319,7 +319,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri ExceptionThrower bean = new ExceptionThrower(); mockTargetSource.setTarget(bean); - AdvisedSupport as = new AdvisedSupport(new Class[]{}); + AdvisedSupport as = new AdvisedSupport(new Class[]{}); as.setTargetSource(mockTargetSource); as.addAdvice(new NopInterceptor()); AopProxy aop = new CglibAopProxy(as); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java index 422517273f6..b845070078f 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java @@ -66,7 +66,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements public void testProxyIsJustInterface() throws Throwable { TestBean raw = new TestBean(); raw.setAge(32); - AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); + AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class}); pc.setTarget(raw); JdkDynamicAopProxy aop = new JdkDynamicAopProxy(pc); @@ -80,7 +80,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements int age = 25; MethodInterceptor mi = createMock(MethodInterceptor.class); - AdvisedSupport pc = new AdvisedSupport(new Class[] { ITestBean.class }); + AdvisedSupport pc = new AdvisedSupport(new Class[] { ITestBean.class }); pc.addAdvice(mi); AopProxy aop = createAopProxy(pc); @@ -101,7 +101,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements } }; - AdvisedSupport pc = new AdvisedSupport(new Class[] { ITestBean.class, IOther.class }); + AdvisedSupport pc = new AdvisedSupport(new Class[] { ITestBean.class, IOther.class }); pc.addAdvice(ExposeInvocationInterceptor.INSTANCE); TrapTargetInterceptor tii = new TrapTargetInterceptor() { public Object invoke(MethodInvocation invocation) throws Throwable { @@ -130,7 +130,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements public void testProxyNotWrappedIfIncompatible() { FooBar bean = new FooBar(); ProxyCreatorSupport as = new ProxyCreatorSupport(); - as.setInterfaces(new Class[] {Foo.class}); + as.setInterfaces(new Class[] {Foo.class}); as.setTarget(bean); Foo proxy = (Foo) createProxy(as); @@ -140,7 +140,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements } public void testEqualsAndHashCodeDefined() throws Exception { - AdvisedSupport as = new AdvisedSupport(new Class[]{Named.class}); + AdvisedSupport as = new AdvisedSupport(new Class[]{Named.class}); as.setTarget(new Person()); JdkDynamicAopProxy aopProxy = new JdkDynamicAopProxy(as); Named proxy = (Named) aopProxy.getProxy(); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java index eb5f420b034..6c255751b4d 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java @@ -539,7 +539,7 @@ public final class ProxyFactoryBeanTests { // 2 globals + 2 explicit assertEquals("Have 2 globals and 2 explicit advisors", 3, pfb.getAdvisors().length); - ApplicationListener l = (ApplicationListener) factory.getBean("validGlobals"); + ApplicationListener l = (ApplicationListener) factory.getBean("validGlobals"); agi = (AddedGlobalInterface) l; assertTrue(agi.globalsAdded() == -1); @@ -760,7 +760,7 @@ public final class ProxyFactoryBeanTests { } public Class[] getInterfaces() { - return new Class[] { AddedGlobalInterface.class }; + return new Class[] { AddedGlobalInterface.class }; } public boolean isPerInstance() { diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java index 6448a2d82bc..56b60673948 100644 --- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java @@ -126,7 +126,7 @@ public class ScopedProxyTests { assertTrue(scope.getMap().containsKey("scopedTarget.scopedList")); assertEquals(ArrayList.class, scope.getMap().get("scopedTarget.scopedList").getClass()); - ArrayList deserialized = (ArrayList) SerializationTestUtils.serializeAndDeserialize(tb.getFriends()); + ArrayList deserialized = (ArrayList) SerializationTestUtils.serializeAndDeserialize(tb.getFriends()); assertNotNull(deserialized); assertTrue(AopUtils.isCglibProxy(deserialized)); assertTrue(deserialized.contains("myFriend")); diff --git a/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java index ddb091770ee..e44bac1740b 100644 --- a/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java @@ -34,17 +34,17 @@ public class IndexedTestBean { private TestBean[] array; - private Collection collection; + private Collection collection; - private List list; + private List list; - private Set set; + private Set set; - private SortedSet sortedSet; + private SortedSet sortedSet; - private Map map; + private Map map; - private SortedMap sortedMap; + private SortedMap sortedMap; public IndexedTestBean() { @@ -69,17 +69,17 @@ public class IndexedTestBean { TestBean tbX = new TestBean("nameX", 0); TestBean tbY = new TestBean("nameY", 0); this.array = new TestBean[] {tb0, tb1}; - this.list = new ArrayList(); + this.list = new ArrayList<>(); this.list.add(tb2); this.list.add(tb3); - this.set = new TreeSet(); + this.set = new TreeSet<>(); this.set.add(tb6); this.set.add(tb7); - this.map = new HashMap(); + this.map = new HashMap<>(); this.map.put("key1", tb4); this.map.put("key2", tb5); this.map.put("key.3", tb5); - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(tbX); list.add(tbY); this.map.put("key4", list); @@ -94,51 +94,52 @@ public class IndexedTestBean { this.array = array; } - public Collection getCollection() { + public Collection getCollection() { return collection; } - public void setCollection(Collection collection) { + public void setCollection(Collection collection) { this.collection = collection; } - public List getList() { + public List getList() { return list; } - public void setList(List list) { + public void setList(List list) { this.list = list; } - public Set getSet() { + public Set getSet() { return set; } + @SuppressWarnings({ "rawtypes", "unchecked" }) public void setSet(Set set) { this.set = set; } - public SortedSet getSortedSet() { + public SortedSet getSortedSet() { return sortedSet; } - public void setSortedSet(SortedSet sortedSet) { + public void setSortedSet(SortedSet sortedSet) { this.sortedSet = sortedSet; } - public Map getMap() { + public Map getMap() { return map; } - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } - public SortedMap getSortedMap() { + public SortedMap getSortedMap() { return sortedMap; } - public void setSortedMap(SortedMap sortedMap) { + public void setSortedMap(SortedMap sortedMap) { this.sortedMap = sortedMap; } diff --git a/spring-context/src/test/java/org/springframework/beans/TestBean.java b/spring-context/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..b93bf96be31 100644 --- a/spring-context/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/TestBean.java @@ -40,7 +40,7 @@ import org.springframework.util.ObjectUtils; * @author Juergen Hoeller * @since 15 April 2001 */ -public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable { +public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable { private String beanName; @@ -70,13 +70,13 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt private Float myFloat = new Float(0.0); - private Collection friends = new LinkedList(); + private Collection friends = new LinkedList<>(); - private Set someSet = new HashSet(); + private Set someSet = new HashSet<>(); - private Map someMap = new HashMap(); + private Map someMap = new HashMap<>(); - private List someList = new ArrayList(); + private List someList = new ArrayList<>(); private Properties someProperties = new Properties(); @@ -94,9 +94,9 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt private Boolean someBoolean; - private List otherColours; + private List otherColours; - private List pets; + private List pets; public TestBean() { @@ -120,15 +120,15 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } - public TestBean(List someList) { + public TestBean(List someList) { this.someList = someList; } - public TestBean(Set someSet) { + public TestBean(Set someSet) { this.someSet = someSet; } - public TestBean(Map someMap) { + public TestBean(Map someMap) { this.someMap = someMap; } @@ -262,35 +262,35 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.myFloat = myFloat; } - public Collection getFriends() { + public Collection getFriends() { return friends; } - public void setFriends(Collection friends) { + public void setFriends(Collection friends) { this.friends = friends; } - public Set getSomeSet() { + public Set getSomeSet() { return someSet; } - public void setSomeSet(Set someSet) { + public void setSomeSet(Set someSet) { this.someSet = someSet; } - public Map getSomeMap() { + public Map getSomeMap() { return someMap; } - public void setSomeMap(Map someMap) { + public void setSomeMap(Map someMap) { this.someMap = someMap; } - public List getSomeList() { + public List getSomeList() { return someList; } - public void setSomeList(List someList) { + public void setSomeList(List someList) { this.someList = someList; } @@ -350,19 +350,19 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.nestedIndexedBean = nestedIndexedBean; } - public List getOtherColours() { + public List getOtherColours() { return otherColours; } - public void setOtherColours(List otherColours) { + public void setOtherColours(List otherColours) { this.otherColours = otherColours; } - public List getPets() { + public List getPets() { return pets; } - public void setPets(List pets) { + public void setPets(List pets) { this.pets = pets; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java index c5ee4d060b7..b9999baa5e6 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -32,7 +32,7 @@ import org.springframework.beans.factory.config.AutowireCapableBeanFactory; * @since 10.03.2003 */ public class DummyFactory - implements FactoryBean, BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean { + implements FactoryBean, BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean { public static final String SINGLETON_NAME = "Factory singleton"; @@ -158,7 +158,7 @@ public class DummyFactory } } - public Class getObjectType() { + public Class getObjectType() { return TestBean.class; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java b/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java index 361746b32a2..1c1708eca5c 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java @@ -28,34 +28,34 @@ import java.util.Set; */ public class HasMap { - private Map map; + private Map map; - private Set set; + private Set set; private Properties props; private Object[] objectArray; - private Class[] classArray; + private Class[] classArray; private Integer[] intArray; private HasMap() { } - public Map getMap() { + public Map getMap() { return map; } - public void setMap(Map map) { + public void setMap(Map map) { this.map = map; } - public Set getSet() { + public Set getSet() { return set; } - public void setSet(Set set) { + public void setSet(Set set) { this.set = set; } @@ -75,11 +75,11 @@ public class HasMap { this.objectArray = objectArray; } - public Class[] getClassArray() { + public Class[] getClassArray() { return classArray; } - public void setClassArray(Class[] classArray) { + public void setClassArray(Class[] classArray) { this.classArray = classArray; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java index 3a77af2f711..39fdf5be5b8 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java @@ -27,7 +27,7 @@ public class TestBean { private String name; - private List list; + private List list; private Object objRef; @@ -48,14 +48,14 @@ public class TestBean { /** * @return Returns the list. */ - public List getList() { + public List getList() { return list; } /** * @param list The list to set. */ - public void setList(List list) { + public void setList(List list) { this.list = list; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java index b149254bfd7..9ae909d7b71 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java @@ -31,20 +31,20 @@ import org.springframework.beans.factory.ObjectFactory; @SuppressWarnings("serial") public class SimpleMapScope implements Scope, Serializable { - private final Map map = new HashMap(); + private final Map map = new HashMap(); - private final List callbacks = new LinkedList(); + private final List callbacks = new LinkedList(); public SimpleMapScope() { } - public final Map getMap() { + public final Map getMap() { return this.map; } - public Object get(String name, ObjectFactory objectFactory) { + public Object get(String name, ObjectFactory objectFactory) { synchronized (this.map) { Object scopedObject = this.map.get(name); if (scopedObject == null) { diff --git a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java index 74d6b48540e..8da9a81a6f8 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java @@ -31,20 +31,20 @@ import org.springframework.core.CollectionFactory; */ public class CollectingReaderEventListener implements ReaderEventListener { - private final List defaults = new LinkedList(); + private final List defaults = new LinkedList(); - private final Map componentDefinitions = CollectionFactory.createLinkedMapIfPossible(8); + private final Map componentDefinitions = CollectionFactory.createLinkedMapIfPossible(8); - private final Map aliasMap = CollectionFactory.createLinkedMapIfPossible(8); + private final Map> aliasMap = CollectionFactory.createLinkedMapIfPossible(8); - private final List imports = new LinkedList(); + private final List imports = new LinkedList(); public void defaultsRegistered(DefaultsDefinition defaultsDefinition) { this.defaults.add(defaultsDefinition); } - public List getDefaults() { + public List getDefaults() { return Collections.unmodifiableList(this.defaults); } @@ -53,25 +53,25 @@ public class CollectingReaderEventListener implements ReaderEventListener { } public ComponentDefinition getComponentDefinition(String name) { - return (ComponentDefinition) this.componentDefinitions.get(name); + return this.componentDefinitions.get(name); } public ComponentDefinition[] getComponentDefinitions() { - Collection collection = this.componentDefinitions.values(); - return (ComponentDefinition[]) collection.toArray(new ComponentDefinition[collection.size()]); + Collection collection = this.componentDefinitions.values(); + return collection.toArray(new ComponentDefinition[collection.size()]); } public void aliasRegistered(AliasDefinition aliasDefinition) { - List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName()); + List aliases = this.aliasMap.get(aliasDefinition.getBeanName()); if(aliases == null) { - aliases = new ArrayList(); + aliases = new ArrayList(); this.aliasMap.put(aliasDefinition.getBeanName(), aliases); } aliases.add(aliasDefinition); } - public List getAliases(String beanName) { - List aliases = (List) this.aliasMap.get(beanName); + public List getAliases(String beanName) { + List aliases = this.aliasMap.get(beanName); return aliases == null ? null : Collections.unmodifiableList(aliases); } @@ -79,7 +79,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { this.imports.add(importDefinition); } - public List getImports() { + public List getImports() { return Collections.unmodifiableList(this.imports); } diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java index 9ab3f8ea40d..3bda3d37230 100644 --- a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java +++ b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java @@ -24,7 +24,7 @@ import java.util.Map; * @author Thomas Risberg * @author Juergen Hoeller */ -public class BeanThatListens implements ApplicationListener { +public class BeanThatListens implements ApplicationListener { private BeanThatBroadcasts beanThatBroadcasts; @@ -36,7 +36,7 @@ public class BeanThatListens implements ApplicationListener { public BeanThatListens(BeanThatBroadcasts beanThatBroadcasts) { this.beanThatBroadcasts = beanThatBroadcasts; - Map beans = beanThatBroadcasts.applicationContext.getBeansOfType(BeanThatListens.class); + Map beans = beanThatBroadcasts.applicationContext.getBeansOfType(BeanThatListens.class); if (!beans.isEmpty()) { throw new IllegalStateException("Shouldn't have found any BeanThatListens instances"); } diff --git a/spring-context/src/test/java/org/springframework/context/TestListener.java b/spring-context/src/test/java/org/springframework/context/TestListener.java index b9f57f73087..834439484c9 100644 --- a/spring-context/src/test/java/org/springframework/context/TestListener.java +++ b/spring-context/src/test/java/org/springframework/context/TestListener.java @@ -22,7 +22,7 @@ package org.springframework.context; * @author Rod Johnson * @since January 21, 2001 */ -public class TestListener implements ApplicationListener { +public class TestListener implements ApplicationListener { private int eventCount; diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java index daacc42cd57..b4135bf6468 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java @@ -206,7 +206,7 @@ public class CommonAnnotationBeanPostProcessorTests { bf.registerBeanDefinition("testBean4", new RootBeanDefinition(TestBean.class, false)); bf.registerResolvableDependency(BeanFactory.class, bf); - bf.registerResolvableDependency(INestedTestBean.class, new ObjectFactory() { + bf.registerResolvableDependency(INestedTestBean.class, new ObjectFactory() { public Object getObject() throws BeansException { return new NestedTestBean(); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java index c07ded41548..176aee5c32d 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java @@ -42,7 +42,7 @@ public class SimpleConfigTests { String value = fooService.foo(1); assertEquals("bar", value); - Future future = fooService.asyncFoo(1); + Future future = fooService.asyncFoo(1); assertTrue(future instanceof FutureTask); assertEquals("bar", future.get()); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java index 11004182c8b..8073f92b831 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java @@ -230,7 +230,7 @@ public class ConfigurationClassProcessingTests { public @Bean Object stringBean() { return "foo"; } - public @Bean FactoryBean factoryBean() { + public @Bean FactoryBean factoryBean() { ListFactoryBean fb = new ListFactoryBean(); fb.setSourceList(Arrays.asList("element1", "element2")); return fb; diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index 789fb09defc..24dec9ad54d 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -47,7 +47,8 @@ public class ApplicationContextEventTests { @Test public void simpleApplicationEventMulticaster() { - ApplicationListener listener = EasyMock.createMock(ApplicationListener.class); + @SuppressWarnings("unchecked") + ApplicationListener listener = mock(ApplicationListener.class); ApplicationEvent evt = new ContextClosedEvent(new StaticApplicationContext()); listener.onApplicationEvent(evt); @@ -73,11 +74,12 @@ public class ApplicationContextEventTests { } @Test + @SuppressWarnings("unchecked") public void proxiedListeners() { MyOrderedListener1 listener1 = new MyOrderedListener1(); MyOrderedListener2 listener2 = new MyOrderedListener2(listener1); - ApplicationListener proxy1 = (ApplicationListener) new ProxyFactory(listener1).getProxy(); - ApplicationListener proxy2 = (ApplicationListener) new ProxyFactory(listener2).getProxy(); + ApplicationListener proxy1 = (ApplicationListener) new ProxyFactory(listener1).getProxy(); + ApplicationListener proxy2 = (ApplicationListener) new ProxyFactory(listener2).getProxy(); SimpleApplicationEventMulticaster smc = new SimpleApplicationEventMulticaster(); smc.addApplicationListener(proxy1); @@ -208,7 +210,7 @@ public class ApplicationContextEventTests { } - public static class MyOrderedListener1 implements ApplicationListener, Ordered { + public static class MyOrderedListener1 implements ApplicationListener, Ordered { public final Set seenEvents = new HashSet(); @@ -248,7 +250,7 @@ public class ApplicationContextEventTests { } - public static class MyNonSingletonListener implements ApplicationListener { + public static class MyNonSingletonListener implements ApplicationListener { public static final Set seenEvents = new HashSet(); diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java index d8bc82ee111..4e1f90468cf 100644 --- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java @@ -138,13 +138,13 @@ public class EventPublicationInterceptorTests { } - public static class FactoryBeanTestListener extends TestListener implements FactoryBean { + public static class FactoryBeanTestListener extends TestListener implements FactoryBean { public Object getObject() throws Exception { return "test"; } - public Class getObjectType() { + public Class getObjectType() { return String.class; } diff --git a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java index d5cc8f790f0..b1bbb815acb 100644 --- a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java @@ -63,7 +63,7 @@ public class LifecycleEventTests extends TestCase { } - private static class LifecycleListener implements ApplicationListener { + private static class LifecycleListener implements ApplicationListener { private ApplicationContext context; diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java index 393e71d5d54..cfd70979e98 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java @@ -57,7 +57,7 @@ public class ApplicationContextExpressionTests { AnnotationConfigUtils.registerAnnotationConfigProcessors(ac); ac.getBeanFactory().registerScope("myScope", new Scope() { - public Object get(String name, ObjectFactory objectFactory) { + public Object get(String name, ObjectFactory objectFactory) { return objectFactory.getObject(); } public Object remove(String name) { diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java index 5a779f0d3a5..34588e19a7a 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java @@ -61,6 +61,7 @@ public class ConversionServiceFactoryBeanTests { converters.add(new ConverterFactory() { public Converter getConverter(Class targetType) { return new Converter () { + @SuppressWarnings("unchecked") public T convert(String source) { return (T) new Bar(); } @@ -103,7 +104,7 @@ public class ConversionServiceFactoryBeanTests { doTestConversionServiceInApplicationContext("conversionServiceWithResourceOverriding.xml", FileSystemResource.class); } - private void doTestConversionServiceInApplicationContext(String fileName, Class resourceClass) { + private void doTestConversionServiceInApplicationContext(String fileName, Class resourceClass) { ApplicationContext ctx = new ClassPathXmlApplicationContext(fileName, getClass()); ResourceTestBean tb = ctx.getBean("resourceTestBean", ResourceTestBean.class); assertTrue(resourceClass.isInstance(tb.getResource())); @@ -128,7 +129,7 @@ public class ConversionServiceFactoryBeanTests { public static class ComplexConstructorArgument { - public ComplexConstructorArgument(Map map) { + public ComplexConstructorArgument(Map> map) { assertTrue(!map.isEmpty()); assertTrue(map.keySet().iterator().next() instanceof String); assertTrue(map.values().iterator().next() instanceof Class); diff --git a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java index 61615a2b591..a561e2cbf38 100644 --- a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java @@ -692,7 +692,7 @@ public class DefaultLifecycleProcessorTests { } - public static class DummySmartLifecycleFactoryBean implements FactoryBean, SmartLifecycle { + public static class DummySmartLifecycleFactoryBean implements FactoryBean, SmartLifecycle { public boolean running = false; @@ -702,7 +702,7 @@ public class DefaultLifecycleProcessorTests { return this.bean; } - public Class getObjectType() { + public Class getObjectType() { return DummySmartLifecycleBean.class; } diff --git a/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java b/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java index b0a90824d44..a545e69e688 100644 --- a/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java +++ b/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java @@ -8,13 +8,13 @@ import org.springframework.context.ApplicationListener; * @author Juergen Hoeller * @since 06.10.2004 */ -public class FactoryBeanAndApplicationListener implements FactoryBean, ApplicationListener { +public class FactoryBeanAndApplicationListener implements FactoryBean, ApplicationListener { - public Object getObject() throws Exception { + public String getObject() throws Exception { return ""; } - public Class getObjectType() { + public Class getObjectType() { return String.class; } diff --git a/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java index 8a462c0425b..7e45ce98985 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java @@ -115,8 +115,8 @@ public class ResourceBundleMessageSourceTests extends TestCase { if (alwaysUseMessageFormat) { pvs.add("alwaysUseMessageFormat", Boolean.TRUE); } - Class clazz = reloadable ? - (Class) ReloadableResourceBundleMessageSource.class : ResourceBundleMessageSource.class; + Class clazz = reloadable ? + (Class) ReloadableResourceBundleMessageSource.class : ResourceBundleMessageSource.class; ac.registerSingleton("messageSource", clazz, pvs); ac.refresh(); diff --git a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java index d734c34f0a7..73c189e36e5 100644 --- a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java +++ b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java @@ -30,7 +30,7 @@ public class Spr7283Tests { @Test public void testListWithInconsistentElementType() { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("spr7283.xml", getClass()); - List list = ctx.getBean("list", List.class); + List list = ctx.getBean("list", List.class); assertEquals(2, list.size()); assertTrue(list.get(0) instanceof A); assertTrue(list.get(1) instanceof B); diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java index 089072fb3c8..9ac74335896 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java @@ -45,7 +45,7 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio /** Run for each test */ protected ConfigurableApplicationContext createContext() throws Exception { StaticApplicationContext parent = new StaticApplicationContext(); - Map m = new HashMap(); + Map m = new HashMap(); m.put("name", "Roderick"); parent.registerPrototype("rod", TestBean.class, new MutablePropertyValues(m)); m.put("name", "Albert"); diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java index 431325062ed..2dba7fc9eac 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java @@ -41,7 +41,7 @@ public class StaticApplicationContextTests extends AbstractApplicationContextTes /** Run for each test */ protected ConfigurableApplicationContext createContext() throws Exception { StaticApplicationContext parent = new StaticApplicationContext(); - Map m = new HashMap(); + Map m = new HashMap(); m.put("name", "Roderick"); parent.registerPrototype("rod", TestBean.class, new MutablePropertyValues(m)); m.put("name", "Albert"); diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java index 47e72fb9116..73d0cab6517 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java @@ -198,7 +198,7 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests { protected ConfigurableApplicationContext createContext() throws Exception { StaticApplicationContext parent = new StaticApplicationContext(); - Map m = new HashMap(); + Map m = new HashMap(); m.put("name", "Roderick"); parent.registerPrototype("rod", org.springframework.beans.TestBean.class, new MutablePropertyValues(m)); m.put("name", "Albert"); @@ -221,7 +221,7 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests { sac.addListener(listener); StaticMessageSource messageSource = sac.getStaticMessageSource(); - Map usMessages = new HashMap(3); + Map usMessages = new HashMap(3); usMessages.put("message.format.example1", MSG_TXT1_US); usMessages.put("message.format.example2", MSG_TXT2_US); usMessages.put("message.format.example3", MSG_TXT3_US); diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java index 11a20f3cd6e..bcfc34c71b9 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java @@ -90,7 +90,7 @@ public class LocalSlsbInvokerInterceptorTests { LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); - ProxyFactory pf = new ProxyFactory(new Class[] { BusinessMethods.class } ); + ProxyFactory pf = new ProxyFactory(new Class[] { BusinessMethods.class } ); pf.addAdvice(si); BusinessMethods target = (BusinessMethods) pf.getProxy(); @@ -113,7 +113,7 @@ public class LocalSlsbInvokerInterceptorTests { LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); - ProxyFactory pf = new ProxyFactory(new Class[] { BusinessMethods.class } ); + ProxyFactory pf = new ProxyFactory(new Class[] { BusinessMethods.class } ); pf.addAdvice(si); BusinessMethods target = (BusinessMethods) pf.getProxy(); @@ -133,7 +133,7 @@ public class LocalSlsbInvokerInterceptorTests { LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); - ProxyFactory pf = new ProxyFactory(new Class[] { LocalInterfaceWithBusinessMethods.class } ); + ProxyFactory pf = new ProxyFactory(new Class[] { LocalInterfaceWithBusinessMethods.class } ); pf.addAdvice(si); LocalInterfaceWithBusinessMethods target = (LocalInterfaceWithBusinessMethods) pf.getProxy(); diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java index 4d921eafcba..a48935c47c2 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java @@ -79,7 +79,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { protected Object configuredProxy(SimpleRemoteSlsbInvokerInterceptor si, Class ifc) throws NamingException { si.afterPropertiesSet(); - ProxyFactory pf = new ProxyFactory(new Class[] {ifc}); + ProxyFactory pf = new ProxyFactory(new Class[] {ifc}); pf.addAdvice(si); return pf.getProxy(); } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java index 95c610e11fb..85865af76fc 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java @@ -238,7 +238,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { ProxyFactory factory = new ProxyFactory(); factory.setTarget(bean); factory.addAdvice(new NopInterceptor()); - factory.setInterfaces(new Class[] { IJmxTestBean.class }); + factory.setInterfaces(new Class[] { IJmxTestBean.class }); IJmxTestBean proxy = (IJmxTestBean) factory.getProxy(); String name = "bean:mmm=whatever"; diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java index 9100215b83c..93735097c67 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java @@ -158,7 +158,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble String objectName = "spring:bean=test,proxy=true"; - Map beans = new HashMap(); + Map beans = new HashMap(); beans.put(objectName, proxy); exporter.setBeans(beans); exporter.afterPropertiesSet(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java index 2e48d506107..4be8a6cc92f 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java @@ -40,7 +40,7 @@ public class InterfaceBasedMBeanInfoAssemblerCustomTests extends AbstractJmxAsse protected MBeanInfoAssembler getAssembler() { InterfaceBasedMBeanInfoAssembler assembler = new InterfaceBasedMBeanInfoAssembler(); - assembler.setManagedInterfaces(new Class[] {ICustomJmxBean.class}); + assembler.setManagedInterfaces(new Class[] {ICustomJmxBean.class}); return assembler; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java index 666f877b807..a0681cc398a 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java @@ -60,7 +60,7 @@ public class InterfaceBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAsse public void ignoreTestWithFallThrough() throws Exception { InterfaceBasedMBeanInfoAssembler assembler = getWithMapping("foobar", "org.springframework.jmx.export.assembler.ICustomJmxBean"); - assembler.setManagedInterfaces(new Class[] {IAdditionalTestMethods.class}); + assembler.setManagedInterfaces(new Class[] {IAdditionalTestMethods.class}); ModelMBeanInfo inf = assembler.getMBeanInfo(getBean(), getObjectName()); MBeanAttributeInfo attr = inf.getAttribute("NickName"); diff --git a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java index aebf7d8e419..dbb46d53859 100644 --- a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java +++ b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java @@ -88,7 +88,7 @@ public class RmiSupportTests extends TestCase { doTestRmiProxyFactoryBeanWithException(UnmarshalException.class); } - private void doTestRmiProxyFactoryBeanWithException(Class exceptionClass) throws Exception { + private void doTestRmiProxyFactoryBeanWithException(Class exceptionClass) throws Exception { CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean(); factory.setServiceInterface(IRemoteBean.class); factory.setServiceUrl("rmi://localhost:1090/test"); @@ -130,7 +130,7 @@ public class RmiSupportTests extends TestCase { doTestRmiProxyFactoryBeanWithExceptionAndRefresh(StubNotFoundException.class); } - private void doTestRmiProxyFactoryBeanWithExceptionAndRefresh(Class exceptionClass) throws Exception { + private void doTestRmiProxyFactoryBeanWithExceptionAndRefresh(Class exceptionClass) throws Exception { CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean(); factory.setServiceInterface(IRemoteBean.class); factory.setServiceUrl("rmi://localhost:1090/test"); @@ -217,7 +217,7 @@ public class RmiSupportTests extends TestCase { } private void doTestRmiProxyFactoryBeanWithBusinessInterfaceAndException( - Class rmiExceptionClass, Class springExceptionClass) throws Exception { + Class rmiExceptionClass, Class springExceptionClass) throws Exception { CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean(); factory.setServiceInterface(IBusinessBean.class); @@ -272,7 +272,7 @@ public class RmiSupportTests extends TestCase { } private void doTestRmiProxyFactoryBeanWithBusinessInterfaceAndExceptionAndRefresh( - Class rmiExceptionClass, Class springExceptionClass) throws Exception { + Class rmiExceptionClass, Class springExceptionClass) throws Exception { CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean(); factory.setServiceInterface(IBusinessBean.class); @@ -319,7 +319,7 @@ public class RmiSupportTests extends TestCase { // let's see if the remote invocation object works final RemoteBean rb = new RemoteBean(); - final Method setNameMethod = rb.getClass().getDeclaredMethod("setName", new Class[] {String.class}); + final Method setNameMethod = rb.getClass().getDeclaredMethod("setName", new Class[] {String.class}); MethodInvocation mi = new MethodInvocation() { public Method getMethod() { @@ -351,10 +351,10 @@ public class RmiSupportTests extends TestCase { assertEquals("bla", inv.getArguments()[0]); inv.setMethodName("setName"); assertEquals("setName", inv.getMethodName()); - inv.setParameterTypes(new Class[] {String.class}); + inv.setParameterTypes(new Class[] {String.class}); assertEquals(String.class, inv.getParameterTypes()[0]); - inv = new RemoteInvocation("setName", new Class[] {String.class}, new Object[] {"bla"}); + inv = new RemoteInvocation("setName", new Class[] {String.class}, new Object[] {"bla"}); assertEquals("bla", inv.getArguments()[0]); assertEquals("setName", inv.getMethodName()); assertEquals(String.class, inv.getParameterTypes()[0]); @@ -436,8 +436,8 @@ public class RmiSupportTests extends TestCase { if (nam != null && nam.endsWith("Exception")) { RemoteException rex = null; try { - Class exClass = Class.forName(nam); - Constructor ctor = exClass.getConstructor(new Class[] {String.class}); + Class exClass = Class.forName(nam); + Constructor ctor = exClass.getConstructor(new Class[] {String.class}); rex = (RemoteException) ctor.newInstance(new Object[] {"myMessage"}); } catch (Exception ex) { diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java index 5886a912eae..2659b23576b 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java @@ -48,7 +48,7 @@ public class TimerSupportTests extends TestCase { tasks[1] = new ScheduledTimerTask(timerTask1, 10, 20, true); tasks[2] = new ScheduledTimerTask(timerTask2, 20); - final List success = new ArrayList(3); + final List success = new ArrayList(3); final Timer timer = new Timer(true) { public void schedule(TimerTask task, long delay, long period) { if (task == timerTask0 && delay == 0 && period == 10) { diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java index 9dfbf55a77f..90582292d41 100644 --- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java @@ -199,9 +199,9 @@ public class BshScriptFactoryTests extends TestCase { mock.replay(); BshScriptFactory factory = new BshScriptFactory( ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX + badScript, - new Class[] {Messenger.class}); + new Class[] {Messenger.class}); try { - Messenger messenger = (Messenger) factory.getScriptedObject(script, new Class[]{Messenger.class}); + Messenger messenger = (Messenger) factory.getScriptedObject(script, new Class[]{Messenger.class}); messenger.getMessage(); fail("Must have thrown a BshScriptUtils.BshExecutionException."); } @@ -212,7 +212,7 @@ public class BshScriptFactoryTests extends TestCase { public void testCtorWithNullScriptSourceLocator() throws Exception { try { - new BshScriptFactory(null, new Class[] {Messenger.class}); + new BshScriptFactory(null, new Class[] {Messenger.class}); fail("Must have thrown exception by this point."); } catch (IllegalArgumentException expected) { @@ -221,7 +221,7 @@ public class BshScriptFactoryTests extends TestCase { public void testCtorWithEmptyScriptSourceLocator() throws Exception { try { - new BshScriptFactory("", new Class[] {Messenger.class}); + new BshScriptFactory("", new Class[] {Messenger.class}); fail("Must have thrown exception by this point."); } catch (IllegalArgumentException expected) { @@ -230,7 +230,7 @@ public class BshScriptFactoryTests extends TestCase { public void testCtorWithWhitespacedScriptSourceLocator() throws Exception { try { - new BshScriptFactory("\n ", new Class[] {Messenger.class}); + new BshScriptFactory("\n ", new Class[] {Messenger.class}); fail("Must have thrown exception by this point."); } catch (IllegalArgumentException expected) { @@ -241,7 +241,7 @@ public class BshScriptFactoryTests extends TestCase { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bsh-with-xsd.xml", getClass()); TestBean testBean = (TestBean) ctx.getBean("testBean"); - Collection beanNames = Arrays.asList(ctx.getBeanNamesForType(Messenger.class)); + Collection beanNames = Arrays.asList(ctx.getBeanNamesForType(Messenger.class)); assertTrue(beanNames.contains("messenger")); assertTrue(beanNames.contains("messengerImpl")); assertTrue(beanNames.contains("messengerInstance")); @@ -262,7 +262,7 @@ public class BshScriptFactoryTests extends TestCase { TestBeanAwareMessenger messengerByName = (TestBeanAwareMessenger) ctx.getBean("messengerByName"); assertEquals(testBean, messengerByName.getTestBean()); - Collection beans = ctx.getBeansOfType(Messenger.class).values(); + Collection beans = ctx.getBeansOfType(Messenger.class).values(); assertTrue(beans.contains(messenger)); assertTrue(beans.contains(messengerImpl)); assertTrue(beans.contains(messengerInstance)); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java index 530559a6b47..132d9211c05 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java @@ -34,12 +34,12 @@ public class GroovyClassLoadingTests extends TestCase { StaticApplicationContext context = new StaticApplicationContext(); GroovyClassLoader gcl = new GroovyClassLoader(); - Class class1 = gcl.parseClass("class TestBean { def myMethod() { \"foo\" } }"); - Class class2 = gcl.parseClass("class TestBean { def myMethod() { \"bar\" } }"); + Class class1 = gcl.parseClass("class TestBean { def myMethod() { \"foo\" } }"); + Class class2 = gcl.parseClass("class TestBean { def myMethod() { \"bar\" } }"); context.registerBeanDefinition("testBean", new RootBeanDefinition(class1)); Object testBean1 = context.getBean("testBean"); - Method method1 = class1.getDeclaredMethod("myMethod", new Class[0]); + Method method1 = class1.getDeclaredMethod("myMethod", new Class[0]); Object result1 = ReflectionUtils.invokeMethod(method1, testBean1); assertEquals("foo", (String) result1); @@ -48,7 +48,7 @@ public class GroovyClassLoadingTests extends TestCase { context.registerBeanDefinition("testBean", new RootBeanDefinition(class2)); Object testBean2 = context.getBean("testBean"); - Method method2 = class2.getDeclaredMethod("myMethod", new Class[0]); + Method method2 = class2.getDeclaredMethod("myMethod", new Class[0]); Object result2 = ReflectionUtils.invokeMethod(method2, testBean2); assertEquals("bar", (String) result2); } diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java index d43f90950b8..763827a05a0 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java @@ -201,7 +201,7 @@ public class GroovyScriptFactoryTests { GroovyScriptFactory factory = new GroovyScriptFactory(ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX + badScript); try { - factory.getScriptedObject(script, new Class[] {}); + factory.getScriptedObject(script, new Class[] {}); fail("Must have thrown a ScriptCompilationException (no public no-arg ctor in scripted class)."); } catch (ScriptCompilationException expected) { assertTrue(expected.contains(InstantiationException.class)); @@ -219,7 +219,7 @@ public class GroovyScriptFactoryTests { GroovyScriptFactory factory = new GroovyScriptFactory(ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX + badScript); try { - factory.getScriptedObject(script, new Class[] {}); + factory.getScriptedObject(script, new Class[] {}); fail("Must have thrown a ScriptCompilationException (no oublic no-arg ctor in scripted class)."); } catch (ScriptCompilationException expected) { assertTrue(expected.contains(IllegalAccessException.class)); @@ -402,7 +402,7 @@ public class GroovyScriptFactoryTests { @Test public void testAnonymousScriptDetected() throws Exception { ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass()); - Map beans = ctx.getBeansOfType(Messenger.class); + Map beans = ctx.getBeansOfType(Messenger.class); assertEquals(4, beans.size()); } diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java index 63de6c42074..cc7e1ce392f 100644 --- a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java @@ -94,7 +94,7 @@ public class JRubyScriptFactoryTests extends TestCase { public void testCtorWithNullScriptSourceLocator() throws Exception { try { - new JRubyScriptFactory(null, new Class[]{Messenger.class}); + new JRubyScriptFactory(null, new Class[]{Messenger.class}); fail("Must have thrown exception by this point."); } catch (IllegalArgumentException expected) { @@ -103,7 +103,7 @@ public class JRubyScriptFactoryTests extends TestCase { public void testCtorWithEmptyScriptSourceLocator() throws Exception { try { - new JRubyScriptFactory("", new Class[]{Messenger.class}); + new JRubyScriptFactory("", new Class[]{Messenger.class}); fail("Must have thrown exception by this point."); } catch (IllegalArgumentException expected) { @@ -112,7 +112,7 @@ public class JRubyScriptFactoryTests extends TestCase { public void testCtorWithWhitespacedScriptSourceLocator() throws Exception { try { - new JRubyScriptFactory("\n ", new Class[]{Messenger.class}); + new JRubyScriptFactory("\n ", new Class[]{Messenger.class}); fail("Must have thrown exception by this point."); } catch (IllegalArgumentException expected) { @@ -130,7 +130,7 @@ public class JRubyScriptFactoryTests extends TestCase { public void testCtorWithEmptyScriptInterfacesArray() throws Exception { try { - new JRubyScriptFactory(RUBY_SCRIPT_SOURCE_LOCATOR, new Class[]{}); + new JRubyScriptFactory(RUBY_SCRIPT_SOURCE_LOCATOR, new Class[]{}); fail("Must have thrown exception by this point."); } catch (IllegalArgumentException expected) { @@ -250,14 +250,14 @@ public class JRubyScriptFactoryTests extends TestCase { assertEquals("2", lol[1][0]); assertEquals("3", lol[2][0]); - Map singleValueMap = adder.toMap("key", "value"); + Map singleValueMap = adder.toMap("key", "value"); assertNotNull(singleValueMap); assertEquals(1, singleValueMap.size()); assertEquals("key", singleValueMap.keySet().iterator().next()); assertEquals("value", singleValueMap.values().iterator().next()); String[] expectedStrings = new String[]{"1", "2", "3"}; - Map map = adder.toMap("key", expectedStrings); + Map map = adder.toMap("key", expectedStrings); assertNotNull(map); assertEquals(1, map.size()); assertEquals("key", map.keySet().iterator().next()); diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java index 2656c8a60e2..3e0589c7b32 100644 --- a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java +++ b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java @@ -47,6 +47,6 @@ public interface WrapperAdder { String[][] createListOfLists(String one, String second, String third); - Map toMap(String key, Object value); + Map toMap(String key, Object value); } diff --git a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java index 0478ed29096..336fe78e678 100644 --- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java +++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java @@ -276,7 +276,7 @@ public final class ModelMapTests { ModelMap map = new ModelMap(); Object proxy = Proxy.newProxyInstance( getClass().getClassLoader(), - new Class[] {Map.class}, + new Class[] {Map.class}, new InvocationHandler() { public Object invoke(Object proxy, Method method, Object[] args) { return "proxy"; diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java index 96d4b6fb0cb..b1ba9804d28 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java @@ -50,7 +50,7 @@ public class DataBinderFieldAccessTests extends TestCase { assertTrue("changed name correctly", rod.getName().equals("Rod")); assertTrue("changed age correctly", rod.getAge() == 32); - Map m = binder.getBindingResult().getModel(); + Map m = binder.getBindingResult().getModel(); assertTrue("There is one element in map", m.size() == 2); FieldAccessBean tb = (FieldAccessBean) m.get("person"); assertTrue("Same object", tb.equals(rod)); @@ -92,7 +92,7 @@ public class DataBinderFieldAccessTests extends TestCase { assertTrue("changed name correctly", rod.getName().equals("Rod")); //assertTrue("changed age correctly", rod.getAge() == 32); - Map map = binder.getBindingResult().getModel(); + Map map = binder.getBindingResult().getModel(); //assertTrue("There are 3 element in map", m.size() == 1); FieldAccessBean tb = (FieldAccessBean) map.get("person"); assertTrue("Same object", tb.equals(rod)); @@ -136,7 +136,7 @@ public class DataBinderFieldAccessTests extends TestCase { assertTrue("changed name correctly", rod.getName().equals("Rod")); //assertTrue("changed age correctly", rod.getAge() == 32); - Map model = binder.getBindingResult().getModel(); + Map model = binder.getBindingResult().getModel(); //assertTrue("There are 3 element in map", m.size() == 1); FieldAccessBean tb = (FieldAccessBean) model.get("person"); assertTrue("Same object", tb.equals(rod)); diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java index ea9fd94b115..c9f12660a17 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -80,7 +80,7 @@ public class DataBinderTests extends TestCase { assertTrue("changed name correctly", rod.getName().equals("Rod")); assertTrue("changed age correctly", rod.getAge() == 32); - Map map = binder.getBindingResult().getModel(); + Map map = binder.getBindingResult().getModel(); assertTrue("There is one element in map", map.size() == 2); TestBean tb = (TestBean) map.get("person"); assertTrue("Same object", tb.equals(rod)); @@ -190,7 +190,7 @@ public class DataBinderTests extends TestCase { assertTrue("changed name correctly", rod.getName().equals("Rod")); //assertTrue("changed age correctly", rod.getAge() == 32); - Map map = binder.getBindingResult().getModel(); + Map map = binder.getBindingResult().getModel(); //assertTrue("There are 3 element in map", m.size() == 1); TestBean tb = (TestBean) map.get("person"); assertTrue("Same object", tb.equals(rod)); @@ -284,7 +284,7 @@ public class DataBinderTests extends TestCase { assertTrue("changed name correctly", rod.getName().equals("Rod")); //assertTrue("changed age correctly", rod.getAge() == 32); - Map model = binder.getBindingResult().getModel(); + Map model = binder.getBindingResult().getModel(); //assertTrue("There are 3 element in map", m.size() == 1); TestBean tb = (TestBean) model.get("person"); assertTrue("Same object", tb.equals(rod)); @@ -1177,8 +1177,8 @@ public class DataBinderTests extends TestCase { pvs.add("array[0].nestedIndexedBean.list[0].name", "test1"); pvs.add("array[1].nestedIndexedBean.list[1].name", "test2"); binder.bind(pvs); - assertEquals("listtest1", ((TestBean) tb.getArray()[0].getNestedIndexedBean().getList().get(0)).getName()); - assertEquals("listtest2", ((TestBean) tb.getArray()[1].getNestedIndexedBean().getList().get(1)).getName()); + assertEquals("listtest1", tb.getArray()[0].getNestedIndexedBean().getList().get(0).getName()); + assertEquals("listtest2", tb.getArray()[1].getNestedIndexedBean().getList().get(1).getName()); assertEquals("test1", binder.getBindingResult().getFieldValue("array[0].nestedIndexedBean.list[0].name")); assertEquals("test2", binder.getBindingResult().getFieldValue("array[1].nestedIndexedBean.list[1].name")); } @@ -1200,8 +1200,8 @@ public class DataBinderTests extends TestCase { pvs.add("array[0].nestedIndexedBean.list[0].name", "test1"); pvs.add("array[1].nestedIndexedBean.list[1].name", "test2"); binder.bind(pvs); - assertEquals("listtest1", ((TestBean) tb.getArray()[0].getNestedIndexedBean().getList().get(0)).getName()); - assertEquals("test2", ((TestBean) tb.getArray()[1].getNestedIndexedBean().getList().get(1)).getName()); + assertEquals("listtest1", tb.getArray()[0].getNestedIndexedBean().getList().get(0).getName()); + assertEquals("test2", tb.getArray()[1].getNestedIndexedBean().getList().get(1).getName()); assertEquals("test1", binder.getBindingResult().getFieldValue("array[0].nestedIndexedBean.list[0].name")); assertEquals("test2", binder.getBindingResult().getFieldValue("array[1].nestedIndexedBean.list[1].name")); } @@ -1223,8 +1223,8 @@ public class DataBinderTests extends TestCase { pvs.add("array[0].nestedIndexedBean.list[0].name", "test1"); pvs.add("array[1].nestedIndexedBean.list[1].name", "test2"); binder.bind(pvs); - assertEquals("listtest1", ((TestBean) tb.getArray()[0].getNestedIndexedBean().getList().get(0)).getName()); - assertEquals("test2", ((TestBean) tb.getArray()[1].getNestedIndexedBean().getList().get(1)).getName()); + assertEquals("listtest1", tb.getArray()[0].getNestedIndexedBean().getList().get(0).getName()); + assertEquals("test2", tb.getArray()[1].getNestedIndexedBean().getList().get(1).getName()); assertEquals("test1", binder.getBindingResult().getFieldValue("array[0].nestedIndexedBean.list[0].name")); assertEquals("test2", binder.getBindingResult().getFieldValue("array[1].nestedIndexedBean.list[1].name")); } @@ -1647,7 +1647,7 @@ public class DataBinderTests extends TestCase { private static class TestBeanValidator implements Validator { - public boolean supports(Class clazz) { + public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } @@ -1674,7 +1674,7 @@ public class DataBinderTests extends TestCase { private static class SpouseValidator implements Validator { - public boolean supports(Class clazz) { + public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } diff --git a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java index 11235906e3f..4ab4f448f4c 100644 --- a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java +++ b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java @@ -161,7 +161,7 @@ public class ValidationUtilsTests { private static class EmptyValidator implements Validator { - public boolean supports(Class clazz) { + public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } @@ -173,7 +173,7 @@ public class ValidationUtilsTests { private static class EmptyOrWhitespaceValidator implements Validator { - public boolean supports(Class clazz) { + public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java index dbfe0b7d1a8..41f500d93ef 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java @@ -95,7 +95,7 @@ public class ValidatorFactoryTests { Set> result = validator.validate(person); assertEquals(1, result.size()); Iterator> iterator = result.iterator(); - ConstraintViolation cv = iterator.next(); + ConstraintViolation cv = iterator.next(); assertEquals("", cv.getPropertyPath().toString()); assertTrue(cv.getConstraintDescriptor().getAnnotation() instanceof NameAddressValid); } diff --git a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java index ce42c75d7c2..a9fb6e6a5fb 100644 --- a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java +++ b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java @@ -41,15 +41,15 @@ public class ConventionsTests extends TestCase { } public void testCollections() { - List list = new ArrayList(); + List list = new ArrayList(); list.add(new TestBean()); assertEquals("Incorrect plural List form", "testBeanList", Conventions.getVariableName(list)); - Set set = new HashSet(); + Set set = new HashSet(); set.add(new TestBean()); assertEquals("Incorrect plural Set form", "testBeanList", Conventions.getVariableName(set)); - List emptyList = new ArrayList(); + List emptyList = new ArrayList(); try { Conventions.getVariableName(emptyList); fail("Should not be able to generate name for empty collection"); @@ -67,7 +67,7 @@ public class ConventionsTests extends TestCase { public void testGetQualifiedAttributeName() throws Exception { String baseName = "foo"; - Class cls = String.class; + Class cls = String.class; String desiredResult = "java.lang.String.foo"; assertEquals(desiredResult, Conventions.getQualifiedAttributeName(cls, baseName)); } diff --git a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java index da27d69e71b..8a6ba96d625 100644 --- a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java +++ b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java @@ -50,14 +50,14 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { } public void testConsParameterNameDiscoveryNoArgs() throws NoSuchMethodException { - Constructor noArgsCons = TestBean.class.getConstructor(new Class[0]); + Constructor noArgsCons = TestBean.class.getConstructor(new Class[0]); String[] names = discoverer.getParameterNames(noArgsCons); assertNotNull("should find cons info", names); assertEquals("no argument names", 0, names.length); } public void testConsParameterNameDiscoveryArgs() throws NoSuchMethodException { - Constructor twoArgCons = TestBean.class.getConstructor(new Class[] { String.class, int.class }); + Constructor twoArgCons = TestBean.class.getConstructor(new Class[] { String.class, int.class }); String[] names = discoverer.getParameterNames(twoArgCons); assertNotNull("should find cons info", names); assertEquals("one argument", 2, names.length); @@ -73,7 +73,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { } public void testOverloadedStaticMethod() throws Exception { - Class clazz = this.getClass(); + Class clazz = this.getClass(); Method m1 = clazz.getMethod("staticMethod", new Class[] { Long.TYPE, Long.TYPE }); String[] names = discoverer.getParameterNames(m1); @@ -92,7 +92,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { } public void testOverloadedStaticMethodInInnerClass() throws Exception { - Class clazz = InnerClass.class; + Class clazz = InnerClass.class; Method m1 = clazz.getMethod("staticMethod", new Class[] { Long.TYPE }); String[] names = discoverer.getParameterNames(m1); @@ -109,7 +109,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { } public void testOverloadedMethod() throws Exception { - Class clazz = this.getClass(); + Class clazz = this.getClass(); Method m1 = clazz.getMethod("instanceMethod", new Class[] { Double.TYPE, Double.TYPE }); String[] names = discoverer.getParameterNames(m1); @@ -128,7 +128,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { } public void testOverloadedMethodInInnerClass() throws Exception { - Class clazz = InnerClass.class; + Class clazz = InnerClass.class; Method m1 = clazz.getMethod("instanceMethod", new Class[] { String.class }); String[] names = discoverer.getParameterNames(m1); @@ -145,9 +145,9 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { } public void testGenerifiedClass() throws Exception { - Class clazz = GenerifiedClass.class; + Class clazz = (Class)GenerifiedClass.class; - Constructor ctor = clazz.getDeclaredConstructor(Object.class); + Constructor ctor = clazz.getDeclaredConstructor(Object.class); String[] names = discoverer.getParameterNames(ctor); assertEquals(1, names.length); assertEquals("key", names[0]); @@ -199,7 +199,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { @Ignore public void ignore_testClassesWithoutDebugSymbols() throws Exception { // JDK classes don't have debug information (usually) - Class clazz = Component.class; + Class clazz = Component.class; String methodName = "list"; Method m = clazz.getMethod(methodName); @@ -275,9 +275,6 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { public static class GenerifiedClass { private static long date; - private K key; - private V value; - static { // some custom static bloc or date = new Date().getTime(); @@ -292,8 +289,6 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase { } public GenerifiedClass(K key, V value) { - this.key = key; - this.value = value; } public static

long generifiedStaticMethod(P param) { diff --git a/spring-core/src/test/java/org/springframework/util/AssertTests.java b/spring-core/src/test/java/org/springframework/util/AssertTests.java index 2fe76022f0c..59cf2a92613 100644 --- a/spring-core/src/test/java/org/springframework/util/AssertTests.java +++ b/spring-core/src/test/java/org/springframework/util/AssertTests.java @@ -38,7 +38,7 @@ public class AssertTests { @Test(expected = IllegalArgumentException.class) public void instanceOf() { - final Set set = new HashSet(); + final Set set = new HashSet(); Assert.isInstanceOf(HashSet.class, set); Assert.isInstanceOf(HashMap.class, set); } @@ -105,12 +105,12 @@ public class AssertTests { @Test(expected = IllegalArgumentException.class) public void assertNotEmptyWithNullCollectionThrowsException() throws Exception { - Assert.notEmpty((Collection) null); + Assert.notEmpty((Collection) null); } @Test(expected = IllegalArgumentException.class) public void assertNotEmptyWithEmptyCollectionThrowsException() throws Exception { - Assert.notEmpty(new ArrayList()); + Assert.notEmpty(new ArrayList()); } @Test @@ -122,12 +122,12 @@ public class AssertTests { @Test(expected = IllegalArgumentException.class) public void assertNotEmptyWithNullMapThrowsException() throws Exception { - Assert.notEmpty((Map) null); + Assert.notEmpty((Map) null); } @Test(expected = IllegalArgumentException.class) public void assertNotEmptyWithEmptyMapThrowsException() throws Exception { - Assert.notEmpty(new HashMap()); + Assert.notEmpty(new HashMap()); } @Test diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java index cca9da12e61..d7bdd36e41b 100644 --- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java +++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java @@ -30,22 +30,22 @@ import org.springframework.beans.TestBean; public class AutoPopulatingListTests extends TestCase { public void testWithClass() throws Exception { - doTestWithClass(new AutoPopulatingList(TestBean.class)); + doTestWithClass(new AutoPopulatingList(TestBean.class)); } public void testWithClassAndUserSuppliedBackingList() throws Exception { - doTestWithClass(new AutoPopulatingList(new LinkedList(), TestBean.class)); + doTestWithClass(new AutoPopulatingList(new LinkedList(), TestBean.class)); } public void testWithElementFactory() throws Exception { - doTestWithElementFactory(new AutoPopulatingList(new MockElementFactory())); + doTestWithElementFactory(new AutoPopulatingList(new MockElementFactory())); } public void testWithElementFactoryAndUserSuppliedBackingList() throws Exception { - doTestWithElementFactory(new AutoPopulatingList(new LinkedList(), new MockElementFactory())); + doTestWithElementFactory(new AutoPopulatingList(new LinkedList(), new MockElementFactory())); } - private void doTestWithClass(AutoPopulatingList list) { + private void doTestWithClass(AutoPopulatingList list) { Object lastElement = null; for (int x = 0; x < 10; x++) { Object element = list.get(x); @@ -66,7 +66,7 @@ public class AutoPopulatingListTests extends TestCase { assertTrue(list.get(20) instanceof TestBean); } - private void doTestWithElementFactory(AutoPopulatingList list) { + private void doTestWithElementFactory(AutoPopulatingList list) { doTestWithClass(list); for(int x = 0; x < list.size(); x++) { @@ -78,7 +78,7 @@ public class AutoPopulatingListTests extends TestCase { } public void testSerialization() throws Exception { - AutoPopulatingList list = new AutoPopulatingList(TestBean.class); + AutoPopulatingList list = new AutoPopulatingList(TestBean.class); Assert.assertEquals(list, SerializationTestUtils.serializeAndDeserialize(list)); } diff --git a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java index 820755a0917..fea68d8ed2c 100644 --- a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java @@ -40,16 +40,16 @@ public class CollectionUtilsTests { @Test public void testIsEmpty() { - assertTrue(CollectionUtils.isEmpty((Set) null)); - assertTrue(CollectionUtils.isEmpty((Map) null)); - assertTrue(CollectionUtils.isEmpty(new HashMap())); - assertTrue(CollectionUtils.isEmpty(new HashSet())); + assertTrue(CollectionUtils.isEmpty((Set) null)); + assertTrue(CollectionUtils.isEmpty((Map) null)); + assertTrue(CollectionUtils.isEmpty(new HashMap())); + assertTrue(CollectionUtils.isEmpty(new HashSet())); - List list = new LinkedList(); + List list = new LinkedList(); list.add(new Object()); assertFalse(CollectionUtils.isEmpty(list)); - Map map = new HashMap(); + Map map = new HashMap(); map.put("foo", "bar"); assertFalse(CollectionUtils.isEmpty(map)); } @@ -57,7 +57,7 @@ public class CollectionUtilsTests { @Test public void testMergeArrayIntoCollection() { Object[] arr = new Object[] {"value1", "value2"}; - List list = new LinkedList(); + List> list = new LinkedList>(); list.add("value3"); CollectionUtils.mergeArrayIntoCollection(arr, list); @@ -69,7 +69,7 @@ public class CollectionUtilsTests { @Test public void testMergePrimitiveArrayIntoCollection() { int[] arr = new int[] {1, 2}; - List list = new LinkedList(); + List> list = new LinkedList>(); list.add(new Integer(3)); CollectionUtils.mergeArrayIntoCollection(arr, list); @@ -86,7 +86,7 @@ public class CollectionUtilsTests { props.setProperty("prop2", "value2"); props.put("prop3", new Integer(3)); - Map map = new HashMap(); + Map map = new HashMap(); map.put("prop4", "value4"); CollectionUtils.mergePropertiesIntoMap(props, map); @@ -98,28 +98,28 @@ public class CollectionUtilsTests { @Test public void testContains() { - assertFalse(CollectionUtils.contains((Iterator) null, "myElement")); - assertFalse(CollectionUtils.contains((Enumeration) null, "myElement")); - assertFalse(CollectionUtils.contains(new LinkedList().iterator(), "myElement")); - assertFalse(CollectionUtils.contains(new Hashtable().keys(), "myElement")); + assertFalse(CollectionUtils.contains((Iterator) null, "myElement")); + assertFalse(CollectionUtils.contains((Enumeration) null, "myElement")); + assertFalse(CollectionUtils.contains(new LinkedList().iterator(), "myElement")); + assertFalse(CollectionUtils.contains(new Hashtable().keys(), "myElement")); - List list = new LinkedList(); + List list = new LinkedList(); list.add("myElement"); assertTrue(CollectionUtils.contains(list.iterator(), "myElement")); - Hashtable ht = new Hashtable(); + Hashtable ht = new Hashtable(); ht.put("myElement", "myValue"); assertTrue(CollectionUtils.contains(ht.keys(), "myElement")); } @Test public void testContainsAny() throws Exception { - List source = new ArrayList(); + List source = new ArrayList(); source.add("abc"); source.add("def"); source.add("ghi"); - List candidates = new ArrayList(); + List candidates = new ArrayList(); candidates.add("xyz"); candidates.add("def"); candidates.add("abc"); @@ -139,7 +139,7 @@ public class CollectionUtilsTests { @Test public void testContainsInstanceWithInstancesThatAreEqualButDistinct() throws Exception { - List list = new ArrayList(); + List list = new ArrayList(); list.add(new Instance("fiona")); assertFalse("Must return false if instance is not in the supplied Collection argument", CollectionUtils.containsInstance(list, new Instance("fiona"))); @@ -147,7 +147,7 @@ public class CollectionUtilsTests { @Test public void testContainsInstanceWithSameInstance() throws Exception { - List list = new ArrayList(); + List list = new ArrayList(); list.add(new Instance("apple")); Instance instance = new Instance("fiona"); list.add(instance); @@ -157,7 +157,7 @@ public class CollectionUtilsTests { @Test public void testContainsInstanceWithNullInstance() throws Exception { - List list = new ArrayList(); + List list = new ArrayList(); list.add(new Instance("apple")); list.add(new Instance("fiona")); assertFalse("Must return false if null instance is supplied", @@ -166,12 +166,12 @@ public class CollectionUtilsTests { @Test public void testFindFirstMatch() throws Exception { - List source = new ArrayList(); + List source = new ArrayList(); source.add("abc"); source.add("def"); source.add("ghi"); - List candidates = new ArrayList(); + List candidates = new ArrayList(); candidates.add("xyz"); candidates.add("def"); candidates.add("abc"); @@ -181,35 +181,35 @@ public class CollectionUtilsTests { @Test public void testHasUniqueObject() { - List list = new LinkedList(); + List list = new LinkedList(); list.add("myElement"); list.add("myOtherElement"); assertFalse(CollectionUtils.hasUniqueObject(list)); - list = new LinkedList(); + list = new LinkedList(); list.add("myElement"); assertTrue(CollectionUtils.hasUniqueObject(list)); - list = new LinkedList(); + list = new LinkedList(); list.add("myElement"); list.add(null); assertFalse(CollectionUtils.hasUniqueObject(list)); - list = new LinkedList(); + list = new LinkedList(); list.add(null); list.add("myElement"); assertFalse(CollectionUtils.hasUniqueObject(list)); - list = new LinkedList(); + list = new LinkedList(); list.add(null); list.add(null); assertTrue(CollectionUtils.hasUniqueObject(list)); - list = new LinkedList(); + list = new LinkedList(); list.add(null); assertTrue(CollectionUtils.hasUniqueObject(list)); - list = new LinkedList(); + list = new LinkedList(); assertFalse(CollectionUtils.hasUniqueObject(list)); } diff --git a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java index 955d788c746..bb9e5700fee 100644 --- a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java +++ b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java @@ -43,14 +43,14 @@ public class MethodInvokerTests extends TestCase { mi = new MethodInvoker(); mi.setTargetClass(TestClass1.class); mi.setTargetMethod("supertypes"); - mi.setArguments(new Object[] {new ArrayList(), new ArrayList(), "hello"}); + mi.setArguments(new Object[] {new ArrayList<>(), new ArrayList<>(), "hello"}); mi.prepare(); assertEquals("hello", mi.invoke()); mi = new MethodInvoker(); mi.setTargetClass(TestClass1.class); mi.setTargetMethod("supertypes2"); - mi.setArguments(new Object[] {new ArrayList(), new ArrayList(), "hello", "bogus"}); + mi.setArguments(new Object[] {new ArrayList<>(), new ArrayList<>(), "hello", "bogus"}); mi.prepare(); assertEquals("hello", mi.invoke()); @@ -58,7 +58,7 @@ public class MethodInvokerTests extends TestCase { mi = new MethodInvoker(); mi.setTargetClass(TestClass1.class); mi.setTargetMethod("supertypes2"); - mi.setArguments(new Object[] {new ArrayList(), new ArrayList(), "hello", Boolean.TRUE}); + mi.setArguments(new Object[] {new ArrayList<>(), new ArrayList<>(), "hello", Boolean.TRUE}); try { mi.prepare(); fail("Shouldn't have matched without argument conversion"); @@ -169,23 +169,23 @@ public class MethodInvokerTests extends TestCase { public static void intArguments(int[] arg) { } - public static String supertypes(Collection c, Integer i) { + public static String supertypes(Collection c, Integer i) { return i.toString(); } - public static String supertypes(Collection c, List l, String s) { + public static String supertypes(Collection c, List l, String s) { return s; } - public static String supertypes2(Collection c, List l, Integer i) { + public static String supertypes2(Collection c, List l, Integer i) { return i.toString(); } - public static String supertypes2(Collection c, List l, String s, Integer i) { + public static String supertypes2(Collection c, List l, String s, Integer i) { return s; } - public static String supertypes2(Collection c, List l, String s, String s2) { + public static String supertypes2(Collection c, List l, String s, String s2) { return s; } } From 4c7cafbde63548b3538ee90921d5c393f0bbf367 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 28 Dec 2012 19:16:22 +0100 Subject: [PATCH 7/9] Fix "unnecessary @SuppressWarnings" warnings --- .../aop/support/DefaultIntroductionAdvisor.java | 2 +- .../io/support/PathMatchingResourcePatternResolver.java | 1 - .../main/java/org/springframework/util/ClassUtils.java | 8 +++++--- .../util/comparator/NullSafeComparator.java | 2 +- .../jdbc/core/metadata/GenericTableMetaDataProvider.java | 1 - .../orm/jpa/persistenceunit/PersistenceUnitReader.java | 4 ---- .../test/context/web/ServletTestExecutionListener.java | 1 - .../org/springframework/test/jpa/AbstractJpaTests.java | 2 -- .../web/context/request/async/WebAsyncManager.java | 2 +- .../support/ServletContextResourcePatternResolver.java | 1 - .../support/DefaultMultipartHttpServletRequest.java | 1 - .../main/java/org/springframework/web/util/WebUtils.java | 1 - .../xml/Jaxb2RootElementHttpMessageConverterTest.java | 3 --- .../portlet/multipart/DefaultMultipartActionRequest.java | 1 - 14 files changed, 8 insertions(+), 22 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java index 36c81c130ba..f9a7e33e5dd 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java @@ -38,7 +38,7 @@ import org.springframework.util.ClassUtils; * @author Juergen Hoeller * @since 11.11.2003 */ -@SuppressWarnings({ "unchecked", "serial" }) +@SuppressWarnings({"serial" }) public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFilter, Ordered, Serializable { private final Advice advice; diff --git a/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java b/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java index 128465c9643..9b2f8493b66 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java @@ -714,7 +714,6 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol return this.resources; } - @SuppressWarnings("unused") public int size() { return this.resources.size(); } diff --git a/spring-core/src/main/java/org/springframework/util/ClassUtils.java b/spring-core/src/main/java/org/springframework/util/ClassUtils.java index 26f1fafe033..467b0f7cb6e 100644 --- a/spring-core/src/main/java/org/springframework/util/ClassUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ClassUtils.java @@ -17,12 +17,15 @@ package org.springframework.util; import java.beans.Introspector; + import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.Proxy; + import java.security.AccessControlException; + import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -47,7 +50,6 @@ import java.util.Set; * @see TypeUtils * @see ReflectionUtils */ -@SuppressWarnings("unchecked") public abstract class ClassUtils { /** Suffix for array class names: "[]" */ @@ -114,9 +116,9 @@ public abstract class ClassUtils { Set> primitiveTypes = new HashSet>(32); primitiveTypes.addAll(primitiveWrapperTypeMap.values()); - primitiveTypes.addAll(Arrays.asList( + primitiveTypes.addAll(Arrays.asList(new Class[] { boolean[].class, byte[].class, char[].class, double[].class, - float[].class, int[].class, long[].class, short[].class)); + float[].class, int[].class, long[].class, short[].class})); primitiveTypes.add(void.class); for (Class primitiveType : primitiveTypes) { primitiveTypeNameMap.put(primitiveType.getName(), primitiveType); diff --git a/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java index 35f37a9eadc..1171bdc1d30 100644 --- a/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java +++ b/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java @@ -64,7 +64,7 @@ public class NullSafeComparator implements Comparator { * @see #NULLS_LOW * @see #NULLS_HIGH */ - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({ "unchecked"}) private NullSafeComparator(boolean nullsLow) { this.nonNullComparator = new ComparableComparator(); this.nullsLow = nullsLow; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java index 4869064edce..138518660a8 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java @@ -475,7 +475,6 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider { this.type = type; } - @SuppressWarnings("unused") public String getType() { return this.type; } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java index 3d4ae968453..78f00a9f2e9 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java @@ -293,7 +293,6 @@ class PersistenceUnitReader { /** * Parse the {@code property} XML elements. */ - @SuppressWarnings("unchecked") protected void parseProperties(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) { Element propRoot = DomUtils.getChildElementByTagName(persistenceUnit, PROPERTIES); if (propRoot == null) { @@ -310,7 +309,6 @@ class PersistenceUnitReader { /** * Parse the {@code class} XML elements. */ - @SuppressWarnings("unchecked") protected void parseManagedClasses(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) { List classes = DomUtils.getChildElementsByTagName(persistenceUnit, MANAGED_CLASS_NAME); for (Element element : classes) { @@ -323,7 +321,6 @@ class PersistenceUnitReader { /** * Parse the {@code mapping-file} XML elements. */ - @SuppressWarnings("unchecked") protected void parseMappingFiles(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) { List files = DomUtils.getChildElementsByTagName(persistenceUnit, MAPPING_FILE_NAME); for (Element element : files) { @@ -337,7 +334,6 @@ class PersistenceUnitReader { /** * Parse the {@code jar-file} XML elements. */ - @SuppressWarnings("unchecked") protected void parseJarFiles(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) throws IOException { List jars = DomUtils.getChildElementsByTagName(persistenceUnit, JAR_FILE_URL); for (Element element : jars) { diff --git a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java index 2d865d8afd5..01302bb1100 100644 --- a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java @@ -126,7 +126,6 @@ public class ServletTestExecutionListener extends AbstractTestExecutionListener RequestContextHolder.setRequestAttributes(servletWebRequest); if (wac instanceof ConfigurableApplicationContext) { - @SuppressWarnings("resource") ConfigurableApplicationContext configurableApplicationContext = (ConfigurableApplicationContext) wac; ConfigurableListableBeanFactory bf = configurableApplicationContext.getBeanFactory(); bf.registerResolvableDependency(MockHttpServletResponse.class, response); diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java index 060d7880a39..3afa5165861 100644 --- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java +++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java @@ -326,7 +326,6 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio private final LoadTimeWeaver ltw; - @SuppressWarnings("unused") public LoadTimeWeaverInjectingBeanPostProcessor(LoadTimeWeaver ltw) { this.ltw = ltw; } @@ -347,7 +346,6 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio private final ClassLoader shadowingClassLoader; - @SuppressWarnings("unused") public ShadowingLoadTimeWeaver(ClassLoader shadowingClassLoader) { this.shadowingClassLoader = shadowingClassLoader; } diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java index d5ec8642b94..2e104d8e75b 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java @@ -252,7 +252,7 @@ public final class WebAsyncManager { * @see #getConcurrentResult() * @see #getConcurrentResultContext() */ - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"unchecked" }) public void startCallableProcessing(final Callable callable, Object... processingContext) throws Exception { Assert.notNull(callable, "Callable must not be null"); startCallableProcessing(new WebAsyncTask(callable), processingContext); diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java index ec2fbecb8b9..e1e54b6b218 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java @@ -156,7 +156,6 @@ public class ServletContextResourcePatternResolver extends PathMatchingResourceP * @param result the Set of matching Resources to add to * @throws IOException if jar contents could not be retrieved */ - @SuppressWarnings("unchecked") private void doRetrieveMatchingJarEntries(String jarFilePath, String entryPattern, Set result) { if (logger.isDebugEnabled()) { logger.debug("Searching jar file [" + jarFilePath + "] for entries matching [" + entryPattern + "]"); diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java index 19d435b77d3..ab995b112fd 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java @@ -103,7 +103,6 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer } @Override - @SuppressWarnings("unchecked") public Map getParameterMap() { Map paramMap = new HashMap(); paramMap.putAll(super.getParameterMap()); diff --git a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java index d35ed572730..0a901294a09 100644 --- a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java @@ -573,7 +573,6 @@ public abstract class WebUtils { * @return the value of the parameter, or {@code null} * if the parameter does not exist in given request */ - @SuppressWarnings("unchecked") public static String findParameterValue(ServletRequest request, String name) { return findParameterValue(request.getParameterMap(), name); } diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java index 5763411e8e2..e2545123fe1 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java @@ -72,7 +72,6 @@ public class Jaxb2RootElementHttpMessageConverterTest { } @Test - @SuppressWarnings("unchecked") public void readXmlRootElement() throws Exception { byte[] body = "".getBytes("UTF-8"); MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); @@ -81,7 +80,6 @@ public class Jaxb2RootElementHttpMessageConverterTest { } @Test - @SuppressWarnings("unchecked") public void readXmlRootElementSubclass() throws Exception { byte[] body = "".getBytes("UTF-8"); MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); @@ -90,7 +88,6 @@ public class Jaxb2RootElementHttpMessageConverterTest { } @Test - @SuppressWarnings("unchecked") public void readXmlType() throws Exception { byte[] body = "".getBytes("UTF-8"); MockHttpInputMessage inputMessage = new MockHttpInputMessage(body); diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java index 550e08867dd..a2b8184f9aa 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java @@ -131,7 +131,6 @@ public class DefaultMultipartActionRequest extends ActionRequestWrapper implemen } @Override - @SuppressWarnings("unchecked") public Map getParameterMap() { Map paramMap = new HashMap(); paramMap.putAll(super.getParameterMap()); From 40357be72bcd687972c0778f03593d076fe05d98 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 19 Dec 2012 16:03:11 +0100 Subject: [PATCH 8/9] Fix various compiler warnings in spring-context All warning types other than [deprecation] and [unchecked] are now fixed in spring-context/src/test --- .../java/example/scannable/ServiceInvocationCounter.java | 3 +-- .../springframework/beans/factory/config/SimpleMapScope.java | 4 ++-- .../context/annotation/ConfigurationClassAndBFPPTests.java | 5 +---- .../java/org/springframework/validation/DataBinderTests.java | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java index fbaf713374c..292b0586568 100644 --- a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java +++ b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java @@ -40,8 +40,7 @@ public class ServiceInvocationCounter { @Before("serviceExecution()") public void countUse() { this.useCount++; - this.threadLocalCount.set(this.useCount); - System.out.println(""); + threadLocalCount.set(this.useCount); } public int getCount() { diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java index 9ae909d7b71..604d2595b01 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java @@ -70,8 +70,8 @@ public class SimpleMapScope implements Scope, Serializable { } public void close() { - for (Iterator it = this.callbacks.iterator(); it.hasNext();) { - Runnable runnable = (Runnable) it.next(); + for (Iterator it = this.callbacks.iterator(); it.hasNext();) { + Runnable runnable = it.next(); runnable.run(); } } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java index 060c9f6bf2c..d917b0d6086 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java @@ -99,14 +99,11 @@ public class ConfigurationClassAndBFPPTests { @Test - @SuppressWarnings("static-access") public void staticBeanMethodsDoNotRespectScoping() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(ConfigWithStaticBeanMethod.class); ctx.refresh(); - - ConfigWithStaticBeanMethod config = ctx.getBean(ConfigWithStaticBeanMethod.class); - assertThat(config.testBean(), not(sameInstance(config.testBean()))); + assertThat(ConfigWithStaticBeanMethod.testBean(), not(sameInstance(ConfigWithStaticBeanMethod.testBean()))); } diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java index c9f12660a17..e85cf9a6234 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -1444,7 +1444,6 @@ public class DataBinderTests extends TestCase { assertEquals("badName", nameError.getCode()); } - @SuppressWarnings("unchecked") public void testBindingWithResortedList() { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); @@ -1590,6 +1589,7 @@ public class DataBinderTests extends TestCase { mpv.add("f[list][1]", "secondValue"); binder.bind(mpv); assertFalse(binder.getBindingResult().hasErrors()); + @SuppressWarnings("unchecked") List list = (List) form.getF().get("list"); assertEquals("firstValue", list.get(0)); assertEquals("secondValue", list.get(1)); From 3ac45547cfccdf3cbfd6ca80e160d25110c99e58 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 19 Dec 2012 14:57:27 -0800 Subject: [PATCH 9/9] Update -Xlint compiler warning output Enable output for the compiler warnings that have been eliminated so far. 'rawtypes', 'deprecation', and 'unchecked' remain suppressed until these warnings can be fully eliminated as well. --- build.gradle | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a0882a2fe0a..540694d2ee0 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,26 @@ configure(allprojects) { sourceCompatibility=1.5 targetCompatibility=1.5 - [compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:none"] + [compileJava, compileTestJava]*.options*.compilerArgs = [ + "-Xlint:serial", + "-Xlint:varargs", + "-Xlint:cast", + "-Xlint:classfile", + "-Xlint:dep-ann", + "-Xlint:divzero", + "-Xlint:empty", + "-Xlint:finally", + "-Xlint:overrides", + "-Xlint:path", + "-Xlint:processing", + "-Xlint:static", + "-Xlint:try", + "-Xlint:-options", // intentionally disabled + "-Xlint:-fallthrough", // intentionally disabled + "-Xlint:-rawtypes", // TODO enable and fix warnings + "-Xlint:-deprecation", // TODO enable and fix warnings + "-Xlint:-unchecked" // TODO enable and fix warnings + ] sourceSets.test.resources.srcDirs = ["src/test/resources", "src/test/java"]