diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java index 2a53432f8184..61f731064b96 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java @@ -49,7 +49,9 @@ * @see #setExposeTransactionAwareSessionFactory * @see org.hibernate.SessionFactory#getCurrentSession() * @see org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public abstract class AbstractSessionFactoryBean extends HibernateExceptionTranslator implements FactoryBean, InitializingBean, DisposableBean { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java index 41b1f28a2ae3..24f5c33a63f3 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java @@ -61,7 +61,9 @@ * @since 1.2 * @see org.hibernate.engine.FilterDefinition * @see LocalSessionFactoryBean#setFilterDefinitions + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class FilterDefinitionFactoryBean implements FactoryBean, BeanNameAware, InitializingBean { private final TypeResolver typeResolver = new TypeResolver(); 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 a5174439d7f1..8b5dc6647d47 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 @@ -48,7 +48,9 @@ * @see HibernateTemplate * @see HibernateInterceptor * @see #setFlushMode + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public abstract class HibernateAccessor implements InitializingBean, BeanFactoryAware { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java index 8bf4dbeffe1f..0c280949ea09 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java @@ -40,7 +40,9 @@ * @since 1.2 * @see HibernateTemplate * @see HibernateTransactionManager + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public interface HibernateCallback { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java index ded5f70434bb..db7401743bfc 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java @@ -39,7 +39,9 @@ * @see org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor * @see SessionFactoryUtils#convertHibernateAccessException(HibernateException) * @see SQLExceptionTranslator + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class HibernateExceptionTranslator implements PersistenceExceptionTranslator { private SQLExceptionTranslator jdbcExceptionTranslator; 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 e43e55f4cc23..24af69709054 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 @@ -29,7 +29,9 @@ * @author Juergen Hoeller * @since 1.2 * @see SessionFactoryUtils#convertHibernateAccessException + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated @SuppressWarnings("serial") public class HibernateJdbcException extends UncategorizedDataAccessException { 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 37d5fde4f7ab..9a4cdf9a2e5e 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 @@ -28,7 +28,9 @@ * @author Juergen Hoeller * @since 1.2 * @see SessionFactoryUtils#convertHibernateAccessException + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated @SuppressWarnings("serial") public class HibernateObjectRetrievalFailureException extends ObjectRetrievalFailureException { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java index 449e5ad4b0ed..6facdbec07fb 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java @@ -62,7 +62,9 @@ * @see org.springframework.transaction.jta.JtaTransactionManager * @see org.springframework.orm.hibernate3.support.OpenSessionInViewFilter * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public interface HibernateOperations { /** 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 43c73be2212d..47ff23a28180 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 @@ -30,7 +30,9 @@ * @author Juergen Hoeller * @since 1.2 * @see SessionFactoryUtils#convertHibernateAccessException + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated @SuppressWarnings("serial") public class HibernateOptimisticLockingFailureException extends ObjectOptimisticLockingFailureException { 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 0dc209bf5cba..81b82ffff53e 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 @@ -27,7 +27,9 @@ * @author Juergen Hoeller * @since 1.2 * @see SessionFactoryUtils#convertHibernateAccessException + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated @SuppressWarnings("serial") public class HibernateQueryException extends InvalidDataAccessResourceUsageException { 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 040eaee1087b..ddc5a2e17fb3 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 @@ -28,7 +28,9 @@ * @author Juergen Hoeller * @since 1.2 * @see SessionFactoryUtils#convertHibernateAccessException + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated @SuppressWarnings("serial") public class HibernateSystemException extends UncategorizedDataAccessException { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java index ab8eaae35135..146b19ec9afd 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java @@ -104,7 +104,9 @@ * @see org.springframework.transaction.jta.JtaTransactionManager * @see org.springframework.orm.hibernate3.support.OpenSessionInViewFilter * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated @SuppressWarnings("deprecation") public class HibernateTemplate extends HibernateAccessor implements HibernateOperations { 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 229e1bfbfbc1..9eb58527eeac 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 @@ -128,7 +128,9 @@ * @see org.springframework.jdbc.core.JdbcTemplate * @see org.springframework.jdbc.datasource.DataSourceTransactionManager * @see org.springframework.transaction.jta.JtaTransactionManager + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated @SuppressWarnings("serial") public class HibernateTransactionManager extends AbstractPlatformTransactionManager implements ResourceTransactionManager, BeanFactoryAware, InitializingBean { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java index 17c2312b1dd1..411d3857d23c 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java @@ -36,7 +36,9 @@ * @author Juergen Hoeller * @since 1.2 * @see LocalSessionFactoryBean#setDataSource + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class LocalDataSourceConnectionProvider implements ConnectionProvider { private DataSource dataSource; diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java index 17764a5fece8..817be9d7cb0d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java @@ -23,7 +23,9 @@ * * @author Juergen Hoeller * @since 2.5.1 + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class LocalJtaDataSourceConnectionProvider extends LocalDataSourceConnectionProvider { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java index 8b68dcb594d9..73e0b5bf767b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java @@ -36,7 +36,9 @@ * @author Juergen Hoeller * @since 3.0 * @see LocalSessionFactoryBean#setCacheRegionFactory + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class LocalRegionFactoryProxy implements RegionFactory { private final RegionFactory regionFactory; diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java index 7f9f72e2ec71..0197fdfd0e6d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java @@ -102,7 +102,9 @@ * @see #setJtaTransactionManager * @see org.hibernate.SessionFactory#getCurrentSession() * @see HibernateTransactionManager + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implements BeanClassLoaderAware { private static final ThreadLocal configTimeDataSourceHolder = diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java index 9314a90b6f2f..fbfcf3c593b0 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java @@ -41,7 +41,9 @@ * @since 1.2 * @see LocalSessionFactoryBean#setJtaTransactionManager * @see org.springframework.transaction.jta.JtaTransactionManager#setTransactionManager + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class LocalTransactionManagerLookup implements TransactionManagerLookup { private final TransactionManager transactionManager; diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java index be43c7bc041d..88b89b9dd01c 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java @@ -100,7 +100,9 @@ * @see HibernateTransactionManager * @see org.springframework.transaction.jta.JtaTransactionManager * @see org.springframework.transaction.support.TransactionSynchronizationManager + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public abstract class SessionFactoryUtils { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionHolder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionHolder.java index a3622f033ad4..abfb36c513b9 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionHolder.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionHolder.java @@ -37,7 +37,9 @@ * @since 1.2 * @see HibernateTransactionManager * @see SessionFactoryUtils + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class SessionHolder extends ResourceHolderSupport { private static final Object DEFAULT_KEY = new Object(); 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 0e33b324586b..f0c1199eda0c 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 @@ -37,7 +37,9 @@ * @since 2.0 * @see SessionFactoryUtils#doGetSession * @see LocalSessionFactoryBean#setExposeTransactionAwareSessionFactory + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated @SuppressWarnings("serial") public class SpringSessionContext implements CurrentSessionContext { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java index 28acc3b604f9..70f8beffeddc 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java @@ -42,7 +42,9 @@ * @since 1.2 * @see SessionFactoryUtils * @see org.springframework.transaction.jta.JtaTransactionManager + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated class SpringSessionSynchronization implements TransactionSynchronization, Ordered { private final SessionHolder sessionHolder; diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java index c0258c7a5fe4..a381d6de203e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java @@ -36,7 +36,9 @@ * @since 2.5.4 * @see org.springframework.transaction.support.TransactionSynchronizationManager * @see org.hibernate.transaction.JDBCTransactionFactory + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class SpringTransactionFactory implements TransactionFactory { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java index 368dcf545104..c91a03eaf949 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java @@ -28,7 +28,9 @@ * @author Juergen Hoeller * @since 1.2 * @see LocalSessionFactoryBean#setUseTransactionAwareDataSource + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class TransactionAwareDataSourceConnectionProvider extends LocalDataSourceConnectionProvider { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java index 9b448402b05a..ceae3a5d2c85 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java @@ -48,7 +48,9 @@ * @author Juergen Hoeller * @since 1.2 * @see LocalSessionFactoryBean#setTypeDefinitions(TypeDefinitionBean[]) + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class TypeDefinitionBean implements BeanNameAware, InitializingBean { private String typeName; diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java index 8e90fdf19f74..bc6f04406220 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java @@ -38,7 +38,6 @@ import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.core.type.filter.TypeFilter; -import org.springframework.orm.hibernate3.LocalSessionFactoryBean; import org.springframework.util.ClassUtils; /** @@ -74,8 +73,11 @@ * @see #setHibernateProperties * @see #setAnnotatedClasses * @see #setAnnotatedPackages + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ -public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implements ResourceLoaderAware { +@Deprecated +public class AnnotationSessionFactoryBean extends org.springframework.orm.hibernate3.LocalSessionFactoryBean + implements ResourceLoaderAware { private static final String RESOURCE_PATTERN = "/**/*.class"; 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 39d68e1b8657..96cb0170864b 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 @@ -32,7 +32,6 @@ import org.springframework.jdbc.support.lob.LobCreator; import org.springframework.jdbc.support.lob.LobCreatorUtils; import org.springframework.jdbc.support.lob.LobHandler; -import org.springframework.orm.hibernate3.LocalSessionFactoryBean; /** * Abstract base class for Hibernate UserType implementations that map to LOBs. @@ -52,7 +51,9 @@ * @see org.springframework.jdbc.support.lob.LobCreator * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setLobHandler * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setJtaTransactionManager + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public abstract class AbstractLobType implements UserType { protected final Log logger = LogFactory.getLog(getClass()); @@ -69,8 +70,8 @@ public abstract class AbstractLobType implements UserType { * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#getConfigTimeTransactionManager */ protected AbstractLobType() { - this(LocalSessionFactoryBean.getConfigTimeLobHandler(), - LocalSessionFactoryBean.getConfigTimeTransactionManager()); + this(org.springframework.orm.hibernate3.LocalSessionFactoryBean.getConfigTimeLobHandler(), + org.springframework.orm.hibernate3.LocalSessionFactoryBean.getConfigTimeTransactionManager()); } /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AsyncRequestInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AsyncRequestInterceptor.java index c58f0e01642e..844e2f3f4717 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AsyncRequestInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AsyncRequestInterceptor.java @@ -22,8 +22,6 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.SessionFactory; -import org.springframework.orm.hibernate3.SessionFactoryUtils; -import org.springframework.orm.hibernate3.SessionHolder; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter; @@ -40,19 +38,21 @@ * * @author Rossen Stoyanchev * @since 3.2.5 + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated class AsyncRequestInterceptor extends CallableProcessingInterceptorAdapter implements DeferredResultProcessingInterceptor { private static final Log logger = LogFactory.getLog(AsyncRequestInterceptor.class); private final SessionFactory sessionFactory; - private final SessionHolder sessionHolder; + private final org.springframework.orm.hibernate3.SessionHolder sessionHolder; private volatile boolean timeoutInProgress; - public AsyncRequestInterceptor(SessionFactory sessionFactory, SessionHolder sessionHolder) { + public AsyncRequestInterceptor(SessionFactory sessionFactory, org.springframework.orm.hibernate3.SessionHolder sessionHolder) { this.sessionFactory = sessionFactory; this.sessionHolder = sessionHolder; } @@ -87,7 +87,7 @@ public void afterCompletion(NativeWebRequest request, Callable task) thro private void closeAfterTimeout() { if (this.timeoutInProgress) { logger.debug("Closing Hibernate Session after async request timeout"); - SessionFactoryUtils.closeSession(this.sessionHolder.getSession()); + org.springframework.orm.hibernate3.SessionFactoryUtils.closeSession(this.sessionHolder.getSession()); } } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java index 4ab0264b628a..f1dd0882a90b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java @@ -38,7 +38,9 @@ * @author Juergen Hoeller * @since 1.2 * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setLobHandler + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class BlobByteArrayType extends AbstractLobType { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java index 1ba488535882..42dec75d4ca6 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java @@ -46,7 +46,9 @@ * @author Juergen Hoeller * @since 1.2 * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setLobHandler + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class BlobSerializableType extends AbstractLobType { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java index 40fd0cd44888..0d6e399c041a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java @@ -44,7 +44,9 @@ * @since 1.2.7 * @see #getCharacterEncoding() * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setLobHandler + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class BlobStringType extends AbstractLobType { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java index 0e293ef1b039..6fe9786c0fa6 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java @@ -40,7 +40,9 @@ * @author Juergen Hoeller * @since 1.2 * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setLobHandler + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class ClobStringType extends AbstractLobType { /** diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java index 3b7fc1468d21..32aa867faf22 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java @@ -23,8 +23,6 @@ import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.support.DaoSupport; -import org.springframework.orm.hibernate3.HibernateTemplate; -import org.springframework.orm.hibernate3.SessionFactoryUtils; /** * Convenient super class for Hibernate-based data access objects. @@ -56,10 +54,12 @@ * @see #setSessionFactory * @see #getHibernateTemplate * @see org.springframework.orm.hibernate3.HibernateTemplate + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public abstract class HibernateDaoSupport extends DaoSupport { - private HibernateTemplate hibernateTemplate; + private org.springframework.orm.hibernate3.HibernateTemplate hibernateTemplate; /** @@ -83,8 +83,8 @@ public final void setSessionFactory(SessionFactory sessionFactory) { * @return the new HibernateTemplate instance * @see #setSessionFactory */ - protected HibernateTemplate createHibernateTemplate(SessionFactory sessionFactory) { - return new HibernateTemplate(sessionFactory); + protected org.springframework.orm.hibernate3.HibernateTemplate createHibernateTemplate(SessionFactory sessionFactory) { + return new org.springframework.orm.hibernate3.HibernateTemplate(sessionFactory); } /** @@ -99,7 +99,7 @@ public final SessionFactory getSessionFactory() { * as an alternative to specifying a SessionFactory. * @see #setSessionFactory */ - public final void setHibernateTemplate(HibernateTemplate hibernateTemplate) { + public final void setHibernateTemplate(org.springframework.orm.hibernate3.HibernateTemplate hibernateTemplate) { this.hibernateTemplate = hibernateTemplate; } @@ -113,7 +113,7 @@ public final void setHibernateTemplate(HibernateTemplate hibernateTemplate) { * {@code new HibernateTemplate(getSessionFactory())}, in which case * you're allowed to customize the settings on the resulting instance. */ - public final HibernateTemplate getHibernateTemplate() { + public final org.springframework.orm.hibernate3.HibernateTemplate getHibernateTemplate() { return this.hibernateTemplate; } @@ -141,7 +141,7 @@ protected final void checkDaoConfig() { * @throws DataAccessResourceFailureException if the Session couldn't be created * @throws IllegalStateException if no thread-bound Session found and allowCreate=false * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession(SessionFactory, boolean) - * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage + * @deprecated as of Spring 3.2.7, in favor of {@link org.springframework.orm.hibernate3.HibernateTemplate} usage */ @Deprecated protected final Session getSession() throws DataAccessResourceFailureException, IllegalStateException { @@ -166,15 +166,15 @@ protected final Session getSession() throws DataAccessResourceFailureException, * @throws DataAccessResourceFailureException if the Session couldn't be created * @throws IllegalStateException if no thread-bound Session found and allowCreate=false * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession(SessionFactory, boolean) - * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage + * @deprecated as of Spring 3.2.7, in favor of {@link org.springframework.orm.hibernate3.HibernateTemplate} usage */ @Deprecated protected final Session getSession(boolean allowCreate) throws DataAccessResourceFailureException, IllegalStateException { return (!allowCreate ? - SessionFactoryUtils.getSession(getSessionFactory(), false) : - SessionFactoryUtils.getSession( + org.springframework.orm.hibernate3.SessionFactoryUtils.getSession(getSessionFactory(), false) : + org.springframework.orm.hibernate3.SessionFactoryUtils.getSession( getSessionFactory(), this.hibernateTemplate.getEntityInterceptor(), this.hibernateTemplate.getJdbcExceptionTranslator())); @@ -192,7 +192,7 @@ protected final Session getSession(boolean allowCreate) * @param ex HibernateException that occurred * @return the corresponding DataAccessException instance * @see org.springframework.orm.hibernate3.SessionFactoryUtils#convertHibernateAccessException - * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage + * @deprecated as of Spring 3.2.7, in favor of {@link org.springframework.orm.hibernate3.HibernateTemplate} usage */ @Deprecated protected final DataAccessException convertHibernateAccessException(HibernateException ex) { @@ -206,11 +206,11 @@ protected final DataAccessException convertHibernateAccessException(HibernateExc * {@link #getSession} and {@link #convertHibernateAccessException}. * @param session the Session to close * @see org.springframework.orm.hibernate3.SessionFactoryUtils#releaseSession - * @deprecated as of Spring 3.2.7, in favor of {@link HibernateTemplate} usage + * @deprecated as of Spring 3.2.7, in favor of {@link org.springframework.orm.hibernate3.HibernateTemplate} usage */ @Deprecated protected final void releaseSession(Session session) { - SessionFactoryUtils.releaseSession(session, getSessionFactory()); + org.springframework.orm.hibernate3.SessionFactoryUtils.releaseSession(session, getSessionFactory()); } } 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 c87e46c5b3eb..b48d6be5e1e2 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 @@ -48,7 +48,9 @@ * @author Juergen Hoeller * @since 1.2 * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setEventListeners(java.util.Map) + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated @SuppressWarnings({"serial", "rawtypes", "deprecation"}) public class IdTransferringMergeEventListener extends DefaultMergeEventListener { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java index 72e15aaa521f..1ece0146c591 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java @@ -27,8 +27,6 @@ import org.hibernate.SessionFactory; import org.springframework.dao.DataAccessResourceFailureException; -import org.springframework.orm.hibernate3.SessionFactoryUtils; -import org.springframework.orm.hibernate3.SessionHolder; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.util.Assert; import org.springframework.web.context.WebApplicationContext; @@ -91,7 +89,9 @@ * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession * @see org.springframework.transaction.support.TransactionSynchronizationManager * @see org.hibernate.SessionFactory#getCurrentSession() + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class OpenSessionInViewFilter extends OncePerRequestFilter { public static final String DEFAULT_SESSION_FACTORY_BEAN_NAME = "sessionFactory"; @@ -127,8 +127,8 @@ protected String getSessionFactoryBeanName() { * its own session (like without Open Session in View). Each of those * sessions will be registered for deferred close, though, actually * processed at request completion. - * @see SessionFactoryUtils#initDeferredClose - * @see SessionFactoryUtils#processDeferredClose + * @see org.springframework.orm.hibernate3.SessionFactoryUtils#initDeferredClose + * @see org.springframework.orm.hibernate3.SessionFactoryUtils#processDeferredClose */ public void setSingleSession(boolean singleSession) { this.singleSession = singleSession; @@ -206,7 +206,7 @@ protected void doFilterInternal( if (isFirstRequest || !applySessionBindingInterceptor(asyncManager, key)) { logger.debug("Opening single Hibernate Session in OpenSessionInViewFilter"); Session session = getSession(sessionFactory); - SessionHolder sessionHolder = new SessionHolder(session); + org.springframework.orm.hibernate3.SessionHolder sessionHolder = new org.springframework.orm.hibernate3.SessionHolder(session); TransactionSynchronizationManager.bindResource(sessionFactory, sessionHolder); AsyncRequestInterceptor interceptor = new AsyncRequestInterceptor(sessionFactory, sessionHolder); @@ -218,12 +218,12 @@ protected void doFilterInternal( else { // deferred close mode Assert.state(!isAsyncStarted(request), "Deferred close mode is not supported on async dispatches"); - if (SessionFactoryUtils.isDeferredCloseActive(sessionFactory)) { + if (org.springframework.orm.hibernate3.SessionFactoryUtils.isDeferredCloseActive(sessionFactory)) { // Do not modify deferred close: just set the participate flag. participate = true; } else { - SessionFactoryUtils.initDeferredClose(sessionFactory); + org.springframework.orm.hibernate3.SessionFactoryUtils.initDeferredClose(sessionFactory); } } @@ -234,8 +234,8 @@ protected void doFilterInternal( if (!participate) { if (isSingleSession()) { // single session mode - SessionHolder sessionHolder = - (SessionHolder) TransactionSynchronizationManager.unbindResource(sessionFactory); + org.springframework.orm.hibernate3.SessionHolder sessionHolder = + (org.springframework.orm.hibernate3.SessionHolder) TransactionSynchronizationManager.unbindResource(sessionFactory); if (!isAsyncStarted(request)) { logger.debug("Closing single Hibernate Session in OpenSessionInViewFilter"); closeSession(sessionHolder.getSession(), sessionFactory); @@ -243,7 +243,7 @@ protected void doFilterInternal( } else { // deferred close mode - SessionFactoryUtils.processDeferredClose(sessionFactory); + org.springframework.orm.hibernate3.SessionFactoryUtils.processDeferredClose(sessionFactory); } } } @@ -291,7 +291,7 @@ protected SessionFactory lookupSessionFactory() { * @see org.hibernate.FlushMode#MANUAL */ protected Session getSession(SessionFactory sessionFactory) throws DataAccessResourceFailureException { - Session session = SessionFactoryUtils.getSession(sessionFactory, true); + Session session = org.springframework.orm.hibernate3.SessionFactoryUtils.getSession(sessionFactory, true); FlushMode flushMode = getFlushMode(); if (flushMode != null) { session.setFlushMode(flushMode); @@ -310,7 +310,7 @@ protected Session getSession(SessionFactory sessionFactory) throws DataAccessRes * @param sessionFactory the SessionFactory that this filter uses */ protected void closeSession(Session session, SessionFactory sessionFactory) { - SessionFactoryUtils.closeSession(session); + org.springframework.orm.hibernate3.SessionFactoryUtils.closeSession(session); } private boolean applySessionBindingInterceptor(WebAsyncManager asyncManager, String key) { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java index b868d797c94f..10598cd87400 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java @@ -20,9 +20,6 @@ import org.hibernate.Session; import org.springframework.dao.DataAccessException; -import org.springframework.orm.hibernate3.HibernateAccessor; -import org.springframework.orm.hibernate3.SessionFactoryUtils; -import org.springframework.orm.hibernate3.SessionHolder; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.ui.ModelMap; import org.springframework.web.context.request.AsyncWebRequestInterceptor; @@ -91,8 +88,10 @@ * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession * @see org.springframework.transaction.support.TransactionSynchronizationManager * @see org.hibernate.SessionFactory#getCurrentSession() + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ -public class OpenSessionInViewInterceptor extends HibernateAccessor implements AsyncWebRequestInterceptor { +@Deprecated +public class OpenSessionInViewInterceptor extends org.springframework.orm.hibernate3.HibernateAccessor implements AsyncWebRequestInterceptor { /** * Suffix that gets appended to the {@code SessionFactory} @@ -121,8 +120,8 @@ public OpenSessionInViewInterceptor() { * its own session (like without Open Session in View). Each of those * sessions will be registered for deferred close, though, actually * processed at request completion. - * @see SessionFactoryUtils#initDeferredClose - * @see SessionFactoryUtils#processDeferredClose + * @see org.springframework.orm.hibernate3.SessionFactoryUtils#initDeferredClose + * @see org.springframework.orm.hibernate3.SessionFactoryUtils#processDeferredClose */ public void setSingleSession(boolean singleSession) { this.singleSession = singleSession; @@ -154,7 +153,7 @@ public void preHandle(WebRequest request) throws DataAccessException { } if ((isSingleSession() && TransactionSynchronizationManager.hasResource(getSessionFactory())) || - SessionFactoryUtils.isDeferredCloseActive(getSessionFactory())) { + org.springframework.orm.hibernate3.SessionFactoryUtils.isDeferredCloseActive(getSessionFactory())) { // Do not modify the Session: just mark the request accordingly. Integer count = (Integer) request.getAttribute(participateAttributeName, WebRequest.SCOPE_REQUEST); int newCount = (count != null ? count + 1 : 1); @@ -164,10 +163,10 @@ public void preHandle(WebRequest request) throws DataAccessException { if (isSingleSession()) { // single session mode logger.debug("Opening single Hibernate Session in OpenSessionInViewInterceptor"); - Session session = SessionFactoryUtils.getSession( + Session session = org.springframework.orm.hibernate3.SessionFactoryUtils.getSession( getSessionFactory(), getEntityInterceptor(), getJdbcExceptionTranslator()); applyFlushMode(session, false); - SessionHolder sessionHolder = new SessionHolder(session); + org.springframework.orm.hibernate3.SessionHolder sessionHolder = new org.springframework.orm.hibernate3.SessionHolder(session); TransactionSynchronizationManager.bindResource(getSessionFactory(), sessionHolder); AsyncRequestInterceptor asyncRequestInterceptor = @@ -177,7 +176,7 @@ public void preHandle(WebRequest request) throws DataAccessException { } else { // deferred close mode - SessionFactoryUtils.initDeferredClose(getSessionFactory()); + org.springframework.orm.hibernate3.SessionFactoryUtils.initDeferredClose(getSessionFactory()); } } } @@ -193,8 +192,8 @@ public void preHandle(WebRequest request) throws DataAccessException { public void postHandle(WebRequest request, ModelMap model) throws DataAccessException { if (isSingleSession()) { // Only potentially flush in single session mode. - SessionHolder sessionHolder = - (SessionHolder) TransactionSynchronizationManager.getResource(getSessionFactory()); + org.springframework.orm.hibernate3.SessionHolder sessionHolder = + (org.springframework.orm.hibernate3.SessionHolder) TransactionSynchronizationManager.getResource(getSessionFactory()); logger.debug("Flushing single Hibernate Session in OpenSessionInViewInterceptor"); try { flushIfNecessary(sessionHolder.getSession(), false); @@ -216,14 +215,14 @@ public void afterCompletion(WebRequest request, Exception ex) throws DataAccessE if (!decrementParticipateCount(request)) { if (isSingleSession()) { // single session mode - SessionHolder sessionHolder = - (SessionHolder) TransactionSynchronizationManager.unbindResource(getSessionFactory()); + org.springframework.orm.hibernate3.SessionHolder sessionHolder = + (org.springframework.orm.hibernate3.SessionHolder) TransactionSynchronizationManager.unbindResource(getSessionFactory()); logger.debug("Closing single Hibernate Session in OpenSessionInViewInterceptor"); - SessionFactoryUtils.closeSession(sessionHolder.getSession()); + org.springframework.orm.hibernate3.SessionFactoryUtils.closeSession(sessionHolder.getSession()); } else { // deferred close mode - SessionFactoryUtils.processDeferredClose(getSessionFactory()); + org.springframework.orm.hibernate3.SessionFactoryUtils.processDeferredClose(getSessionFactory()); } } } diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInterceptor.java index 3429d71a05ef..1a61ffd547a8 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInterceptor.java @@ -25,8 +25,6 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessResourceFailureException; -import org.springframework.orm.hibernate3.SessionFactoryUtils; -import org.springframework.orm.hibernate3.SessionHolder; import org.springframework.transaction.support.TransactionSynchronizationManager; /** @@ -49,7 +47,9 @@ * @see org.springframework.orm.hibernate3.HibernateTransactionManager * @see org.springframework.transaction.support.TransactionSynchronizationManager * @see org.hibernate.SessionFactory#getCurrentSession() + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class OpenSessionInterceptor implements MethodInterceptor, InitializingBean { private SessionFactory sessionFactory; @@ -84,11 +84,11 @@ public Object invoke(MethodInvocation invocation) throws Throwable { // New Session to be bound for the current method's scope... Session session = openSession(); try { - TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session)); + TransactionSynchronizationManager.bindResource(sf, new org.springframework.orm.hibernate3.SessionHolder(session)); return invocation.proceed(); } finally { - SessionFactoryUtils.closeSession(session); + org.springframework.orm.hibernate3.SessionFactoryUtils.closeSession(session); TransactionSynchronizationManager.unbindResource(sf); } } 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 a189463f2dad..6dec1f93480c 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 @@ -41,7 +41,9 @@ * @author Costin Leau * @author Juergen Hoeller * @since 2.0 + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated @SuppressWarnings("serial") public class ScopedBeanInterceptor extends EmptyInterceptor { diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java index 0ab51e08cab4..dd94db2174bf 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java @@ -42,7 +42,9 @@ * @author Juergen Hoeller * @author Phillip Webb * @since 05.03.2005 + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class HibernateInterceptorTests { private SessionFactory sessionFactory; 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 d64e193eed68..b3b111e47179 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 @@ -55,7 +55,9 @@ * @author Juergen Hoeller * @author Phillip Webb * @since 05.03.2005 + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class HibernateJtaTransactionTests { @After diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java index e1f690aa5755..25f3de52676e 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java @@ -73,8 +73,10 @@ * @author Juergen Hoeller * @author Phillip Webb * @since 05.03.2005 + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ -@SuppressWarnings({ "rawtypes", "unchecked" }) +@Deprecated +@SuppressWarnings({"rawtypes", "unchecked"}) public class HibernateTemplateTests { private SessionFactory sessionFactory; diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java index 99cdbd1b6dd7..9acc23cf3368 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java @@ -65,7 +65,9 @@ * @author Juergen Hoeller * @author Phillip Webb * @since 05.03.2005 + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated @SuppressWarnings({"rawtypes", "unchecked", "deprecation"}) public class HibernateTransactionManagerTests { 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 a7fae646417d..0f51dbbf5ad7 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 @@ -61,7 +61,9 @@ * @author Juergen Hoeller * @author Phillip Webb * @since 05.03.2005 + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class LocalSessionFactoryBeanTests { @Test diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java index e05d9c8f5dbe..8ffe0754e1c7 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java @@ -31,7 +31,9 @@ * @author Juergen Hoeller * @author Phillip Webb * @since 05.03.2005 + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class HibernateDaoSupportTests { @Test diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java index 9f4bc63717fb..48a590a6aa8e 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java @@ -50,7 +50,9 @@ * @author Juergen Hoeller * @author Phillip Webb * @since 05.03.2005 + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class LobTypeTests { private ResultSet rs = mock(ResultSet.class); 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 7d87483126e9..e2c379e5b175 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 @@ -68,7 +68,9 @@ * @author Rossen Stoyanchev * @author Phillip Webb * @since 05.03.2005 + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class OpenSessionInViewTests { private MockServletContext sc; diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java index 8e901ad91178..762c04443d08 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java @@ -27,7 +27,9 @@ * Unit tests for {@link ScopedBeanInterceptor}. * * @author Costin Leau + * @deprecated as of Spring 4.3, in favor of Hibernate 4.x/5.x */ +@Deprecated public class ScopedBeanInterceptorTests { private final ScopedBeanInterceptor interceptor = new ScopedBeanInterceptor();