Consistent formatting of license headers, package javadocs, and import declarations

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

@@ -17,7 +17,6 @@
 package org.springframework.orm.hibernate3;
 
 import java.util.Properties;
-
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 

spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
- * Support package for the Hibernate3 Annotation add-on,
- * which supports EJB3-compliant JDK 1.5+ annotations for mappings.
- *
+ * Support package for the Hibernate 3 Annotation add-on,
+ * which supports JPA-compliant Java 5+ annotations for mappings.
  */
 package org.springframework.orm.hibernate3.annotation;
-

spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java

@@ -1,5 +1,4 @@
 /**
- *
  * Package providing integration of
  * <a href="http://www.hibernate.org">Hibernate 3.x</a>
  * with Spring concepts.
@@ -10,7 +9,5 @@
  *
  * <p><b>This package supports Hibernate 3.x only.</b>
  * See the {@code org.springframework.orm.hibernate4} package for Hibernate 4.x support.
- *
  */
 package org.springframework.orm.hibernate3;
-

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

@@ -21,7 +21,6 @@ import java.io.Serializable;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import javax.transaction.TransactionManager;
 
 import org.apache.commons.logging.Log;
@@ -31,8 +30,8 @@ import org.hibernate.usertype.UserType;
 import org.hibernate.util.EqualsHelper;
 
 import org.springframework.jdbc.support.lob.LobCreator;
-import org.springframework.jdbc.support.lob.LobHandler;
 import org.springframework.jdbc.support.lob.LobCreatorUtils;
+import org.springframework.jdbc.support.lob.LobHandler;
 import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
 
 /**

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,9 +16,12 @@
 
 package org.springframework.orm.hibernate3.support;
 
+import java.util.concurrent.Callable;
+
 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;
@@ -27,8 +30,6 @@ import org.springframework.web.context.request.async.CallableProcessingIntercept
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.context.request.async.DeferredResultProcessingInterceptor;
 
-import java.util.concurrent.Callable;
-
 /**
  * An interceptor with asynchronous web requests used in OpenSessionInViewFilter and
  * OpenSessionInViewInterceptor.

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

@@ -21,7 +21,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Arrays;
-
 import javax.transaction.TransactionManager;
 
 import org.springframework.jdbc.support.lob.LobCreator;

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

@@ -27,7 +27,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import javax.transaction.TransactionManager;
 
 import org.hibernate.HibernateException;

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

@@ -21,7 +21,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import javax.transaction.TransactionManager;
 
 import org.springframework.jdbc.support.lob.LobCreator;

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

@@ -20,7 +20,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import javax.transaction.TransactionManager;
 
 import org.springframework.jdbc.support.lob.LobCreator;

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

@@ -1,8 +1,5 @@
 /**
- *
  * Classes supporting the {@code org.springframework.orm.hibernate3} package.
  * Contains a DAO base class for HibernateTemplate usage.
- *
  */
 package org.springframework.orm.hibernate3.support;
-

spring-orm/src/main/java/org/springframework/orm/jdo/package-info.java

@@ -1,10 +1,6 @@
-
 /**
- *
  * Package providing integration of JDO (Java Date Objects) with Spring concepts.
  * Contains PersistenceManagerFactory helper classes, a template plus callback for JDO
  * access, and an implementation of Spring's transaction SPI for local JDO transactions.
- *
  */
 package org.springframework.orm.jdo;
-

spring-orm/src/main/java/org/springframework/orm/jdo/support/package-info.java

@@ -1,7 +1,5 @@
 /**
- *
  * Classes supporting the {@code org.springframework.orm.jdo} package.
- *
  */
 package org.springframework.orm.jdo.support;
 

spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java

@@ -18,7 +18,6 @@ package org.springframework.orm.jpa;
 
 import java.lang.reflect.Method;
 import java.util.Map;
-
 import javax.persistence.EntityExistsException;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -35,6 +34,7 @@ import javax.persistence.TransactionRequiredException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;

spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java

@@ -17,7 +17,6 @@
 package org.springframework.orm.jpa;
 
 import java.util.Map;
-
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.spi.PersistenceProvider;

spring-orm/src/main/java/org/springframework/orm/jpa/package-info.java

@@ -1,10 +1,6 @@
-
 /**
- *
  * Package providing integration of JPA (Java Persistence API) with Spring concepts.
  * Contains EntityManagerFactory helper classes, a template plus callback for JPA access,
  * and an implementation of Spring's transaction SPI for local JPA transactions.
- *
  */
 package org.springframework.orm.jpa;
