You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/02/04 19:02:18 UTC
(commons-net) branch master updated: Remove variable assignment just before returning it
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
The following commit(s) were added to refs/heads/master by this push:
new 5e6b6de0 Remove variable assignment just before returning it
5e6b6de0 is described below
commit 5e6b6de0b119bd79e22722c37723d43d44db2357
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Feb 4 14:02:13 2024 -0500
Remove variable assignment just before returning it
Use StringBuilder
---
.../java/org/apache/commons/net/ftp/FTPSClient.java | 4 ++--
.../java/org/apache/commons/net/imap/IMAPClient.java | 18 +++++++++---------
.../java/org/apache/commons/net/nntp/NNTPClient.java | 3 +--
.../java/org/apache/commons/net/ntp/NtpV3Impl.java | 13 ++++---------
src/main/java/org/apache/commons/net/ntp/TimeInfo.java | 5 ++---
.../org/apache/commons/net/SubnetUtilsNet728Test.java | 4 ++--
6 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
index 4d1cbf89..52343eb7 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
@@ -431,7 +431,7 @@ public class FTPSClient extends FTPClient {
* @since 3.0
*/
public int execCCC() throws IOException {
- final int repCode = sendCommand(CMD_CCC);
+
// This will be performed by sendCommand(String, String)
// if (FTPReply.isPositiveCompletion(repCode)) {
// _socket_.close();
@@ -443,7 +443,7 @@ public class FTPSClient extends FTPClient {
// new OutputStreamWriter(
// _socket_.getOutputStream(), getControlEncoding()));
// }
- return repCode;
+ return sendCommand(CMD_CCC);
}
/**
diff --git a/src/main/java/org/apache/commons/net/imap/IMAPClient.java b/src/main/java/org/apache/commons/net/imap/IMAPClient.java
index 46e9179d..f1f15790 100644
--- a/src/main/java/org/apache/commons/net/imap/IMAPClient.java
+++ b/src/main/java/org/apache/commons/net/imap/IMAPClient.java
@@ -219,18 +219,18 @@ public class IMAPClient extends IMAP {
*/
@Deprecated
public boolean append(final String mailboxName, final String flags, final String datetime) throws IOException {
- String args = mailboxName;
+ final StringBuilder args = new StringBuilder().append(mailboxName);
if (flags != null) {
- args += " " + flags;
+ args.append(" ").append(flags);
}
if (datetime != null) {
if (datetime.charAt(0) == '{') {
- args += " " + datetime;
+ args.append(" ").append(datetime);
} else {
- args += " {" + datetime + "}";
+ args.append(" {").append(datetime).append("}");
}
}
- return doCommand(IMAPCommand.APPEND, args);
+ return doCommand(IMAPCommand.APPEND, args.toString());
}
/**
@@ -473,12 +473,12 @@ public class IMAPClient extends IMAP {
* @throws IOException If a network I/O error occurs.
*/
public boolean search(final String charset, final String criteria) throws IOException {
- String args = "";
+ final StringBuilder args = new StringBuilder();
if (charset != null) {
- args += "CHARSET " + charset;
+ args.append("CHARSET ").append(charset);
}
- args += criteria;
- return doCommand(IMAPCommand.SEARCH, args);
+ args.append(criteria);
+ return doCommand(IMAPCommand.SEARCH, args.toString());
}
/**
diff --git a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
index 3438e674..c42014f0 100644
--- a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
+++ b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
@@ -183,8 +183,7 @@ public class NNTPClient extends NNTP {
if (ap == null) {
return null;
}
- final ArticleInfo ai = new ArticleInfo();
- return ai;
+ return new ArticleInfo();
}
/**
diff --git a/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java b/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
index bafdc71d..c59310c0 100644
--- a/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
+++ b/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
@@ -56,8 +56,7 @@ public class NtpV3Impl implements NtpV3Packet {
* @return unsigned int value of byte
*/
protected static final int ui(final byte b) {
- final int i = b & 0xFF;
- return i;
+ return b & 0xFF;
}
/**
@@ -67,8 +66,7 @@ public class NtpV3Impl implements NtpV3Packet {
* @return unsigned long value of byte
*/
protected static final long ul(final byte b) {
- final long i = b & 0xFF;
- return i;
+ return b & 0xFF;
}
private final byte[] buf = new byte[48];
@@ -117,9 +115,7 @@ public class NtpV3Impl implements NtpV3Packet {
* @return 4 bytes as 32-bit int
*/
private int getInt(final int index) {
- final int i = ui(buf[index]) << 24 | ui(buf[index + 1]) << 16 | ui(buf[index + 2]) << 8 | ui(buf[index + 3]);
-
- return i;
+ return ui(buf[index]) << 24 | ui(buf[index + 1]) << 16 | ui(buf[index + 2]) << 8 | ui(buf[index + 3]);
}
/**
@@ -139,9 +135,8 @@ public class NtpV3Impl implements NtpV3Packet {
* @return 8 bytes as 64-bit long
*/
private long getLong(final int index) {
- final long i = ul(buf[index]) << 56 | ul(buf[index + 1]) << 48 | ul(buf[index + 2]) << 40 | ul(buf[index + 3]) << 32 | ul(buf[index + 4]) << 24
+ return ul(buf[index]) << 56 | ul(buf[index + 1]) << 48 | ul(buf[index + 2]) << 40 | ul(buf[index + 3]) << 32 | ul(buf[index + 4]) << 24
| ul(buf[index + 5]) << 16 | ul(buf[index + 6]) << 8 | ul(buf[index + 7]);
- return i;
}
/**
diff --git a/src/main/java/org/apache/commons/net/ntp/TimeInfo.java b/src/main/java/org/apache/commons/net/ntp/TimeInfo.java
index 2ad05bbc..bf2058be 100644
--- a/src/main/java/org/apache/commons/net/ntp/TimeInfo.java
+++ b/src/main/java/org/apache/commons/net/ntp/TimeInfo.java
@@ -295,9 +295,8 @@ public class TimeInfo {
@Override
public int hashCode() {
final int prime = 31;
- int result = (int) returnTimeMillis;
- result = prime * result + message.hashCode();
- return result;
+ final int result = (int) returnTimeMillis;
+ return prime * result + message.hashCode();
}
}
diff --git a/src/test/java/org/apache/commons/net/SubnetUtilsNet728Test.java b/src/test/java/org/apache/commons/net/SubnetUtilsNet728Test.java
index 14f33af3..4becc15d 100644
--- a/src/test/java/org/apache/commons/net/SubnetUtilsNet728Test.java
+++ b/src/test/java/org/apache/commons/net/SubnetUtilsNet728Test.java
@@ -47,9 +47,9 @@ public class SubnetUtilsNet728Test {
@Test
void test() {
- SubnetUtils s = new SubnetUtils("192.168.1.1/32");
+ final SubnetUtils s = new SubnetUtils("192.168.1.1/32");
s.setInclusiveHostCount(true);
- SubnetUtils ss = new SubnetUtils("10.65.0.151/32");
+ final SubnetUtils ss = new SubnetUtils("10.65.0.151/32");
ss.setInclusiveHostCount(true);
assertTrue(ss.getInfo().isInRange("10.65.0.151"));
assertTrue(s.getInfo().isInRange("192.168.1.1"));