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

spring-core/src/main/java/org/springframework/asm/package-info.java

@@ -1,4 +1,3 @@
-
 /**
  * Spring's repackaging of
  * <a href="http://asm.ow2.org">org.objectweb.asm 5.0</a>
@@ -12,7 +11,5 @@
  * and javadocs are not available here. See the original ObjectWeb
  * <a href="http://asm.ow2.org/asm50/javadoc/user">ASM 5.0 javadocs</a>
  * for details when working with these classes.
- *
- * @since 3.2
  */
 package org.springframework.asm;

spring-core/src/main/java/org/springframework/cglib/package-info.java

@@ -1,4 +1,3 @@
-
 /**
  * Spring's repackaging of
  * <a href="http://cglib.sourceforge.net">net.sf.cglib 3.1</a>
@@ -12,7 +11,5 @@
  * and javadocs are not available here. See the original
  * <a href="http://cglib.sourceforge.net/apidocs">CGLIB 3.1 javadocs</a>
  * for details when working with these classes.
- *
- * @since 3.2
  */
 package org.springframework.cglib;

spring-core/src/main/java/org/springframework/core/SerializableTypeWrapper.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-core/src/main/java/org/springframework/core/annotation/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Core support package for Java 5 annotations.
- *
  */
 package org.springframework.core.annotation;
-

spring-core/src/main/java/org/springframework/core/convert/converter/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * SPI to implement Converters for the type conversion system.
- *
  */
 package org.springframework.core.convert.converter;
-

spring-core/src/main/java/org/springframework/core/convert/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Type conversion system API.
- *
  */
 package org.springframework.core.convert;
-

spring-core/src/main/java/org/springframework/core/convert/support/ByteBufferConverter.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-core/src/main/java/org/springframework/core/convert/support/ObjectToOptionalConverter.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-core/src/main/java/org/springframework/core/convert/support/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Default implementation of the type conversion system.
- *
  */
 package org.springframework.core.convert.support;
-

spring-core/src/main/java/org/springframework/core/env/package-info.java

@@ -1,7 +1,5 @@
 /**
  * Spring's environment abstraction consisting of bean definition
  * profile and hierarchical property source support.
- * @author Chris Beams
- * @since 3.1
  */
 package org.springframework.core.env;

spring-core/src/main/java/org/springframework/core/io/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Generic abstraction for (file-based) resources, used throughout the framework.
- *
  */
 package org.springframework.core.io;
-

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

@@ -1,9 +1,5 @@
-
 /**
- *
  * Support classes for Spring's resource abstraction.
  * Includes a ResourcePatternResolver mechanism.
- *
  */
 package org.springframework.core.io.support;
-

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

@@ -1,9 +1,5 @@
-
 /**
- *
  * Provides basic classes for exception handling and version detection,
  * and other core helpers that are not specific to any part of the framework.
- *
  */
 package org.springframework.core;
-

spring-core/src/main/java/org/springframework/core/serializer/package-info.java

@@ -1,10 +1,6 @@
-
 /**
- *
  * Root package for Spring's serializer interfaces and implementations.
  * Provides an abstraction over various serialization techniques.
  * Includes exceptions for serialization and deserialization failures.
- *
  */
 package org.springframework.core.serializer;
-

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

@@ -1,9 +1,5 @@
-
 /**
- *
  * Support classes for Spring's serializer abstraction.
  * Includes adapters to the Converter SPI.
- *
  */
 package org.springframework.core.serializer.support;
-

spring-core/src/main/java/org/springframework/core/style/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support for styling values as Strings, with ToStringCreator as central class.
- *
  */
 package org.springframework.core.style;
-

spring-core/src/main/java/org/springframework/core/task/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * This package defines Spring's core TaskExecutor abstraction,
  * and provides SyncTaskExecutor and SimpleAsyncTaskExecutor implementations.
- *
  */
 package org.springframework.core.task;
-

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

