Use final
- Remove redunant this
- Use for each loop
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 e69d6a7..5d8c0bb 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 @@
* @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 2bf35d3..f5956e4 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 @@
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 ef29131..f549558 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 @@
*/
@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 @@
*/
@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 @@
*/
@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 56dafbf..7df738b 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 @@
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 cbf1c61..97fa0eb 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 @@
// 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 e9b4ab1..88ba62d 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 @@
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 c2ef66b..40c7370 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 @@
}
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 e1a7312..72302b4 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 @@
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=~",
