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

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java

@@ -28,6 +28,7 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.weaver.tools.PointcutParser;
 import org.aspectj.weaver.tools.PointcutPrimitive;
+
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.util.StringUtils;
 

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java

@@ -37,6 +37,7 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.AjType;
 import org.aspectj.lang.reflect.AjTypeSystem;
 import org.aspectj.lang.reflect.PerClauseKind;
+
 import org.springframework.aop.aspectj.AspectJExpressionPointcut;
 import org.springframework.aop.framework.AopConfigException;
 import org.springframework.core.ParameterNameDiscoverer;

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java

@@ -1,10 +1,6 @@
-
 /**
- *
  * Classes enabling AspectJ 5 @Annotated classes to be used in Spring AOP.
  *
  * <p>Normally to be used through an AspectJAutoProxyCreator rather than directly.
- *
  */
 package org.springframework.aop.aspectj.annotation;
-

spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Base classes enabling auto-proxying based on AspectJ.
  * Support for AspectJ annotation aspects resides in the "aspectj.annotation" package.
- *
  */
 package org.springframework.aop.aspectj.autoproxy;
-

spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java

@@ -1,5 +1,4 @@
 /**
- *
  * AspectJ integration package. Includes Spring AOP advice implementations for AspectJ 5
  * annotation-style methods, and an AspectJExpressionPointcut: a Spring AOP Pointcut
  * implementation that allows use of the AspectJ pointcut expression language with the Spring AOP
@@ -8,7 +7,5 @@
  * <p>Note that use of this package does <i>not</i> require the use of the {@code ajc} compiler
  * or AspectJ load-time weaver. It is intended to enable the use of a valuable subset of AspectJ
  * functionality, with consistent semantics, with the proxy-based Spring AOP framework.
- *
  */
 package org.springframework.aop.aspectj;
-

spring-aop/src/main/java/org/springframework/aop/config/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Support package for declarative AOP configuration,
  * with XML schema being the primary configuration format.
- *
  */
 package org.springframework.aop.config;
-

spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.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-aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java

@@ -1,18 +1,12 @@
-
 /**
- *
  * SPI package allowing Spring AOP framework to handle arbitrary advice types.
- * <br>
- * Users who want merely to <i>use</i> the Spring AOP framework, rather than extend
+ *
+ * <p>Users who want merely to <i>use</i> the Spring AOP framework, rather than extend
  * its capabilities, don't need to concern themselves with this package.
- * <br>
- * 	You may wish to use these adapters to wrap Spring-specific advices, such as MethodBeforeAdvice,
- * 	in MethodInterceptor, to allow their use in another AOP framework supporting the AOP Alliance interfaces.
- * </br>
- * <br>
- * 	These adapters do not depend on any other Spring framework classes to allow such usage.
- * </br>
  *
+ * <p>You may wish to use these adapters to wrap Spring-specific advices, such as MethodBeforeAdvice,
+ * in MethodInterceptor, to allow their use in another AOP framework supporting the AOP Alliance interfaces.
+ *
+ * <p>These adapters do not depend on any other Spring framework classes to allow such usage.
  */
 package org.springframework.aop.framework.adapter;
-

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java

@@ -1,6 +1,4 @@
-
 /**
- *
  * Bean post-processors for use in ApplicationContexts to simplify AOP usage
  * by automatically creating AOP proxies without the need to use a ProxyFactoryBean.
  *
@@ -10,7 +8,5 @@
  * <p><b>NB</b>: Automatic auto-proxying is not supported for BeanFactory implementations,
  * as post-processors beans are only automatically detected in application contexts.
  * Post-processors can be explicitly registered on a ConfigurableBeanFactory instead.
- *
  */
 package org.springframework.aop.framework.autoproxy;
-

spring-aop/src/main/java/org/springframework/aop/framework/package-info.java

@@ -1,6 +1,4 @@
-
 /**
- *
  * Package containing Spring's basic AOP infrastructure, compliant with the
  * <a href="http://aopalliance.sourceforge.net">AOP Alliance</a> interfaces.
  *
@@ -13,7 +11,5 @@
  * <p>The ProxyFactoryBean is a convenient way to create AOP proxies in a BeanFactory
  * or ApplicationContext. However, proxies can be created programmatically using the
  * ProxyFactory class.
- *
  */
 package org.springframework.aop.framework;
