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

spring-test/src/main/java/org/springframework/mock/http/client/package-info.java

@@ -1,23 +1,6 @@
-/*
- * Copyright 2002-2012 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.
- */
-
 /**
  * Mock implementations of client-side HTTP abstractions.
- * This package contains the {@code MockClientHttpRequest} and
+ * This package contains {@code MockClientHttpRequest} and
  * {@code MockClientHttpResponse}.
  */
 package org.springframework.mock.http.client;
-

spring-test/src/main/java/org/springframework/mock/http/package-info.java

@@ -1,23 +1,6 @@
-/*
- * Copyright 2002-2012 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.
- */
-
 /**
  * Mock implementations of client/server-side HTTP abstractions.
  * This package contains {@code MockHttpInputMessage} and
  * {@code MockHttpOutputMessage}.
  */
 package org.springframework.mock.http;
-

spring-test/src/main/java/org/springframework/mock/jndi/package-info.java

@@ -1,13 +1,9 @@
-
 /**
- *
  * The simplest implementation of the JNDI SPI that could possibly work.
  *
  * <p>Useful for setting up a simple JNDI environment for test suites
  * or stand-alone applications. If, for example, JDBC DataSources get bound to the
  * same JNDI names as within a Java EE container, both application code and
  * configuration can be reused without changes.
- *
  */
 package org.springframework.mock.jndi;
-

spring-test/src/main/java/org/springframework/mock/web/MockFilterChain.java

@@ -21,7 +21,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -30,8 +29,6 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.springframework.mock.web.MockFilterConfig;
-import org.springframework.mock.web.PassThroughFilterChain;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 

spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java

@@ -30,7 +30,6 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
-
 import javax.activation.FileTypeMap;
 import javax.servlet.Filter;
 import javax.servlet.FilterRegistration;

spring-test/src/main/java/org/springframework/mock/web/package-info.java

@@ -1,6 +1,6 @@
 /**
- * A comprehensive set of Servlet API 3.0 mock objects, targeted at usage with
- * Spring's web MVC framework.
+ * A comprehensive set of Servlet API 3.0 mock objects,
+ * targeted at usage with Spring's Web MVC framework.
  *
  * <p>Useful for testing web contexts and controllers.
  *
@@ -9,6 +9,4 @@
  * existing Servlet API mock objects
  * (<a href="http://www.mockobjects.com">MockObjects</a>).
  */
-
 package org.springframework.mock.web;
-

spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java

@@ -1,14 +1,10 @@
-
 /**
- *
  * A comprehensive set of Portlet API 2.0 mock objects,
- * targeted at usage with Spring's web MVC framework.
+ * targeted at usage with Spring's Web MVC framework.
  * Useful for testing web contexts and controllers.
  *
  * <p>More convenient to use than dynamic mock objects
  * (<a href="http://www.easymock.org">EasyMock</a>) or
  * existing Portlet API mock objects.
- *
  */
 package org.springframework.mock.web.portlet;
-

spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java

@@ -20,6 +20,7 @@ import java.lang.reflect.Method;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;

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

@@ -1,6 +1,4 @@
 /**
  * Support classes for annotation-driven tests.
  */
-
 package org.springframework.test.annotation;
-

spring-test/src/main/java/org/springframework/test/context/ActiveProfilesResolver.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-test/src/main/java/org/springframework/test/context/BootstrapUtils.java

@@ -18,6 +18,7 @@ package org.springframework.test.context;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.util.ClassUtils;
 
 import static org.springframework.beans.BeanUtils.*;

spring-test/src/main/java/org/springframework/test/context/BootstrapWith.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-test/src/main/java/org/springframework/test/context/DefaultBootstrapContext.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-test/src/main/java/org/springframework/test/context/DefaultCacheAwareContextLoaderDelegate.java

@@ -18,6 +18,7 @@ package org.springframework.test.context;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.annotation.DirtiesContext.HierarchyMode;
 import org.springframework.util.Assert;

spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.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-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.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-test/src/main/java/org/springframework/test/context/jdbc/Sql.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-test/src/main/java/org/springframework/test/context/jdbc/SqlConfig.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-test/src/main/java/org/springframework/test/context/jdbc/SqlGroup.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-test/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.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,
@@ -18,11 +18,11 @@ package org.springframework.test.context.jdbc;
 
 import java.lang.reflect.Method;
 import java.util.Set;
-
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.io.ClassPathResource;

spring-test/src/main/java/org/springframework/test/context/jdbc/package-info.java

