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

spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
- * Package providing integration of <a href="http://castor.codehaus.org/xml-mapping.html">Castor</a> within Springs O/X Mapping
- * support
- *
+ * Package providing integration of <a href="http://castor.codehaus.org/xml-mapping.html">Castor</a>
+ * within Spring's O/X Mapping support.
  */
 package org.springframework.oxm.castor;
-

spring-oxm/src/main/java/org/springframework/oxm/config/package-info.java

@@ -1,8 +1,4 @@
-
 /**
- *
- * Provides an namespace handler for the Spring Object/XML namespace
- *
+ * Provides an namespace handler for the Spring Object/XML namespace.
  */
 package org.springframework.oxm.config;
-

spring-oxm/src/main/java/org/springframework/oxm/jaxb/ClassPathJaxb2TypeScanner.java

@@ -19,7 +19,6 @@ package org.springframework.oxm.jaxb;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.bind.annotation.XmlRootElement;

spring-oxm/src/main/java/org/springframework/oxm/jaxb/package-info.java

@@ -1,8 +1,5 @@
-
 /**
- *
- * Package providing integration of <a href="http://java.sun.com/webservices/jaxb/">JAXB</a> with Springs O/X Mapping
- * support
- *
+ * Package providing integration of <a href="http://java.sun.com/webservices/jaxb/">JAXB</a>
+ * with Spring's O/X Mapping support.
  */
 package org.springframework.oxm.jaxb;

spring-oxm/src/main/java/org/springframework/oxm/jibx/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
- * Package providing integration of <a href="http://jibx.sourceforge.net/">JiBX</a> with Springs O/X Mapping
- * support
- *
+ * Package providing integration of <a href="http://jibx.sourceforge.net/">JiBX</a>
+ * with Spring's O/X Mapping support.
  */
 package org.springframework.oxm.jibx;
-

spring-oxm/src/main/java/org/springframework/oxm/mime/package-info.java

@@ -1,9 +1,4 @@
-
 /**
- *
  * Contains (un)marshallers optimized to store binary data in MIME attachments.
- * </htm
- *
  */
 package org.springframework.oxm.mime;
-

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

@@ -1,9 +1,6 @@
-
 /**
- *
- * Root package for Spring's O/X Mapping integration classes. Contains generic Marshaller and Unmarshaller interfaces,
+ * Root package for Spring's O/X Mapping integration classes.
+ * Contains generic Marshaller and Unmarshaller interfaces,
  * and XmlMappingExceptions related to O/X Mapping
- *
  */
 package org.springframework.oxm;
-

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

@@ -1,11 +1,7 @@
-
 /**
- *
- * Provides generic support classes for using Spring's O/X Mapping integration within various scenario's. Includes the
- * MarshallingSource for compatibility with TrAX, MarshallingView for use withing Spring Web MVC, and the
+ * Provides generic support classes for using Spring's O/X Mapping integration
+ * within various scenario's. Includes the MarshallingSource for compatibility
+ * with TrAX, MarshallingView for use withing Spring Web MVC, and the
  * MarshallingMessageConverter for use within Spring's JMS support.
- * </htm
- *
  */
 package org.springframework.oxm.support;
-

spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/package-info.java

@@ -1,8 +1,5 @@
-
 /**
- *
- * Package providing integration of <a href="http://xmlbeans.apache.org/">XMLBeans</a> with Springs O/X Mapping support
- *
+ * Package providing integration of <a href="http://xmlbeans.apache.org/">XMLBeans</a>
+ * with Spring's O/X Mapping support.
  */
 package org.springframework.oxm.xmlbeans;
-

spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java

@@ -1,8 +1,5 @@
-
 /**
- *
- * Package providing integration of <a href="http://xstream.codehaus.org/">XStream</a> with Springs O/X Mapping support
- *
+ * Package providing integration of <a href="http://xstream.codehaus.org/">XStream</a>
+ * with Spring's O/X Mapping support.
  */
 package org.springframework.oxm.xstream;
-

spring-oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTests.java

@@ -28,9 +28,7 @@ import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stax.StAXResult;
 import javax.xml.transform.stream.StreamResult;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
 import org.custommonkey.xmlunit.XMLUnit;
-import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Attr;
@@ -40,6 +38,9 @@ import org.w3c.dom.Text;
 
 import org.springframework.util.xml.StaxUtils;
 
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author Arjen Poutsma
  */

spring-oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTests.java

