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
commit a85af85adfbde965fa7e9c27196f56138a09b913 Author: Gary Gregory <[email protected]> AuthorDate: Sat Feb 6 10:47:58 2021 -0500 And and use NetConstants constants. Organize imports. --- .../org/apache/commons/net/chargen/CharGenUDPClient.java | 3 ++- .../org/apache/commons/net/discard/DiscardUDPClient.java | 3 ++- .../java/org/apache/commons/net/echo/EchoUDPClient.java | 3 ++- .../apache/commons/net/examples/ftp/FTPClientExample.java | 2 +- .../org/apache/commons/net/examples/ftp/TFTPExample.java | 1 + .../apache/commons/net/examples/mail/IMAPExportMbox.java | 2 +- .../apache/commons/net/examples/nntp/ListNewsgroups.java | 1 + .../apache/commons/net/examples/nntp/MessageThreading.java | 1 + .../org/apache/commons/net/examples/nntp/NNTPUtils.java | 1 + .../apache/commons/net/examples/ntp/SimpleNTPServer.java | 8 ++++---- .../commons/net/examples/telnet/TelnetClientExample.java | 10 +++++----- .../apache/commons/net/examples/telnet/WeatherTelnet.java | 2 +- .../java/org/apache/commons/net/examples/unix/rexec.java | 2 +- .../java/org/apache/commons/net/examples/unix/rlogin.java | 2 +- .../java/org/apache/commons/net/examples/unix/rshell.java | 2 +- .../java/org/apache/commons/net/examples/util/IOUtil.java | 1 + .../java/org/apache/commons/net/finger/FingerClient.java | 4 ++-- .../java/org/apache/commons/net/ftp/FTPSTrustManager.java | 6 +++--- .../apache/commons/net/imap/AuthenticatingIMAPClient.java | 1 + src/main/java/org/apache/commons/net/imap/IMAP.java | 2 +- src/main/java/org/apache/commons/net/imap/IMAPSClient.java | 2 +- src/main/java/org/apache/commons/net/nntp/Article.java | 6 +++--- src/main/java/org/apache/commons/net/nntp/NNTPClient.java | 6 ++++-- .../org/apache/commons/net/pop3/ExtendedPOP3Client.java | 1 + .../apache/commons/net/smtp/AuthenticatingSMTPClient.java | 1 + src/main/java/org/apache/commons/net/telnet/Telnet.java | 2 +- src/main/java/org/apache/commons/net/tftp/TFTPClient.java | 1 + src/main/java/org/apache/commons/net/util/Base64.java | 6 ++---- .../java/org/apache/commons/net/util/NetConstants.java | 12 ++++++++++++ .../java/org/apache/commons/net/util/SSLContextUtils.java | 1 + .../org/apache/commons/net/util/TrustManagerUtils.java | 4 +--- .../java/org/apache/commons/net/nntp/TestThreader.java | 14 ++++++++------ 32 files changed, 69 insertions(+), 44 deletions(-) diff --git a/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java b/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java index 4cdb842..79d8c16 100644 --- a/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java +++ b/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java @@ -22,6 +22,7 @@ import java.net.DatagramPacket; import java.net.InetAddress; import org.apache.commons.net.DatagramSocketClient; +import org.apache.commons.net.util.NetConstants; /** * The CharGenUDPClient class is a UDP implementation of a client for the @@ -76,7 +77,7 @@ public final class CharGenUDPClient extends DatagramSocketClient // CharGen return packets have a maximum length of 512 receiveData = new byte[512]; receivePacket = new DatagramPacket(receiveData, receiveData.length); - sendPacket = new DatagramPacket(new byte[0], 0); + sendPacket = new DatagramPacket(NetConstants.EMPTY_BTYE_ARRAY, 0); } diff --git a/src/main/java/org/apache/commons/net/discard/DiscardUDPClient.java b/src/main/java/org/apache/commons/net/discard/DiscardUDPClient.java index c322692..e290a11 100644 --- a/src/main/java/org/apache/commons/net/discard/DiscardUDPClient.java +++ b/src/main/java/org/apache/commons/net/discard/DiscardUDPClient.java @@ -22,6 +22,7 @@ import java.net.DatagramPacket; import java.net.InetAddress; import org.apache.commons.net.DatagramSocketClient; +import org.apache.commons.net.util.NetConstants; /** * The DiscardUDPClient class is a UDP implementation of a client for the @@ -45,7 +46,7 @@ public class DiscardUDPClient extends DatagramSocketClient public DiscardUDPClient() { - sendPacket = new DatagramPacket(new byte[0], 0); + sendPacket = new DatagramPacket(NetConstants.EMPTY_BTYE_ARRAY, 0); } diff --git a/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java b/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java index 8d052d1..f7d2e4f 100644 --- a/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java +++ b/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java @@ -22,6 +22,7 @@ import java.net.DatagramPacket; import java.net.InetAddress; import org.apache.commons.net.discard.DiscardUDPClient; +import org.apache.commons.net.util.NetConstants; /** * The EchoUDPClient class is a UDP implementation of a client for the @@ -43,7 +44,7 @@ public final class EchoUDPClient extends DiscardUDPClient /** The default echo port. It is set to 7 according to RFC 862. */ public static final int DEFAULT_PORT = 7; - private final DatagramPacket receivePacket = new DatagramPacket(new byte[0], 0); + private final DatagramPacket receivePacket = new DatagramPacket(NetConstants.EMPTY_BTYE_ARRAY, 0); /** * Sends the specified data to the specified server at the default echo diff --git a/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java b/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java index 17d4f8e..a9e22ae 100644 --- a/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java +++ b/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java @@ -30,10 +30,10 @@ import java.util.Arrays; import org.apache.commons.net.PrintCommandListener; import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; -import org.apache.commons.net.ftp.FTPHTTPClient; import org.apache.commons.net.ftp.FTPClientConfig; import org.apache.commons.net.ftp.FTPConnectionClosedException; import org.apache.commons.net.ftp.FTPFile; +import org.apache.commons.net.ftp.FTPHTTPClient; import org.apache.commons.net.ftp.FTPReply; import org.apache.commons.net.ftp.FTPSClient; import org.apache.commons.net.io.CopyStreamEvent; diff --git a/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java b/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java index e88e2d1..f83216d 100644 --- a/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java +++ b/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java @@ -24,6 +24,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.net.SocketException; import java.net.UnknownHostException; + import org.apache.commons.net.tftp.TFTP; import org.apache.commons.net.tftp.TFTPClient; import org.apache.commons.net.tftp.TFTPPacket; diff --git a/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java b/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java index 93b402b..e90a4a1 100644 --- a/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java +++ b/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java @@ -35,8 +35,8 @@ import java.util.regex.Pattern; import org.apache.commons.net.PrintCommandListener; import org.apache.commons.net.ProtocolCommandEvent; -import org.apache.commons.net.imap.IMAP.IMAPChunkListener; import org.apache.commons.net.imap.IMAP; +import org.apache.commons.net.imap.IMAP.IMAPChunkListener; import org.apache.commons.net.imap.IMAPClient; import org.apache.commons.net.imap.IMAPReply; diff --git a/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java b/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java index 01f87bd..b870475 100644 --- a/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java +++ b/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java @@ -18,6 +18,7 @@ package org.apache.commons.net.examples.nntp; import java.io.IOException; + import org.apache.commons.net.nntp.NNTPClient; import org.apache.commons.net.nntp.NewsgroupInfo; diff --git a/src/main/java/org/apache/commons/net/examples/nntp/MessageThreading.java b/src/main/java/org/apache/commons/net/examples/nntp/MessageThreading.java index 7772c64..a692051 100644 --- a/src/main/java/org/apache/commons/net/examples/nntp/MessageThreading.java +++ b/src/main/java/org/apache/commons/net/examples/nntp/MessageThreading.java @@ -21,6 +21,7 @@ package org.apache.commons.net.examples.nntp; import java.io.IOException; import java.io.PrintWriter; import java.net.SocketException; + import org.apache.commons.net.PrintCommandListener; import org.apache.commons.net.nntp.Article; import org.apache.commons.net.nntp.NNTPClient; diff --git a/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java b/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java index 66599a9..def8b59 100644 --- a/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java +++ b/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java @@ -19,6 +19,7 @@ package org.apache.commons.net.examples.nntp; import java.io.IOException; import java.util.ArrayList; import java.util.List; + import org.apache.commons.net.nntp.Article; import org.apache.commons.net.nntp.NNTPClient; diff --git a/src/main/java/org/apache/commons/net/examples/ntp/SimpleNTPServer.java b/src/main/java/org/apache/commons/net/examples/ntp/SimpleNTPServer.java index 07a0601..ab84632 100644 --- a/src/main/java/org/apache/commons/net/examples/ntp/SimpleNTPServer.java +++ b/src/main/java/org/apache/commons/net/examples/ntp/SimpleNTPServer.java @@ -16,15 +16,15 @@ */ package org.apache.commons.net.examples.ntp; +import java.io.IOException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; + import org.apache.commons.net.ntp.NtpUtils; import org.apache.commons.net.ntp.NtpV3Impl; import org.apache.commons.net.ntp.NtpV3Packet; import org.apache.commons.net.ntp.TimeStamp; -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; - /** * The SimpleNTPServer class is a UDP implementation of a server for the * Network Time Protocol (NTP) version 3 as described in RFC 1305. diff --git a/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java b/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java index ec6707c..1cfa46b 100644 --- a/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java +++ b/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java @@ -17,19 +17,19 @@ package org.apache.commons.net.examples.telnet; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.FileOutputStream; import java.util.StringTokenizer; +import org.apache.commons.net.telnet.EchoOptionHandler; +import org.apache.commons.net.telnet.InvalidTelnetOptionException; +import org.apache.commons.net.telnet.SimpleOptionHandler; +import org.apache.commons.net.telnet.SuppressGAOptionHandler; import org.apache.commons.net.telnet.TelnetClient; import org.apache.commons.net.telnet.TelnetNotificationHandler; -import org.apache.commons.net.telnet.SimpleOptionHandler; -import org.apache.commons.net.telnet.EchoOptionHandler; import org.apache.commons.net.telnet.TerminalTypeOptionHandler; -import org.apache.commons.net.telnet.SuppressGAOptionHandler; -import org.apache.commons.net.telnet.InvalidTelnetOptionException; /** diff --git a/src/main/java/org/apache/commons/net/examples/telnet/WeatherTelnet.java b/src/main/java/org/apache/commons/net/examples/telnet/WeatherTelnet.java index acfdc67..cd22b33 100644 --- a/src/main/java/org/apache/commons/net/examples/telnet/WeatherTelnet.java +++ b/src/main/java/org/apache/commons/net/examples/telnet/WeatherTelnet.java @@ -18,9 +18,9 @@ package org.apache.commons.net.examples.telnet; import java.io.IOException; -import org.apache.commons.net.telnet.TelnetClient; import org.apache.commons.net.examples.util.IOUtil; +import org.apache.commons.net.telnet.TelnetClient; /** * This is an example of a trivial use of the TelnetClient class. diff --git a/src/main/java/org/apache/commons/net/examples/unix/rexec.java b/src/main/java/org/apache/commons/net/examples/unix/rexec.java index a27bc38..688a7fa 100644 --- a/src/main/java/org/apache/commons/net/examples/unix/rexec.java +++ b/src/main/java/org/apache/commons/net/examples/unix/rexec.java @@ -18,8 +18,8 @@ package org.apache.commons.net.examples.unix; import java.io.IOException; -import org.apache.commons.net.bsd.RExecClient; +import org.apache.commons.net.bsd.RExecClient; import org.apache.commons.net.examples.util.IOUtil; /** diff --git a/src/main/java/org/apache/commons/net/examples/unix/rlogin.java b/src/main/java/org/apache/commons/net/examples/unix/rlogin.java index cbca81b..cf93e29 100644 --- a/src/main/java/org/apache/commons/net/examples/unix/rlogin.java +++ b/src/main/java/org/apache/commons/net/examples/unix/rlogin.java @@ -18,8 +18,8 @@ package org.apache.commons.net.examples.unix; import java.io.IOException; -import org.apache.commons.net.bsd.RLoginClient; +import org.apache.commons.net.bsd.RLoginClient; import org.apache.commons.net.examples.util.IOUtil; /** diff --git a/src/main/java/org/apache/commons/net/examples/unix/rshell.java b/src/main/java/org/apache/commons/net/examples/unix/rshell.java index cf01d7e..67766e6 100644 --- a/src/main/java/org/apache/commons/net/examples/unix/rshell.java +++ b/src/main/java/org/apache/commons/net/examples/unix/rshell.java @@ -18,8 +18,8 @@ package org.apache.commons.net.examples.unix; import java.io.IOException; -import org.apache.commons.net.bsd.RCommandClient; +import org.apache.commons.net.bsd.RCommandClient; import org.apache.commons.net.examples.util.IOUtil; /** diff --git a/src/main/java/org/apache/commons/net/examples/util/IOUtil.java b/src/main/java/org/apache/commons/net/examples/util/IOUtil.java index 1863865..1a8c0d7 100644 --- a/src/main/java/org/apache/commons/net/examples/util/IOUtil.java +++ b/src/main/java/org/apache/commons/net/examples/util/IOUtil.java @@ -20,6 +20,7 @@ package org.apache.commons.net.examples.util; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import org.apache.commons.net.io.Util; /** diff --git a/src/main/java/org/apache/commons/net/finger/FingerClient.java b/src/main/java/org/apache/commons/net/finger/FingerClient.java index 753e877..3a8e580 100644 --- a/src/main/java/org/apache/commons/net/finger/FingerClient.java +++ b/src/main/java/org/apache/commons/net/finger/FingerClient.java @@ -16,12 +16,12 @@ */ package org.apache.commons.net.finger; +import java.io.BufferedOutputStream; import java.io.BufferedReader; +import java.io.DataOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.BufferedOutputStream; -import java.io.DataOutputStream; import org.apache.commons.net.SocketClient; import org.apache.commons.net.util.Charsets; diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java b/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java index 60136bf..7471b37 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java @@ -22,6 +22,8 @@ import java.security.cert.X509Certificate; import javax.net.ssl.X509TrustManager; +import org.apache.commons.net.util.NetConstants; + /** * Do not use. * @since 2.0 @@ -32,8 +34,6 @@ import javax.net.ssl.X509TrustManager; @Deprecated public class FTPSTrustManager implements X509TrustManager { - private static final X509Certificate[] EMPTY_X509CERTIFICATE_ARRAY = new X509Certificate[]{}; - /** * No-op */ @@ -54,6 +54,6 @@ public class FTPSTrustManager implements X509TrustManager @Override public X509Certificate[] getAcceptedIssuers() { - return EMPTY_X509CERTIFICATE_ARRAY; + return NetConstants.EMPTY_X509_CERTIFICATE_ARRAY; } } diff --git a/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java b/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java index 8645500..d8bc990 100644 --- a/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java +++ b/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java @@ -25,6 +25,7 @@ import java.security.spec.InvalidKeySpecException; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; import javax.net.ssl.SSLContext; + import org.apache.commons.net.util.Base64; /** diff --git a/src/main/java/org/apache/commons/net/imap/IMAP.java b/src/main/java/org/apache/commons/net/imap/IMAP.java index ec6c6c8..a6d833e 100644 --- a/src/main/java/org/apache/commons/net/imap/IMAP.java +++ b/src/main/java/org/apache/commons/net/imap/IMAP.java @@ -20,8 +20,8 @@ package org.apache.commons.net.imap; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.EOFException; -import java.io.InputStreamReader; import java.io.IOException; +import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/apache/commons/net/imap/IMAPSClient.java b/src/main/java/org/apache/commons/net/imap/IMAPSClient.java index 8130205..56807b3 100644 --- a/src/main/java/org/apache/commons/net/imap/IMAPSClient.java +++ b/src/main/java/org/apache/commons/net/imap/IMAPSClient.java @@ -18,8 +18,8 @@ package org.apache.commons.net.imap; import java.io.BufferedWriter; -import java.io.InputStreamReader; import java.io.IOException; +import java.io.InputStreamReader; import java.io.OutputStreamWriter; import javax.net.ssl.HostnameVerifier; diff --git a/src/main/java/org/apache/commons/net/nntp/Article.java b/src/main/java/org/apache/commons/net/nntp/Article.java index e45c3a0..ae91673 100644 --- a/src/main/java/org/apache/commons/net/nntp/Article.java +++ b/src/main/java/org/apache/commons/net/nntp/Article.java @@ -17,12 +17,12 @@ package org.apache.commons.net.nntp; -import org.apache.commons.net.util.NetConstants; - import java.io.PrintStream; import java.util.ArrayList; import java.util.Collections; +import org.apache.commons.net.util.NetConstants; + /** * This is a class that contains the basic state needed for message retrieval and threading. * With thanks to Jamie Zawinski ([email protected]) @@ -63,7 +63,7 @@ public class Article implements Threadable { */ public String[] getReferences() { if (references == null) { - return new String[0]; + return NetConstants.EMPTY_STRING_ARRAY; } return references.toArray(NetConstants.EMPTY_STRING_ARRAY); } diff --git a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java index 7ef0b77..41de1e0 100644 --- a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java +++ b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java @@ -87,6 +87,8 @@ import org.apache.commons.net.util.NetConstants; public class NNTPClient extends NNTP { + private static final NewsgroupInfo[] EMPTY_NEWSGROUP_INFO_ARRAY = new NewsgroupInfo[0]; + /** * Parse the reply and store the id and number in the pointer. * @@ -262,7 +264,7 @@ public class NNTPClient extends NNTP } final int size; if ((size = list.size()) < 1) { - return new NewsgroupInfo[0]; + return EMPTY_NEWSGROUP_INFO_ARRAY; } final NewsgroupInfo[] info = new NewsgroupInfo[size]; @@ -1271,7 +1273,7 @@ public class NNTPClient extends NNTP final int size = list.size(); if (size < 1) { - return new String[0]; + return NetConstants.EMPTY_STRING_ARRAY; } final String[] result = new String[size]; diff --git a/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java b/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java index 74e7e70..f0bce79 100644 --- a/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java +++ b/src/main/java/org/apache/commons/net/pop3/ExtendedPOP3Client.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; + import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; diff --git a/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java b/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java index ffb30e4..fc21d39 100644 --- a/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java +++ b/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java @@ -22,6 +22,7 @@ import java.net.InetAddress; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; + import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; import javax.net.ssl.SSLContext; diff --git a/src/main/java/org/apache/commons/net/telnet/Telnet.java b/src/main/java/org/apache/commons/net/telnet/Telnet.java index b9d725f..b1d4e20 100644 --- a/src/main/java/org/apache/commons/net/telnet/Telnet.java +++ b/src/main/java/org/apache/commons/net/telnet/Telnet.java @@ -19,8 +19,8 @@ package org.apache.commons.net.telnet; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; import java.util.Arrays; import org.apache.commons.net.SocketClient; diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPClient.java b/src/main/java/org/apache/commons/net/tftp/TFTPClient.java index 7c5ad26..4a5d47e 100644 --- a/src/main/java/org/apache/commons/net/tftp/TFTPClient.java +++ b/src/main/java/org/apache/commons/net/tftp/TFTPClient.java @@ -24,6 +24,7 @@ import java.io.OutputStream; import java.net.InetAddress; import java.net.SocketException; import java.net.UnknownHostException; + import org.apache.commons.net.io.FromNetASCIIOutputStream; import org.apache.commons.net.io.ToNetASCIIInputStream; diff --git a/src/main/java/org/apache/commons/net/util/Base64.java b/src/main/java/org/apache/commons/net/util/Base64.java index 42b1216..bdd116a 100644 --- a/src/main/java/org/apache/commons/net/util/Base64.java +++ b/src/main/java/org/apache/commons/net/util/Base64.java @@ -68,8 +68,6 @@ public class Base64 { */ private static final byte[] CHUNK_SEPARATOR = {'\r', '\n'}; - private static final byte[] EMPTY_BYTE_ARRAY = new byte[0]; - /** * This array is a lookup table that translates 6-bit positive integer index values into their "Base64 Alphabet" * equivalents as specified in Table 1 of RFC 2045. @@ -312,7 +310,7 @@ public class Base64 { public Base64(int lineLength, byte[] lineSeparator, final boolean urlSafe) { if (lineSeparator == null) { lineLength = 0; // disable chunk-separating - lineSeparator = EMPTY_BYTE_ARRAY; // this just gets ignored + lineSeparator = NetConstants.EMPTY_BTYE_ARRAY; // this just gets ignored } this.lineLength = lineLength > 0 ? (lineLength / 4) * 4 : 0; this.lineSeparator = new byte[lineSeparator.length]; @@ -817,7 +815,7 @@ public class Base64 { } final long len = getEncodeLength(binaryData, isChunked ? CHUNK_SIZE : 0, - isChunked ? CHUNK_SEPARATOR : EMPTY_BYTE_ARRAY); + isChunked ? CHUNK_SEPARATOR : NetConstants.EMPTY_BTYE_ARRAY); if (len > maxResultSize) { throw new IllegalArgumentException("Input array too big, the output array would be bigger (" + len + ") than the specified maxium size of " + maxResultSize); diff --git a/src/main/java/org/apache/commons/net/util/NetConstants.java b/src/main/java/org/apache/commons/net/util/NetConstants.java index ad50c3a..e91c39a 100644 --- a/src/main/java/org/apache/commons/net/util/NetConstants.java +++ b/src/main/java/org/apache/commons/net/util/NetConstants.java @@ -16,6 +16,8 @@ */ package org.apache.commons.net.util; +import java.security.cert.X509Certificate; + /** * Constants provided as public only for our own implementation, you can consider this private for now. * @@ -29,6 +31,16 @@ public class NetConstants { public static final String[] EMPTY_STRING_ARRAY = new String[0]; /** + * An empty immutable {@code byte} array. + */ + public static final byte[] EMPTY_BTYE_ARRAY = new byte[0]; + + /** + * An empty immutable {link X509Certificate} array. + */ + public static final X509Certificate[] EMPTY_X509_CERTIFICATE_ARRAY = new X509Certificate[0]; + + /** * Prevents instantiation. */ private NetConstants() { diff --git a/src/main/java/org/apache/commons/net/util/SSLContextUtils.java b/src/main/java/org/apache/commons/net/util/SSLContextUtils.java index 391b57b..f71dd3b 100644 --- a/src/main/java/org/apache/commons/net/util/SSLContextUtils.java +++ b/src/main/java/org/apache/commons/net/util/SSLContextUtils.java @@ -20,6 +20,7 @@ package org.apache.commons.net.util; import java.io.IOException; import java.security.GeneralSecurityException; + import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; diff --git a/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java b/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java index 8755ef6..eca1fdf 100644 --- a/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java +++ b/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java @@ -32,8 +32,6 @@ import javax.net.ssl.X509TrustManager; */ public final class TrustManagerUtils { - private static final X509Certificate[] EMPTY_X509CERTIFICATE_ARRAY = new X509Certificate[]{}; - private static class TrustManager implements X509TrustManager { private final boolean checkServerValidity; @@ -68,7 +66,7 @@ public final class TrustManagerUtils @Override public X509Certificate[] getAcceptedIssuers() { - return EMPTY_X509CERTIFICATE_ARRAY; + return NetConstants.EMPTY_X509_CERTIFICATE_ARRAY; } } diff --git a/src/test/java/org/apache/commons/net/nntp/TestThreader.java b/src/test/java/org/apache/commons/net/nntp/TestThreader.java index 30963fe..9f5021b 100644 --- a/src/test/java/org/apache/commons/net/nntp/TestThreader.java +++ b/src/test/java/org/apache/commons/net/nntp/TestThreader.java @@ -28,25 +28,27 @@ import org.junit.Test; */ public class TestThreader { + private static final Threadable[] EMPTY_THREADABLE_ARRAY = new Threadable[0]; + @Test @SuppressWarnings("deprecation") // test of deprecated method public void testNullArray() { // NET-539 final Threader t = new Threader(); - final Threadable[] messages=null; + final Threadable[] messages = null; Assert.assertNull(t.thread(messages)); } @Test public void testNullList() { final Threader t = new Threader(); - final List<Threadable> messages=null; + final List<Threadable> messages = null; Assert.assertNull(t.thread(messages)); } @Test public void testNullIterable() { final Threader t = new Threader(); - final Iterable<Threadable> messages=null; + final Iterable<Threadable> messages = null; Assert.assertNull(t.thread(messages)); } @@ -54,14 +56,14 @@ public class TestThreader { @Test public void testEmptyArray() { // NET-539 final Threader t = new Threader(); - final Threadable[] messages=new Threadable[0]; + final Threadable[] messages = EMPTY_THREADABLE_ARRAY; Assert.assertNull(t.thread(messages)); } @Test public void testEmptyList() { // NET-539 final Threader t = new Threader(); - final Threadable[] messages=new Threadable[0]; + final Threadable[] messages = EMPTY_THREADABLE_ARRAY; final List<Threadable> asList = Arrays.asList(messages); Assert.assertNull(t.thread(asList)); } @@ -69,7 +71,7 @@ public class TestThreader { @Test public void testEmptyIterable() { // NET-539 final Threader t = new Threader(); - final Threadable[] messages=new Threadable[0]; + final Threadable[] messages = EMPTY_THREADABLE_ARRAY; final Iterable<Threadable> asList = Arrays.asList(messages); Assert.assertNull(t.thread(asList)); }
