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 450b8cb65aef832aba76b9124f2be1629f44a83c
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue May 28 18:05:01 2024 -0400
Use final
- Remove redunant this
- Use for each loop
---
src/main/java/org/apache/commons/net/ftp/FTPCmd.java | 2 +-
src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java | 4 ++--
src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java | 6 +++---
.../org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java | 2 +-
src/main/java/org/apache/commons/net/nntp/NntpThreadContainer.java | 2 +-
src/main/java/org/apache/commons/net/smtp/SMTPClient.java | 4 ++--
src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java | 2 +-
src/test/java/org/apache/commons/net/util/Base64Test.java | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPCmd.java
b/src/main/java/org/apache/commons/net/ftp/FTPCmd.java
index e69d6a72..5d8c0bb2 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPCmd.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPCmd.java
@@ -255,7 +255,7 @@ public enum FTPCmd {
* @return The FTP protcol command string corresponding to a specified
command code.
*/
public final String getCommand() {
- return this.name();
+ return name();
}
}
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 2bf35d3c..f5956e4b 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
@@ -142,13 +142,13 @@ public class FTPHTTPClient extends FTPClient {
return null;
}
_parsePassiveModeReply(_replyLines.get(0));
- passiveHost = this.getPassiveHost();
+ passiveHost = getPassiveHost();
}
final Socket socket = _socketFactory_.createSocket(proxyHost,
proxyPort);
final InputStream is = socket.getInputStream();
final OutputStream os = socket.getOutputStream();
- tunnelHandshake(passiveHost, this.getPassivePort(), is, os);
+ tunnelHandshake(passiveHost, getPassivePort(), is, os);
if (getRestartOffset() > 0 && !restart(getRestartOffset())) {
socket.close();
return null;
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
b/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
index ef29131f..f549558e 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
@@ -47,7 +47,7 @@ public class FTPSSocketFactory extends SocketFactory {
*/
@Deprecated
public java.net.ServerSocket createServerSocket(final int port) throws
IOException {
- return
this.init(this.context.getServerSocketFactory().createServerSocket(port));
+ return
init(this.context.getServerSocketFactory().createServerSocket(port));
}
/**
@@ -59,7 +59,7 @@ public class FTPSSocketFactory extends SocketFactory {
*/
@Deprecated
public java.net.ServerSocket createServerSocket(final int port, final int
backlog) throws IOException {
- return
this.init(this.context.getServerSocketFactory().createServerSocket(port,
backlog));
+ return
init(this.context.getServerSocketFactory().createServerSocket(port, backlog));
}
/**
@@ -72,7 +72,7 @@ public class FTPSSocketFactory extends SocketFactory {
*/
@Deprecated
public java.net.ServerSocket createServerSocket(final int port, final int
backlog, final InetAddress ifAddress) throws IOException {
- return
this.init(this.context.getServerSocketFactory().createServerSocket(port,
backlog, ifAddress));
+ return
init(this.context.getServerSocketFactory().createServerSocket(port, backlog,
ifAddress));
}
// Override the default implementation
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 56dafbf7..7df738b7 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
@@ -265,7 +265,7 @@ public class FTPTimestampParserImpl implements
FTPTimestampParser, Configurable
if (recentDateFormat != null) {
final Calendar now = (Calendar) serverTime.clone(); // Copy this,
because we may change it
- now.setTimeZone(this.getServerTimeZone());
+ now.setTimeZone(getServerTimeZone());
if (lenientFutureDates) {
// add a day to "now" so that "slop" doesn't cause a date
// slightly in the future to roll back a full year. (Bug 35181
=> NET-83)
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 cbf1c610..97fa0eb0 100644
--- a/src/main/java/org/apache/commons/net/nntp/NntpThreadContainer.java
+++ b/src/main/java/org/apache/commons/net/nntp/NntpThreadContainer.java
@@ -49,7 +49,7 @@ final class NntpThreadContainer {
// with very large Threadable trees
void flush() {
if (parent != null && threadable == null) {
- throw new IllegalStateException("no threadable in " +
this.toString());
+ throw new IllegalStateException("no threadable in " + toString());
}
parent = null;
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 e9b4ab1f..88ba62d5 100644
--- a/src/main/java/org/apache/commons/net/smtp/SMTPClient.java
+++ b/src/main/java/org/apache/commons/net/smtp/SMTPClient.java
@@ -378,8 +378,8 @@ public class SMTPClient extends SMTP {
return false;
}
boolean oneSuccess = false;
- for (int count = 0; count < recipients.length; count++) {
- if (addRecipient(recipients[count])) {
+ for (final String recipient : recipients) {
+ if (addRecipient(recipient)) {
oneSuccess = true;
}
}
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
index c2ef66be..40c73704 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
@@ -44,7 +44,7 @@ public class TelnetClientTest extends TestCase implements
TelnetNotificationHand
}
protected void close() {
- TelnetClientTest.this.closeConnection(this.server, this.client,
this.port);
+ closeConnection(this.server, this.client, this.port);
}
}
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 e1a7312c..72302b47 100644
--- a/src/test/java/org/apache/commons/net/util/Base64Test.java
+++ b/src/test/java/org/apache/commons/net/util/Base64Test.java
@@ -107,7 +107,7 @@ public class Base64Test {
assertFalse(b64.isUrlSafe());
assertArrayEquals(new byte[] {}, b64.getLineSeparator());
final String stringToEncode =
"<<???>><<???>><<???>><<???>><<???>><<???>><<???>><<???>><<???>><<???>><<???>>";
- byte[] encodedData = new Base64(Base64.CHUNK_SIZE,
Base64.CHUNK_SEPARATOR).encode(stringToEncode.getBytes());
+ final byte[] encodedData = new Base64(Base64.CHUNK_SIZE,
Base64.CHUNK_SEPARATOR).encode(stringToEncode.getBytes());
assertEquals("PDw/Pz8+Pjw8Pz8/Pj48PD8/Pz4+PDw/Pz8+Pjw8Pz8/Pj48PD8/Pz4+PDw/Pz8+Pjw8Pz8/Pj48\r\nPD8/Pz4+PDw/Pz8+Pjw8Pz8/Pj4=\r\n",
toString(encodedData));
assertEquals(getJreMimeEncoder().encodeToString(stringToEncode.getBytes()) +
"\r\n", toString(encodedData));
assertEquals("PDw/Pz8+Pjw8Pz8/Pj48PD8/Pz4+PDw/Pz8+Pjw8Pz8/Pj48PD8/Pz4+PDw/Pz8+Pjw8Pz8/Pj48~PD8/Pz4+PDw/Pz8+Pjw8Pz8/Pj4=~",
