root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Deprecate Hibernate 3 support 

Issue: SPR-13230
This commit is contained in:
Juergen Hoeller 2015-12-17 17:17:05 +01:00
parent a2a9c47e59
commit e90942223f
47 changed files with 139 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
View File

@ -49,7 +49,9 @@ import org.springframework.beans.factory.InitializingBean;
* @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<SessionFactory>, InitializingBean, DisposableBean {

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/FilterDefinitionFactoryBean.java
View File

@ -61,7 +61,9 @@ import org.springframework.beans.factory.InitializingBean;
* @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<FilterDefinition>, BeanNameAware, InitializingBean {
private final TypeResolver typeResolver = new TypeResolver();

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java
View File

@ -48,7 +48,9 @@ import org.springframework.jdbc.support.SQLExceptionTranslator;
* @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 {
/**

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java
View File

@ -40,7 +40,9 @@ import org.hibernate.Session;
* @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<T> {
/**

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java
View File

@ -39,7 +39,9 @@ import org.springframework.jdbc.support.SQLExceptionTranslator;
* @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;

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

@ -29,7 +29,9 @@ import org.springframework.dao.UncategorizedDataAccessException;
* @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 {

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

@ -28,7 +28,9 @@ import org.springframework.orm.ObjectRetrievalFailureException;
* @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 {

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java
View File

@ -62,7 +62,9 @@ import org.springframework.dao.DataAccessException;
* @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 {
/**

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

@ -30,7 +30,9 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException;
* @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 {

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

@ -27,7 +27,9 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
* @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 {

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

@ -28,7 +28,9 @@ import org.springframework.dao.UncategorizedDataAccessException;
* @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 {

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java
View File

@ -104,7 +104,9 @@ import org.springframework.util.Assert;
* @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 {

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

@ -128,7 +128,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* @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 {

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
View File

@ -36,7 +36,9 @@ import org.springframework.jdbc.datasource.DataSourceUtils;
* @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;

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java
View File

@ -23,7 +23,9 @@ package org.springframework.orm.hibernate3;
*
* @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 {
/**

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
View File

@ -36,7 +36,9 @@ import org.hibernate.cfg.Settings;
* @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;

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java
View File

@ -102,7 +102,9 @@ import org.springframework.util.StringUtils;
* @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<DataSource> configTimeDataSourceHolder =

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
View File

@ -41,7 +41,9 @@ import org.hibernate.transaction.TransactionManagerLookup;
* @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;

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionFactoryUtils.java
View File

@ -100,7 +100,9 @@ import org.springframework.util.Assert;
* @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 {
/**

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/SessionHolder.java
View File

@ -37,7 +37,9 @@ import org.springframework.util.Assert;
* @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();

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

@ -37,7 +37,9 @@ import org.hibernate.engine.SessionFactoryImplementor;
* @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 {

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java
View File

@ -42,7 +42,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* @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;

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java
View File

@ -36,7 +36,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* @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 {
/**

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java
View File

@ -28,7 +28,9 @@ import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
* @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 {
/**

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
View File

@ -48,7 +48,9 @@ import org.springframework.beans.factory.InitializingBean;
* @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;

6
spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java
View File

@ -38,7 +38,6 @@ import org.springframework.core.type.classreading.MetadataReader;
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 @@ import org.springframework.util.ClassUtils;
* @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";

7
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
View File

@ -32,7 +32,6 @@ import org.hibernate.util.EqualsHelper;
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 @@ import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
* @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());
}
/**

10
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AsyncRequestInterceptor.java
View File

@ -22,8 +22,6 @@ import org.apache.commons.logging.Log;
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 @@ import org.springframework.web.context.request.async.DeferredResultProcessingInt
*
* @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 @@ class AsyncRequestInterceptor extends CallableProcessingInterceptorAdapter imple
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());
}
}

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
View File

@ -38,7 +38,9 @@ import org.springframework.jdbc.support.lob.LobHandler;
* @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 {
/**

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
View File

@ -46,7 +46,9 @@ import org.springframework.jdbc.support.lob.LobHandler;
* @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 {
/**

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
View File

@ -44,7 +44,9 @@ import org.springframework.jdbc.support.lob.LobHandler;
* @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 {
/**

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
View File

@ -40,7 +40,9 @@ import org.springframework.jdbc.support.lob.LobHandler;
* @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 {
/**

28
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java
View File

@ -23,8 +23,6 @@ import org.hibernate.SessionFactory;
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 @@ import org.springframework.orm.hibernate3.SessionFactoryUtils;
* @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 abstract class HibernateDaoSupport extends DaoSupport {
* @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 abstract class HibernateDaoSupport extends DaoSupport {
* 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 abstract class HibernateDaoSupport extends DaoSupport {
* {@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 @@ public abstract class HibernateDaoSupport extends DaoSupport {
* @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 @@ public abstract class HibernateDaoSupport extends DaoSupport {
* @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 @@ public abstract class HibernateDaoSupport extends DaoSupport {
* @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 @@ public abstract class HibernateDaoSupport extends DaoSupport {
* {@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());
}
}

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

@ -48,7 +48,9 @@ import org.hibernate.persister.entity.EntityPersister;
* @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 {

24
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java
View File

@ -27,8 +27,6 @@ import org.hibernate.Session;
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 @@ import org.springframework.web.filter.OncePerRequestFilter;
* @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 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
* 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 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
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 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
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 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
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 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
}
else {
// deferred close mode
SessionFactoryUtils.processDeferredClose(sessionFactory);
org.springframework.orm.hibernate3.SessionFactoryUtils.processDeferredClose(sessionFactory);
}
}
}
@ -291,7 +291,7 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
* @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 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
* @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) {

31
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewInterceptor.java
View File

@ -20,9 +20,6 @@ import org.hibernate.HibernateException;
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 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
* @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 class OpenSessionInViewInterceptor extends HibernateAccessor implements A
* 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 class OpenSessionInViewInterceptor extends HibernateAccessor implements A
}
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 class OpenSessionInViewInterceptor extends HibernateAccessor implements A
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 class OpenSessionInViewInterceptor extends HibernateAccessor implements A
}
else {
// deferred close mode
SessionFactoryUtils.initDeferredClose(getSessionFactory());
org.springframework.orm.hibernate3.SessionFactoryUtils.initDeferredClose(getSessionFactory());
}
}
}
@ -193,8 +192,8 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
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 class OpenSessionInViewInterceptor extends HibernateAccessor implements A
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());
}
}
}

8
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInterceptor.java
View File

@ -25,8 +25,6 @@ import org.hibernate.SessionFactory;
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 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* @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 class OpenSessionInterceptor implements MethodInterceptor, InitializingBe
// 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);
}
}

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

@ -41,7 +41,9 @@ import org.springframework.aop.support.AopUtils;
* @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 {

2
spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java
View File

@ -42,7 +42,9 @@ import static org.mockito.BDDMockito.*;
* @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;

2
spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
View File

@ -55,7 +55,9 @@ import static org.mockito.BDDMockito.*;
* @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

4
spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java
View File

@ -73,8 +73,10 @@ import static org.mockito.BDDMockito.*;
* @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;

2
spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
View File

@ -65,7 +65,9 @@ import static org.mockito.BDDMockito.*;
* @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 {

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

@ -61,7 +61,9 @@ import static org.mockito.BDDMockito.*;
* @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

2
spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
View File

@ -31,7 +31,9 @@ import static org.mockito.BDDMockito.*;
* @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

2
spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java
View File

@ -50,7 +50,9 @@ import static org.mockito.BDDMockito.*;
* @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);

2
spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
View File

@ -68,7 +68,9 @@ import static org.mockito.BDDMockito.*;
* @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;

2
spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
View File

@ -27,7 +27,9 @@ import static org.junit.Assert.*;
* 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();