@@ -1,9 +1,5 @@
-
 /**
- *
  * Support classes for Spring's TaskExecutor abstraction.
  * Includes an adapter for the standard ExecutorService interface.
- *
  */
 package org.springframework.core.task.support;
-

spring-core/src/main/java/org/springframework/core/type/classreading/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Support classes for reading annotation and class-level metadata.
- *
  */
 package org.springframework.core.type.classreading;
-

spring-core/src/main/java/org/springframework/core/type/filter/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Core support package for type filtering (e.g. for classpath scanning).
- *
  */
 package org.springframework.core.type.filter;
-

spring-core/src/main/java/org/springframework/core/type/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Core support package for type introspection.
- *
  */
 package org.springframework.core.type;
-

spring-core/src/main/java/org/springframework/lang/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Annotations indicating the use of core Java/JDK API beyond the API level of JDK 6 update 18.
  * Used descriptively within the framework codebase; validated by Animal Sniffer at build time.
- *
  */
 package org.springframework.lang;
-

spring-core/src/main/java/org/springframework/util/AlternativeJdkIdGenerator.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-core/src/main/java/org/springframework/util/IdGenerator.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-core/src/main/java/org/springframework/util/MimeTypeUtils.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-core/src/main/java/org/springframework/util/SocketUtils.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,
@@ -21,7 +21,6 @@ import java.net.ServerSocket;
 import java.util.Random;
 import java.util.SortedSet;
 import java.util.TreeSet;
-
 import javax.net.ServerSocketFactory;
 
 /**

spring-core/src/main/java/org/springframework/util/StreamUtils.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-core/src/main/java/org/springframework/util/TypeUtils.java

@@ -21,8 +21,6 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
 
-import org.springframework.util.ClassUtils;
-
 /**
  * Utility to work with Java 5 generic type parameters.
  * Mainly for internal use within the framework.

spring-core/src/main/java/org/springframework/util/backoff/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * A generic back-off abstraction.
- *
  */
 package org.springframework.util.backoff;
-

spring-core/src/main/java/org/springframework/util/comparator/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Useful generic {@code java.util.Comparator} implementations,
  * such as an invertible comparator and a compound comparator.
- *
  */
 package org.springframework.util.comparator;
-

spring-core/src/main/java/org/springframework/util/concurrent/SettableListenableFuture.java

@@ -16,14 +16,14 @@
 
 package org.springframework.util.concurrent;
 
-import org.springframework.util.Assert;
-
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.springframework.util.Assert;
+
 /**
  * A {@link org.springframework.util.concurrent.ListenableFuture ListenableFuture}
  * whose value can be set via {@link #set(Object)} or

spring-core/src/main/java/org/springframework/util/concurrent/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
  * Useful generic {@code java.util.concurrent.Future} extension.
- *
  */
 package org.springframework.util.concurrent;
-

spring-core/src/main/java/org/springframework/util/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Miscellaneous utility classes, such as String manipulation utilities,
  * a Log4J configurer, and a state holder for paged lists of objects.
- *
  */
 package org.springframework.util;
-

spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java

@@ -17,7 +17,6 @@
 package org.springframework.util.xml;
 
 import java.util.Iterator;
-
 import javax.xml.namespace.QName;
 import javax.xml.stream.Location;
 import javax.xml.stream.XMLEventReader;
@@ -37,13 +36,14 @@ import javax.xml.stream.events.StartDocument;
 import javax.xml.stream.events.StartElement;
 import javax.xml.stream.events.XMLEvent;
 
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.ext.Locator2;
 import org.xml.sax.helpers.AttributesImpl;
 
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
 /**
  * SAX {@code XMLReader} that reads from a StAX {@code XMLEventReader}. Consumes {@code XMLEvents} from
  * an {@code XMLEventReader}, and calls the corresponding methods on the SAX callback interfaces.

spring-core/src/main/java/org/springframework/util/xml/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
  * Miscellaneous utility classes for XML parsing and transformation,
  * such as error handlers that log warnings via Commons Logging.
- *
  */
 package org.springframework.util.xml;
-