-

spring-aop/src/main/java/org/springframework/aop/interceptor/package-info.java

@@ -1,10 +1,6 @@
-
 /**
- *
  * Provides miscellaneous interceptor implementations.
  * More specific interceptors can be found in corresponding
  * functionality packages, like "transaction" and "orm".
- *
  */
 package org.springframework.aop.interceptor;
-

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

@@ -1,25 +1,20 @@
-
 /**
- *
  * Core Spring AOP interfaces, built on AOP Alliance AOP interoperability interfaces.
  *
- * <br>Any AOP Alliance MethodInterceptor is usable in Spring.
+ * <p>Any AOP Alliance MethodInterceptor is usable in Spring.
  *
  * <br>Spring AOP also offers:
  * <ul>
- * 	<li>Introduction support
- * 	<li>A Pointcut abstraction, supporting "static" pointcuts
- * 		(class and method-based) and "dynamic" pointcuts (also considering method arguments).
- * 		There are currently no AOP Alliance interfaces for pointcuts.
- * 	<li>A full range of advice types, including around, before, after returning and throws advice.
- * 	<li>Extensibility allowing arbitrary custom advice types to
- * 		be plugged in without modifying the core framework.
+ * <li>Introduction support
+ * <li>A Pointcut abstraction, supporting "static" pointcuts
+ * (class and method-based) and "dynamic" pointcuts (also considering method arguments).
+ * There are currently no AOP Alliance interfaces for pointcuts.
+ * <li>A full range of advice types, including around, before, after returning and throws advice.
+ * <li>Extensibility allowing arbitrary custom advice types to
+ * be plugged in without modifying the core framework.
  * </ul>
  *
- * <br>
- * Spring AOP can be used programmatically or (preferably)
+ * <p>Spring AOP can be used programmatically or (preferably)
  * integrated with the Spring IoC container.
- *
  */
 package org.springframework.aop;
-

spring-aop/src/main/java/org/springframework/aop/scope/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support for AOP-based scoping of target objects, with configurable backend.
- *
  */
 package org.springframework.aop.scope;
-

spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java

@@ -18,9 +18,9 @@ package org.springframework.aop.support;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Arrays;
 
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.PatternMatchUtils;

spring-aop/src/main/java/org/springframework/aop/support/annotation/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Annotation support for AOP pointcuts.
- *
  */
 package org.springframework.aop.support.annotation;
-

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

@@ -1,8 +1,4 @@
-
 /**
- *
  * Convenience classes for using Spring's AOP API.
- *
  */
 package org.springframework.aop.support;
-

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		targetNamespace="http://www.springframework.org/schema/aop"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:tool="http://www.springframework.org/schema/tool"
+			targetNamespace="http://www.springframework.org/schema/aop"
+			elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.0.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		targetNamespace="http://www.springframework.org/schema/aop"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:tool="http://www.springframework.org/schema/tool"
+			targetNamespace="http://www.springframework.org/schema/aop"
+			elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-2.5.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		targetNamespace="http://www.springframework.org/schema/aop"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:tool="http://www.springframework.org/schema/tool"
+			targetNamespace="http://www.springframework.org/schema/aop"
+			elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.0.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.1.xsd

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		targetNamespace="http://www.springframework.org/schema/aop"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:tool="http://www.springframework.org/schema/tool"
+			targetNamespace="http://www.springframework.org/schema/aop"
+			elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.1.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.2.xsd

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		targetNamespace="http://www.springframework.org/schema/aop"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:tool="http://www.springframework.org/schema/tool"
+			targetNamespace="http://www.springframework.org/schema/aop"
+			elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.2.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.0.xsd

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		targetNamespace="http://www.springframework.org/schema/aop"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:tool="http://www.springframework.org/schema/tool"
+			targetNamespace="http://www.springframework.org/schema/aop"
+			elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.0.xsd"/>

spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.1.xsd

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <xsd:schema xmlns="http://www.springframework.org/schema/aop"
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-		xmlns:beans="http://www.springframework.org/schema/beans"
-		xmlns:tool="http://www.springframework.org/schema/tool"
-		targetNamespace="http://www.springframework.org/schema/aop"
-		elementFormDefault="qualified"
-		attributeFormDefault="unqualified">
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:tool="http://www.springframework.org/schema/tool"
+			targetNamespace="http://www.springframework.org/schema/aop"
+			elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"/>
 	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.1.xsd"/>

spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java

@@ -15,13 +15,14 @@
  */
 package org.springframework.aop.aspectj;
 
-import static org.junit.Assert.*;
+import java.lang.reflect.Method;
 
 import org.aspectj.lang.JoinPoint;
 import org.junit.Test;
+
 import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer.AmbiguousBindingException;
 
-import java.lang.reflect.Method;
+import static org.junit.Assert.*;
 
 /**
  * Unit tests for the {@link AspectJAdviceParameterNameDiscoverer} class.

spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.aop.aspectj;
 
-import static org.junit.Assert.*;
-
 import java.lang.reflect.Method;
 
 import org.aopalliance.intercept.MethodInterceptor;
@@ -27,17 +25,19 @@ import org.aspectj.weaver.tools.PointcutPrimitive;
 import org.aspectj.weaver.tools.UnsupportedPointcutPrimitiveException;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
-
 import org.springframework.tests.sample.beans.IOther;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.tests.sample.beans.subpkg.DeepBean;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rob Harrop
  * @author Rod Johnson

spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java

@@ -16,12 +16,12 @@
 
 package org.springframework.aop.aspectj;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * Tests for matching of bean() pointcut designator.
  *

spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java

@@ -26,16 +26,17 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.aspectj.lang.reflect.SourceLocation;
 import org.aspectj.runtime.reflect.Factory;
-import static org.junit.Assert.*;
 import org.junit.Test;
-import org.springframework.tests.sample.beans.ITestBean;
-import org.springframework.tests.sample.beans.TestBean;
 
 import org.springframework.aop.MethodBeforeAdvice;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Rod Johnson

spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java

@@ -17,6 +17,7 @@
 package org.springframework.aop.aspectj;
 
 import org.junit.Test;
+
 import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer.AmbiguousBindingException;
 
 /**

spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java

@@ -16,9 +16,6 @@
 
 package org.springframework.aop.aspectj;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.List;
@@ -26,11 +23,13 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-
 import test.annotation.EmptySpringAnnotation;
 import test.annotation.transaction.Tx;
+
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * Java5-specific {@link AspectJExpressionPointcutTests}.
  *

spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java

@@ -1,8 +1,5 @@
 package org.springframework.aop.aspectj;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -12,6 +9,7 @@ import java.lang.annotation.Target;
 import java.lang.reflect.Method;
 
 import org.junit.Test;
+
 import org.springframework.aop.Advisor;
 import org.springframework.aop.MethodBeforeAdvice;
 import org.springframework.aop.ThrowsAdvice;
@@ -19,6 +17,8 @@ import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.core.OverridingClassLoader;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Dave Syer
  */

spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java

@@ -16,18 +16,18 @@
 
 package org.springframework.aop.aspectj;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-
 import org.springframework.tests.sample.beans.CountingTestBean;
 import org.springframework.tests.sample.beans.IOther;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.tests.sample.beans.subpkg.DeepBean;
 
