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;
-

spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java

@@ -32,6 +32,7 @@ import java.util.concurrent.DelayQueue;
 import java.util.concurrent.Delayed;
 
 import org.junit.Test;
+
 import org.springframework.util.ReflectionUtils;
 
 import static org.junit.Assert.*;

spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java

@@ -27,6 +27,7 @@ import java.util.Set;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.core.io.Resource;
 import org.springframework.tests.sample.objects.GenericObject;
 

spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java

@@ -23,8 +23,8 @@ import java.lang.reflect.Method;
 import java.util.Date;
 
 import junit.framework.TestCase;
-
 import org.junit.Ignore;
+
 import org.springframework.tests.sample.objects.TestObject;
 
 /**

spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java

@@ -16,10 +16,10 @@
 
 package org.springframework.core;
 
-import junit.framework.TestCase;
-
 import java.util.Comparator;
 
+import junit.framework.TestCase;
+
 /**
  * Unit tests for the {@link OrderComparator} class.
  *

spring-core/src/test/java/org/springframework/core/SerializableTypeWrapperTests.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/test/java/org/springframework/core/StandardReflectionParameterNameDiscoverTests.java

@@ -15,14 +15,15 @@
  */
 package org.springframework.core;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.util.ReflectionUtils;
-
 import java.lang.reflect.Method;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.util.ReflectionUtils;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
 
 /**
  * Tests for StandardReflectionParameterNameDiscoverer

spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.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,
@@ -25,6 +25,7 @@ import java.lang.annotation.Target;
 import java.util.Arrays;
 
 import org.junit.Test;
+
 import org.springframework.util.MultiValueMap;
 
 import static org.junit.Assert.*;

spring-core/src/test/java/org/springframework/core/annotation/AnnotationAttributesTests.java

@@ -16,13 +16,11 @@
 
 package org.springframework.core.annotation;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Unit tests for {@link AnnotationAttributes}.
  *

spring-core/src/test/java/org/springframework/core/annotation/AnnotationAwareOrderComparatorTests.java

@@ -18,14 +18,13 @@ package org.springframework.core.annotation;
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Priority;
 
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
-import javax.annotation.Priority;
-
 /**
  * @author Juergen Hoeller
  * @author Oliver Gierke

spring-core/src/test/java/org/springframework/core/annotation/OrderUtilsTests.java

@@ -16,12 +16,12 @@
 
 package org.springframework.core.annotation;
 
-import static org.junit.Assert.*;
-
 import javax.annotation.Priority;
 
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  *
  * @author Stephane Nicoll

spring-core/src/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotatedClass.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/test/java/org/springframework/core/annotation/subpackage/NonPublicAnnotation.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/test/java/org/springframework/core/convert/support/ByteBufferConverterTests.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,
@@ -20,6 +20,7 @@ import java.nio.ByteBuffer;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.core.convert.converter.Converter;
 
 import static org.hamcrest.Matchers.*;

spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java

@@ -25,6 +25,7 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.ConverterNotFoundException;
 import org.springframework.core.convert.TypeDescriptor;

spring-core/src/test/java/org/springframework/core/env/CompositePropertySourceTests.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/test/java/org/springframework/core/env/CustomEnvironmentTests.java

@@ -16,15 +16,15 @@
 
 package org.springframework.core.env;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Unit tests covering the extensibility of {@link AbstractEnvironment}.
  *

spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java

@@ -16,19 +16,15 @@
 
 package org.springframework.core.env;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
 import java.util.Arrays;
 
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
-
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Unit tests for {@link JOptCommandLinePropertySource}.
  *

spring-core/src/test/java/org/springframework/core/env/MutablePropertySourcesTests.java

@@ -17,9 +17,10 @@
 package org.springframework.core.env;
 
 import org.junit.Test;
+
 import org.springframework.mock.env.MockPropertySource;
 
-import static java.lang.String.*;
+import static java.lang.String.format;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 import static org.springframework.core.env.MutablePropertySources.*;

spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java

@@ -16,10 +16,6 @@
 
 package org.springframework.core.env;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +26,9 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Unit tests for {@link AbstractPropertySource} implementations.
  *

spring-core/src/test/java/org/springframework/core/env/SimpleCommandLineParserTests.java

@@ -16,16 +16,14 @@
 
 package org.springframework.core.env;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
 import java.util.Collections;
 import java.util.List;
 
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 public class SimpleCommandLineParserTests {
 
 	@Test

spring-core/src/test/java/org/springframework/core/io/ClassPathResourceTests.java

@@ -16,20 +16,15 @@
 
 package org.springframework.core.io;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 /**
  * Unit tests that serve as regression tests for the bugs described in SPR-6888

spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java

@@ -27,6 +27,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
+
 import org.springframework.util.FileCopyUtils;
 
 import static org.hamcrest.Matchers.*;

spring-core/src/test/java/org/springframework/core/io/ResourceEditorTests.java

@@ -18,10 +18,12 @@ package org.springframework.core.io;
 
 import java.beans.PropertyEditor;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
+
 import org.springframework.core.env.StandardEnvironment;
 
+import static org.junit.Assert.*;
+
 /**
  * Unit tests for the {@link ResourceEditor} class.
  *

spring-core/src/test/java/org/springframework/core/io/ResourceTests.java

@@ -25,6 +25,7 @@ import java.util.HashSet;
 
 import org.junit.Ignore;
 import org.junit.Test;
+
 import org.springframework.util.FileCopyUtils;
 
 import static org.hamcrest.CoreMatchers.*;

spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java

@@ -18,12 +18,13 @@ package org.springframework.core.io.support;
 
 import java.beans.PropertyEditor;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.Resource;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Dave Syer
  * @author Juergen Hoeller

spring-core/src/test/java/org/springframework/core/serializer/SerializationConverterTests.java

@@ -19,13 +19,14 @@ package org.springframework.core.serializer;
 import java.io.NotSerializableException;
 import java.io.Serializable;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
 import org.springframework.core.serializer.support.DeserializingConverter;
 import org.springframework.core.serializer.support.SerializationFailedException;
 import org.springframework.core.serializer.support.SerializingConverter;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Gary Russell
  * @author Mark Fisher

spring-core/src/test/java/org/springframework/core/type/AbstractClassMetadataMemberClassTests.java

@@ -16,11 +16,11 @@
 
 package org.springframework.core.type;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Abstract base class for testing implementations of
  * {@link ClassMetadata#getMemberClassNames()}.

spring-core/src/test/java/org/springframework/core/type/AnnotationTypeFilterTests.java

@@ -16,17 +16,18 @@
 
 package org.springframework.core.type;
 
-import static org.junit.Assert.*;
-
 import java.lang.annotation.Inherited;
 
 import org.junit.Test;
+
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.stereotype.Component;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Ramnivas Laddad
  * @author Juergen Hoeller

spring-core/src/test/java/org/springframework/core/type/AspectJTypeFilterTests.java

@@ -18,8 +18,8 @@ package org.springframework.core.type;
 
 import junit.framework.TestCase;
 
-import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
 import org.springframework.core.type.filter.AspectJTypeFilter;
 import org.springframework.stereotype.Component;

spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java

@@ -18,8 +18,8 @@ package org.springframework.core.type;
 
 import junit.framework.TestCase;
 
-import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
 import org.springframework.core.type.filter.AssignableTypeFilter;
 

spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTests.java

@@ -19,6 +19,7 @@ package org.springframework.core.type;
 import java.net.URL;
 
 import org.junit.Test;
+
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.core.type.classreading.CachingMetadataReaderFactory;

spring-core/src/test/java/org/springframework/tests/BuildTests.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/test/java/org/springframework/tests/JavaVersionTests.java

@@ -16,11 +16,11 @@
 
 package org.springframework.tests;
 
-import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Tests for {@link JavaVersion}.
  *

spring-core/src/test/java/org/springframework/tests/MockitoUtils.java

@@ -16,16 +16,15 @@
 
 package org.springframework.tests;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
 import java.util.List;
 
 import org.mockito.Mockito;
 import org.mockito.internal.util.MockUtil;
 import org.mockito.invocation.Invocation;
 
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
 /**
  * General test utilities for use with {@link Mockito}.
  *

spring-core/src/test/java/org/springframework/tests/TestResourceUtils.java

@@ -16,10 +16,10 @@
 
 package org.springframework.tests;
 
-import static java.lang.String.format;
-
 import org.springframework.core.io.ClassPathResource;
 
+import static java.lang.String.*;
+
 /**
  * Convenience utilities for common operations with test resources.
  *

spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java

@@ -18,7 +18,7 @@ package org.springframework.util;
 
 import java.util.LinkedList;
 
-import junit.framework.*;
+import junit.framework.TestCase;
 
 import org.springframework.tests.sample.objects.TestObject;
 

spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java

@@ -28,6 +28,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import org.springframework.tests.sample.objects.DerivedTestObject;
 import org.springframework.tests.sample.objects.ITestInterface;
 import org.springframework.tests.sample.objects.ITestObject;
@@ -35,9 +38,6 @@ import org.springframework.tests.sample.objects.TestObject;
 
 import static org.junit.Assert.*;
 
-import org.junit.Before;
-import org.junit.Test;
-
 /**
  * @author Colin Sampaleanu
  * @author Juergen Hoeller

spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java

@@ -28,9 +28,10 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller

spring-core/src/test/java/org/springframework/util/DigestUtilsTests.java

@@ -18,10 +18,11 @@ package org.springframework.util;
 
 import java.io.UnsupportedEncodingException;
 
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 public class DigestUtilsTests {
 
 	private byte[] bytes;

spring-core/src/test/java/org/springframework/util/ExceptionTypeFilterTests.java

@@ -16,12 +16,10 @@
 
 package org.springframework.util;
 
-import static java.util.Arrays.*;
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
-import org.springframework.util.ExceptionTypeFilter;
+import static java.util.Arrays.*;
+import static org.junit.Assert.*;
 
 /**
  * @author Stephane Nicoll

spring-core/src/test/java/org/springframework/util/ExponentialBackOffTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.util;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -25,6 +23,8 @@ import org.junit.rules.ExpectedException;
 import org.springframework.util.backoff.BackOffExecution;
 import org.springframework.util.backoff.ExponentialBackOff;
 
+import static org.junit.Assert.*;
+
 /**
  *
  * @author Stephane Nicoll

spring-core/src/test/java/org/springframework/util/FixedBackOffTests.java

@@ -16,13 +16,13 @@
 
 package org.springframework.util;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
 import org.springframework.util.backoff.BackOffExecution;
 import org.springframework.util.backoff.FixedBackOff;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Stephane Nicoll
  */

