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 58f0e1fad3f5047e3c19a59e760a79d495a4ef25 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Fri Feb 28 18:27:32 2025 -0500 Add Checkstyle FinalLocalVariable --- src/conf/checkstyle.xml | 1 + .../java/org/apache/commons/net/examples/ftp/TFTPExample.java | 4 ++-- .../apache/commons/net/examples/telnet/TelnetClientExample.java | 2 +- src/main/java/org/apache/commons/net/ftp/FTP.java | 2 +- src/main/java/org/apache/commons/net/ftp/FTPClient.java | 2 +- src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java | 4 ++-- .../apache/commons/net/ftp/parser/FTPTimestampParserImpl.java | 2 +- .../commons/net/ftp/parser/VMSVersioningFTPEntryParser.java | 2 +- src/main/java/org/apache/commons/net/tftp/TFTPPacket.java | 9 ++------- 9 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index fabe7330..a7772d27 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -67,6 +67,7 @@ limitations under the License. <module name="EqualsHashCode" /> <module name="ExplicitInitialization" /> <module name="FallThrough" /> + <module name="FinalLocalVariable" /> <module name="ImportOrder"> <property name="option" value="top"/> <property name="groups" value="java,javax,org"/> 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 0e90f180..1c148099 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 @@ -175,7 +175,7 @@ public final class TFTPExample { System.err.println("Error: " + localFilename + " already exists."); return false; } - FileOutputStream output; + final FileOutputStream output; // Try to open local file for writing try { output = new FileOutputStream(file); @@ -210,7 +210,7 @@ public final class TFTPExample { private static boolean send(final int transferMode, final String hostname, final String localFilename, final String remoteFilename, final TFTPClient tftp) throws IOException { - FileInputStream input; + final FileInputStream input; // Try to open local file for reading try { input = new FileInputStream(localFilename); 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 41f60931..eb532a43 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 @@ -212,7 +212,7 @@ public class TelnetClientExample implements Runnable, TelnetNotificationHandler */ @Override public void receivedNegotiation(final int negotiation_code, final int option_code) { - String command; + final String command; switch (negotiation_code) { case RECEIVED_DO: command = "DO"; 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 902e22e2..9172854e 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTP.java +++ b/src/main/java/org/apache/commons/net/ftp/FTP.java @@ -630,7 +630,7 @@ public class FTP extends SocketClient { if (length < REPLY_CODE_LEN) { throw new MalformedServerReplyException("Truncated server reply: " + line); } - String code; + final String code; try { code = line.substring(0, REPLY_CODE_LEN); _replyCode = Integer.parseInt(code); 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 10b37419..37aef6f6 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java @@ -857,7 +857,7 @@ public class FTPClient extends FTP implements Configurable { if (!m.find()) { throw new MalformedServerReplyException("Could not parse passive host information.\nServer Reply: " + reply); } - int pasvPort; + final int pasvPort; // Fix up to look like IP address String pasvHost = "0,0,0,0".equals(m.group(1)) ? _socket_.getInetAddress().getHostAddress() : m.group(1).replace(',', '.'); try { 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 57df87b3..b45e871c 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java @@ -126,7 +126,7 @@ public class FTPHTTPClient extends FTPClient { } final boolean isInet6Address = getRemoteAddress() instanceof Inet6Address; - String passiveHost; + final String passiveHost; final boolean attemptEPSV = isUseEPSVwithIPv4() || isInet6Address; if (attemptEPSV && epsv() == FTPReply.ENTERING_EPSV_MODE) { @@ -207,7 +207,7 @@ public class FTPHTTPClient extends FTPClient { throw new IOException("No response from proxy"); } - String code; + final String code; final String resp = response.get(0); if (!resp.startsWith("HTTP/") || resp.length() < 12) { throw new IOException("Invalid response from proxy: " + resp); 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 0e91ab10..8c83382c 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 @@ -150,7 +150,7 @@ public class FTPTimestampParserImpl implements FTPTimestampParser, Configurable */ @Override public void configure(final FTPClientConfig config) { - DateFormatSymbols dfs; + final DateFormatSymbols dfs; final String languageCode = config.getServerLanguageCode(); final String shortmonths = config.getShortMonthNames(); diff --git a/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java index c0865383..f53cb42a 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java @@ -92,7 +92,7 @@ public class VMSVersioningFTPEntryParser extends VMSFTPEntryParser { final ListIterator<String> iter = original.listIterator(); while (iter.hasNext()) { final String entry = iter.next().trim(); - MatchResult result; + final MatchResult result; final Matcher matcher = PATTERN.matcher(entry); if (matcher.matches()) { result = matcher.toMatchResult(); 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 b0ec043f..b7fe1383 100644 --- a/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java +++ b/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java @@ -81,15 +81,11 @@ public abstract class TFTPPacket { * @throws TFTPPacketException If the datagram does not contain a valid TFTP packet. */ public static final TFTPPacket newTFTPPacket(final DatagramPacket datagram) throws TFTPPacketException { - final byte[] data; - TFTPPacket packet; - if (datagram.getLength() < MIN_PACKET_SIZE) { throw new TFTPPacketException("Bad packet. Datagram data length is too short."); } - - data = datagram.getData(); - + final byte[] data = datagram.getData(); + final TFTPPacket packet; switch (data[1]) { case READ_REQUEST: packet = new TFTPReadRequestPacket(datagram); @@ -109,7 +105,6 @@ public abstract class TFTPPacket { default: throw new TFTPPacketException("Bad packet. Invalid TFTP operator code."); } - return packet; }