Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix [serial] compiler warnings

Browse Source 
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.
This commit is contained in:
Phillip Webb
2012-12-19 14:35:57 -08:00
committed by Chris Beams
parent 7f0aa5cfb2
commit b0986049a3
550 changed files with 705 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java
View File

@@ -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;

1
spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java
View File

@@ -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;

1
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java
View File

@@ -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) {

1
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java
View File

@@ -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) {

1
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java
View File

@@ -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) {

1
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
View File

@@ -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) {

1
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
View File

@@ -29,6 +29,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
* @since 1.2
* @see SessionFactoryUtils#convertHibernateAccessException
*/
@SuppressWarnings("serial")
public class HibernateSystemException extends UncategorizedDataAccessException {
/**

1
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java
View File

@@ -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 {

1
spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
View File

@@ -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;

1
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
View File

@@ -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 {
/**

1
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
View File

@@ -42,6 +42,7 @@ import org.springframework.aop.support.AopUtils;
* @author Juergen Hoeller
* @since 2.0
*/
@SuppressWarnings("serial")
public class ScopedBeanInterceptor extends EmptyInterceptor {
@Override

1
spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java
View File

@@ -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) {

1
spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java
View File

@@ -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) {

1
spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java
View File

@@ -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) {

1
spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
View File

@@ -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) {

1
spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java
View File

@@ -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 {

1
spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
View File

@@ -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) {

2
spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
View File

@@ -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;

1
spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java
View File

@@ -41,6 +41,7 @@ import org.springframework.transaction.TransactionException;
* @see JpaAccessor#setJpaDialect
* @see JpaTransactionManager#setJpaDialect
*/
@SuppressWarnings("serial")
public class DefaultJpaDialect implements JpaDialect, Serializable {
//-------------------------------------------------------------------------

1
spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
View File

@@ -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);

1
spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
View File

@@ -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) {

1
spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
View File

@@ -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) {

1
spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
View File

@@ -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) {

1
spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
View File

@@ -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 {

2
spring-orm/src/main/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java
View File

@@ -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 =

2
spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java
View File

@@ -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

1
spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
View File

@@ -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());

1
spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java vendored
View File

@@ -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;

1
spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java vendored
View File

@@ -47,6 +47,7 @@ import org.springframework.util.ReflectionUtils;
* @author Juergen Hoeller
* @since 2.0
*/
@SuppressWarnings("serial")
public class HibernateJpaDialect extends DefaultJpaDialect {
@Override

1
spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java vendored
View File

@@ -40,6 +40,7 @@ import org.springframework.transaction.TransactionException;
* @author Juergen Hoeller
* @since 2.0
*/
@SuppressWarnings("serial")
public class OpenJpaDialect extends DefaultJpaDialect {
@Override

1
spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java vendored
View File

@@ -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;

3
spring-orm/src/test/java/org/springframework/beans/Colour.java
View File

@@ -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);
}
}
}

1
spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
View File

@@ -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();

15
spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
View File

@@ -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 {

2
spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
View File

@@ -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) {

1
spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
View File

@@ -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,

4
spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
View File

@@ -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;