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

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

@@ -1,5 +1,4 @@
 /**
- *
  * Package providing integration of
  * <a href="http://www.hibernate.org">Hibernate 4.x</a>
  * with Spring concepts.
@@ -13,7 +12,5 @@
  * See the {@code org.springframework.orm.hibernate3} package for Hibernate 3.x support.
  * <b>Note:</b> Do not use HibernateTemplate or other classes from the hibernate3 package
  * with Hibernate 4; this will lead to class definition exceptions at runtime.
- *
  */
 package org.springframework.orm.hibernate4;
-

spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/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,9 +17,12 @@
 package org.springframework.orm.hibernate4.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.hibernate4.SessionFactoryUtils;
 import org.springframework.orm.hibernate4.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -28,8 +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 java.util.concurrent.Callable;
-
 /**
  * An interceptor with asynchronous web requests used in OpenSessionInViewFilter and
  * OpenSessionInViewInterceptor.

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

@@ -1,24 +1,4 @@
-
-/*
- * Copyright 2002-2012 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.
- * You may obtain a copy of the License at
- *
- *      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,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 /**
- *
  * Classes supporting the {@code org.springframework.orm.hibernate4} package.
- *
  */
 package org.springframework.orm.hibernate4.support;
-

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

@@ -52,6 +52,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;