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 a45b091fb22d94346d5b654f4a47daeb7bc8e425
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Feb 16 11:44:28 2025 -0500
Remove "__" prefix from local variable names
- Better use of StringBuilder API
- Reduce vertical whitespace
---
.../org/apache/commons/net/PrintCommandListener.java | 2 +-
.../java/org/apache/commons/net/bsd/RExecClient.java | 8 +-------
.../java/org/apache/commons/net/ftp/FTPClient.java | 6 +++---
.../java/org/apache/commons/net/ftp/FTPFile.java | 2 +-
.../org/apache/commons/net/ftp/FTPHTTPClient.java | 2 +-
src/main/java/org/apache/commons/net/imap/IMAP.java | 20 ++++++++------------
src/main/java/org/apache/commons/net/nntp/NNTP.java | 15 +++++----------
src/main/java/org/apache/commons/net/pop3/POP3.java | 15 +++++----------
src/main/java/org/apache/commons/net/smtp/SMTP.java | 16 +++++-----------
.../org/apache/commons/net/telnet/TelnetClient.java | 2 +-
.../commons/net/ftp/ListingFunctionalTest.java | 1 +
11 files changed, 32 insertions(+), 57 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/PrintCommandListener.java
b/src/main/java/org/apache/commons/net/PrintCommandListener.java
index 95d304e7..51888441 100644
--- a/src/main/java/org/apache/commons/net/PrintCommandListener.java
+++ b/src/main/java/org/apache/commons/net/PrintCommandListener.java
@@ -139,7 +139,7 @@ public class PrintCommandListener implements
ProtocolCommandListener {
}
final int pos = msg.indexOf(SocketClient.NETASCII_EOL);
if (pos > 0) {
- final StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder(msg + 1);
sb.append(msg.substring(0, pos));
sb.append(eolMarker);
sb.append(msg.substring(pos));
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 a121bff7..ea85360b 100644
--- a/src/main/java/org/apache/commons/net/bsd/RExecClient.java
+++ b/src/main/java/org/apache/commons/net/bsd/RExecClient.java
@@ -183,14 +183,11 @@ public class RExecClient extends SocketClient {
* @throws IOException If the rexec() attempt fails. The exception will
contain a message indicating the nature of the failure.
*/
public void rexec(final String user, final String password, final String
command, final boolean separateErrorStream) throws IOException {
- int ch;
-
if (separateErrorStream) {
_errorStream_ = createErrorStream();
} else {
_output_.write(NULL_CHAR);
}
-
_output_.write(user.getBytes(getCharset()));
_output_.write(NULL_CHAR);
_output_.write(password.getBytes(getCharset()));
@@ -198,15 +195,12 @@ public class RExecClient extends SocketClient {
_output_.write(command.getBytes(getCharset()));
_output_.write(NULL_CHAR);
_output_.flush();
-
- ch = _input_.read();
+ int ch = _input_.read();
if (ch > 0) {
final StringBuilder buffer = new StringBuilder();
-
while ((ch = _input_.read()) != NetConstants.EOS && ch != '\n') {
buffer.append((char) ch);
}
-
throw new IOException(buffer.toString());
}
if (ch < 0) {
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 ca522a5a..0d4cf266 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -496,7 +496,7 @@ public class FTPClient extends FTP implements Configurable {
static String parsePathname(final String reply) {
final String param = reply.substring(REPLY_CODE_LEN + 1);
if (param.startsWith("\"")) {
- final StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder(param.length());
boolean quoteSeen = false;
// start after initial quote
for (int i = 1; i < param.length(); i++) {
@@ -1627,7 +1627,7 @@ public class FTPClient extends FTP implements
Configurable {
/**
* Gets the host address for active mode; allows the local address to be
overridden.
*
- * @return __activeExternalHost if non-null, else getLocalAddress()
+ * @return activeExternalHost if non-null, else getLocalAddress()
* @see #setActiveExternalIPAddress(String)
*/
InetAddress getHostAddress() {
@@ -1733,7 +1733,7 @@ public class FTPClient extends FTP implements
Configurable {
*
* Useful for FTP Client behind Firewall NAT.
*
- * @return __reportActiveExternalHost if non-null, else getHostAddress();
+ * @return reportActiveExternalHost if non-null, else getHostAddress();
*/
InetAddress getReportHostAddress() {
if (reportActiveExternalHost != null) {
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPFile.java
b/src/main/java/org/apache/commons/net/ftp/FTPFile.java
index a8c31bcb..38d3a4d8 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPFile.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPFile.java
@@ -283,7 +283,7 @@ public class FTPFile implements Serializable {
}
private String permissionToString(final int access) {
- final StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder(3);
if (hasPermission(access, READ_PERMISSION)) {
sb.append('r');
} else {
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 644f5061..28bbf9f0 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
@@ -216,7 +216,7 @@ public class FTPHTTPClient extends FTPClient {
code = resp.substring(9, 12);
if (!"200".equals(code)) {
- final StringBuilder msg = new StringBuilder();
+ final StringBuilder msg = new StringBuilder(256);
msg.append("HTTPTunnelConnector: connection failed\r\n");
msg.append("Response received from the proxy:\r\n");
for (final String line : response) {
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 3a426150..b0a363f7 100644
--- a/src/main/java/org/apache/commons/net/imap/IMAP.java
+++ b/src/main/java/org/apache/commons/net/imap/IMAP.java
@@ -389,25 +389,21 @@ public class IMAP extends SocketClient {
* @return The server reply code (either {@link IMAPReply#OK}, {@link
IMAPReply#NO} or {@link IMAPReply#BAD}).
*/
private int sendCommandWithID(final String commandID, final String
command, final String args) throws IOException {
- final StringBuilder __commandBuffer = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
if (commandID != null) {
- __commandBuffer.append(commandID);
- __commandBuffer.append(' ');
+ builder.append(commandID);
+ builder.append(' ');
}
- __commandBuffer.append(command);
-
+ builder.append(command);
if (args != null) {
- __commandBuffer.append(' ');
- __commandBuffer.append(args);
+ builder.append(' ');
+ builder.append(args);
}
- __commandBuffer.append(NETASCII_EOL);
-
- final String message = __commandBuffer.toString();
+ builder.append(NETASCII_EOL);
+ final String message = builder.toString();
__writer.write(message);
__writer.flush();
-
fireCommandSent(command, message);
-
getReply();
return replyCode;
}
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 69047ef5..61810827 100644
--- a/src/main/java/org/apache/commons/net/nntp/NNTP.java
+++ b/src/main/java/org/apache/commons/net/nntp/NNTP.java
@@ -640,21 +640,16 @@ public class NNTP extends SocketClient {
* @throws IOException If an I/O error occurs while
either sending the command or receiving the server reply.
*/
public int sendCommand(final String command, final String args) throws
IOException {
- final StringBuilder __commandBuffer = new StringBuilder();
- __commandBuffer.append(command);
-
+ final StringBuilder builder = new StringBuilder(command);
if (args != null) {
- __commandBuffer.append(' ');
- __commandBuffer.append(args);
+ builder.append(' ');
+ builder.append(args);
}
- __commandBuffer.append(NETASCII_EOL);
-
+ builder.append(NETASCII_EOL);
final String message;
- _writer_.write(message = __commandBuffer.toString());
+ _writer_.write(message = builder.toString());
_writer_.flush();
-
fireCommandSent(command, message);
-
return getReply();
}
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 c9755819..a0ddd72b 100644
--- a/src/main/java/org/apache/commons/net/pop3/POP3.java
+++ b/src/main/java/org/apache/commons/net/pop3/POP3.java
@@ -275,21 +275,16 @@ public class POP3 extends SocketClient {
if (writer == null) {
throw new IllegalStateException("Socket is not connected");
}
- final StringBuilder __commandBuffer = new StringBuilder();
- __commandBuffer.append(command);
-
+ final StringBuilder builder = new StringBuilder(command);
if (args != null) {
- __commandBuffer.append(' ');
- __commandBuffer.append(args);
+ builder.append(' ');
+ builder.append(args);
}
- __commandBuffer.append(NETASCII_EOL);
-
- final String message = __commandBuffer.toString();
+ builder.append(NETASCII_EOL);
+ final String message = builder.toString();
writer.write(message);
writer.flush();
-
fireCommandSent(command, message);
-
getReply();
return replyCode;
}
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 ee6e7cf6..62d3f4fb 100644
--- a/src/main/java/org/apache/commons/net/smtp/SMTP.java
+++ b/src/main/java/org/apache/commons/net/smtp/SMTP.java
@@ -516,24 +516,18 @@ public class SMTP extends SocketClient {
* @throws IOException
*/
private int sendCommand(final String command, final String args, final
boolean includeSpace) throws IOException {
- final StringBuilder __commandBuffer = new StringBuilder();
- __commandBuffer.append(command);
-
+ final StringBuilder builder = new StringBuilder(command);
if (args != null) {
if (includeSpace) {
- __commandBuffer.append(' ');
+ builder.append(' ');
}
- __commandBuffer.append(args);
+ builder.append(args);
}
-
- __commandBuffer.append(NETASCII_EOL);
-
- final String message = __commandBuffer.toString();
+ builder.append(NETASCII_EOL);
+ final String message = builder.toString();
writer.write(message);
writer.flush();
-
fireCommandSent(command, message);
-
return getReply();
}
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 b956235a..c1145ed0 100644
--- a/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
+++ b/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
@@ -109,7 +109,7 @@ public class TelnetClient extends Telnet {
if (readerThread) {
tmp.start();
}
- // __input CANNOT refer to the TelnetInputStream. We run into
+ // input CANNOT refer to the TelnetInputStream. We run into
// blocking problems when some classes use TelnetInputStream, so
// we wrap it with a BufferedInputStream which we know is safe.
// This blocking behavior requires further investigation, but right
diff --git
a/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
b/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
index 0487c385..e18b775a 100644
--- a/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/ListingFunctionalTest.java
@@ -120,6 +120,7 @@ public class ListingFunctionalTest extends TestCase {
client.connect(hostName);
client.login("anonymous", "anonymous");
client.enterLocalPassiveMode();
+ client.setAutodetectUTF8(true);
client.addProtocolCommandListener(new
PrintCommandListener(System.out));
}