spring-core/src/test/java/org/springframework/util/InstanceFilterTests.java

@@ -16,12 +16,10 @@
 
 package org.springframework.util;
 
-import static java.util.Arrays.*;
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
-import org.springframework.util.InstanceFilter;
+import static java.util.Arrays.*;
+import static org.junit.Assert.*;
 
 /**
  * @author Stephane Nicoll

spring-core/src/test/java/org/springframework/util/LinkedMultiValueMapTests.java

@@ -22,10 +22,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Arjen Poutsma
  */

spring-core/src/test/java/org/springframework/util/MimeTypeTests.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,
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Random;
 
 import org.junit.Test;
+
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 

spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java

@@ -18,9 +18,10 @@ package org.springframework.util;
 
 import java.util.Properties;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rob Harrop
  */

spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java

@@ -25,7 +25,6 @@ import java.util.LinkedList;
 import java.util.List;
 
 import org.hamcrest.Matchers;
-
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -33,7 +32,7 @@ import org.springframework.tests.Assume;
 import org.springframework.tests.TestGroup;
 import org.springframework.tests.sample.objects.TestObject;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 /**

spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java

@@ -16,15 +16,11 @@
 
 package org.springframework.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
 import java.math.BigInteger;
 
 import org.junit.Test;
 
-import org.springframework.util.SerializationUtils;
+import static org.junit.Assert.*;
 
 /**
  * Test for static utility to help with serialization.

spring-core/src/test/java/org/springframework/util/SocketUtilsTests.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/test/java/org/springframework/util/StreamUtilsTests.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/test/java/org/springframework/util/SystemPropertyUtilsTests.java

@@ -18,9 +18,10 @@ package org.springframework.util;
 
 import java.util.Map;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller

spring-core/src/test/java/org/springframework/util/TypeUtilsTests.java

@@ -16,9 +16,6 @@
 
 package org.springframework.util;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Collection;
@@ -28,6 +25,8 @@ import java.util.List;
 
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  * Unit tests for {@link TypeUtils}.
  *

spring-core/src/test/java/org/springframework/util/comparator/BooleanComparatorTests.java

@@ -16,13 +16,13 @@
 
 package org.springframework.util.comparator;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-
 import java.util.Comparator;
 
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Tests for {@link BooleanComparator}.
  *

spring-core/src/test/java/org/springframework/util/comparator/ComparableComparatorTests.java

@@ -16,14 +16,14 @@
 
 package org.springframework.util.comparator;
 
-import static org.junit.Assert.assertTrue;
-
 import java.util.Comparator;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import static org.junit.Assert.*;
+
 /**
  * Tests for {@link ComparableComparator}.
  *

spring-core/src/test/java/org/springframework/util/comparator/InstanceComparatorTests.java

@@ -16,13 +16,13 @@
 
 package org.springframework.util.comparator;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-
 import java.util.Comparator;
 
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Tests for {@link InstanceComparator}.
  *

spring-core/src/test/java/org/springframework/util/comparator/NullSafeComparatorTests.java

@@ -16,12 +16,12 @@
 
 package org.springframework.util.comparator;
 
-import static org.junit.Assert.*;
-
 import java.util.Comparator;
 
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  * Tests for {@link NullSafeComparator}.
  *

spring-core/src/test/java/org/springframework/util/concurrent/FutureAdapterTests.java

@@ -20,12 +20,11 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.mock;
+
+import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.*;
 
 /**
  * @author Arjen Poutsma

spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java

@@ -16,16 +16,17 @@
 
 package org.springframework.util.concurrent;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static org.hamcrest.Matchers.equalTo;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.*;
 
 

spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java

@@ -25,7 +25,6 @@ import javax.xml.transform.Result;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stream.StreamResult;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
@@ -33,6 +32,8 @@ import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
+import static org.custommonkey.xmlunit.XMLAssert.*;
+
 public abstract class AbstractStaxHandlerTestCase {
 
 	private static final String COMPLEX_XML =

spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java

@@ -25,10 +25,8 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.sax.SAXSource;
 
-import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
-import static org.mockito.BDDMockito.*;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.w3c.dom.Node;
@@ -46,6 +44,9 @@ import org.springframework.core.io.Resource;
 import org.springframework.tests.MockitoUtils;
 import org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter;
 
+import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.*;
+
 public abstract class AbstractStaxXMLReaderTestCase {
 
 	protected static XMLInputFactory inputFactory;

spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java

@@ -20,7 +20,6 @@ import java.io.StringReader;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
@@ -29,6 +28,8 @@ import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
+import static org.custommonkey.xmlunit.XMLAssert.*;
+
 /**
  * Unit tests for {@link DomContentHandler}.
  */

spring-core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java

@@ -19,10 +19,11 @@ import java.util.Collections;
 import java.util.Iterator;
 import javax.xml.XMLConstants;
 
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 public class SimpleNamespaceContextTests {
 
 	private SimpleNamespaceContext context;

spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java

@@ -18,7 +18,6 @@ package org.springframework.util.xml;
 
 import java.io.InputStream;
 import java.io.StringReader;
-
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;

spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java

@@ -18,7 +18,6 @@ package org.springframework.util.xml;
 
 import java.io.InputStream;
 import java.io.StringReader;
-
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;

spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java

@@ -25,10 +25,10 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.URIResolver;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rick Evans
  * @author Arjen Poutsma