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 045f0ab2ffdc8199911aba5d4e381b439e35beaa
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Feb 28 18:40:46 2025 -0500
Add Checkstyle MultipleVariableDeclarations
---
src/conf/checkstyle.xml | 1 +
.../commons/net/examples/ftp/FTPClientExample.java | 17 ++++++++++++++---
.../commons/net/examples/ftp/ServerToServerFTP.java | 3 ++-
.../apache/commons/net/examples/ftp/TFTPExample.java | 6 ++++--
.../org/apache/commons/net/examples/unix/echo.java | 3 ++-
.../org/apache/commons/net/examples/unix/finger.java | 6 ++++--
.../apache/commons/net/nntp/NewGroupsOrNewsQuery.java | 3 ++-
.../apache/commons/net/nntp/NntpThreadContainer.java | 4 +++-
.../org/apache/commons/net/nntp/SimpleNNTPHeader.java | 3 ++-
.../java/org/apache/commons/net/nntp/Threader.java | 11 ++++++++---
.../java/org/apache/commons/net/pop3/POP3Client.java | 3 ++-
.../apache/commons/net/telnet/TelnetInputStream.java | 18 ++++++++++++++----
12 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index 49019c0c..7d95aa9d 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -83,6 +83,7 @@ limitations under the License.
<module name="LeftCurly" />
<module name="MissingOverride" />
<module name="ModifierOrder"/>
+ <module name="MultipleVariableDeclarations" />
<module name="NeedBraces"/>
<module name="ParenPad"/>
<module name="RedundantImport"/>
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 f037453a..67a27b1e 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
@@ -121,9 +121,20 @@ public final class FTPClientExample {
}
public static void main(final String[] args) throws UnknownHostException {
- boolean storeFile = false, binaryTransfer = false, error = false,
listFiles = false, listNames = false, hidden = false;
- boolean localActive = false, useEpsvWithIPv4 = false, feat = false,
printHash = false;
- boolean mlst = false, mlsd = false, mdtm = false, saveUnparseable =
false;
+ boolean storeFile = false;
+ boolean binaryTransfer = false;
+ boolean error = false;
+ boolean listFiles = false;
+ boolean listNames = false;
+ boolean hidden = false;
+ boolean localActive = false;
+ boolean useEpsvWithIPv4 = false;
+ boolean feat = false;
+ boolean printHash = false;
+ boolean mlst = false;
+ boolean mlsd = false;
+ boolean mdtm = false;
+ boolean saveUnparseable = false;
boolean size = false;
boolean lenient = false;
long keepAliveTimeoutSeconds = -1;
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 f49c9a38..04ce559b 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
@@ -44,7 +44,8 @@ public final class ServerToServerFTP {
final String password2;
final String file2;
String[] parts;
- int port1 = 0, port2 = 0;
+ int port1 = 0;
+ int port2 = 0;
final FTPClient ftp1;
final FTPClient ftp2;
final ProtocolCommandListener listener;
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 1c148099..68d03100 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
@@ -68,8 +68,10 @@ public final class TFTPExample {
* @throws IOException if a network or I/O error occurs.
*/
public static void main(final String[] args) throws IOException {
- boolean receiveFile = true, closed;
- int transferMode = TFTP.BINARY_MODE, argc;
+ boolean receiveFile = true;
+ boolean closed;
+ int transferMode = TFTP.BINARY_MODE;
+ int argc;
String arg;
final String hostname;
final String localFilename;
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 e87e85d5..44703cda 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
@@ -66,7 +66,8 @@ public final class echo {
}
public static void echoUDP(final String host) throws IOException {
- int length, count;
+ int length;
+ int count;
byte[] data;
String line;
final BufferedReader input;
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 0ee6e1f5..2968e941 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
@@ -33,8 +33,10 @@ public final class finger {
public static void main(final String[] args) {
boolean longOutput = false;
- int arg = 0, index;
- String handle, host;
+ int arg = 0;
+ int index;
+ String handle;
+ String host;
final FingerClient finger;
InetAddress address = null;
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 cd122795..81e4a98f 100644
--- a/src/main/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java
+++ b/src/main/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java
@@ -40,7 +40,8 @@ import java.util.Objects;
*/
public final class NewGroupsOrNewsQuery {
- private final String date, time;
+ private final String date;
+ private final String time;
private StringBuffer distributions;
private StringBuffer newsgroups;
private final boolean isGMT;
diff --git a/src/main/java/org/apache/commons/net/nntp/NntpThreadContainer.java
b/src/main/java/org/apache/commons/net/nntp/NntpThreadContainer.java
index 97fa0eb0..92dd156b 100644
--- a/src/main/java/org/apache/commons/net/nntp/NntpThreadContainer.java
+++ b/src/main/java/org/apache/commons/net/nntp/NntpThreadContainer.java
@@ -80,7 +80,9 @@ final class NntpThreadContainer {
*/
void reverseChildren() {
if (child != null) {
- NntpThreadContainer kid, prev, rest;
+ NntpThreadContainer kid;
+ NntpThreadContainer prev;
+ NntpThreadContainer rest;
for (prev = null, kid = child, rest = kid.next; kid != null; prev
= kid, kid = rest, rest = rest == null ? null : rest.next) {
kid.next = prev;
}
diff --git a/src/main/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java
b/src/main/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java
index 52586403..30987af7 100644
--- a/src/main/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java
+++ b/src/main/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java
@@ -43,7 +43,8 @@ package org.apache.commons.net.nntp;
*/
public class SimpleNNTPHeader {
- private final String subject, from;
+ private final String subject;
+ private final String from;
private final StringBuilder newsgroups;
private final StringBuilder headerFields;
private int newsgroupCount;
diff --git a/src/main/java/org/apache/commons/net/nntp/Threader.java
b/src/main/java/org/apache/commons/net/nntp/Threader.java
index 2ed17d14..44173893 100644
--- a/src/main/java/org/apache/commons/net/nntp/Threader.java
+++ b/src/main/java/org/apache/commons/net/nntp/Threader.java
@@ -106,7 +106,8 @@ public class Threader {
// a parent based on the other entries in that field. Now that we have
the actual message, we can
// throw away the old parent and use this new one
if (container.parent != null) {
- NntpThreadContainer rest, prev;
+ NntpThreadContainer rest;
+ NntpThreadContainer prev;
for (prev = null, rest = container.parent.child; rest != null;
prev = rest, rest = rest.next) {
if (rest == container) {
@@ -214,7 +215,9 @@ public class Threader {
// subjectTable is now populated with one entry for each subject which
occurs in the
// root set. Iterate over the root set, and gather together the
difference.
- NntpThreadContainer prev, c, rest;
+ NntpThreadContainer prev;
+ NntpThreadContainer c;
+ NntpThreadContainer rest;
for (prev = null, c = root.child, rest = c.next; c != null; prev = c,
c = rest, rest = rest == null ? null : rest.next) {
Threadable threadable = c.threadable;
@@ -302,7 +305,9 @@ public class Threader {
* @param parent
*/
private void pruneEmptyContainers(final NntpThreadContainer parent) {
- NntpThreadContainer container, prev, next;
+ NntpThreadContainer container;
+ NntpThreadContainer prev;
+ NntpThreadContainer next;
for (prev = null, container = parent.child, next = container.next;
container != null; prev = container, container = next, next = container == null
? null
: container.next) {
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 e382d798..387be1b4 100644
--- a/src/main/java/org/apache/commons/net/pop3/POP3Client.java
+++ b/src/main/java/org/apache/commons/net/pop3/POP3Client.java
@@ -46,7 +46,8 @@ import org.apache.commons.net.io.DotTerminatedMessageReader;
public class POP3Client extends POP3 {
private static POP3MessageInfo parseStatus(final String line) {
- int num, size;
+ int num;
+ int size;
final StringTokenizer tokenizer;
tokenizer = new StringTokenizer(line);
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 c217e7de..9d57084a 100644
--- a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
+++ b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
@@ -30,13 +30,23 @@ final class TelnetInputStream extends BufferedInputStream
implements Runnable {
private static final int WOULD_BLOCK = -2;
// TODO should these be private enums?
- static final int STATE_DATA = 0, STATE_IAC = 1, STATE_WILL = 2, STATE_WONT
= 3, STATE_DO = 4, STATE_DONT = 5, STATE_SB = 6, STATE_SE = 7, STATE_CR = 8,
- STATE_IAC_SB = 9;
-
+ static final int STATE_DATA = 0;
+ static final int STATE_IAC = 1;
+ static final int STATE_WILL = 2;
+ static final int STATE_WONT = 3;
+ static final int STATE_DO = 4;
+ static final int STATE_DONT = 5;
+ static final int STATE_SB = 6;
+ static final int STATE_SE = 7;
+ static final int STATE_CR = 8;
+ static final int STATE_IAC_SB = 9;
private boolean hasReachedEOF; // @GuardedBy("queue")
private volatile boolean isClosed;
private boolean readIsWaiting;
- private int receiveState, queueHead, queueTail, bytesAvailable;
+ private int receiveState;
+ private int queueHead;
+ private int queueTail;
+ private int bytesAvailable;
private final int[] queue;
private final TelnetClient client;
private final Thread thread;
