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

spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj

@@ -29,12 +29,12 @@ import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
 
 /**
- * Concrete aspect that uses the {@link Configurable}
- * annotation to identify which classes need autowiring.
+ * Concrete aspect that uses the {@link Configurable} annotation to identify
+ * which classes need autowiring.
  *
- * <p>The bean name to look up will be taken from the
- * {@code &#64;Configurable} annotation if specified, otherwise the
- * default bean name to look up will be the FQN of the class being configured.
+ * <p>The bean name to look up will be taken from the {@code &#64;Configurable}
+ * annotation if specified, otherwise the default bean name to look up will be
+ * the fully qualified name of the class being configured.
  *
  * @author Rod Johnson
  * @author Ramnivas Laddad

spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj

@@ -20,6 +20,7 @@ import java.lang.reflect.Method;
 
 import org.aspectj.lang.annotation.SuppressAjWarnings;
 import org.aspectj.lang.reflect.MethodSignature;
+
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.cache.interceptor.CacheAspectSupport;
 import org.springframework.cache.interceptor.CacheOperationInvoker;

spring-aspects/src/main/java/org/springframework/cache/aspectj/JCacheCacheAspect.aj

@@ -17,7 +17,6 @@
 package org.springframework.cache.aspectj;
 
 import java.lang.reflect.Method;
-
 import javax.cache.annotation.CachePut;
 import javax.cache.annotation.CacheRemove;
 import javax.cache.annotation.CacheRemoveAll;

spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj

@@ -27,6 +27,7 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.orm.jpa.EntityManagerFactoryUtils;
 
 public aspect JpaExceptionTranslatorAspect {
+
 	pointcut entityManagerCall():
 		call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) ||
 		call(* EntityTransaction.*(..)) || call(* Query.*(..));
@@ -41,4 +42,5 @@ public aspect JpaExceptionTranslatorAspect {
 			throw re;
 		}
 	}
-}
+
+}

spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj

@@ -17,7 +17,6 @@
 package org.springframework.scheduling.aspectj;
 
 import java.lang.reflect.Method;
-
 import java.util.concurrent.Future;
 
 import org.springframework.core.annotation.AnnotationUtils;

spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj

@@ -18,6 +18,7 @@ package org.springframework.transaction.aspectj;
 
 import org.aspectj.lang.annotation.SuppressAjWarnings;
 import org.aspectj.lang.reflect.MethodSignature;
+
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.transaction.interceptor.TransactionAttributeSource;
 

spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj

@@ -32,9 +32,9 @@ import org.springframework.transaction.annotation.Transactional;
  *
  * <p>An @Transactional annotation on a method within the class overrides the
  * default transaction semantics given by the class annotation (if present).
- * Any method may be annotated (regardless of visibility).
- * Annotating non-public methods directly is the only way
- * to get transaction demarcation for the execution of such operations.
+ * Any method may be annotated (regardless of visibility). Annotating
+ * non-public methods directly is the only way to get transaction demarcation
+ * for the execution of such operations.
  *
  * @author Rod Johnson
  * @author Ramnivas Laddad

spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java

@@ -16,10 +16,10 @@
 
 package org.springframework.aop.aspectj.autoproxy;
 
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
 import junit.framework.TestCase;
 
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
 /**
  * @author Adrian Colyer
  */

spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java

@@ -16,10 +16,10 @@
 
 package org.springframework.beans.factory.aspectj;
 
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
 import junit.framework.TestCase;
 
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
 public class SpringConfiguredWithAutoProxyingTests extends TestCase {
 
 	@Override

spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java

@@ -16,18 +16,17 @@
 
 package org.springframework.cache.aspectj;
 
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-
 import org.junit.Assert;
 import org.junit.Test;
+
 import org.springframework.cache.Cache;
 import org.springframework.cache.config.AbstractAnnotationTests;
 import org.springframework.cache.config.CacheableService;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Costin Leau
  */

spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedJCacheableService.java

@@ -19,7 +19,6 @@ package org.springframework.cache.config;
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
-
 import javax.cache.annotation.CacheDefaults;
 import javax.cache.annotation.CacheKey;
 import javax.cache.annotation.CachePut;

spring-aspects/src/test/java/org/springframework/cache/config/SomeCustomKeyGenerator.java

@@ -16,10 +16,10 @@
 
 package org.springframework.cache.config;
 
-import org.springframework.cache.interceptor.KeyGenerator;
-
 import java.lang.reflect.Method;
 
+import org.springframework.cache.interceptor.KeyGenerator;
+
 /**
  * A custom {@link KeyGenerator} that exposes the algorithm used to compute the key
  * for convenience in tests scenario.

spring-aspects/src/test/java/org/springframework/cache/config/TestEntity.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-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java

@@ -36,7 +36,7 @@ import org.springframework.tests.Assume;
 import org.springframework.tests.TestGroup;
 import org.springframework.util.ReflectionUtils;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.*;
 

spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java

@@ -16,14 +16,14 @@
 
 package org.springframework.transaction.aspectj;
 
+import java.lang.reflect.Method;
+
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.transaction.interceptor.TransactionAttribute;
 
-import java.lang.reflect.Method;
-
 /**
  * @author Rod Johnson
  * @author Ramnivas Laddad