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

spring-context-support/src/main/java/org/springframework/cache/jcache/config/package-info.java

@@ -2,7 +2,8 @@
  * Support package for declarative JSR-107 caching configuration. Used
  * by the regular Spring's caching configuration when it detects the
  * JSR-107 API and Spring's JCache implementation.
+ *
  * <p>Provide an extension of the {@code CachingConfigurer} that exposes
  * the exception cache resolver to use, see {@code JCacheConfigurer}.
  */
-package org.springframework.cache.jcache.config;
+package org.springframework.cache.jcache.config;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractJCacheKeyOperation.java

@@ -19,7 +19,6 @@ package org.springframework.cache.jcache.interceptor;
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.cache.annotation.CacheInvocationParameter;
 import javax.cache.annotation.CacheMethodDetails;
 

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractKeyCacheInterceptor.java

@@ -17,7 +17,6 @@
 package org.springframework.cache.jcache.interceptor;
 
 import java.lang.annotation.Annotation;
-
 import javax.cache.annotation.CacheKeyInvocationContext;
 
 import org.springframework.cache.interceptor.CacheErrorHandler;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AnnotationJCacheOperationSource.java

@@ -20,7 +20,6 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.cache.annotation.CacheDefaults;
 import javax.cache.annotation.CacheKeyGenerator;
 import javax.cache.annotation.CacheMethodDetails;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CachePutOperation.java

@@ -18,7 +18,6 @@ package org.springframework.cache.jcache.interceptor;
 
 import java.lang.reflect.Method;
 import java.util.List;
-
 import javax.cache.annotation.CacheInvocationParameter;
 import javax.cache.annotation.CacheMethodDetails;
 import javax.cache.annotation.CachePut;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapter.java

@@ -3,7 +3,6 @@ package org.springframework.cache.jcache.interceptor;
 
 import java.util.Collection;
 import java.util.Collections;
-
 import javax.cache.annotation.CacheInvocationContext;
 
 import org.springframework.cache.Cache;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/DefaultCacheInvocationContext.java

@@ -20,7 +20,6 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Set;
-
 import javax.cache.annotation.CacheInvocationContext;
 import javax.cache.annotation.CacheInvocationParameter;
 

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/DefaultCacheKeyInvocationContext.java

@@ -17,7 +17,6 @@
 package org.springframework.cache.jcache.interceptor;
 
 import java.lang.annotation.Annotation;
-
 import javax.cache.annotation.CacheInvocationParameter;
 import javax.cache.annotation.CacheKeyInvocationContext;
 

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/DefaultCacheMethodDetails.java

@@ -16,16 +16,15 @@
 
 package org.springframework.cache.jcache.interceptor;
 
-import static java.util.Arrays.*;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
-
 import javax.cache.annotation.CacheMethodDetails;
 
+import static java.util.Arrays.*;
+
 /**
  * The default {@link CacheMethodDetails} implementation.
  *

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheOperation.java

@@ -17,7 +17,6 @@
 package org.springframework.cache.jcache.interceptor;
 
 import java.lang.annotation.Annotation;
-
 import javax.cache.annotation.CacheInvocationParameter;
 import javax.cache.annotation.CacheMethodDetails;
 

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java

@@ -4,7 +4,6 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.cache.annotation.CacheInvocationParameter;
 import javax.cache.annotation.CacheKeyGenerator;
 import javax.cache.annotation.CacheKeyInvocationContext;

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/package-info.java

@@ -1,8 +1,10 @@
 /**
  * AOP-based solution for declarative caching demarcation using JSR-107 annotations.
+ *
  * <p>Strongly based on the infrastructure in org.springframework.cache.interceptor
  * that deals with Spring's caching annotations.
+ *
  * <p>Builds on the AOP infrastructure in org.springframework.aop.framework.
  * Any POJO can be cache-advised with Spring.
  */
-package org.springframework.cache.jcache.interceptor;
+package org.springframework.cache.jcache.interceptor;

spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java

@@ -19,9 +19,9 @@ package org.springframework.mail;
 import java.io.Serializable;
 import java.util.Date;
 
+import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.util.Assert;
 
 /**
  * Models a simple mail message, including data such as the from, to, cc, subject, and text fields.

spring-context-support/src/main/java/org/springframework/mail/javamail/package-info.java

@@ -1,10 +1,6 @@
-
 /**
- *
  * JavaMail support for Spring's mail infrastructure.
  * Provides an extended JavaMailSender interface and a MimeMessageHelper
  * class for convenient population of a JavaMail MimeMessage.
- *
  */
 package org.springframework.mail.javamail;
-

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

@@ -1,9 +1,5 @@
-
 /**
- *
  * Spring's generic mail infrastructure.
  * Concrete implementations are provided in the subpackages.
- *
  */
 package org.springframework.mail;
-

spring-context-support/src/main/java/org/springframework/scheduling/commonj/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Convenience classes for scheduling based on the CommonJ WorkManager/TimerManager
  * facility, as supported by IBM WebSphere 6.0+ and BEA WebLogic 9.0+.
- *
  */
 package org.springframework.scheduling.commonj;
-

spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java

@@ -24,6 +24,7 @@ import java.net.URL;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.quartz.spi.ClassLoadHelper;
+
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;

spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerContextAware.java

@@ -17,6 +17,7 @@
 package org.springframework.scheduling.quartz;
 
 import org.quartz.SchedulerContext;
+
 import org.springframework.beans.factory.Aware;
 
 /**

spring-context-support/src/main/java/org/springframework/scheduling/quartz/package-info.java

@@ -1,12 +1,8 @@
-
 /**
- *
  * Support classes for the open source scheduler
  * <a href="http://quartz-scheduler.org">Quartz</a>,
  * allowing to set up Quartz Schedulers, JobDetails and
  * Triggers as beans in a Spring context. Also provides
  * convenience classes for implementing Quartz Jobs.
- *
  */
 package org.springframework.scheduling.quartz;
-

spring-context-support/src/main/java/org/springframework/ui/freemarker/package-info.java

@@ -1,10 +1,6 @@
-
 /**
- *
  * Support classes for setting up
  * <a href="http://www.freemarker.org">FreeMarker</a>
  * within a Spring application context.
- *
  */
 package org.springframework.ui.freemarker;
-

spring-context-support/src/main/java/org/springframework/ui/jasperreports/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Support classes for
  * <a href="http://jasperreports.sourceforge.net">JasperReports</a>.
- *
  */
 package org.springframework.ui.jasperreports;
-

spring-context-support/src/main/java/org/springframework/ui/velocity/package-info.java

@@ -1,10 +1,6 @@
-
 /**
- *
  * Support classes for setting up
  * <a href="http://velocity.apache.org">Velocity</a>
  * within a Spring application context.
- *
  */
 package org.springframework.ui.velocity;
-