[commons-net] branch master updated: Organize imports

Mon, 07 Nov 2022 07:43:27 -0800 

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git


The following commit(s) were added to refs/heads/master by this push:
     new f7f3f3e7 Organize imports
f7f3f3e7 is described below

commit f7f3f3e73fe64efe630937e70c9151d1773ad5a0
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Nov 7 10:43:17 2022 -0500

    Organize imports
---
 src/main/java/org/apache/commons/net/io/CRLFLineReader.java          | 4 ++--
 .../java/org/apache/commons/net/io/DotTerminatedMessageReader.java   | 4 ++--
 src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java | 4 ++--
 src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java   | 4 ++--
 src/main/java/org/apache/commons/net/io/Util.java                    | 4 ++--
 src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java  | 4 ++--
 .../org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java  | 1 +
 src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java          | 1 -
 src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java           | 5 ++---
 .../java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java   | 1 -
 src/test/java/org/apache/commons/net/util/Base64Test.java            | 1 -
 11 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/apache/commons/net/io/CRLFLineReader.java 
b/src/main/java/org/apache/commons/net/io/CRLFLineReader.java
index 3988ffb0..5f0e347f 100644
--- a/src/main/java/org/apache/commons/net/io/CRLFLineReader.java
+++ b/src/main/java/org/apache/commons/net/io/CRLFLineReader.java
@@ -17,12 +17,12 @@
 
 package org.apache.commons.net.io;
 
-import org.apache.commons.net.util.NetConstants;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
 
+import org.apache.commons.net.util.NetConstants;
+
 /**
  * CRLFLineReader implements a readLine() method that requires
  * exactly CRLF to terminate an input line.
diff --git 
a/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java 
b/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java
index 8524ebc2..01350b2d 100644
--- a/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java
+++ b/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java
@@ -17,12 +17,12 @@
 
 package org.apache.commons.net.io;
 
-import org.apache.commons.net.util.NetConstants;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
 
+import org.apache.commons.net.util.NetConstants;
+
 /**
  * DotTerminatedMessageReader is a class used to read messages from a
  * server that are terminated by a single dot followed by a
diff --git 
a/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java 
b/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
index bcf92206..654d778e 100644
--- a/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
+++ b/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
@@ -17,13 +17,13 @@
 
 package org.apache.commons.net.io;
 
-import org.apache.commons.net.util.NetConstants;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PushbackInputStream;
 import java.nio.charset.StandardCharsets;
 
+import org.apache.commons.net.util.NetConstants;
+
 /**
  * This class wraps an input stream, replacing all occurrences
  * of &lt;CR&gt;&lt;LF&gt; (carriage return followed by a linefeed),
diff --git a/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java 
b/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
index b393c920..0b02d339 100644
--- a/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
+++ b/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
@@ -17,12 +17,12 @@
 
 package org.apache.commons.net.io;
 
-import org.apache.commons.net.util.NetConstants;
-
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.commons.net.util.NetConstants;
+
 /**
  * This class wraps an input stream, replacing all singly occurring
  * &lt;LF&gt; (linefeed) characters with &lt;CR&gt;&lt;LF&gt; (carriage return
diff --git a/src/main/java/org/apache/commons/net/io/Util.java 
b/src/main/java/org/apache/commons/net/io/Util.java
index eb848eca..c452a08d 100644
--- a/src/main/java/org/apache/commons/net/io/Util.java
+++ b/src/main/java/org/apache/commons/net/io/Util.java
@@ -17,8 +17,6 @@
 
 package org.apache.commons.net.io;
 
-import org.apache.commons.net.util.NetConstants;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,6 +25,8 @@ import java.io.Reader;
 import java.io.Writer;
 import java.net.Socket;
 
+import org.apache.commons.net.util.NetConstants;
+
 /**
  * The Util class cannot be instantiated and stores short static convenience
  * methods that are often quite useful.
diff --git 
a/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java 
b/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
index 618155c1..d51a90ed 100644
--- a/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 package org.apache.commons.net.ftp;
+import static org.junit.Assert.assertArrayEquals;
+
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -25,8 +27,6 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import static org.junit.Assert.assertArrayEquals;
-
 /**
  * A functional test suite for checking that site listings work.
  */
diff --git 
a/src/test/java/org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java 
b/src/test/java/org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java
index 7a26989a..060c9eb7 100644
--- 
a/src/test/java/org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java
+++ 
b/src/test/java/org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java
@@ -18,6 +18,7 @@
 package org.apache.commons.net.ftp;
 
 import java.security.GeneralSecurityException;
+
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 
diff --git a/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java 
b/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java
index 9aa49e99..bf34381a 100644
--- a/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java
+++ b/src/test/java/org/apache/commons/net/ntp/TestNtpPacket.java
@@ -22,7 +22,6 @@ import java.net.DatagramPacket;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.jupiter.api.function.Executable;
 
 public class TestNtpPacket {
 
diff --git a/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java 
b/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java
index 2d1622d9..b80252e8 100644
--- a/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java
+++ b/src/test/java/org/apache/commons/net/ntp/TestTimeInfo.java
@@ -16,6 +16,8 @@
  */
 package org.apache.commons.net.ntp;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -23,9 +25,6 @@ import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.jupiter.api.function.Executable;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class TestTimeInfo {
 
diff --git 
a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java 
b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java
index 7c50c5e5..95f61236 100644
--- a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java
+++ b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java
@@ -30,7 +30,6 @@ import java.util.regex.Pattern;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.jupiter.api.function.Executable;
 
 public class SimpleSMTPHeaderTestCase {
 
diff --git a/src/test/java/org/apache/commons/net/util/Base64Test.java 
b/src/test/java/org/apache/commons/net/util/Base64Test.java
index 01e87b75..df3a328f 100644
--- a/src/test/java/org/apache/commons/net/util/Base64Test.java
+++ b/src/test/java/org/apache/commons/net/util/Base64Test.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-
 import org.junit.Ignore;
 import org.junit.Test;

Reply via email to