+import static org.junit.Assert.*;
+
 /**
  * Unit tests for the {@link TypePatternClassFilter} class.
  *

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java

@@ -37,9 +37,12 @@ import org.aspectj.lang.annotation.DeclareParents;
 import org.aspectj.lang.annotation.DeclarePrecedence;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-
 import org.junit.Ignore;
 import org.junit.Test;
+import test.aop.DefaultLockable;
+import test.aop.Lockable;
+import test.aop.PerTargetAspect;
+import test.aop.TwoAdviceAspect;
 
 import org.springframework.aop.Advisor;
 import org.springframework.aop.aspectj.annotation.ReflectiveAspectJAdvisorFactory.SyntheticInstantiationAdvisor;
@@ -55,11 +58,6 @@ import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.ObjectUtils;
 
-import test.aop.DefaultLockable;
-import test.aop.Lockable;
-import test.aop.PerTargetAspect;
-import test.aop.TwoAdviceAspect;
-
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.aop.aspectj.annotation;
 
-import static org.junit.Assert.*;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
@@ -27,11 +25,13 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.junit.Test;
-import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer;
 
+import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Adrian Colyer
  * @author Juergen Hoeller

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java

@@ -16,17 +16,17 @@
 
 package org.springframework.aop.aspectj.annotation;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
+import test.aop.PerTargetAspect;
+
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.aspectj.AspectJExpressionPointcut;
 import org.springframework.aop.aspectj.AspectJExpressionPointcutTests;
 import org.springframework.aop.framework.AopConfigException;
-
-import test.aop.PerTargetAspect;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java

@@ -16,14 +16,14 @@
 
 package org.springframework.aop.aspectj.annotation;
 
-import static org.junit.Assert.*;
 import org.aspectj.lang.reflect.PerClauseKind;
 import org.junit.Test;
+import test.aop.PerTargetAspect;
 
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests.ExceptionAspect;
 
-import test.aop.PerTargetAspect;
+import static org.junit.Assert.*;
 
 /**
  * @since 2.0

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java

@@ -16,16 +16,16 @@
 
 package org.springframework.aop.aspectj.annotation;
 
-import static org.junit.Assert.assertEquals;
-
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.junit.Ignore;
 import org.junit.Test;
+import test.aop.PerThisAspect;
+
 import org.springframework.util.SerializationTestUtils;
 
-import test.aop.PerThisAspect;
+import static org.junit.Assert.*;
 
 /**
  * @author Rob Harrop

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

@@ -16,10 +16,9 @@
 
 package org.springframework.aop.aspectj.autoproxy;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.aop.config.AopConfigUtils;
 import org.springframework.aop.config.AopNamespaceUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -32,6 +31,8 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.factory.xml.XmlReaderContext;
 import org.springframework.tests.beans.CollectingReaderEventListener;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rob Harrop
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java

@@ -16,16 +16,12 @@
 
 package org.springframework.aop.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import java.util.HashSet;
 import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanReference;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@@ -36,6 +32,9 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 import org.springframework.tests.beans.CollectingReaderEventListener;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller

spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java

@@ -16,16 +16,16 @@
 
 package org.springframework.aop.config;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import org.junit.Test;
+
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * @author Mark Fisher
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java

@@ -16,14 +16,15 @@
 
 package org.springframework.aop.config;
 
-import static org.junit.Assert.assertTrue;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import org.junit.Test;
+
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * Tests that the <aop:config/> element can be used as a top level element.
  *

spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.aop.framework;
 
-import static org.junit.Assert.*;
-
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -25,11 +23,13 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
-import org.springframework.aop.SpringProxy;
 
+import org.springframework.aop.SpringProxy;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/framework/ClassWithConstructor.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-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java

@@ -17,11 +17,11 @@
 package org.springframework.aop.framework;
 
 import org.junit.Test;
-import org.springframework.aop.support.DelegatingIntroductionInterceptor;
-import org.springframework.util.StopWatch;
 
+import org.springframework.aop.support.DelegatingIntroductionInterceptor;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.util.StopWatch;
 
 /**
  * Benchmarks for introductions.

spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.aop.framework;
 
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.List;
@@ -28,6 +26,8 @@ import org.junit.Test;
 
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java

@@ -16,15 +16,16 @@
 
 package org.springframework.aop.framework;
 
-import static org.junit.Assert.assertEquals;
-
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+
 import org.springframework.aop.AopInvocationException;
 
+import static org.junit.Assert.*;
+
 /**
  * Test for SPR-4675. A null value returned from around advice is very hard to debug if
  * the caller expects a primitive.

spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java

@@ -16,16 +16,17 @@
 
 package org.springframework.aop.framework;
 
-import static org.junit.Assert.assertEquals;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
+
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * @author Juergen Hoeller
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java

@@ -16,13 +16,6 @@
 
 package org.springframework.aop.framework;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import javax.accessibility.Accessible;
 import javax.swing.JFrame;
 import javax.swing.RootPaneContainer;
@@ -31,6 +24,7 @@ import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Ignore;
 import org.junit.Test;
+
 import org.springframework.aop.Advisor;
 import org.springframework.aop.interceptor.DebugInterceptor;
 import org.springframework.aop.support.AopUtils;
@@ -44,6 +38,9 @@ import org.springframework.tests.sample.beans.IOther;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Also tests AdvisedSupport and ProxyCreatorSupport superclasses.
  *

spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java

@@ -20,11 +20,11 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.rmi.RemoteException;
-
 import javax.transaction.TransactionRolledbackException;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
+
 import org.springframework.aop.ThrowsAdvice;
 import org.springframework.tests.aop.advice.MethodCounter;
 

spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java

@@ -16,11 +16,10 @@
 
 package org.springframework.aop.interceptor;
 
-import static org.junit.Assert.assertEquals;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
+
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.tests.sample.beans.DerivedTestBean;
@@ -28,6 +27,8 @@ import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Juergen Hoeller
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java

@@ -16,15 +16,15 @@
 
 package org.springframework.aop.interceptor;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
+
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.factory.NamedBean;
-
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java

@@ -16,18 +16,18 @@
 
 package org.springframework.aop.interceptor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
+
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * Non-XML tests are in AbstractAopProxyTests
  *

spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java

@@ -17,6 +17,7 @@
 package org.springframework.aop.scope;
 
 import org.junit.Test;
+
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 
 import static org.mockito.BDDMockito.*;

spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java

@@ -16,14 +16,15 @@
 
 package org.springframework.aop.scope;
 
-import static org.junit.Assert.assertSame;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import org.junit.Test;
+
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * @author Mark Fisher
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java

@@ -20,6 +20,7 @@ import java.io.IOException;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 

spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java

@@ -16,13 +16,10 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.Method;
 
 import org.junit.Test;
+
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
@@ -32,6 +29,8 @@ import org.springframework.tests.aop.interceptor.NopInterceptor;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java

@@ -16,15 +16,15 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
+
 import org.springframework.aop.ClassFilter;
 import org.springframework.core.NestedRuntimeException;
-
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java

@@ -16,18 +16,18 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.*;
-
 import java.lang.reflect.Method;
 
 import org.junit.Test;
+
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
 import org.springframework.core.NestedRuntimeException;
-
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java

@@ -16,16 +16,16 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
 import org.junit.Test;
+
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.tests.aop.interceptor.NopInterceptor;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java

@@ -20,6 +20,7 @@ import java.io.Serializable;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.junit.Test;
+
 import org.springframework.aop.IntroductionAdvisor;
 import org.springframework.aop.IntroductionInterceptor;
 import org.springframework.aop.framework.ProxyFactory;

spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java

@@ -16,19 +16,18 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.Method;
 
 import org.junit.Test;
+
 import org.springframework.aop.MethodMatcher;
 import org.springframework.tests.sample.beans.IOther;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Juergen Hoeller
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java

@@ -16,12 +16,9 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.tests.aop.interceptor.NopInterceptor;
@@ -30,6 +27,8 @@ import org.springframework.tests.sample.beans.Person;
 import org.springframework.tests.sample.beans.SerializablePerson;
 import org.springframework.util.SerializationTestUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java

@@ -16,16 +16,16 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.*;
-
 import java.lang.reflect.Method;
 
 import org.junit.Test;
+
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.Pointcut;
-
 import org.springframework.tests.sample.beans.TestBean;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java

@@ -16,10 +16,8 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.assertEquals;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import org.junit.Test;
+
 import org.springframework.aop.framework.Advised;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -31,6 +29,9 @@ import org.springframework.tests.sample.beans.Person;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java

@@ -16,16 +16,17 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.assertTrue;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import org.junit.Test;
+
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 import org.springframework.tests.sample.beans.ITestBean;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * @author Rob Harrop
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java

@@ -16,14 +16,10 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
@@ -36,6 +32,9 @@ import org.springframework.tests.sample.beans.SerializablePerson;
 import org.springframework.tests.sample.beans.SideEffectBean;
 import org.springframework.util.SerializationTestUtils;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java

@@ -16,12 +16,13 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
+
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.framework.ProxyFactory;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller

spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java

@@ -16,19 +16,18 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import java.util.Set;
 
 import org.junit.Test;
+
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 import org.springframework.tests.sample.beans.ITestBean;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * @author Juergen Hoeller
  * @author Rob Harrop

spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java

@@ -16,10 +16,8 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
+
 import org.springframework.aop.TargetSource;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -28,6 +26,8 @@ import org.springframework.tests.sample.beans.SerializablePerson;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * Unit tests relating to the abstract {@link AbstractPrototypeBasedTargetSource}
  * and not subclasses.

spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java

@@ -16,11 +16,9 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.assertEquals;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -28,6 +26,9 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 import org.springframework.tests.sample.beans.SideEffectBean;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java

@@ -16,19 +16,18 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static org.springframework.tests.TestResourceUtils.qualifiedResource;
-
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.SideEffectBean;
 
+import static org.junit.Assert.*;
+import static org.springframework.tests.TestResourceUtils.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java

@@ -16,12 +16,13 @@
 
 package org.springframework.aop.target.dynamic;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
+
 import org.springframework.tests.Assume;
 import org.springframework.tests.TestGroup;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rob Harrop
  * @author Chris Beams

spring-aop/src/test/java/org/springframework/tests/aop/advice/TimestampIntroductionAdvisor.java

@@ -16,8 +16,8 @@
 
 package org.springframework.tests.aop.advice;
 
-import org.springframework.aop.support.DelegatingIntroductionInterceptor;
 import org.springframework.aop.support.DefaultIntroductionAdvisor;
+import org.springframework.aop.support.DelegatingIntroductionInterceptor;
 import org.springframework.tests.aop.interceptor.TimestampIntroductionInterceptor;
 
 /**

spring-aop/src/test/java/test/aop/PerTargetAspect.java

@@ -1,11 +1,25 @@
-/**
+/*
+ * 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.
+ * 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.
  */
