Revert "Merge branch 'SPR-10130' into cleanup-master"

This reverts commit 45fa50821a, reversing
changes made to a312d900f8.

spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateExceptionTranslator.java

@@ -38,7 +38,6 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
  */
 public class HibernateExceptionTranslator implements PersistenceExceptionTranslator {
 
-	@Override
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		if (ex instanceof HibernateException) {
 			return convertHibernateAccessException((HibernateException) ex);

spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTransactionManager.java

@@ -242,7 +242,6 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 		this.hibernateManagedSession = hibernateManagedSession;
 	}
 
-	@Override
 	public void afterPropertiesSet() {
 		if (getSessionFactory() == null) {
 			throw new IllegalArgumentException("Property 'sessionFactory' is required");
@@ -263,7 +262,6 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	}
 
 
-	@Override
 	public Object getResourceFactory() {
 		return getSessionFactory();
 	}
@@ -654,7 +652,6 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 			}
 		}
 
-		@Override
 		public boolean isRollbackOnly() {
 			return this.sessionHolder.isRollbackOnly() ||
 					(hasConnectionHolder() && getConnectionHolder().isRollbackOnly());

spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java

@@ -268,13 +268,11 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator
 		this.jtaTransactionManager = jtaTransactionManager;
 	}
 
-	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
 	}
 
 
-	@Override
 	public void afterPropertiesSet() throws IOException {
 		LocalSessionFactoryBuilder sfb = new LocalSessionFactoryBuilder(this.dataSource, this.resourcePatternResolver);
 
@@ -387,23 +385,19 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator
 	}
 
 
-	@Override
 	public SessionFactory getObject() {
 		return this.sessionFactory;
 	}
 
-	@Override
 	public Class<?> getObjectType() {
 		return (this.sessionFactory != null ? this.sessionFactory.getClass() : SessionFactory.class);
 	}
 
-	@Override
 	public boolean isSingleton() {
 		return true;
 	}
 
 
-	@Override
 	public void destroy() {
 		this.sessionFactory.close();
 	}

spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionContext.java

@@ -62,7 +62,6 @@ public class SpringSessionContext implements CurrentSessionContext {
 	/**
 	 * Retrieve the Spring-managed Session for the current thread, if any.
 	 */
-	@Override
 	public Session currentSession() throws HibernateException {
 		Object value = TransactionSynchronizationManager.getResource(this.sessionFactory);
 		if (value instanceof Session) {

spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java

@@ -52,12 +52,10 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 	}
 
 
-	@Override
 	public int getOrder() {
 		return SessionFactoryUtils.SESSION_SYNCHRONIZATION_ORDER;
 	}
 
-	@Override
 	public void suspend() {
 		if (this.holderActive) {
 			TransactionSynchronizationManager.unbindResource(this.sessionFactory);
@@ -66,14 +64,12 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		}
 	}
 
-	@Override
 	public void resume() {
 		if (this.holderActive) {
 			TransactionSynchronizationManager.bindResource(this.sessionFactory, this.sessionHolder);
 		}
 	}
 
-	@Override
 	public void flush() {
 		try {
 			SessionFactoryUtils.logger.debug("Flushing Hibernate Session on explicit request");
@@ -84,7 +80,6 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		}
 	}
 
-	@Override
 	public void beforeCommit(boolean readOnly) throws DataAccessException {
 		if (!readOnly) {
 			Session session = getCurrentSession();
@@ -102,7 +97,6 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		}
 	}
 
-	@Override
 	public void beforeCompletion() {
 		Session session = this.sessionHolder.getSession();
 		if (this.sessionHolder.getPreviousFlushMode() != null) {
@@ -113,11 +107,9 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		session.disconnect();
 	}
 
-	@Override
 	public void afterCommit() {
 	}
 
-	@Override
 	public void afterCompletion(int status) {
 		try {
 			if (status != STATUS_COMMITTED) {

spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewInterceptor.java

@@ -95,7 +95,6 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 	 * {@code HibernateAccessor} and bind it to the thread via the
 	 * {@link org.springframework.transaction.support.TransactionSynchronizationManager}.
 	 */
-	@Override
 	public void preHandle(WebRequest request) throws DataAccessException {
 
 		String participateAttributeName = getParticipateAttributeName();
@@ -124,7 +123,6 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 		}
 	}
 
-	@Override
 	public void postHandle(WebRequest request, ModelMap model) {
 	}
 
@@ -132,7 +130,6 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 	 * Unbind the Hibernate {@code Session} from the thread and close it).
 	 * @see org.springframework.transaction.support.TransactionSynchronizationManager
 	 */
-	@Override
 	public void afterCompletion(WebRequest request, Exception ex) throws DataAccessException {
 		if (!decrementParticipateCount(request)) {
 			SessionHolder sessionHolder =
@@ -159,7 +156,6 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 		return true;
 	}
 
-	@Override
 	public void afterConcurrentHandlingStarted(WebRequest request) {
 		if (!decrementParticipateCount(request)) {
 			TransactionSynchronizationManager.unbindResource(getSessionFactory());