You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/12/26 17:29:48 UTC
[commons-net] branch master updated: Minor Improvement:
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 562ba39 Minor Improvement:
new e9ce9f1 Merge pull request #71 from arturobernalg/feature/minor_improvement
562ba39 is described below
commit 562ba39946dce98efcc08d6b39510b7a35b586f6
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Dec 24 07:40:14 2020 +0100
Minor Improvement:
* Add final
* Field may be 'final'
* Use Standard Charset
* Unnecessary semicolon
* Change String concatenation in loop for StringBuilder
* Fix JavaDoc
---
.../apache/commons/net/ProtocolCommandSupport.java | 4 ++--
.../java/org/apache/commons/net/SocketClient.java | 3 ++-
.../org/apache/commons/net/bsd/RCommandClient.java | 5 +++--
.../java/org/apache/commons/net/bsd/RExecClient.java | 7 ++++---
.../apache/commons/net/chargen/CharGenUDPClient.java | 4 ++--
.../apache/commons/net/daytime/DaytimeTCPClient.java | 2 +-
.../apache/commons/net/daytime/DaytimeUDPClient.java | 3 ++-
.../commons/net/examples/ftp/FTPClientExample.java | 8 ++++----
.../commons/net/examples/ftp/ServerToServerFTP.java | 19 +++++++++++++------
.../apache/commons/net/examples/ftp/TFTPExample.java | 11 +++++++----
.../commons/net/examples/mail/POP3ExportMbox.java | 4 ++--
.../apache/commons/net/examples/mail/POP3Mail.java | 4 ++--
.../apache/commons/net/examples/mail/SMTPMail.java | 15 ++++++++++-----
.../commons/net/examples/nntp/ArticleReader.java | 4 ++--
.../commons/net/examples/nntp/ExtendedNNTPOps.java | 2 +-
.../apache/commons/net/examples/nntp/PostMessage.java | 15 ++++++++++-----
.../apache/commons/net/examples/ntp/NTPClient.java | 2 +-
.../net/examples/telnet/TelnetClientExample.java | 2 +-
.../commons/net/examples/telnet/WeatherTelnet.java | 2 +-
.../org/apache/commons/net/examples/unix/chargen.java | 6 +++---
.../org/apache/commons/net/examples/unix/echo.java | 11 ++++++-----
.../org/apache/commons/net/examples/unix/finger.java | 2 +-
.../org/apache/commons/net/examples/unix/fwhois.java | 7 ++++---
.../org/apache/commons/net/examples/unix/rexec.java | 7 +++++--
.../org/apache/commons/net/examples/unix/rlogin.java | 7 +++++--
.../org/apache/commons/net/examples/unix/rshell.java | 7 +++++--
.../org/apache/commons/net/examples/util/IOUtil.java | 3 ++-
.../org/apache/commons/net/finger/FingerClient.java | 8 ++++----
src/main/java/org/apache/commons/net/ftp/FTP.java | 6 +++---
.../java/org/apache/commons/net/ftp/FTPClient.java | 9 ++++++---
.../org/apache/commons/net/ftp/FTPHTTPClient.java | 5 +++--
.../ftp/parser/DefaultFTPFileEntryParserFactory.java | 4 ++--
.../net/ftp/parser/FTPTimestampParserImpl.java | 2 +-
.../commons/net/ftp/parser/MLSxEntryParser.java | 4 ++--
.../net/ftp/parser/MacOsPeterFTPEntryParser.java | 2 +-
.../commons/net/ftp/parser/OS400FTPEntryParser.java | 2 +-
.../commons/net/ftp/parser/UnixFTPEntryParser.java | 2 +-
.../commons/net/ftp/parser/VMSFTPEntryParser.java | 4 ++--
src/main/java/org/apache/commons/net/imap/IMAP.java | 2 +-
.../java/org/apache/commons/net/imap/IMAPClient.java | 6 +++---
.../commons/net/io/FromNetASCIIInputStream.java | 11 ++++-------
.../apache/commons/net/io/ToNetASCIIInputStream.java | 7 ++++---
src/main/java/org/apache/commons/net/nntp/NNTP.java | 2 +-
.../java/org/apache/commons/net/nntp/NNTPClient.java | 2 +-
.../apache/commons/net/nntp/NewGroupsOrNewsQuery.java | 2 +-
.../org/apache/commons/net/nntp/ThreadContainer.java | 2 +-
.../java/org/apache/commons/net/ntp/TimeStamp.java | 2 +-
src/main/java/org/apache/commons/net/pop3/POP3.java | 2 +-
.../java/org/apache/commons/net/pop3/POP3Client.java | 11 ++++++-----
.../commons/net/smtp/AuthenticatingSMTPClient.java | 4 ++--
.../java/org/apache/commons/net/smtp/RelayPath.java | 2 +-
src/main/java/org/apache/commons/net/smtp/SMTP.java | 4 ++--
.../java/org/apache/commons/net/smtp/SMTPClient.java | 8 ++++----
.../org/apache/commons/net/telnet/TelnetClient.java | 2 +-
.../apache/commons/net/telnet/TelnetInputStream.java | 9 +++++----
src/main/java/org/apache/commons/net/tftp/TFTP.java | 6 +++---
.../org/apache/commons/net/tftp/TFTPAckPacket.java | 4 ++--
.../org/apache/commons/net/tftp/TFTPDataPacket.java | 2 +-
.../org/apache/commons/net/tftp/TFTPErrorPacket.java | 13 +++++++------
.../java/org/apache/commons/net/tftp/TFTPPacket.java | 2 +-
.../apache/commons/net/tftp/TFTPRequestPacket.java | 8 +++++---
.../org/apache/commons/net/time/TimeTCPClient.java | 2 +-
.../org/apache/commons/net/time/TimeUDPClient.java | 3 ++-
src/main/java/org/apache/commons/net/util/Base64.java | 15 +++------------
.../org/apache/commons/net/util/SSLContextUtils.java | 2 +-
.../commons/net/ftp/parser/DownloadListings.java | 2 +-
.../apache/commons/net/ftp/parser/MLSDComparison.java | 4 ++--
.../commons/net/io/ToNetASCIIInputStreamTest.java | 5 +++--
.../java/org/apache/commons/net/tftp/TFTPServer.java | 4 ++--
.../java/org/apache/commons/net/util/Base64Test.java | 2 +-
70 files changed, 201 insertions(+), 165 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/ProtocolCommandSupport.java b/src/main/java/org/apache/commons/net/ProtocolCommandSupport.java
index c857bec..c55a9d3 100644
--- a/src/main/java/org/apache/commons/net/ProtocolCommandSupport.java
+++ b/src/main/java/org/apache/commons/net/ProtocolCommandSupport.java
@@ -66,7 +66,7 @@ public class ProtocolCommandSupport implements Serializable
*/
public void fireCommandSent(final String command, final String message)
{
- ProtocolCommandEvent event;
+ final ProtocolCommandEvent event;
event = new ProtocolCommandEvent(source, command, message);
@@ -91,7 +91,7 @@ public class ProtocolCommandSupport implements Serializable
*/
public void fireReplyReceived(final int replyCode, final String message)
{
- ProtocolCommandEvent event;
+ final ProtocolCommandEvent event;
event = new ProtocolCommandEvent(source, replyCode, message);
for (final EventListener listener : listeners)
diff --git a/src/main/java/org/apache/commons/net/SocketClient.java b/src/main/java/org/apache/commons/net/SocketClient.java
index 492b59a..eee799d 100644
--- a/src/main/java/org/apache/commons/net/SocketClient.java
+++ b/src/main/java/org/apache/commons/net/SocketClient.java
@@ -691,7 +691,8 @@ public abstract class SocketClient
*/
public boolean verifyRemote(final Socket socket)
{
- InetAddress host1, host2;
+ final InetAddress host1;
+ final InetAddress host2;
host1 = socket.getInetAddress();
host2 = getRemoteAddress();
diff --git a/src/main/java/org/apache/commons/net/bsd/RCommandClient.java b/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
index 95a8510..1ea94dd 100644
--- a/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
+++ b/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
@@ -25,6 +25,7 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.net.io.SocketInputStream;
@@ -110,7 +111,7 @@ public class RCommandClient extends RExecClient
{
int localPort;
ServerSocket server;
- Socket socket;
+ final Socket socket;
localPort = MAX_CLIENT_PORT;
server = null; // Keep compiler from barfing
@@ -133,7 +134,7 @@ public class RCommandClient extends RExecClient
throw new BindException("All ports in use.");
}
- _output_.write(Integer.toString(server.getLocalPort()).getBytes("UTF-8")); // $NON-NLS
+ _output_.write(Integer.toString(server.getLocalPort()).getBytes(StandardCharsets.UTF_8)); // $NON-NLS
_output_.write(NULL_CHAR);
_output_.flush();
diff --git a/src/main/java/org/apache/commons/net/bsd/RExecClient.java b/src/main/java/org/apache/commons/net/bsd/RExecClient.java
index ab151a7..2d63f86 100644
--- a/src/main/java/org/apache/commons/net/bsd/RExecClient.java
+++ b/src/main/java/org/apache/commons/net/bsd/RExecClient.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.ServerSocket;
import java.net.Socket;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.net.SocketClient;
import org.apache.commons.net.io.SocketInputStream;
@@ -88,12 +89,12 @@ public class RExecClient extends SocketClient
// limitations of rcmd and rlogin
InputStream createErrorStream() throws IOException
{
- ServerSocket server;
- Socket socket;
+ final ServerSocket server;
+ final Socket socket;
server = _serverSocketFactory_.createServerSocket(0, 1, getLocalAddress());
- _output_.write(Integer.toString(server.getLocalPort()).getBytes("UTF-8")); // $NON-NLS-1$
+ _output_.write(Integer.toString(server.getLocalPort()).getBytes(StandardCharsets.UTF_8)); // $NON-NLS-1$
_output_.write(NULL_CHAR);
_output_.flush();
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 54adc90..4cdb842 100644
--- a/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java
+++ b/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java
@@ -115,8 +115,8 @@ public final class CharGenUDPClient extends DatagramSocketClient
*/
public byte[] receive() throws IOException
{
- int length;
- byte[] result;
+ final int length;
+ final byte[] result;
_socket_.receive(receivePacket);
diff --git a/src/main/java/org/apache/commons/net/daytime/DaytimeTCPClient.java b/src/main/java/org/apache/commons/net/daytime/DaytimeTCPClient.java
index c6027fd..2080e0f 100644
--- a/src/main/java/org/apache/commons/net/daytime/DaytimeTCPClient.java
+++ b/src/main/java/org/apache/commons/net/daytime/DaytimeTCPClient.java
@@ -69,7 +69,7 @@ public final class DaytimeTCPClient extends SocketClient
{
int read;
final StringBuilder result = new StringBuilder(buffer.length);
- BufferedReader reader;
+ final BufferedReader reader;
reader = new BufferedReader(new InputStreamReader(_input_, getCharset()));
diff --git a/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java b/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java
index 42b4f58..5da5046 100644
--- a/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java
+++ b/src/main/java/org/apache/commons/net/daytime/DaytimeUDPClient.java
@@ -58,7 +58,8 @@ public final class DaytimeUDPClient extends DatagramSocketClient
*/
public String getTime(final InetAddress host, final int port) throws IOException
{
- DatagramPacket sendPacket, receivePacket;
+ final DatagramPacket sendPacket;
+ final DatagramPacket receivePacket;
sendPacket =
new DatagramPacket(dummyData, dummyData.length, host, port);
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 bc234e1..ee049fd 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
@@ -271,7 +271,7 @@ public final class FTPClientExample
ftp = new FTPClient();
}
} else {
- FTPSClient ftps;
+ final FTPSClient ftps;
if (protocol.equals("true")) {
ftps = new FTPSClient(true);
} else if (protocol.equals("false")) {
@@ -328,7 +328,7 @@ public final class FTPClientExample
try
{
- int reply;
+ final int reply;
if (port > 0) {
ftp.connect(server, port);
} else {
@@ -397,7 +397,7 @@ __main:
if (storeFile)
{
- try (InputStream input = new FileInputStream(local)) {
+ try (final InputStream input = new FileInputStream(local)) {
ftp.storeFile(remote, input);
}
@@ -501,7 +501,7 @@ __main:
}
else
{
- try (OutputStream output = new FileOutputStream(local)) {
+ try (final OutputStream output = new FileOutputStream(local)) {
ftp.retrieveFile(remote, output);
}
diff --git a/src/main/java/org/apache/commons/net/examples/ftp/ServerToServerFTP.java b/src/main/java/org/apache/commons/net/examples/ftp/ServerToServerFTP.java
index 0484282..bb032d7 100644
--- a/src/main/java/org/apache/commons/net/examples/ftp/ServerToServerFTP.java
+++ b/src/main/java/org/apache/commons/net/examples/ftp/ServerToServerFTP.java
@@ -41,12 +41,19 @@ public final class ServerToServerFTP
public static void main(final String[] args)
{
- String server1, username1, password1, file1;
- String server2, username2, password2, file2;
+ String server1;
+ final String username1;
+ final String password1;
+ final String file1;
+ String server2;
+ final String username2;
+ final String password2;
+ final String file2;
String [] parts;
int port1=0, port2=0;
- FTPClient ftp1, ftp2;
- ProtocolCommandListener listener;
+ final FTPClient ftp1;
+ final FTPClient ftp2;
+ final ProtocolCommandListener listener;
if (args.length < 8)
{
@@ -83,7 +90,7 @@ public final class ServerToServerFTP
try
{
- int reply;
+ final int reply;
if (port1 > 0) {
ftp1.connect(server1, port1);
} else {
@@ -120,7 +127,7 @@ public final class ServerToServerFTP
try
{
- int reply;
+ final int reply;
if (port2 > 0) {
ftp2.connect(server2, port2);
} else {
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 837d87e..e88e2d1 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
@@ -67,7 +67,10 @@ public final class TFTPExample
{
boolean receiveFile = true, closed;
int transferMode = TFTP.BINARY_MODE, argc;
- String arg, hostname, localFilename, remoteFilename;
+ String arg;
+ final String hostname;
+ final String localFilename;
+ final String remoteFilename;
final TFTPClient tftp;
int timeout = 60000;
boolean verbose = false;
@@ -152,7 +155,7 @@ public final class TFTPExample
private static boolean send(final int transferMode, final String hostname, final String localFilename,
final String remoteFilename, final TFTPClient tftp) {
- boolean closed;
+ final boolean closed;
FileInputStream input = null;
// Try to open local file for reading
@@ -201,9 +204,9 @@ public final class TFTPExample
private static boolean receive(final int transferMode, final String hostname, final String localFilename,
final String remoteFilename, final TFTPClient tftp) {
- boolean closed;
+ final boolean closed;
FileOutputStream output = null;
- File file;
+ final File file;
file = new File(localFilename);
diff --git a/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java b/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java
index 2f1410b..a5a1c59 100644
--- a/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java
+++ b/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java
@@ -84,7 +84,7 @@ public final class POP3ExportMbox
final String proto = argCount > 3 ? args[argIdx++] : null;
final boolean implicit = argCount > 4 ? Boolean.parseBoolean(args[argIdx++]) : false;
- POP3Client pop3;
+ final POP3Client pop3;
if (proto != null) {
System.out.println("Using secure protocol: "+proto);
@@ -93,7 +93,7 @@ public final class POP3ExportMbox
pop3 = new POP3Client();
}
- int port;
+ final int port;
if (arg0.length == 2) {
port = Integer.parseInt(arg0[1]);
} else {
diff --git a/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java b/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java
index 33bf350..bc921ac 100644
--- a/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java
+++ b/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java
@@ -79,7 +79,7 @@ public final class POP3Mail
final String proto = args.length > 3 ? args[3] : null;
final boolean implicit = args.length > 4 ? Boolean.parseBoolean(args[4]) : false;
- POP3Client pop3;
+ final POP3Client pop3;
if (proto != null) {
System.out.println("Using secure protocol: "+proto);
@@ -88,7 +88,7 @@ public final class POP3Mail
pop3 = new POP3Client();
}
- int port;
+ final int port;
if (arg0.length == 2) {
port = Integer.parseInt(arg0[1]);
} else {
diff --git a/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java b/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java
index b3ff8f7..ec412cd 100644
--- a/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java
+++ b/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java
@@ -44,13 +44,18 @@ public final class SMTPMail
public static void main(final String[] args)
{
- String sender, recipient, subject, fileName, server, cc;
+ final String sender;
+ final String recipient;
+ final String subject;
+ final String fileName;
+ final String server;
+ String cc;
final List<String> ccList = new ArrayList<>();
- BufferedReader stdin;
+ final BufferedReader stdin;
FileReader fileReader = null;
- Writer writer;
- SimpleSMTPHeader header;
- SMTPClient client;
+ final Writer writer;
+ final SimpleSMTPHeader header;
+ final SMTPClient client;
if (args.length < 1)
{
diff --git a/src/main/java/org/apache/commons/net/examples/nntp/ArticleReader.java b/src/main/java/org/apache/commons/net/examples/nntp/ArticleReader.java
index 185c161..981a4d0 100644
--- a/src/main/java/org/apache/commons/net/examples/nntp/ArticleReader.java
+++ b/src/main/java/org/apache/commons/net/examples/nntp/ArticleReader.java
@@ -59,7 +59,7 @@ public class ArticleReader {
final NewsgroupInfo group = new NewsgroupInfo();
client.selectNewsgroup(newsgroup, group);
- BufferedReader brHdr;
+ final BufferedReader brHdr;
String line;
if (articleSpec != null) {
brHdr = (BufferedReader) client.retrieveArticleHeader(articleSpec);
@@ -73,7 +73,7 @@ public class ArticleReader {
}
brHdr.close();
}
- BufferedReader brBody;
+ final BufferedReader brBody;
if (articleSpec != null) {
brBody = (BufferedReader) client.retrieveArticleBody(articleSpec);
} else {
diff --git a/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java b/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java
index 6df2633..96b8405 100644
--- a/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java
+++ b/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java
@@ -82,7 +82,7 @@ public class ExtendedNNTPOps {
}
public static void main(final String[] args) {
- ExtendedNNTPOps ops;
+ final ExtendedNNTPOps ops;
final int argc = args.length;
if (argc < 1) {
diff --git a/src/main/java/org/apache/commons/net/examples/nntp/PostMessage.java b/src/main/java/org/apache/commons/net/examples/nntp/PostMessage.java
index 250fdd8..f97af16 100644
--- a/src/main/java/org/apache/commons/net/examples/nntp/PostMessage.java
+++ b/src/main/java/org/apache/commons/net/examples/nntp/PostMessage.java
@@ -43,12 +43,17 @@ public final class PostMessage
public static void main(final String[] args)
{
- String from, subject, newsgroup, fileName, server, organization;
- String references;
- BufferedReader stdin;
+ final String from;
+ final String subject;
+ String newsgroup;
+ final String fileName;
+ final String server;
+ final String organization;
+ final String references;
+ final BufferedReader stdin;
FileReader fileReader = null;
- SimpleNNTPHeader header;
- NNTPClient client;
+ final SimpleNNTPHeader header;
+ final NNTPClient client;
if (args.length < 1)
{
diff --git a/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java b/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java
index 4e0ca53..3152c51 100644
--- a/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java
+++ b/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java
@@ -57,7 +57,7 @@ public final class NTPClient
{
final NtpV3Packet message = info.getMessage();
final int stratum = message.getStratum();
- String refType;
+ final String refType;
if (stratum <= 0) {
refType = "(Unspecified or Unavailable)";
} else if (stratum == 1) {
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 892e71c..a32cf6d 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
@@ -66,7 +66,7 @@ public class TelnetClientExample implements Runnable, TelnetNotificationHandler
final String remoteip = args[0];
- int remoteport;
+ final int remoteport;
if (args.length > 1)
{
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 7164fae..acfdc67 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
@@ -40,7 +40,7 @@ public final class WeatherTelnet
public static void main(final String[] args)
{
- TelnetClient telnet;
+ final TelnetClient telnet;
telnet = new TelnetClient();
diff --git a/src/main/java/org/apache/commons/net/examples/unix/chargen.java b/src/main/java/org/apache/commons/net/examples/unix/chargen.java
index 32a2a41..713215a 100644
--- a/src/main/java/org/apache/commons/net/examples/unix/chargen.java
+++ b/src/main/java/org/apache/commons/net/examples/unix/chargen.java
@@ -51,7 +51,7 @@ public final class chargen
// We want to timeout if a response takes longer than 60 seconds
client.setDefaultTimeout(60000);
client.connect(host);
- try (BufferedReader chargenInput = new BufferedReader(new InputStreamReader(client.getInputStream()))) {
+ try (final BufferedReader chargenInput = new BufferedReader(new InputStreamReader(client.getInputStream()))) {
// We assume the chargen service outputs lines, but it really doesn't
// have to, so this code might actually not work if no newlines are
@@ -70,8 +70,8 @@ public final class chargen
{
int packets = 50;
byte[] data;
- InetAddress address;
- CharGenUDPClient client;
+ final InetAddress address;
+ final CharGenUDPClient client;
address = InetAddress.getByName(host);
client = new CharGenUDPClient();
diff --git a/src/main/java/org/apache/commons/net/examples/unix/echo.java b/src/main/java/org/apache/commons/net/examples/unix/echo.java
index 49fc71b..27a5999 100644
--- a/src/main/java/org/apache/commons/net/examples/unix/echo.java
+++ b/src/main/java/org/apache/commons/net/examples/unix/echo.java
@@ -45,8 +45,9 @@ public final class echo
public static void echoTCP(final String host) throws IOException
{
final EchoTCPClient client = new EchoTCPClient();
- BufferedReader input, echoInput;
- PrintWriter echoOutput;
+ final BufferedReader input;
+ final BufferedReader echoInput;
+ final PrintWriter echoOutput;
String line;
// We want to timeout if a response takes longer than 60 seconds
@@ -75,9 +76,9 @@ public final class echo
int length, count;
byte[] data;
String line;
- BufferedReader input;
- InetAddress address;
- EchoUDPClient client;
+ final BufferedReader input;
+ final InetAddress address;
+ final EchoUDPClient client;
input = new BufferedReader(new InputStreamReader(System.in));
address = InetAddress.getByName(host);
diff --git a/src/main/java/org/apache/commons/net/examples/unix/finger.java b/src/main/java/org/apache/commons/net/examples/unix/finger.java
index e573e51..eb658d3 100644
--- a/src/main/java/org/apache/commons/net/examples/unix/finger.java
+++ b/src/main/java/org/apache/commons/net/examples/unix/finger.java
@@ -40,7 +40,7 @@ public final class finger
boolean longOutput = false;
int arg = 0, index;
String handle, host;
- FingerClient finger;
+ final FingerClient finger;
InetAddress address = null;
// Get flags. If an invalid flag is present, exit with usage message.
diff --git a/src/main/java/org/apache/commons/net/examples/unix/fwhois.java b/src/main/java/org/apache/commons/net/examples/unix/fwhois.java
index 561e932..2cbca6a 100644
--- a/src/main/java/org/apache/commons/net/examples/unix/fwhois.java
+++ b/src/main/java/org/apache/commons/net/examples/unix/fwhois.java
@@ -32,10 +32,11 @@ public final class fwhois
public static void main(final String[] args)
{
- int index;
- String handle, host;
+ final int index;
+ final String handle;
+ final String host;
InetAddress address = null;
- WhoisClient whois;
+ final WhoisClient whois;
if (args.length != 1)
{
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 8cbf061..a27bc38 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
@@ -41,8 +41,11 @@ public final class rexec
public static void main(final String[] args)
{
- String server, username, password, command;
- RExecClient client;
+ final String server;
+ final String username;
+ final String password;
+ final String command;
+ final RExecClient client;
if (args.length != 4)
{
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 16ecde1..cbca81b 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
@@ -52,8 +52,11 @@ public final class rlogin
public static void main(final String[] args)
{
- String server, localuser, remoteuser, terminal;
- RLoginClient client;
+ final String server;
+ final String localuser;
+ final String remoteuser;
+ final String terminal;
+ final RLoginClient client;
if (args.length != 4)
{
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 c0e4b6f..cf01d7e 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
@@ -45,8 +45,11 @@ public final class rshell
public static void main(final String[] args)
{
- String server, localuser, remoteuser, command;
- RCommandClient client;
+ final String server;
+ final String localuser;
+ final String remoteuser;
+ final String command;
+ final RCommandClient client;
if (args.length != 4)
{
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 e575e2c..1863865 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
@@ -41,7 +41,8 @@ public final class IOUtil
final InputStream localInput,
final OutputStream localOutput)
{
- Thread reader, writer;
+ final Thread reader;
+ final Thread writer;
reader = new Thread()
{
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 57d4e0a..753e877 100644
--- a/src/main/java/org/apache/commons/net/finger/FingerClient.java
+++ b/src/main/java/org/apache/commons/net/finger/FingerClient.java
@@ -59,7 +59,7 @@ public class FingerClient extends SocketClient
private static final String LONG_FLAG = "/W ";
- private transient char[] buffer = new char[1024];
+ private final transient char[] buffer = new char[1024];
/**
* The default FingerClient constructor. Initializes the
@@ -86,8 +86,8 @@ public class FingerClient extends SocketClient
int read;
final StringBuilder result = new StringBuilder(buffer.length);
- try (BufferedReader input = new BufferedReader(
- new InputStreamReader(getInputStream(longOutput, username), getCharset()));) {
+ try (final BufferedReader input = new BufferedReader(
+ new InputStreamReader(getInputStream(longOutput, username), getCharset()))) {
while (true) {
read = input.read(buffer, 0, buffer.length);
if (read <= 0) {
@@ -151,7 +151,7 @@ public class FingerClient extends SocketClient
*/
public InputStream getInputStream(final boolean longOutput, final String username, final String encoding)
throws IOException {
- DataOutputStream output;
+ final DataOutputStream output;
final StringBuilder buffer = new StringBuilder(64);
if (longOutput) {
buffer.append(LONG_FLAG);
diff --git a/src/main/java/org/apache/commons/net/ftp/FTP.java b/src/main/java/org/apache/commons/net/ftp/FTP.java
index 2476563..82fe6c2 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTP.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTP.java
@@ -303,7 +303,7 @@ public class FTP extends SocketClient
private int getReply(final boolean reportReply) throws IOException
{
- int length;
+ final int length;
_newReplyString = true;
_replyLines.clear();
@@ -754,7 +754,7 @@ public class FTP extends SocketClient
*/
public String getReplyString()
{
- StringBuilder buffer;
+ final StringBuilder buffer;
if (!_newReplyString) {
return _replyString;
@@ -997,7 +997,7 @@ public class FTP extends SocketClient
*/
public int eprt(final InetAddress host, final int port) throws IOException
{
- int num;
+ final int num;
final StringBuilder info = new StringBuilder();
String h;
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPClient.java b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
index 9646fa4..f01c928 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -610,7 +610,10 @@ implements Configurable
reply = reply.substring(reply.indexOf('(') + 1,
reply.indexOf(')')).trim();
- char delim1, delim2, delim3, delim4;
+ final char delim1;
+ final char delim2;
+ final char delim3;
+ final char delim4;
delim1 = reply.charAt(0);
delim2 = reply.charAt(1);
delim3 = reply.charAt(2);
@@ -622,7 +625,7 @@ implements Configurable
"Could not parse extended passive host information.\nServer Reply: " + reply);
}
- int port;
+ final int port;
try
{
port = Integer.parseInt(reply.substring(3, reply.length()-1));
@@ -819,7 +822,7 @@ implements Configurable
final boolean isInet6Address = getRemoteAddress() instanceof Inet6Address;
- Socket socket;
+ final Socket socket;
if (dataConnectionMode == ACTIVE_LOCAL_DATA_CONNECTION_MODE)
{
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
index de1c697..207fcab 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
@@ -28,6 +28,7 @@ import java.net.Inet6Address;
import java.net.Socket;
import java.net.SocketException;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -78,7 +79,7 @@ public class FTPHTTPClient extends FTPClient {
* @param proxyPass the password for the proxy
*/
public FTPHTTPClient(final String proxyHost, final int proxyPort, final String proxyUser, final String proxyPass) {
- this(proxyHost, proxyPort, proxyUser, proxyPass, Charset.forName("UTF-8"));
+ this(proxyHost, proxyPort, proxyUser, proxyPass, StandardCharsets.UTF_8);
}
/**
@@ -175,7 +176,7 @@ public class FTPHTTPClient extends FTPClient {
_socket_ = _socketFactory_.createSocket(proxyHost, proxyPort);
_input_ = _socket_.getInputStream();
_output_ = _socket_.getOutputStream();
- Reader socketIsReader;
+ final Reader socketIsReader;
try {
socketIsReader = tunnelHandshake(host, port, _input_, _output_);
}
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java b/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
index 0fbbbb0..5a8a1b2 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
@@ -228,7 +228,7 @@ public class DefaultFTPFileEntryParserFactory
/**
* Creates an NT FTP parser: if the config exists, and the system key equals
- * {@link FTPClientConfig.SYST_NT} then a plain {@link NTFTPEntryParser} is used,
+ * {@link FTPClientConfig#SYST_NT} then a plain {@link NTFTPEntryParser} is used,
* otherwise a composite of {@link NTFTPEntryParser} and {@link UnixFTPEntryParser} is used.
* @param config the config to use, may be {@code null}
* @return the parser
@@ -262,7 +262,7 @@ public class DefaultFTPFileEntryParserFactory
/**
* Creates an OS400 FTP parser: if the config exists, and the system key equals
- * {@link FTPClientConfig.SYST_OS400} then a plain {@link OS400FTPEntryParser} is used,
+ * {@link FTPClientConfig#SYST_OS400} then a plain {@link OS400FTPEntryParser} is used,
* otherwise a composite of {@link OS400FTPEntryParser} and {@link UnixFTPEntryParser} is used.
* @param config the config to use, may be {@code null}
* @return the parser
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java b/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
index 82ea58b..c94d19d 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
@@ -326,7 +326,7 @@ public class FTPTimestampParserImpl implements
/**
* sets a TimeZone represented by the supplied ID string into all
* of the parsers used by this server.
- * @param serverTimeZone Time Id java.util.TimeZone id used by
+ * @param serverTimeZoneId Time Id java.util.TimeZone id used by
* the ftp server. If null the client's local time zone is assumed.
*/
private void setServerTimeZone(final String serverTimeZoneId) {
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
index f023d5d..1c163d5 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
@@ -70,13 +70,13 @@ public class MLSxEntryParser extends FTPFileEntryParserImpl
TYPE_TO_INT.put("dir", Integer.valueOf(FTPFile.DIRECTORY_TYPE)); // dir or sub-dir
}
- private static int UNIX_GROUPS[] = { // Groups in order of mode digits
+ private static final int[] UNIX_GROUPS = { // Groups in order of mode digits
FTPFile.USER_ACCESS,
FTPFile.GROUP_ACCESS,
FTPFile.WORLD_ACCESS,
};
- private static int UNIX_PERMS[][] = { // perm bits, broken down by octal int value
+ private static final int[][] UNIX_PERMS = { // perm bits, broken down by octal int value
/* 0 */ {},
/* 1 */ {FTPFile.EXECUTE_PERMISSION},
/* 2 */ {FTPFile.WRITE_PERMISSION},
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
index a0ee318..bcd5c24 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
@@ -128,7 +128,7 @@ public class MacOsPeterFTPEntryParser extends ConfigurableFTPFileEntryParserImpl
public FTPFile parseFTPEntry(final String entry) {
final FTPFile file = new FTPFile();
file.setRawListing(entry);
- int type;
+ final int type;
boolean isDevice = false;
if (matches(entry))
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
index 74e72ab..83f992d 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
@@ -284,7 +284,7 @@ public class OS400FTPEntryParser extends ConfigurableFTPFileEntryParserImpl
final FTPFile file = new FTPFile();
file.setRawListing(entry);
- int type;
+ final int type;
if (matches(entry))
{
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
index 80ee9fb..dadd477 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
@@ -228,7 +228,7 @@ public class UnixFTPEntryParser extends ConfigurableFTPFileEntryParserImpl
public FTPFile parseFTPEntry(final String entry) {
final FTPFile file = new FTPFile();
file.setRawListing(entry);
- int type;
+ final int type;
boolean isDevice = false;
if (matches(entry))
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
index 10c122e..5183e02 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
@@ -129,8 +129,8 @@ public class VMSFTPEntryParser extends ConfigurableFTPFileEntryParserImpl
}
- String grp;
- String user;
+ final String grp;
+ final String user;
final StringTokenizer t = new StringTokenizer(owner, ",");
switch (t.countTokens()) {
case 1:
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 f10624a..fa8becd 100644
--- a/src/main/java/org/apache/commons/net/imap/IMAP.java
+++ b/src/main/java/org/apache/commons/net/imap/IMAP.java
@@ -48,7 +48,7 @@ public class IMAP extends SocketClient
/** A constant representing the "authenticated" state. */
AUTH_STATE,
/** A constant representing the "logout" state. */
- LOGOUT_STATE;
+ LOGOUT_STATE
}
// RFC 3501, section 5.1.3. It should be "modified UTF-7".
diff --git a/src/main/java/org/apache/commons/net/imap/IMAPClient.java b/src/main/java/org/apache/commons/net/imap/IMAPClient.java
index edef6d8..34360aa 100644
--- a/src/main/java/org/apache/commons/net/imap/IMAPClient.java
+++ b/src/main/java/org/apache/commons/net/imap/IMAPClient.java
@@ -446,7 +446,7 @@ public class IMAPClient extends IMAP
/** The unique identifier validity value of the mailbox. */
UIDVALIDITY,
/** The number of messages which do not have the \Seen flag set. */
- UNSEEN;
+ UNSEEN
}
/**
@@ -585,7 +585,7 @@ public class IMAPClient extends IMAP
/** Messages that do not have the specified keyword flag set. */
UNKEYWORD,
/** Messages that do not have the \Seen flag set. */
- UNSEEN;
+ UNSEEN
}
/**
@@ -612,7 +612,7 @@ public class IMAPClient extends IMAP
/** A prefix for RFC-822 item names. */
RFC822,
/** The unique identifier for the message. */
- UID;
+ UID
}
}
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 3fa1b6c..65787ed 100644
--- a/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
+++ b/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
@@ -20,7 +20,7 @@ package org.apache.commons.net.io;
import java.io.IOException;
import java.io.InputStream;
import java.io.PushbackInputStream;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
/**
* This class wraps an input stream, replacing all occurrences
@@ -41,11 +41,7 @@ public final class FromNetASCIIInputStream extends PushbackInputStream
static {
_lineSeparator = System.getProperty("line.separator");
_noConversionRequired = _lineSeparator.equals("\r\n");
- try {
- _lineSeparatorBytes = _lineSeparator.getBytes("US-ASCII");
- } catch (final UnsupportedEncodingException e) {
- throw new RuntimeException("Broken JVM - cannot find US-ASCII charset!",e);
- }
+ _lineSeparatorBytes = _lineSeparator.getBytes(StandardCharsets.US_ASCII);
}
private int length = 0;
@@ -171,7 +167,8 @@ public final class FromNetASCIIInputStream extends PushbackInputStream
return 0;
}
- int ch, off;
+ int ch;
+ final int off;
ch = available();
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 938a734..61d744f 100644
--- a/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
+++ b/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
@@ -64,7 +64,7 @@ public final class ToNetASCIIInputStream extends FilterInputStream
@Override
public int read() throws IOException
{
- int ch;
+ final int ch;
if (status == LAST_WAS_NL)
{
@@ -130,7 +130,8 @@ public final class ToNetASCIIInputStream extends FilterInputStream
@Override
public int read(final byte buffer[], int offset, int length) throws IOException
{
- int ch, off;
+ int ch;
+ final int off;
if (length < 1) {
return 0;
@@ -172,7 +173,7 @@ public final class ToNetASCIIInputStream extends FilterInputStream
@Override
public int available() throws IOException
{
- int result;
+ final int result;
result = in.available();
diff --git a/src/main/java/org/apache/commons/net/nntp/NNTP.java b/src/main/java/org/apache/commons/net/nntp/NNTP.java
index 679a46d..8b25ec5 100644
--- a/src/main/java/org/apache/commons/net/nntp/NNTP.java
+++ b/src/main/java/org/apache/commons/net/nntp/NNTP.java
@@ -212,7 +212,7 @@ public class NNTP extends SocketClient
}
__commandBuffer.append(SocketClient.NETASCII_EOL);
- String message;
+ final String message;
_writer_.write(message = __commandBuffer.toString());
_writer_.flush();
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 1c4fcad..a946640 100644
--- a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
+++ b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
@@ -259,7 +259,7 @@ public class NNTPClient extends NNTP
}
}
}
- int size;
+ final int size;
if ((size = list.size()) < 1) {
return new NewsgroupInfo[0];
}
diff --git a/src/main/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java b/src/main/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java
index 919dee4..dfe4d36 100644
--- a/src/main/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java
+++ b/src/main/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java
@@ -58,7 +58,7 @@ public final class NewGroupsOrNewsQuery
{
int num;
String str;
- StringBuilder buffer;
+ final StringBuilder buffer;
this.distributions = null;
this.newsgroups = null;
diff --git a/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java b/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
index be2b68f..0e7a9ed 100644
--- a/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
+++ b/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
@@ -33,7 +33,7 @@ class ThreadContainer {
/**
*
- * @param container
+ * @param target
* @return true if child is under self's tree. Detects circular references
*/
boolean findChild(final ThreadContainer target) {
diff --git a/src/main/java/org/apache/commons/net/ntp/TimeStamp.java b/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
index c3c9f2c..fb4dde8 100644
--- a/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
+++ b/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
@@ -284,7 +284,7 @@ public class TimeStamp implements java.io.Serializable, Comparable<TimeStamp>
protected static long toNtpTime(final long t)
{
final boolean useBase1 = t < msb0baseTime; // time < Feb-2036
- long baseTime;
+ final long baseTime;
if (useBase1) {
baseTime = t - msb1baseTime; // dates <= Feb-2036
} else {
diff --git a/src/main/java/org/apache/commons/net/pop3/POP3.java b/src/main/java/org/apache/commons/net/pop3/POP3.java
index 284dc3a..8e03791 100644
--- a/src/main/java/org/apache/commons/net/pop3/POP3.java
+++ b/src/main/java/org/apache/commons/net/pop3/POP3.java
@@ -110,7 +110,7 @@ public class POP3 extends SocketClient
private void getReply() throws IOException
{
- String line;
+ final String line;
replyLines.clear();
line = reader.readLine();
diff --git a/src/main/java/org/apache/commons/net/pop3/POP3Client.java b/src/main/java/org/apache/commons/net/pop3/POP3Client.java
index 461cddd..583d276 100644
--- a/src/main/java/org/apache/commons/net/pop3/POP3Client.java
+++ b/src/main/java/org/apache/commons/net/pop3/POP3Client.java
@@ -54,7 +54,7 @@ public class POP3Client extends POP3
private static POP3MessageInfo parseStatus(final String line)
{
int num, size;
- StringTokenizer tokenizer;
+ final StringTokenizer tokenizer;
tokenizer = new StringTokenizer(line);
@@ -85,7 +85,7 @@ public class POP3Client extends POP3
private static POP3MessageInfo parseUID(String line)
{
int num;
- StringTokenizer tokenizer;
+ final StringTokenizer tokenizer;
tokenizer = new StringTokenizer(line);
@@ -204,9 +204,10 @@ public class POP3Client extends POP3
throws IOException, NoSuchAlgorithmException
{
int i;
- byte[] digest;
- StringBuilder buffer, digestBuffer;
- MessageDigest md5;
+ final byte[] digest;
+ final StringBuilder buffer;
+ final StringBuilder digestBuffer;
+ final MessageDigest md5;
if (getState() != AUTHORIZATION_STATE) {
return false;
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 aed5621..ffb30e4 100644
--- a/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
+++ b/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
@@ -153,8 +153,8 @@ public class AuthenticatingSMTPClient extends SMTPSClient
*/
public boolean elogin() throws IOException
{
- String name;
- InetAddress host;
+ final String name;
+ final InetAddress host;
host = getLocalAddress();
name = host.getHostName();
diff --git a/src/main/java/org/apache/commons/net/smtp/RelayPath.java b/src/main/java/org/apache/commons/net/smtp/RelayPath.java
index e7d6f3d..a58542e 100644
--- a/src/main/java/org/apache/commons/net/smtp/RelayPath.java
+++ b/src/main/java/org/apache/commons/net/smtp/RelayPath.java
@@ -72,7 +72,7 @@ public final class RelayPath
public String toString()
{
final StringBuilder buffer = new StringBuilder();
- Enumeration<String> hosts;
+ final Enumeration<String> hosts;
buffer.append('<');
diff --git a/src/main/java/org/apache/commons/net/smtp/SMTP.java b/src/main/java/org/apache/commons/net/smtp/SMTP.java
index 75b811f..475e26e 100644
--- a/src/main/java/org/apache/commons/net/smtp/SMTP.java
+++ b/src/main/java/org/apache/commons/net/smtp/SMTP.java
@@ -353,7 +353,7 @@ public class SMTP extends SocketClient
*/
public int getReply() throws IOException
{
- int length;
+ final int length;
newReplyString = true;
replyLines.clear();
@@ -442,7 +442,7 @@ public class SMTP extends SocketClient
*/
public String getReplyString()
{
- StringBuilder buffer;
+ final StringBuilder buffer;
if (!newReplyString) {
return replyString;
diff --git a/src/main/java/org/apache/commons/net/smtp/SMTPClient.java b/src/main/java/org/apache/commons/net/smtp/SMTPClient.java
index b8c044f..326daea 100644
--- a/src/main/java/org/apache/commons/net/smtp/SMTPClient.java
+++ b/src/main/java/org/apache/commons/net/smtp/SMTPClient.java
@@ -214,8 +214,8 @@ public class SMTPClient extends SMTP
*/
public boolean login() throws IOException
{
- String name;
- InetAddress host;
+ final String name;
+ final InetAddress host;
host = getLocalAddress();
name = host.getHostName();
@@ -388,7 +388,7 @@ public class SMTPClient extends SMTP
*/
public boolean sendShortMessageData(final String message) throws IOException
{
- try (Writer writer = sendMessageData()) {
+ try (final Writer writer = sendMessageData()) {
if (writer == null) {
return false;
@@ -546,7 +546,7 @@ public class SMTPClient extends SMTP
*/
public boolean verify(final String username) throws IOException
{
- int result;
+ final int result;
result = vrfy(username);
diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetClient.java b/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
index 8073bad..e4a695d 100644
--- a/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
+++ b/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
@@ -442,7 +442,7 @@ public class TelnetClient extends Telnet
// Notify input listener
void notifyInputListener() {
- TelnetInputListener listener;
+ final TelnetInputListener listener;
synchronized (this) {
listener = this.inputListener;
}
diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
index 4cc298f..283b499 100644
--- a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
+++ b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
@@ -304,7 +304,7 @@ final class TelnetInputStream extends BufferedInputStream implements Runnable
{
// Critical section because we're altering __bytesAvailable,
// __queueTail, and the contents of _queue.
- boolean bufferWasEmpty;
+ final boolean bufferWasEmpty;
synchronized (queue)
{
bufferWasEmpty = bytesAvailable == 0;
@@ -361,7 +361,7 @@ final class TelnetInputStream extends BufferedInputStream implements Runnable
{
if (ioException != null)
{
- IOException e;
+ final IOException e;
e = ioException;
ioException = null;
throw e;
@@ -451,7 +451,7 @@ final class TelnetInputStream extends BufferedInputStream implements Runnable
}
continue;
}
- int ch;
+ final int ch;
ch = queue[queueHead];
@@ -507,7 +507,8 @@ final class TelnetInputStream extends BufferedInputStream implements Runnable
@Override
public int read(final byte buffer[], int offset, int length) throws IOException
{
- int ch, off;
+ int ch;
+ final int off;
if (length < 1) {
return 0;
diff --git a/src/main/java/org/apache/commons/net/tftp/TFTP.java b/src/main/java/org/apache/commons/net/tftp/TFTP.java
index ecf1c59..66283f9 100644
--- a/src/main/java/org/apache/commons/net/tftp/TFTP.java
+++ b/src/main/java/org/apache/commons/net/tftp/TFTP.java
@@ -140,8 +140,8 @@ public class TFTP extends DatagramSocketClient
*/
public final void discardPackets() throws IOException
{
- int to;
- DatagramPacket datagram;
+ final int to;
+ final DatagramPacket datagram;
datagram = new DatagramPacket(new byte[PACKET_SIZE], PACKET_SIZE);
@@ -292,7 +292,7 @@ public class TFTP extends DatagramSocketClient
public final TFTPPacket receive() throws IOException, InterruptedIOException,
SocketException, TFTPPacketException
{
- DatagramPacket packet;
+ final DatagramPacket packet;
packet = new DatagramPacket(new byte[PACKET_SIZE], PACKET_SIZE);
diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java
index d2e7d77..66d971d 100644
--- a/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java
+++ b/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java
@@ -73,7 +73,7 @@ public final class TFTPAckPacket extends TFTPPacket
{
super(TFTPPacket.ACKNOWLEDGEMENT, datagram.getAddress(),
datagram.getPort());
- byte[] data;
+ final byte[] data;
data = datagram.getData();
@@ -126,7 +126,7 @@ public final class TFTPAckPacket extends TFTPPacket
@Override
public DatagramPacket newDatagram()
{
- byte[] data;
+ final byte[] data;
data = new byte[4];
data[0] = 0;
diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java
index 408ab8b..80cfcf3 100644
--- a/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java
+++ b/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java
@@ -175,7 +175,7 @@ public final class TFTPDataPacket extends TFTPPacket
@Override
public DatagramPacket newDatagram()
{
- byte[] data;
+ final byte[] data;
data = new byte[length + 4];
data[0] = 0;
diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java
index af357eb..d67b167 100644
--- a/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java
+++ b/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java
@@ -105,9 +105,10 @@ public final class TFTPErrorPacket extends TFTPPacket
TFTPErrorPacket(final DatagramPacket datagram) throws TFTPPacketException
{
super(TFTPPacket.ERROR, datagram.getAddress(), datagram.getPort());
- int index, length;
- byte[] data;
- StringBuilder buffer;
+ int index;
+ final int length;
+ final byte[] data;
+ final StringBuilder buffer;
data = datagram.getData();
length = datagram.getLength();
@@ -148,7 +149,7 @@ public final class TFTPErrorPacket extends TFTPPacket
@Override
DatagramPacket newDatagram(final DatagramPacket datagram, final byte[] data)
{
- int length;
+ final int length;
length = message.length();
@@ -185,8 +186,8 @@ public final class TFTPErrorPacket extends TFTPPacket
@Override
public DatagramPacket newDatagram()
{
- byte[] data;
- int length;
+ final byte[] data;
+ final int length;
length = message.length();
diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java
index 7d05ca3..791f098 100644
--- a/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java
+++ b/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java
@@ -124,7 +124,7 @@ public abstract class TFTPPacket
public static final TFTPPacket newTFTPPacket(final DatagramPacket datagram)
throws TFTPPacketException
{
- byte[] data;
+ final byte[] data;
TFTPPacket packet = null;
if (datagram.getLength() < MIN_PACKET_SIZE) {
diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java
index 69f8fe1..e5ad288 100644
--- a/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java
+++ b/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java
@@ -179,7 +179,8 @@ public abstract class TFTPRequestPacket extends TFTPPacket
@Override
final DatagramPacket newDatagram(final DatagramPacket datagram, final byte[] data)
{
- int fileLength, modeLength;
+ final int fileLength;
+ final int modeLength;
fileLength = fileName.length();
modeLength = modeBytes[mode].length;
@@ -213,8 +214,9 @@ public abstract class TFTPRequestPacket extends TFTPPacket
@Override
public final DatagramPacket newDatagram()
{
- int fileLength, modeLength;
- byte[] data;
+ final int fileLength;
+ final int modeLength;
+ final byte[] data;
fileLength = fileName.length();
modeLength = modeBytes[mode].length;
diff --git a/src/main/java/org/apache/commons/net/time/TimeTCPClient.java b/src/main/java/org/apache/commons/net/time/TimeTCPClient.java
index 7cc47ae..944045d 100644
--- a/src/main/java/org/apache/commons/net/time/TimeTCPClient.java
+++ b/src/main/java/org/apache/commons/net/time/TimeTCPClient.java
@@ -78,7 +78,7 @@ public final class TimeTCPClient extends SocketClient
*/
public long getTime() throws IOException
{
- DataInputStream input;
+ final DataInputStream input;
input = new DataInputStream(_input_);
return input.readInt() & 0xffffffffL;
}
diff --git a/src/main/java/org/apache/commons/net/time/TimeUDPClient.java b/src/main/java/org/apache/commons/net/time/TimeUDPClient.java
index 806bc0d..94a3cb2 100644
--- a/src/main/java/org/apache/commons/net/time/TimeUDPClient.java
+++ b/src/main/java/org/apache/commons/net/time/TimeUDPClient.java
@@ -74,7 +74,8 @@ public final class TimeUDPClient extends DatagramSocketClient
public long getTime(final InetAddress host, final int port) throws IOException
{
long time;
- DatagramPacket sendPacket, receivePacket;
+ final DatagramPacket sendPacket;
+ final DatagramPacket receivePacket;
sendPacket =
new DatagramPacket(dummyData, dummyData.length, host, port);
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 2a4e874..42b1216 100644
--- a/src/main/java/org/apache/commons/net/util/Base64.java
+++ b/src/main/java/org/apache/commons/net/util/Base64.java
@@ -17,9 +17,8 @@
package org.apache.commons.net.util;
-import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
-
+import java.nio.charset.StandardCharsets;
/**
@@ -730,11 +729,7 @@ public class Base64 {
}
private byte[] getBytesUtf8(final String pArray) {
- try {
- return pArray.getBytes("UTF8");
- } catch (final UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
+ return pArray.getBytes(StandardCharsets.UTF_8);
}
/**
@@ -890,11 +885,7 @@ public class Base64 {
private static String newStringUtf8(final byte[] encode) {
String str = null;
- try {
- str = new String(encode, "UTF8");
- } catch (final UnsupportedEncodingException ue) {
- throw new RuntimeException(ue);
- }
+ str = new String(encode, StandardCharsets.UTF_8);
return str;
}
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 26e5470..391b57b 100644
--- a/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
+++ b/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
@@ -59,7 +59,7 @@ public class SSLContextUtils {
*/
public static SSLContext createSSLContext(final String protocol, final KeyManager[] keyManagers,
final TrustManager[] trustManagers) throws IOException {
- SSLContext ctx;
+ final SSLContext ctx;
try {
ctx = SSLContext.getInstance(protocol);
ctx.init(keyManagers, trustManagers, /* SecureRandom */ null);
diff --git a/src/test/java/org/apache/commons/net/ftp/parser/DownloadListings.java b/src/test/java/org/apache/commons/net/ftp/parser/DownloadListings.java
index 91a3404..6f0c7ef 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/DownloadListings.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/DownloadListings.java
@@ -71,7 +71,7 @@ public class DownloadListings extends FTPClient {
}
private void download(final String path, final FTPCmd command, final File fileName) throws Exception {
- Socket socket;
+ final Socket socket;
if ((socket = _openDataConnection_(command, getListArguments(path))) == null) {
System.out.println(getReplyString());
return;
diff --git a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
index a2e3b66..cade6f5 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
@@ -64,12 +64,12 @@ public class MLSDComparison {
for (final File mlsd : path.listFiles(filter)) {
System.out.println(mlsd);
FTPListParseEngine engine = new FTPListParseEngine(MLSxEntryParser.getInstance());
- try (InputStream is = new FileInputStream(mlsd)) {
+ try (final InputStream is = new FileInputStream(mlsd)) {
engine.readServerList(is, FTP.DEFAULT_CONTROL_ENCODING);
}
final FTPFile[] mlsds = engine.getFiles(FTPFileFilters.ALL);
final File listFile = new File(mlsd.getParentFile(), mlsd.getName().replace("_mlsd", "_list"));
- try (InputStream inputStream = new FileInputStream(listFile)) {
+ try (final InputStream inputStream = new FileInputStream(listFile)) {
final FTPClientConfig cfg = new FTPClientConfig();
cfg.setServerTimeZoneId("GMT");
final UnixFTPEntryParser parser = new UnixFTPEntryParser(cfg);
diff --git a/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java b/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
index 98a9b35..d8f6af3 100644
--- a/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
+++ b/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
@@ -21,6 +21,7 @@ package org.apache.commons.net.io;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
//import java.nio.charset.Charset;
import org.junit.Assert;
import org.junit.Test;
@@ -58,8 +59,8 @@ public class ToNetASCIIInputStreamTest {
}
private void byteTest(final boolean byByte, final String input, final String expect) throws IOException {
- final byte[] data = input.getBytes(ASCII);
- final byte[] expected = expect.getBytes(ASCII);
+ final byte[] data = input.getBytes(StandardCharsets.US_ASCII);
+ final byte[] expected = expect.getBytes(StandardCharsets.US_ASCII);
final InputStream source = new ByteArrayInputStream(data);
try (final ToNetASCIIInputStream toNetASCII = new ToNetASCIIInputStream(source)) {
final byte[] output = new byte[data.length * 2]; // cannot be longer than twice the input
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
index 48079ba..4999619 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
@@ -84,7 +84,7 @@ import org.apache.commons.net.io.ToNetASCIIInputStream;
public class TFTPServer implements Runnable
{
private static final int DEFAULT_TFTP_PORT = 69;
- public enum ServerMode { GET_ONLY, PUT_ONLY, GET_AND_PUT; }
+ public enum ServerMode { GET_ONLY, PUT_ONLY, GET_AND_PUT}
private final HashSet<TFTPTransfer> transfers_ = new HashSet<>();
private volatile boolean shutdownServer = false;
@@ -363,7 +363,7 @@ public class TFTPServer implements Runnable
{
while (!shutdownServer)
{
- TFTPPacket tftpPacket;
+ final TFTPPacket tftpPacket;
tftpPacket = serverTftp_.receive();
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 4ba1100..31ba7a7 100644
--- a/src/test/java/org/apache/commons/net/util/Base64Test.java
+++ b/src/test/java/org/apache/commons/net/util/Base64Test.java
@@ -52,7 +52,7 @@ public class Base64Test {
@Test
public void testBase64IntByteArray() {
- Base64 b64;
+ final Base64 b64;
b64 = new Base64(8, new byte[]{});
assertFalse(b64.isUrlSafe());
assertTrue(Arrays.equals(new byte[]{}, b64.getLineSeparator()));