@@ -2,6 +2,4 @@
  * JDBC support classes for the <em>Spring TestContext Framework</em>,
  * including support for declarative SQL script execution via {@code @Sql}.
  */
-
 package org.springframework.test.context.jdbc;
-

spring-test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java

@@ -18,7 +18,6 @@ package org.springframework.test.context.junit4;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.junit.runner.RunWith;
 
 import org.springframework.context.ApplicationContext;

spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java

@@ -32,6 +32,7 @@ import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.Statement;
+
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.annotation.AnnotationUtils;

spring-test/src/main/java/org/springframework/test/context/junit4/package-info.java

@@ -1,7 +1,4 @@
 /**
- * <p>Support classes for integrating the <em>Spring TestContext Framework</em>
- * with JUnit.</p>
+ * Support classes for integrating the <em>Spring TestContext Framework</em> with JUnit.
  */
-
 package org.springframework.test.context.junit4;
-

spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java

@@ -21,6 +21,7 @@ import java.util.List;
 
 import org.junit.runners.model.MultipleFailureException;
 import org.junit.runners.model.Statement;
+
 import org.springframework.test.context.TestContextManager;
 
 /**

spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java

@@ -22,6 +22,7 @@ import java.util.List;
 
 import org.junit.runners.model.MultipleFailureException;
 import org.junit.runners.model.Statement;
+
 import org.springframework.test.context.TestContextManager;
 
 /**

spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java

@@ -17,6 +17,7 @@
 package org.springframework.test.context.junit4.statements;
 
 import org.junit.runners.model.Statement;
+
 import org.springframework.test.context.TestContextManager;
 
 /**

spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java

@@ -19,6 +19,7 @@ package org.springframework.test.context.junit4.statements;
 import java.lang.reflect.Method;
 
 import org.junit.runners.model.Statement;
+
 import org.springframework.test.context.TestContextManager;
 
 /**

spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java

@@ -19,6 +19,7 @@ package org.springframework.test.context.junit4.statements;
 import java.util.concurrent.TimeoutException;
 
 import org.junit.runners.model.Statement;
+
 import org.springframework.test.annotation.Timed;
 
 /**

spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java

@@ -21,6 +21,7 @@ import java.lang.reflect.Method;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.runners.model.Statement;
+
 import org.springframework.test.annotation.Repeat;
 import org.springframework.util.ClassUtils;
 

spring-test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java

@@ -1,6 +1,4 @@
 /**
- * <p>Custom JUnit {@code Statements} used in the <em>Spring TestContext Framework</em>.</p>
+ * Custom JUnit {@code Statements} used in the <em>Spring TestContext Framework</em>.
  */
-
 package org.springframework.test.context.junit4.statements;
-

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

@@ -1,5 +1,5 @@
 /**
- * <p>This package contains the <em>Spring TestContext Framework</em> which
+ * This package contains the <em>Spring TestContext Framework</em> which
  * provides annotation-driven unit and integration testing support that is
  * agnostic of the actual testing framework in use. The same techniques and
  * annotation-based configuration used in, for example, a JUnit environment
@@ -11,6 +11,4 @@
  * and caching, dependency injection of test fixtures, and transactional test
  * management with default rollback semantics.
  */
-
 package org.springframework.test.context;
-

spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java

@@ -27,6 +27,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextInitializer;

spring-test/src/main/java/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.java

@@ -21,6 +21,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.ContextConfigurationAttributes;

spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.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,
@@ -27,6 +27,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.BeanInstantiationException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.ApplicationContextInitializer;

spring-test/src/main/java/org/springframework/test/context/support/ActiveProfilesUtils.java

@@ -21,6 +21,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.test.context.ActiveProfiles;

spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java

@@ -18,6 +18,7 @@ package org.springframework.test.context.support;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.support.BeanDefinitionReader;
 import org.springframework.context.annotation.AnnotatedBeanDefinitionReader;
 import org.springframework.context.support.GenericApplicationContext;

spring-test/src/main/java/org/springframework/test/context/support/ApplicationContextInitializerUtils.java

@@ -23,6 +23,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.test.context.ContextConfiguration;

spring-test/src/main/java/org/springframework/test/context/support/ContextLoaderUtils.java

@@ -25,6 +25,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.ContextConfigurationAttributes;

spring-test/src/main/java/org/springframework/test/context/support/DefaultActiveProfilesResolver.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,6 +21,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ActiveProfilesResolver;

spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContextBootstrapper.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-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java

@@ -18,6 +18,7 @@ package org.springframework.test.context.support;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.core.Conventions;
 import org.springframework.test.context.TestContext;

spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java

@@ -20,6 +20,7 @@ import java.lang.reflect.Method;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.core.annotation.AnnotationAttributes;

spring-test/src/main/java/org/springframework/test/context/support/MergedTestPropertySources.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-test/src/main/java/org/springframework/test/context/support/TestPropertySourceAttributes.java

@@ -18,6 +18,7 @@ package org.springframework.test.context.support;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.style.ToStringCreator;

spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java

@@ -22,10 +22,11 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.util.TestContextResourceUtils;
-import org.springframework.test.util.MetaAnnotationUtils.AnnotationDescriptor;
+import org.springframework.test.util.MetaAnnotationUtils.*;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

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

@@ -1,6 +1,4 @@
 /**
- * <p>Support classes for the <em>Spring TestContext Framework</em>.</p>
+ * Support classes for the <em>Spring TestContext Framework</em>.
  */
-
 package org.springframework.test.context.support;
-

spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java

@@ -21,6 +21,13 @@ import java.lang.reflect.Method;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.testng.IHookCallBack;
+import org.testng.IHookable;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -32,14 +39,6 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution
 import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
 import org.springframework.test.context.web.ServletTestExecutionListener;
 
-import org.testng.IHookCallBack;
-import org.testng.IHookable;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-
 /**
  * Abstract base test class which integrates the <em>Spring TestContext Framework</em>
  * with explicit {@link ApplicationContext} testing support in a <strong>TestNG</strong>

spring-test/src/main/java/org/springframework/test/context/testng/package-info.java

@@ -1,7 +1,5 @@
 /**
- * <p>Support classes for ApplicationContext-based and transactional
- * tests run with TestNG and the <em>Spring TestContext Framework</em>.</p>
+ * Support classes for ApplicationContext-based and transactional
+ * tests run with TestNG and the <em>Spring TestContext Framework</em>.
  */
-
 package org.springframework.test.context.testng;
-

spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.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,
@@ -17,11 +17,11 @@
 package org.springframework.test.context.transaction;
 
 import java.util.Map;
-
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryUtils;

spring-test/src/main/java/org/springframework/test/context/transaction/TestTransaction.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-test/src/main/java/org/springframework/test/context/transaction/TransactionContext.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,
@@ -18,6 +18,7 @@ package org.springframework.test.context.transaction;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.test.context.TestContext;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;

spring-test/src/main/java/org/springframework/test/context/transaction/TransactionContextHolder.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-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java

@@ -25,6 +25,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils;

spring-test/src/main/java/org/springframework/test/context/transaction/package-info.java

@@ -1,7 +1,4 @@
 /**
- * <p>Transactional support classes for the <em>Spring TestContext
- * Framework</em>.</p>
+ * Transactional support classes for the <em>Spring TestContext Framework</em>.
  */
-
 package org.springframework.test.context.transaction;
-

spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.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-test/src/main/java/org/springframework/test/context/util/package-info.java

@@ -1,6 +1,4 @@
 /**
  * Common utilities used within the <em>Spring TestContext Framework</em>.
  */
-
 package org.springframework.test.context.util;
-

spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java

@@ -20,6 +20,7 @@ import javax.servlet.ServletContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;

spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java

@@ -18,6 +18,7 @@ package org.springframework.test.context.web;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.annotation.AnnotatedBeanDefinitionReader;
 import org.springframework.test.context.ContextConfigurationAttributes;
 import org.springframework.test.context.MergedContextConfiguration;

spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java

@@ -20,6 +20,7 @@ import javax.servlet.ServletContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;

spring-test/src/main/java/org/springframework/test/context/web/WebTestContextBootstrapper.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-test/src/main/java/org/springframework/test/context/web/package-info.java

@@ -1,6 +1,4 @@
 /**
  * Web support classes for the <em>Spring TestContext Framework</em>.
  */
-
 package org.springframework.test.context.web;
-

spring-test/src/main/java/org/springframework/test/jdbc/package-info.java

@@ -1,6 +1,4 @@
 /**
  * Support classes for tests based on JDBC.
  */
-
 package org.springframework.test.jdbc;
-

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

@@ -3,6 +3,4 @@
  *
  * @see org.springframework.test.util
  */
-
 package org.springframework.test;
