Removed outdated hibernate3 references across the codebase

Issue: SPR-9028
(cherry picked from commit 09e2e58)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -278,9 +278,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	 * Will get applied to any new Session created by this transaction manager.
 	 * <p>Such an interceptor can either be set at the SessionFactory level,
 	 * i.e. on LocalSessionFactoryBean, or at the Session level, i.e. on
-	 * HibernateTemplate, HibernateInterceptor, and HibernateTransactionManager.
-	 * It's preferable to set it on LocalSessionFactoryBean or HibernateTransactionManager
-	 * to avoid repeated configuration and guarantee consistent behavior in transactions.
+	 * HibernateTransactionManager.
 	 * @see LocalSessionFactoryBean#setEntityInterceptor
 	 */
 	public void setEntityInterceptor(Interceptor entityInterceptor) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,17 @@
 
 package org.springframework.orm.hibernate4.support;
 
+import java.io.IOException;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.orm.hibernate4.SessionFactoryUtils;
 import org.springframework.orm.hibernate4.SessionHolder;
@@ -30,12 +37,6 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
 /**
  * Servlet 2.3 Filter that binds a Hibernate Session to the thread for the entire
  * processing of the request. Intended for the "Open Session in View" pattern,
@@ -72,6 +73,7 @@ import java.io.IOException;
  * @see OpenSessionInViewInterceptor
  * @see org.springframework.orm.hibernate4.HibernateTransactionManager
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
+ * @see org.hibernate.SessionFactory#getCurrentSession()
  */
 public class OpenSessionInViewFilter extends OncePerRequestFilter {
 
@@ -190,9 +192,8 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
 
 	/**
 	 * Open a Session for the SessionFactory that this filter uses.
-	 * <p>The default implementation delegates to the
-	 * {@code SessionFactory.openSession} method and
-	 * sets the {@code Session}'s flush mode to "MANUAL".
+	 * <p>The default implementation delegates to the {@link SessionFactory#openSession}
+	 * method and sets the {@link Session}'s flush mode to "MANUAL".
 	 * @param sessionFactory the SessionFactory that this filter uses
 	 * @return the Session to use
 	 * @throws DataAccessResourceFailureException if the Session could not be created

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,6 +62,7 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
  * @see OpenSessionInViewFilter
  * @see org.springframework.orm.hibernate4.HibernateTransactionManager
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
+ * @see org.hibernate.SessionFactory#getCurrentSession()
  */
 public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor {
 
@@ -79,16 +80,14 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 
 
 	/**
-	 * Set the Hibernate SessionFactory that should be used to create
-	 * Hibernate Sessions.
+	 * Set the Hibernate SessionFactory that should be used to create Hibernate Sessions.
 	 */
 	public void setSessionFactory(SessionFactory sessionFactory) {
 		this.sessionFactory = sessionFactory;
 	}
 
 	/**
-	 * Return the Hibernate SessionFactory that should be used to create
-	 * Hibernate Sessions.
+	 * Return the Hibernate SessionFactory that should be used to create Hibernate Sessions.
 	 */
 	public SessionFactory getSessionFactory() {
 		return this.sessionFactory;
@@ -169,9 +168,8 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 
 	/**
 	 * Open a Session for the SessionFactory that this interceptor uses.
-	 * <p>The default implementation delegates to the
-	 * {@code SessionFactory.openSession} method and
-	 * sets the {@code Session}'s flush mode to "MANUAL".
+	 * <p>The default implementation delegates to the {@link SessionFactory#openSession}
+	 * method and sets the {@link Session}'s flush mode to "MANUAL".
 	 * @return the Session to use
 	 * @throws DataAccessResourceFailureException if the Session could not be created
 	 * @see org.hibernate.FlushMode#MANUAL

spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java

@@ -63,17 +63,19 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * configuration just adds value when fine-tuning Session settings like the flush mode
  * - or when relying on exception translation.
  *
+ * <p>This class is effectively deprecated, in favor of either HibernateTemplate usage
+ * or native Hibernate API usage within transactions, in combination with a general
+ * {@link org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor}.
+ * <b>Note: This class does not have an equivalent replacement in {@code orm.hibernate4}.
+ * It is officially deprecated in the Spring 4.0.x line, superseded by a streamlined
+ * OpenSessionInterceptor which also exists in 4.0.2's {@code orm.hibernate4} package.</b>
+ *
  * @author Juergen Hoeller
  * @since 1.2
  * @see org.hibernate.SessionFactory#getCurrentSession()
  * @see HibernateTransactionManager
  * @see HibernateTemplate
- * @deprecated as of Spring 3.2.7, in favor of either HibernateTemplate usage or
- * native Hibernate API usage within transactions, in combination with a general
- * {@link org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor}.
- * Note: This class does not have an equivalent replacement in {@code orm.hibernate4}.
  */
-@Deprecated
 public class HibernateInterceptor extends HibernateAccessor implements MethodInterceptor {
 
 	private boolean exceptionConversionEnabled = true;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -214,8 +214,7 @@ public abstract class SessionFactoryUtils {
 	 * <p>Supports setting a Session-level Hibernate entity interceptor that allows
 	 * to inspect and change property values before writing to and reading from the
 	 * database. Such an interceptor can also be set at the SessionFactory level
-	 * (i.e. on LocalSessionFactoryBean), on HibernateTransactionManager, or on
-	 * HibernateInterceptor/HibernateTemplate.
+	 * (i.e. on LocalSessionFactoryBean), on HibernateTransactionManager, etc.
 	 * @param sessionFactory Hibernate SessionFactory to create the session with
 	 * @param entityInterceptor Hibernate entity interceptor, or {@code null} if none
 	 * @param jdbcExceptionTranslator SQLExcepionTranslator to use for flushing the
@@ -224,7 +223,6 @@ public abstract class SessionFactoryUtils {
 	 * @return the Hibernate Session
 	 * @throws DataAccessResourceFailureException if the Session couldn't be created
 	 * @see LocalSessionFactoryBean#setEntityInterceptor
-	 * @see HibernateInterceptor#setEntityInterceptor
 	 * @see HibernateTemplate#setEntityInterceptor
 	 */
 	public static Session getSession(
@@ -371,8 +369,8 @@ public abstract class SessionFactoryUtils {
 	 * @throws DataAccessResourceFailureException if the Session couldn't be created
 	 */
 	private static Session getJtaSynchronizedSession(
-		SessionHolder sessionHolder, SessionFactory sessionFactory,
-		SQLExceptionTranslator jdbcExceptionTranslator) throws DataAccessResourceFailureException {
+			SessionHolder sessionHolder, SessionFactory sessionFactory,
+			SQLExceptionTranslator jdbcExceptionTranslator) throws DataAccessResourceFailureException {
 
 		// JTA synchronization is only possible with a javax.transaction.TransactionManager.
 		// We'll check the Hibernate SessionFactory: If a TransactionManagerLookup is specified

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.orm.hibernate3.support;
 
 import java.io.IOException;
-
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -26,13 +25,15 @@ import javax.servlet.http.HttpServletResponse;
 import org.hibernate.FlushMode;
 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;
-import org.springframework.web.context.request.async.*;
+import org.springframework.web.context.request.async.WebAsyncManager;
+import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -91,6 +92,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * @see org.springframework.orm.hibernate3.HibernateTransactionManager
  * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
+ * @see org.hibernate.SessionFactory#getCurrentSession()
  */
 public class OpenSessionInViewFilter extends OncePerRequestFilter {
 
@@ -165,7 +167,7 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
 	}
 
 	/**
-	 * The default value is "false" so that the filter may re-bind the opened
+	 * Returns "false" so that the filter may re-bind the opened Hibernate
 	 * {@code Session} to each asynchronously dispatched thread and postpone
 	 * closing it until the very last asynchronous dispatch.
 	 */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,9 @@
 
 package org.springframework.orm.hibernate3.support;
 
-import java.util.concurrent.Callable;
-
 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;
@@ -27,9 +26,9 @@ import org.springframework.orm.hibernate3.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.context.request.AsyncWebRequestInterceptor;
-import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.context.request.async.*;
+import org.springframework.web.context.request.async.WebAsyncManager;
+import org.springframework.web.context.request.async.WebAsyncUtils;
 
 /**
  * Spring web request interceptor that binds a Hibernate {@code Session} to the
@@ -91,6 +90,7 @@ import org.springframework.web.context.request.async.*;
  * @see org.springframework.orm.hibernate3.HibernateTransactionManager
  * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession
  * @see org.springframework.transaction.support.TransactionSynchronizationManager
+ * @see org.hibernate.SessionFactory#getCurrentSession()
  */
 public class OpenSessionInViewInterceptor extends HibernateAccessor implements AsyncWebRequestInterceptor {
 
@@ -143,10 +143,9 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession
 	 */
 	public void preHandle(WebRequest request) throws DataAccessException {
-
-		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
 		String participateAttributeName = getParticipateAttributeName();
 
+		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
 		if (asyncManager.hasConcurrentResult()) {
 			if (applySessionBindingInterceptor(asyncManager, participateAttributeName)) {
 				return;

spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,13 +40,12 @@ import org.springframework.util.Assert;
  * candidate exceptions.
  *
 
- * <p>All of Spring's applicable resource factories (e.g. {@link
- * org.springframework.orm.hibernate3.LocalSessionFactoryBean LocalSessionFactoryBean},
- * {@link org.springframework.orm.jpa.LocalEntityManagerFactoryBean
- * LocalEntityManagerFactoryBean}) implement the {@code PersistenceExceptionTranslator}
- * interface out of the box. As a consequence, all that is usually needed to enable
- * automatic exception translation is marking all affected beans (such as Repositories or
- * DAOs) with the {@code @Repository} annotation, along with defining this post-processor
+ * <p>All of Spring's applicable resource factories (e.g.
+ * {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean})
+ * implement the {@code PersistenceExceptionTranslator} interface out of the box.
+ * As a consequence, all that is usually needed to enable automatic exception
+ * translation is marking all affected beans (such as Repositories or DAOs)
+ * with the {@code @Repository} annotation, along with defining this post-processor
  * as a bean in the application context.
  *
  * @author Rod Johnson

spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionProxyFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,9 +69,7 @@ import org.springframework.transaction.PlatformTransactionManager;
  *
  * <p>The "preInterceptors" and "postInterceptors" properties can be set to add
  * additional interceptors to the mix, like
- * {@link org.springframework.aop.interceptor.PerformanceMonitorInterceptor} or
- * {@link org.springframework.orm.hibernate3.HibernateInterceptor} /
- * {@link org.springframework.orm.jdo.JdoInterceptor}.
+ * {@link org.springframework.aop.interceptor.PerformanceMonitorInterceptor}.
  *
  * <p><b>HINT:</b> This class is often used with parent / child bean definitions.
  * Typically, you will define the transaction manager and default transaction

spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@ package org.springframework.transaction.support;
  * @see TransactionSynchronizationManager
  * @see AbstractPlatformTransactionManager
  * @see org.springframework.jdbc.datasource.DataSourceUtils#CONNECTION_SYNCHRONIZATION_ORDER
- * @see org.springframework.orm.hibernate3.SessionFactoryUtils#SESSION_SYNCHRONIZATION_ORDER
  */
 public interface TransactionSynchronization {
 

spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerMapping.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,7 +111,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 	 * @see #setInterceptors
 	 * @see org.springframework.web.context.request.WebRequestInterceptor
 	 * @see WebRequestHandlerInterceptorAdapter#WebRequestHandlerInterceptorAdapter(WebRequestInterceptor, boolean)
-	 * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor
+	 * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor
 	 */
 	public void setApplyWebRequestInterceptorsToRenderPhaseOnly(boolean applyWebRequestInterceptorsToRenderPhaseOnly) {
 		this.applyWebRequestInterceptorsToRenderPhaseOnly = applyWebRequestInterceptorsToRenderPhaseOnly;
@@ -139,7 +139,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 	 * allowing to add further interceptors before as well as after the existing
 	 * interceptors
 	 */
-	protected void extendInterceptors(List interceptors) {
+	protected void extendInterceptors(List<?> interceptors) {
 	}
 
 	/**

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ import org.springframework.web.util.WebUtils;
  * <p><b>Example:</b> web.xml, mapping all "/myservlet" requests to a Spring dispatcher.
  * Also defines a custom "myServlet", but <i>without</i> servlet mapping.
  *
- * <pre>
+ * <pre class="code">
  * &lt;servlet&gt;
  *   &lt;servlet-name&gt;myServlet&lt;/servlet-name&gt;
  *   &lt;servlet-class&gt;mypackage.TestServlet&lt;/servlet-class&gt;
@@ -59,7 +59,7 @@ import org.springframework.web.util.WebUtils;
  * configured HandlerInterceptor chain (e.g. an OpenSessionInViewInterceptor).
  * From the servlet point of view, everything will work as usual.
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"&gt;
  *   &lt;property name="interceptors"&gt;
  *     &lt;list&gt;
@@ -80,10 +80,8 @@ import org.springframework.web.util.WebUtils;
  * @author Juergen Hoeller
  * @since 1.1.1
  * @see ServletWrappingController
- * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor
- * @see org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
- * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewInterceptor
- * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewFilter
+ * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor
+ * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter
  */
 public class ServletForwardingController extends AbstractController implements BeanNameAware {
 

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.springframework.web.servlet.mvc;
 
 import java.util.Enumeration;
 import java.util.Properties;
-
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -48,7 +47,7 @@ import org.springframework.web.servlet.ModelAndView;
  * through the configured HandlerInterceptor chain (e.g. an OpenSessionInViewInterceptor).
  * From the Struts point of view, everything will work as usual.
  *
- * <pre>
+ * <pre class="code">
  * &lt;bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"&gt;
  *   &lt;property name="interceptors"&gt;
  *     &lt;list&gt;
@@ -79,15 +78,13 @@ import org.springframework.web.servlet.ModelAndView;
  * @author Juergen Hoeller
  * @since 1.1.1
  * @see ServletForwardingController
- * @see org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor
- * @see org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
- * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewInterceptor
- * @see org.springframework.orm.jdo.support.OpenPersistenceManagerInViewFilter
+ * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor
+ * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter
  */
 public class ServletWrappingController extends AbstractController
-	implements BeanNameAware, InitializingBean, DisposableBean {
+		implements BeanNameAware, InitializingBean, DisposableBean {
 
-	private Class servletClass;
+	private Class<?> servletClass;
 
 	private String servletName;
 
@@ -103,7 +100,7 @@ public class ServletWrappingController extends AbstractController
 	 * Needs to implement {@code javax.servlet.Servlet}.
 	 * @see javax.servlet.Servlet
 	 */
-	public void setServletClass(Class servletClass) {
+	public void setServletClass(Class<?> servletClass) {
 		this.servletClass = servletClass;
 	}