@@ -30,7 +30,6 @@ import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stax.StAXSource;
 import javax.xml.transform.stream.StreamSource;
 
-import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
@@ -42,6 +41,8 @@ import org.xml.sax.helpers.XMLReaderFactory;
 
 import org.springframework.util.xml.StaxUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Arjen Poutsma
  */

spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java

@@ -20,7 +20,6 @@ import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.stream.StreamResult;
 
@@ -30,16 +29,19 @@ import org.custommonkey.xmlunit.XMLUnit;
 import org.custommonkey.xmlunit.XpathEngine;
 import org.junit.Test;
 import org.mockito.InOrder;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.oxm.AbstractMarshallerTests;
-import org.springframework.oxm.Marshaller;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.junit.Assert.*;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.oxm.AbstractMarshallerTests;
+import org.springframework.oxm.Marshaller;
+
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.*;
 
 /**

spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java

@@ -20,19 +20,18 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.concurrent.atomic.AtomicReference;
-
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
 import org.junit.Ignore;
 import org.junit.Test;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.oxm.AbstractUnmarshallerTests;
 import org.springframework.oxm.MarshallingException;
 import org.springframework.oxm.Unmarshaller;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;

spring-oxm/src/test/java/org/springframework/oxm/jaxb/Airplane.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-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java

@@ -22,7 +22,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.Collections;
-
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
 import javax.xml.bind.JAXBElement;
@@ -38,6 +37,11 @@ import javax.xml.transform.stream.StreamSource;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InOrder;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.oxm.AbstractMarshallerTests;
@@ -50,10 +54,12 @@ import org.springframework.oxm.jaxb.test.ObjectFactory;
 import org.springframework.oxm.mime.MimeContainer;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.ReflectionUtils;
-import org.xml.sax.*;
 
-import static org.junit.Assert.*;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.BDDMockito.*;
 
 /**

spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java

@@ -27,10 +27,7 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.mock;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -41,6 +38,9 @@ import org.springframework.oxm.jaxb.test.Flights;
 import org.springframework.oxm.mime.MimeContainer;
 import org.springframework.util.xml.StaxUtils;
 
+import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.*;
+
 /**
  * @author Arjen Poutsma
  * @author Biju Kunjummen

spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java

@@ -17,19 +17,18 @@
 package org.springframework.oxm.jibx;
 
 import java.io.ByteArrayInputStream;
-
 import javax.xml.transform.stream.StreamSource;
 
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+
 import org.springframework.oxm.AbstractUnmarshallerTests;
 import org.springframework.oxm.Unmarshaller;
 import org.springframework.tests.Assume;
 import org.springframework.tests.TestGroup;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 
 
 /**

spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallerTests.java

@@ -20,8 +20,6 @@ import java.io.ByteArrayOutputStream;
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.xmlbeans.XmlObject;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import org.springframework.oxm.AbstractMarshallerTests;
@@ -29,6 +27,8 @@ import org.springframework.oxm.Marshaller;
 import org.springframework.samples.flight.FlightType;
 import org.springframework.samples.flight.FlightsDocument;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Arjen Poutsma
  */

spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallerTests.java

@@ -23,7 +23,6 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
 import org.springframework.oxm.AbstractUnmarshallerTests;
@@ -34,6 +33,8 @@ import org.springframework.samples.flight.FlightType;
 import org.springframework.samples.flight.FlightsDocument;
 import org.springframework.util.xml.StaxUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Arjen Poutsma
  */

spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java

@@ -19,9 +19,10 @@ package org.springframework.oxm.xmlbeans;
 import java.util.Collections;
 
 import org.apache.xmlbeans.XmlOptions;
-import static org.junit.Assert.*;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Arjen Poutsma
  */

spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java

@@ -25,7 +25,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.stream.XMLEventWriter;
@@ -43,7 +42,6 @@ import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.json.JsonWriter;
-
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -53,6 +51,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Text;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
+
 import org.springframework.util.xml.StaxUtils;
 
 import static org.custommonkey.xmlunit.XMLAssert.*;

spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java

@@ -20,7 +20,6 @@ import java.io.ByteArrayInputStream;
 import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.stream.XMLInputFactory;
@@ -31,12 +30,11 @@ import javax.xml.transform.stream.StreamSource;
 
 import org.junit.Before;
 import org.junit.Test;
-
-import org.springframework.util.xml.StaxUtils;
-
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 
+import org.springframework.util.xml.StaxUtils;
+
 import static org.junit.Assert.*;
 
 /**