-

spring-test/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java

@@ -16,18 +16,15 @@
 
 package org.springframework.test.util;
 
-import static org.springframework.test.util.AssertionErrors.assertEquals;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.springframework.test.util.AssertionErrors.fail;
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-
 import java.text.ParseException;
 import java.util.List;
 
-import org.hamcrest.Matcher;
-
 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.JsonPath;
+import org.hamcrest.Matcher;
+
+import static org.springframework.test.util.AssertionErrors.*;
+import static org.springframework.test.util.MatcherAssertionErrors.*;
 
 /**
  * A helper class for applying assertions via JSONPath expressions.

spring-test/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java

@@ -20,6 +20,7 @@ import java.lang.reflect.Method;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.StringDescription;
+
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 

spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.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-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java

@@ -21,6 +21,7 @@ import java.lang.reflect.Method;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.util.Assert;
 import org.springframework.util.MethodInvoker;
 import org.springframework.util.ObjectUtils;

spring-test/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java

@@ -19,7 +19,6 @@ package org.springframework.test.util;
 import java.io.StringReader;
 import java.util.Collections;
 import java.util.Map;
-
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -30,13 +29,14 @@ import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
 import org.hamcrest.Matcher;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.xml.SimpleNamespaceContext;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.xml.SimpleNamespaceContext;
+
 import static org.springframework.test.util.AssertionErrors.*;
 import static org.springframework.test.util.MatcherAssertionErrors.*;
 

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

@@ -1,5 +1,4 @@
 /**
  * General utility classes for use in unit and integration tests.
  */
-
-package org.springframework.test.util;
+package org.springframework.test.util;

spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java

@@ -16,8 +16,6 @@
 
 package org.springframework.test.web;
 
-import static org.springframework.test.util.AssertionErrors.*;
-
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -28,6 +26,8 @@ import java.util.Set;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.servlet.ModelAndView;
 
+import static org.springframework.test.util.AssertionErrors.*;
+
 /**
  * A collection of assertions intended to simplify testing scenarios dealing
  * with Spring Web MVC {@link org.springframework.web.servlet.ModelAndView

spring-test/src/main/java/org/springframework/test/web/client/MockMvcClientHttpRequestFactory.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.test.web.client;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.request;
-
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;
@@ -34,6 +32,8 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+
 /**
  * A {@link ClientHttpRequestFactory} for requests executed via {@link MockMvc}.
  *

spring-test/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java

@@ -15,22 +15,21 @@
  */
 package org.springframework.test.web.client.match;
 
-import static org.springframework.test.util.AssertionErrors.assertEquals;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-
 import java.io.IOException;
-
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
 import org.hamcrest.Matcher;
+import org.w3c.dom.Node;
+
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 import org.springframework.test.util.XmlExpectationsHelper;
 import org.springframework.test.web.client.RequestMatcher;
-import org.w3c.dom.Node;
+
+import static org.springframework.test.util.AssertionErrors.*;
+import static org.springframework.test.util.MatcherAssertionErrors.*;
 
 /**
  * Factory for request content {@code RequestMatcher}'s. An instance of this

spring-test/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java

@@ -19,6 +19,7 @@ import java.io.IOException;
 import java.text.ParseException;
 
 import org.hamcrest.Matcher;
+
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 import org.springframework.test.util.JsonPathExpectationsHelper;

spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java

@@ -15,17 +15,14 @@
  */
 package org.springframework.test.web.client.match;
 
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-import static org.springframework.test.util.AssertionErrors.*;
-
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
-
 import javax.xml.xpath.XPathExpressionException;
 
 import org.hamcrest.Matcher;
+
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
@@ -34,6 +31,9 @@ import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.test.web.client.RequestMatcher;
 import org.springframework.util.Assert;
 
