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

Author: jhoeller

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

@@ -28,6 +28,7 @@
 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.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 @@
 
 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.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.
  *