+
 package test.aop;
 
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
+
 import org.springframework.core.Ordered;
 
 @Aspect("pertarget(execution(* *.getSpouse()))")
@@ -33,4 +47,5 @@ public class PerTargetAspect implements Ordered {
 	public void setOrder(int order) {
 		this.order = order;
 	}
+
 }

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

spring-beans-groovy/src/main/java/org/springframework/beans/factory/groovy/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support package for Groovy-based bean definitions.
- *
  */
 package org.springframework.beans.factory.groovy;
-

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

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support package for beans-style handling of Java 5 annotations.
- *
  */
 package org.springframework.beans.annotation;
-

spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java

@@ -22,6 +22,7 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;

spring-beans/src/main/java/org/springframework/beans/factory/access/el/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support classes for accessing a Spring BeanFactory from Unified EL.
- *
  */
 package org.springframework.beans.factory.access.el;
-

spring-beans/src/main/java/org/springframework/beans/factory/access/package-info.java

@@ -1,12 +1,8 @@
-
 /**
- *
  * Helper infrastructure to locate and access bean factories.
  *
  * <p><b>Note: This package is only relevant for special sharing of bean
  * factories, for example behind EJB facades. It is <i>not</i> used in a
  * typical web application or standalone application.</b>
- *
  */
 package org.springframework.beans.factory.access;