+import static org.springframework.test.util.AssertionErrors.*;
+import static org.springframework.test.util.MatcherAssertionErrors.*;
+
 /**
  * Static, factory methods for {@link RequestMatcher} classes. Typically used to
  * provide input for {@link MockRestServiceServer#expect(RequestMatcher)}.

spring-test/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java

@@ -17,15 +17,15 @@ package org.springframework.test.web.client.match;
 
 import java.io.IOException;
 import java.util.Map;
-
 import javax.xml.xpath.XPathExpressionException;
 
 import org.hamcrest.Matcher;
+import org.w3c.dom.Node;
+
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 import org.springframework.test.util.XpathExpectationsHelper;
 import org.springframework.test.web.client.RequestMatcher;
-import org.w3c.dom.Node;
 
 /**
  * Factory methods for request content {@code RequestMatcher}'s using an XPath

spring-test/src/main/java/org/springframework/test/web/client/match/package-info.java

@@ -1,19 +1,3 @@
-/*
- * Copyright 2002-2012 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.
- */
-
 /**
  * Contains built-in {@link org.springframework.test.web.client.RequestMatcher}
  * implementations. Use

spring-test/src/main/java/org/springframework/test/web/client/package-info.java

@@ -1,19 +1,3 @@
-/*
- * Copyright 2002-2012 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.
- */
-
 /**
  * Contains client-side REST testing support.
  * @see org.springframework.test.web.client.MockRestServiceServer

spring-test/src/main/java/org/springframework/test/web/client/response/package-info.java

@@ -1,19 +1,3 @@
-/*
- * Copyright 2002-2012 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.
- */
-
 /**
  * Contains built-in {@link org.springframework.test.web.client.ResponseCreator}
  * implementations. Use

spring-test/src/main/java/org/springframework/test/web/package-info.java

@@ -1,6 +1,4 @@
 /**
  * Helper classes for unit tests based on Spring's web support.
  */
-
 package org.springframework.test.web;
-

spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java

@@ -18,7 +18,6 @@ package org.springframework.test.web.servlet;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.servlet.Filter;
 import javax.servlet.ServletContext;
 

spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java

@@ -17,7 +17,6 @@
 package org.springframework.test.web.servlet;
 
 import java.util.List;
-
 import javax.servlet.Filter;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;

spring-test/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java

@@ -18,7 +18,6 @@ package org.springframework.test.web.servlet;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;
-
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -26,7 +25,11 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.context.request.async.*;
+import org.springframework.web.context.request.async.CallableProcessingInterceptorAdapter;
+import org.springframework.web.context.request.async.DeferredResult;
+import org.springframework.web.context.request.async.DeferredResultProcessingInterceptorAdapter;
+import org.springframework.web.context.request.async.WebAsyncManager;
+import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.ModelAndView;

spring-test/src/main/java/org/springframework/test/web/servlet/package-info.java