-

spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java

@@ -18,7 +18,6 @@ package org.springframework.orm.jpa.persistenceunit;
 
 import java.lang.instrument.ClassFileTransformer;
 import java.security.ProtectionDomain;
-
 import javax.persistence.spi.ClassTransformer;
 
 import org.apache.commons.logging.Log;

spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Internal support for managing JPA persistence units.
- *
  */
 package org.springframework.orm.jpa.persistenceunit;
-

spring-orm/src/main/java/org/springframework/orm/jpa/support/AsyncRequestInterceptor.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,8 +17,12 @@
 package org.springframework.orm.jpa.support;
 
 
+import java.util.concurrent.Callable;
+import javax.persistence.EntityManagerFactory;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.orm.jpa.EntityManagerFactoryUtils;
 import org.springframework.orm.jpa.EntityManagerHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -27,9 +31,6 @@ import org.springframework.web.context.request.async.CallableProcessingIntercept
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.context.request.async.DeferredResultProcessingInterceptor;
 
-import javax.persistence.EntityManagerFactory;
-import java.util.concurrent.Callable;
-
 /**
  * An interceptor with asynchronous web requests used in OpenSessionInViewFilter and
  * OpenSessionInViewInterceptor.

spring-orm/src/main/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewFilter.java

@@ -17,7 +17,6 @@
 package org.springframework.orm.jpa.support;
 
 import java.io.IOException;
-
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceException;

spring-orm/src/main/java/org/springframework/orm/jpa/support/package-info.java

@@ -1,7 +1,4 @@
 /**
- *
  * Classes supporting the {@code org.springframework.orm.jpa} package.
- *
  */
 package org.springframework.orm.jpa.support;
-

spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java

@@ -26,8 +26,6 @@ import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.eclipse.persistence.config.TargetDatabase;
 import org.eclipse.persistence.jpa.JpaEntityManager;
 
-import org.springframework.orm.jpa.JpaDialect;
-
 /**
  * {@link org.springframework.orm.jpa.JpaVendorAdapter} implementation for Eclipse
  * Persistence Services (EclipseLink). Developed and tested against EclipseLink 2.4.

spring-orm/src/main/java/org/springframework/orm/jpa/vendor/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support classes for adapting to specific JPA vendors.
- *
  */
 package org.springframework.orm.jpa.vendor;
-

spring-orm/src/main/java/org/springframework/orm/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Root package for Spring's O/R Mapping integration classes.
  * Contains generic DataAccessExceptions related to O/R Mapping.
- *
  */
 package org.springframework.orm;
-

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

@@ -30,6 +30,7 @@ import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.transaction.support.TransactionSynchronizationManager;

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

@@ -18,7 +18,6 @@ package org.springframework.orm.hibernate3;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.transaction.RollbackException;
 import javax.transaction.Status;
 import javax.transaction.Synchronization;
@@ -36,6 +35,7 @@ import org.hibernate.engine.SessionImplementor;
 import org.junit.After;
 import org.junit.Test;
 import org.mockito.InOrder;
+
 import org.springframework.dao.DataAccessException;
 import org.springframework.tests.transaction.MockJtaTransaction;
 import org.springframework.transaction.TransactionDefinition;

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

@@ -56,6 +56,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InOrder;
+
 import org.springframework.dao.CannotAcquireLockException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;

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

@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-
 import javax.transaction.TransactionManager;
 
 import org.hibernate.HibernateException;
@@ -47,6 +46,7 @@ import org.hibernate.event.MergeEvent;
 import org.hibernate.event.MergeEventListener;
 import org.hibernate.mapping.TypeDef;
 import org.junit.Test;
+
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;

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

@@ -21,6 +21,7 @@ import java.util.List;
 
 import org.hibernate.SessionFactory;
 import org.junit.Test;
+
 import org.springframework.orm.hibernate3.HibernateTemplate;
 
 import static org.junit.Assert.*;

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

@@ -26,7 +26,6 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Arrays;
 import java.util.List;
-
 import javax.transaction.Status;
 import javax.transaction.Synchronization;
 import javax.transaction.TransactionManager;
@@ -36,6 +35,7 @@ import org.hibernate.classic.Session;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.jdbc.support.lob.LobCreator;
 import org.springframework.jdbc.support.lob.LobHandler;
 import org.springframework.orm.hibernate3.SessionFactoryUtils;

spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java

@@ -19,11 +19,11 @@ package org.springframework.orm.jdo;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Properties;
-
 import javax.jdo.JDOFatalUserException;
 import javax.jdo.PersistenceManagerFactory;
 
 import org.junit.Test;
+
 import org.springframework.core.io.ClassPathResource;
 
 import static org.junit.Assert.*;

spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java

@@ -17,7 +17,6 @@
 package org.springframework.orm.jdo.support;
 
 import java.io.IOException;
-
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 import javax.servlet.FilterChain;
@@ -26,6 +25,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
 import org.junit.Test;
+
 import org.springframework.mock.web.test.MockFilterConfig;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;

spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java

@@ -18,7 +18,6 @@ package org.springframework.orm.jpa;
 
 import java.lang.reflect.Proxy;
 import java.util.List;
-
 import javax.persistence.EntityManager;
 import javax.persistence.EntityNotFoundException;
 import javax.persistence.FlushModeType;

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

@@ -22,6 +22,7 @@ import javax.persistence.spi.PersistenceUnitInfo;
 
 import org.junit.After;
 import org.junit.Before;
+
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import static org.junit.Assert.*;

spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java

@@ -18,7 +18,6 @@ package org.springframework.orm.jpa;
 
 import java.lang.reflect.Proxy;
 import java.util.List;
-
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TransactionRequiredException;

spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java

@@ -18,7 +18,6 @@ package org.springframework.orm.jpa;
 
 import java.lang.reflect.Proxy;
 import java.util.List;
-
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceException;
 import javax.persistence.Query;

spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java

@@ -21,6 +21,7 @@ import javax.persistence.EntityTransaction;
 import javax.persistence.OptimisticLockException;
 
 import org.junit.Test;
+
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.support.DefaultTransactionDefinition;

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

@@ -27,6 +27,7 @@ import javax.persistence.PersistenceException;
 import javax.persistence.TransactionRequiredException;
 
 import org.junit.Test;
+
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.EmptyResultDataAccessException;

spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java

@@ -19,7 +19,6 @@ package org.springframework.orm.jpa;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
@@ -29,6 +28,7 @@ import javax.sql.DataSource;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.transaction.InvalidIsolationLevelException;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;

spring-orm/src/test/java/org/springframework/orm/jpa/SharedEntityManagerCreatorTests.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java

@@ -18,6 +18,7 @@ package org.springframework.orm.jpa.hibernate;
 
 import org.hibernate.ejb.HibernateEntityManager;
 import org.hibernate.ejb.HibernateEntityManagerFactory;
+
 import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrationTests;
 import org.springframework.orm.jpa.EntityManagerFactoryInfo;
 

spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java

@@ -17,7 +17,6 @@
 package org.springframework.orm.jpa.openjpa;
 
 import java.util.List;
-
 import javax.persistence.FlushModeType;
 import javax.persistence.Query;
 

spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java

@@ -21,14 +21,24 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import javax.servlet.*;
+import javax.servlet.AsyncEvent;
+import javax.servlet.AsyncListener;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
-import org.springframework.mock.web.test.*;
+import org.springframework.mock.web.test.MockAsyncContext;
+import org.springframework.mock.web.test.MockFilterConfig;
+import org.springframework.mock.web.test.MockHttpServletRequest;
+import org.springframework.mock.web.test.MockHttpServletResponse;
+import org.springframework.mock.web.test.MockServletContext;
+import org.springframework.mock.web.test.PassThroughFilterChain;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.request.ServletWebRequest;

spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java

@@ -20,6 +20,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
 import org.junit.Test;
+
 import org.springframework.orm.jpa.EntityManagerHolder;
 import org.springframework.orm.jpa.EntityManagerProxy;
 import org.springframework.transaction.support.TransactionSynchronizationManager;

spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java

@@ -21,7 +21,6 @@ import java.io.LineNumberReader;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-
 import javax.sql.DataSource;
 
 import org.springframework.core.io.support.EncodedResource;

spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java

@@ -16,11 +16,11 @@
 
 package org.springframework.test.jdbc;
 
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-import java.io.LineNumberReader;
 import java.io.IOException;
+import java.io.LineNumberReader;
+import java.util.List;
+
+import org.springframework.util.StringUtils;
 
 /**
  * JdbcTestUtils is a collection of JDBC related utility methods for

spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java

@@ -23,7 +23,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;