-

spring-beans/src/main/java/org/springframework/beans/factory/annotation/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support package for annotation-driven bean configuration.
- *
  */
 package org.springframework.beans.factory.annotation;
-

spring-beans/src/main/java/org/springframework/beans/factory/config/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * SPI interfaces and configuration-related convenience classes for bean factories.
- *
  */
 package org.springframework.beans.factory.config;
-

spring-beans/src/main/java/org/springframework/beans/factory/package-info.java

@@ -1,16 +1,12 @@
-
 /**
- *
  * The core package implementing Spring's lightweight Inversion of Control (IoC) container.
- * <p>
- * Provides an alternative to the Singleton and Prototype design
+ *
+ * <p>Provides an alternative to the Singleton and Prototype design
  * patterns, including a consistent approach to configuration management.
  * Builds on the org.springframework.beans package.
  *
  * <p>This package and related packages are discussed in Chapter 11 of
  * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
  * by Rod Johnson (Wrox, 2002).
- *
  */
 package org.springframework.beans.factory;
-

spring-beans/src/main/java/org/springframework/beans/factory/parsing/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support infrastructure for bean definition parsing.
- *
  */
 package org.springframework.beans.factory.parsing;
-

spring-beans/src/main/java/org/springframework/beans/factory/serviceloader/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
- * Support package for the JDK 1.6 ServiceLoader facility.
- *
+ * Support package for the Java 6 ServiceLoader facility.
  */
 package org.springframework.beans.factory.serviceloader;
-

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java

@@ -21,10 +21,11 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.EnvironmentCapable;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;

spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java

@@ -1,9 +1,5 @@
 /**
- *
  * Classes supporting the {@code org.springframework.beans.factory} package.
  * Contains abstract base classes for {@code BeanFactory} implementations.
- *
- *
  */
 package org.springframework.beans.factory.support;
-