@@ -1,19 +1,3 @@
-/*
- * Copyright 2002-2012 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.
- */
-
 /**
  * Contains server-side support for testing Spring MVC applications.
  * @see org.springframework.test.web.servlet.MockMvc

spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.test.web.servlet.request;
 
+import java.net.URI;
 import javax.servlet.ServletContext;
 
 import org.springframework.http.HttpMethod;
@@ -22,8 +23,6 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.RequestBuilder;
 
-import java.net.URI;
-
 /**
  * Static factory methods for {@link RequestBuilder}s.
  *

spring-test/src/main/java/org/springframework/test/web/servlet/request/package-info.java

@@ -1,19 +1,3 @@
-/*
- * Copyright 2002-2012 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.
- */
-
 /**
  * Contains built-in {@link org.springframework.test.web.servlet.RequestBuilder}
  * implementations. Use

spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java

@@ -16,23 +16,22 @@
 
 package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.util.AssertionErrors.assertEquals;
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-
 import java.util.Map;
-
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
 import org.hamcrest.Matcher;
+import org.w3c.dom.Node;
+
 import org.springframework.http.MediaType;
 import org.springframework.test.util.JsonExpectationsHelper;
 import org.springframework.test.util.XmlExpectationsHelper;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
-import org.w3c.dom.Node;
+
+import static org.springframework.test.util.AssertionErrors.*;
+import static org.springframework.test.util.MatcherAssertionErrors.*;
 
 /**
  * Factory for response content assertions. An instance of this class is

spring-test/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java

@@ -16,16 +16,16 @@
 
 package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.util.AssertionErrors.assertEquals;
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-
 import javax.servlet.http.Cookie;
 
 import org.hamcrest.Matcher;
+
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
 
+import static org.springframework.test.util.AssertionErrors.*;
+import static org.springframework.test.util.MatcherAssertionErrors.*;
+
 /**
  * Factory for response cookie assertions. An instance of this class is
  * typically accessed via {@link MockMvcResultMatchers#cookie()}.

spring-test/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java

@@ -16,13 +16,14 @@
 
 package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.util.AssertionErrors.*;
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-
 import org.hamcrest.Matcher;
+
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
 
+import static org.springframework.test.util.AssertionErrors.*;
+import static org.springframework.test.util.MatcherAssertionErrors.*;
+
 /**
  * Factory for "output" flash attribute assertions. An instance of this class is
  * typically accessed via {@link MockMvcResultMatchers#flash()}.

spring-test/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java

@@ -16,13 +16,10 @@
 
 package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.util.AssertionErrors.assertEquals;
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-
 import java.lang.reflect.Method;
 
 import org.hamcrest.Matcher;
+
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.util.ClassUtils;
@@ -30,6 +27,9 @@ import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
+import static org.springframework.test.util.AssertionErrors.*;
+import static org.springframework.test.util.MatcherAssertionErrors.*;
+
 /**
  * Factory for assertions on the selected handler. An instance of this class is
  * typically accessed via {@link MockMvcResultMatchers#handler()}.

spring-test/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java

@@ -17,6 +17,7 @@
 package org.springframework.test.web.servlet.result;
 
 import org.hamcrest.Matcher;
+
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
 

spring-test/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java

@@ -17,6 +17,7 @@
 package org.springframework.test.web.servlet.result;
 
 import org.hamcrest.Matcher;
+
 import org.springframework.test.util.JsonPathExpectationsHelper;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;

spring-test/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java

@@ -17,10 +17,10 @@
 package org.springframework.test.web.servlet.result;
 
 import java.util.Map;
-
 import javax.xml.xpath.XPathExpressionException;
 
 import org.hamcrest.Matcher;
+
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.util.AntPathMatcher;

spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java

@@ -16,11 +16,8 @@
 
 package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.util.AssertionErrors.assertEquals;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-
 import org.hamcrest.Matcher;
+
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.ui.ModelMap;
@@ -28,6 +25,9 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
 import org.springframework.web.servlet.ModelAndView;
 
+import static org.springframework.test.util.AssertionErrors.*;
+import static org.springframework.test.util.MatcherAssertionErrors.*;
+
 /**
  * Factory for assertions on the model. An instance of this class is
  * typically accessed via {@link MockMvcResultMatchers#model()}.

spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java

@@ -18,7 +18,6 @@ package org.springframework.test.web.servlet.result;
 
 import java.util.Enumeration;
 import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;

spring-test/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java

@@ -16,20 +16,20 @@
 
 package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.util.AssertionErrors.assertEquals;
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-
 import java.util.concurrent.Callable;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.hamcrest.Matcher;
+
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.context.request.async.WebAsyncTask;
 
+import static org.springframework.test.util.AssertionErrors.*;
+import static org.springframework.test.util.MatcherAssertionErrors.*;
+
 /**
  * Factory for assertions on the request. An instance of this class is
  * typically accessed via {@link MockMvcResultMatchers#request()}.

spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java

@@ -15,14 +15,15 @@
  */
 package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.util.AssertionErrors.assertEquals;
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-
 import org.hamcrest.Matcher;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
 
+import static org.springframework.test.util.AssertionErrors.*;
+import static org.springframework.test.util.MatcherAssertionErrors.*;
+
 /**
  * Factory for assertions on the response status. An instance of this class is
  * typically accessed via {@link MockMvcResultMatchers#status()}.

spring-test/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java

@@ -16,14 +16,15 @@
 
 package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
-import static org.springframework.test.util.AssertionErrors.*;
-
 import org.hamcrest.Matcher;
+
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.web.servlet.ModelAndView;
 
+import static org.springframework.test.util.AssertionErrors.*;
+import static org.springframework.test.util.MatcherAssertionErrors.*;
+
 /**
  * Factory for assertions on the selected view. An instance of this class is
  * typically accessed via {@link MockMvcResultMatchers#view()}.

spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java

@@ -17,14 +17,14 @@
 package org.springframework.test.web.servlet.result;
 
 import java.util.Map;
-
 import javax.xml.xpath.XPathExpressionException;
 
 import org.hamcrest.Matcher;
+import org.w3c.dom.Node;
+
 import org.springframework.test.util.XpathExpectationsHelper;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultMatcher;
-import org.w3c.dom.Node;
 
 /**
  * Factory for response content {@code ResultMatcher}'s using an XPath

spring-test/src/main/java/org/springframework/test/web/servlet/result/package-info.java

@@ -1,19 +1,3 @@
-/*
- * Copyright 2002-2012 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.
- */
-
 /**
  * Contains built-in {@code ResultMatcher} and {@code ResultHandler} implementations.
  * Use {@link org.springframework.test.web.servlet.result.MockMvcResultMatchers}