Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add blank line between java and javax imports

Browse Source 
See gh-23539

Co-authored-by: Sam Brannen <sbrannen@pivotal.io>
This commit is contained in:
Phillip Webb
2019-09-04 10:44:02 -07:00
committed by Sam Brannen
parent d09f537699
commit d945ae9191
854 changed files with 951 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-core/src/main/java/org/springframework/lang/NonNull.java
View File

@@ -21,6 +21,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.annotation.Nonnull;
import javax.annotation.meta.TypeQualifierNickname;

1
spring-core/src/main/java/org/springframework/lang/NonNullApi.java
View File

@@ -21,6 +21,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.annotation.Nonnull;
import javax.annotation.meta.TypeQualifierDefault;

1
spring-core/src/main/java/org/springframework/lang/NonNullFields.java
View File

@@ -21,6 +21,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.annotation.Nonnull;
import javax.annotation.meta.TypeQualifierDefault;

1
spring-core/src/main/java/org/springframework/lang/Nullable.java
View File

@@ -21,6 +21,7 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.annotation.Nonnull;
import javax.annotation.meta.TypeQualifierNickname;
import javax.annotation.meta.When;

1
spring-core/src/main/java/org/springframework/util/SocketUtils.java
View File

@@ -22,6 +22,7 @@ import java.net.ServerSocket;
import java.util.Random;
import java.util.SortedSet;
import java.util.TreeSet;
import javax.net.ServerSocketFactory;
/**

1
spring-core/src/main/java/org/springframework/util/xml/AbstractStaxHandler.java
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;

1
spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
View File

@@ -18,6 +18,7 @@ package org.springframework.util.xml;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.stream.Location;
import javax.xml.stream.XMLStreamException;

1
spring-core/src/main/java/org/springframework/util/xml/AbstractXMLEventReader.java
View File

@@ -17,6 +17,7 @@
package org.springframework.util.xml;
import java.util.NoSuchElementException;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLStreamException;

1
spring-core/src/main/java/org/springframework/util/xml/ListBasedXMLEventReader.java
View File

@@ -19,6 +19,7 @@ package org.springframework.util.xml;
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.Characters;

1
spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
View File

@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;

1
spring-core/src/main/java/org/springframework/util/xml/StaxEventHandler.java
View File

@@ -19,6 +19,7 @@ package org.springframework.util.xml;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.stream.Location;
import javax.xml.stream.XMLEventFactory;

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

@@ -17,6 +17,7 @@
package org.springframework.util.xml;
import java.util.Iterator;
import javax.xml.namespace.QName;
import javax.xml.stream.Location;
import javax.xml.stream.XMLEventReader;

1
spring-core/src/main/java/org/springframework/util/xml/StaxStreamHandler.java
View File

@@ -17,6 +17,7 @@
package org.springframework.util.xml;
import java.util.Map;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;

1
spring-core/src/main/java/org/springframework/util/xml/StaxUtils.java
View File

@@ -18,6 +18,7 @@ package org.springframework.util.xml;
import java.util.List;
import java.util.function.Supplier;
import javax.xml.stream.XMLEventFactory;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLEventWriter;

1
spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamReader.java
View File

@@ -17,6 +17,7 @@
package org.springframework.util.xml;
import java.util.Iterator;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import javax.xml.stream.Location;

1
spring-core/src/main/java/org/springframework/util/xml/XMLEventStreamWriter.java
View File

@@ -19,6 +19,7 @@ package org.springframework.util.xml;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventFactory;

1
spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java
View File

@@ -29,6 +29,7 @@ import java.lang.reflect.Method;
import java.util.Date;
import java.util.List;
import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.annotation.Resource;

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

@@ -18,6 +18,7 @@ package org.springframework.core.annotation;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Priority;
import org.junit.Test;

2
spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
View File

@@ -1811,6 +1811,7 @@ public class AnnotationUtilsTests {
public static class ImplementsInterfaceWithGenericAnnotatedMethod implements InterfaceWithGenericAnnotatedMethod<String> {
@Override
public void foo(String t) {
}
}
@@ -1823,6 +1824,7 @@ public class AnnotationUtilsTests {
public static class ExtendsBaseClassWithGenericAnnotatedMethod extends BaseClassWithGenericAnnotatedMethod<String> {
@Override
public void foo(String t) {
}
}

1
spring-core/src/test/java/org/springframework/util/Base64UtilsTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.util;
import java.io.UnsupportedEncodingException;
import javax.xml.bind.DatatypeConverter;
import org.junit.Test;

1
spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java
View File

@@ -20,6 +20,7 @@ import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.util.SortedSet;
import javax.net.ServerSocketFactory;
import org.junit.Rule;

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

@@ -19,6 +19,7 @@ package org.springframework.util.xml;
import java.io.StringReader;
import java.io.StringWriter;
import java.net.Socket;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.stream.XMLStreamException;

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

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

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

@@ -17,6 +17,7 @@
package org.springframework.util.xml;
import java.io.StringReader;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;

1
spring-core/src/test/java/org/springframework/util/xml/ListBasedXMLEventReaderTests.java
View File

@@ -20,6 +20,7 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLInputFactory;

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

@@ -19,6 +19,7 @@ package org.springframework.util.xml;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import javax.xml.XMLConstants;
import org.junit.Test;

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

@@ -18,6 +18,7 @@ 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;

17
spring-core/src/test/java/org/springframework/util/xml/StaxResultTests.java
View File

@@ -16,8 +16,9 @@
package org.springframework.util.xml;
import org.junit.Before;
import org.junit.Test;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLOutputFactory;
@@ -26,14 +27,12 @@ import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamSource;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
import static org.xmlunit.matchers.CompareMatcher.*;
/**
* @author Arjen Poutsma

19
spring-core/src/test/java/org/springframework/util/xml/StaxSourceTests.java
View File

@@ -16,10 +16,8 @@
package org.springframework.util.xml;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import java.io.StringReader;
import java.io.StringWriter;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -30,13 +28,14 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamResult;
import java.io.StringReader;
import java.io.StringWriter;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import static org.junit.Assert.*;
import static org.xmlunit.matchers.CompareMatcher.*;
/**
* @author Arjen Poutsma

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

@@ -18,6 +18,7 @@ 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;

1
spring-core/src/test/java/org/springframework/util/xml/StaxUtilsTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.util.xml;
import java.io.StringReader;
import java.io.StringWriter;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;

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

@@ -17,6 +17,7 @@
package org.springframework.util.xml;
import java.util.Properties;
import javax.xml.transform.ErrorListener;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Result;

17
spring-core/src/test/java/org/springframework/util/xml/XMLEventStreamReaderTests.java
View File

@@ -16,10 +16,8 @@
package org.springframework.util.xml;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Node;
import org.xmlunit.util.Predicate;
import java.io.StringReader;
import java.io.StringWriter;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
@@ -27,11 +25,14 @@ import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stax.StAXSource;
import javax.xml.transform.stream.StreamResult;
import java.io.StringReader;
import java.io.StringWriter;
import static org.junit.Assert.assertThat;
import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Node;
import org.xmlunit.util.Predicate;
import static org.junit.Assert.*;
import static org.xmlunit.matchers.CompareMatcher.*;
public class XMLEventStreamReaderTests {

15
spring-core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java
View File

@@ -16,18 +16,19 @@
package org.springframework.util.xml;
import java.io.StringWriter;
import javax.xml.stream.XMLEventFactory;
import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLOutputFactory;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Node;
import org.xmlunit.util.Predicate;
import javax.xml.stream.XMLEventFactory;
import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLOutputFactory;
import java.io.StringWriter;
import static org.junit.Assert.assertThat;
import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
import static org.junit.Assert.*;
import static org.xmlunit.matchers.CompareMatcher.*;
public class XMLEventStreamWriterTests {