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 2023/09/13 13:50:43 UTC
[commons-net] branch master updated (fbb4bcae -> 04817c96)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
from fbb4bcae Better param name
new 67fcb7d1 Remove noisy parens
new 529d45b1 Remove noisy parens and trailing whitespace
new 04817c96 Simplify
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/net/examples/mail/IMAPExportMbox.java | 2 +-
.../commons/net/examples/mail/IMAPImportMbox.java | 2 +-
.../java/org/apache/commons/net/ftp/FTPClient.java | 14 +++++++-------
.../java/org/apache/commons/net/ftp/FTPHTTPClient.java | 2 +-
.../java/org/apache/commons/net/ftp/FTPSClient.java | 6 +++---
.../commons/net/ftp/parser/FTPTimestampParserImpl.java | 2 +-
.../net/ftp/parser/MacOsPeterFTPEntryParser.java | 4 ++--
.../commons/net/ftp/parser/OS400FTPEntryParser.java | 2 +-
.../net/ftp/parser/VMSVersioningFTPEntryParser.java | 4 ++--
src/main/java/org/apache/commons/net/nntp/Article.java | 8 ++++----
.../java/org/apache/commons/net/nntp/NNTPClient.java | 2 +-
.../java/org/apache/commons/net/nntp/Threader.java | 18 +++++++++---------
src/main/java/org/apache/commons/net/ntp/NtpUtils.java | 6 +++---
.../java/org/apache/commons/net/telnet/Telnet.java | 4 ++--
.../commons/net/telnet/TerminalTypeOptionHandler.java | 4 ++--
.../org/apache/commons/net/tftp/TFTPDataPacket.java | 2 +-
.../commons/net/ftp/parser/MVSFTPEntryParserTest.java | 2 +-
.../commons/net/telnet/TelnetClientFunctionalTest.java | 7 ++-----
.../java/org/apache/commons/net/tftp/TFTPServer.java | 2 +-
.../apache/commons/net/tftp/TFTPServerPathTest.java | 4 ++--
20 files changed, 47 insertions(+), 50 deletions(-)
[commons-net] 01/03: Remove noisy parens
Posted by gg...@apache.org.
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 67fcb7d1ba45550feb8fa1bb6b8307cdcc9e2cba
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Sep 13 09:35:54 2023 -0400
Remove noisy parens
---
src/test/java/org/apache/commons/net/tftp/TFTPServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
index 6aefe01f..c6fc2efe 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
@@ -523,7 +523,7 @@ public class TFTPServer implements Runnable, AutoCloseable {
InetAddress inetAddress = null;
if (localiface != null) {
final Enumeration<InetAddress> ifaddrs = localiface.getInetAddresses();
- if ((ifaddrs != null) && ifaddrs.hasMoreElements()) {
+ if (ifaddrs != null && ifaddrs.hasMoreElements()) {
inetAddress = ifaddrs.nextElement();
}
}
[commons-net] 03/03: Simplify
Posted by gg...@apache.org.
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 04817c96adfce576b2dacc33ec8f96b230b2a981
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Sep 13 09:50:38 2023 -0400
Simplify
---
.../org/apache/commons/net/telnet/TelnetClientFunctionalTest.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java b/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
index 3c7bb7d4..a41a99dd 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
@@ -86,9 +86,6 @@ public class TelnetClientFunctionalTest extends TestCase {
}
}
- if (readbytes.indexOf(end) >= 0) {
- return true;
- }
- return false;
+ return readbytes.indexOf(end) >= 0;
}
}
\ No newline at end of file
[commons-net] 02/03: Remove noisy parens and trailing whitespace
Posted by gg...@apache.org.
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 529d45b1f0c5fc7e21fbd2c8db851288bbd5d61f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Sep 13 09:43:06 2023 -0400
Remove noisy parens and trailing whitespace
---
.../commons/net/examples/mail/IMAPExportMbox.java | 2 +-
.../commons/net/examples/mail/IMAPImportMbox.java | 2 +-
.../java/org/apache/commons/net/ftp/FTPClient.java | 14 +++++++-------
.../java/org/apache/commons/net/ftp/FTPHTTPClient.java | 2 +-
.../java/org/apache/commons/net/ftp/FTPSClient.java | 6 +++---
.../commons/net/ftp/parser/FTPTimestampParserImpl.java | 2 +-
.../net/ftp/parser/MacOsPeterFTPEntryParser.java | 4 ++--
.../commons/net/ftp/parser/OS400FTPEntryParser.java | 2 +-
.../net/ftp/parser/VMSVersioningFTPEntryParser.java | 4 ++--
src/main/java/org/apache/commons/net/nntp/Article.java | 8 ++++----
.../java/org/apache/commons/net/nntp/NNTPClient.java | 2 +-
.../java/org/apache/commons/net/nntp/Threader.java | 18 +++++++++---------
src/main/java/org/apache/commons/net/ntp/NtpUtils.java | 6 +++---
.../java/org/apache/commons/net/telnet/Telnet.java | 4 ++--
.../commons/net/telnet/TerminalTypeOptionHandler.java | 4 ++--
.../org/apache/commons/net/tftp/TFTPDataPacket.java | 2 +-
.../commons/net/ftp/parser/MVSFTPEntryParserTest.java | 2 +-
.../commons/net/telnet/TelnetClientFunctionalTest.java | 6 +++---
.../apache/commons/net/tftp/TFTPServerPathTest.java | 4 ++--
19 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java b/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java
index 562baeb4..ae0599e3 100644
--- a/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java
+++ b/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java
@@ -377,7 +377,7 @@ public final class IMAPExportMbox {
while (true) {
final boolean ok = imap.fetch(sequenceSet, itemNames);
// If the fetch failed, can we retry?
- if (ok || (retryWaitSecs <= 0) || (mboxListener == null) || !checkSequence) {
+ if (ok || retryWaitSecs <= 0 || mboxListener == null || !checkSequence) {
break;
}
final String replyString = imap.getReplyString(); // includes EOL
diff --git a/src/main/java/org/apache/commons/net/examples/mail/IMAPImportMbox.java b/src/main/java/org/apache/commons/net/examples/mail/IMAPImportMbox.java
index 875e483b..3c12ee0c 100644
--- a/src/main/java/org/apache/commons/net/examples/mail/IMAPImportMbox.java
+++ b/src/main/java/org/apache/commons/net/examples/mail/IMAPImportMbox.java
@@ -201,7 +201,7 @@ public final class IMAPImportMbox {
* @return true if the message is wanted
*/
private static boolean wanted(final int msgNum, final String line, final BitSet msgNums, final List<String> contains) {
- return (msgNums.isEmpty() && contains.isEmpty()) // no selectors
+ return msgNums.isEmpty() && contains.isEmpty() // no selectors
|| msgNums.get(msgNum) // matches message number
|| listContains(contains, line); // contains string
}
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 c169f808..4a743ddf 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -697,7 +697,7 @@ public class FTPClient extends FTP implements Configurable {
return null;
}
- if ((restartOffset > 0) && !restart(restartOffset)) {
+ if (restartOffset > 0 && !restart(restartOffset)) {
return null;
}
@@ -768,7 +768,7 @@ public class FTPClient extends FTP implements Configurable {
}
socket.connect(new InetSocketAddress(passiveHost, passivePort), connectTimeout);
- if ((restartOffset > 0) && !restart(restartOffset)) {
+ if (restartOffset > 0 && !restart(restartOffset)) {
socket.close();
return null;
}
@@ -800,7 +800,7 @@ public class FTPClient extends FTP implements Configurable {
final char delim3 = reply.charAt(2);
final char delim4 = reply.charAt(reply.length() - 1);
- if ((delim1 != delim2) || (delim2 != delim3) || (delim3 != delim4)) {
+ if (delim1 != delim2 || delim2 != delim3 || delim3 != delim4) {
throw new MalformedServerReplyException("Could not parse extended passive host information.\nServer Reply: " + reply);
}
@@ -834,7 +834,7 @@ public class FTPClient extends FTP implements Configurable {
try {
final int oct1 = Integer.parseInt(m.group(2));
final int oct2 = Integer.parseInt(m.group(3));
- pasvPort = (oct1 << 8) | oct2;
+ pasvPort = oct1 << 8 | oct2;
} catch (final NumberFormatException e) {
throw new MalformedServerReplyException("Could not parse passive port information.\nServer Reply: " + reply);
}
@@ -1211,7 +1211,7 @@ public class FTPClient extends FTP implements Configurable {
// We cache the value to avoid creation of a new object every
// time a file listing is generated.
// Note: we don't check against a null parserKey (NET-544)
- if (entryParser == null || (parserKey != null && !entryParserKey.equals(parserKey))) {
+ if (entryParser == null || parserKey != null && !entryParserKey.equals(parserKey)) {
if (null != parserKey) {
// if a parser key was supplied in the parameters,
// use that to create the parser
@@ -2646,7 +2646,7 @@ public class FTPClient extends FTP implements Configurable {
public boolean reinitialize() throws IOException {
rein();
- if (FTPReply.isPositiveCompletion(_replyCode) || (FTPReply.isPositivePreliminary(_replyCode) && FTPReply.isPositiveCompletion(getReply()))) {
+ if (FTPReply.isPositiveCompletion(_replyCode) || FTPReply.isPositivePreliminary(_replyCode) && FTPReply.isPositiveCompletion(getReply())) {
initDefaults();
@@ -3137,7 +3137,7 @@ public class FTPClient extends FTP implements Configurable {
* @see <a href="http://tools.ietf.org/html/draft-somers-ftp-mfxx-04">http://tools.ietf.org/html/draft-somers-ftp-mfxx-04</a>
*/
public boolean setModificationTime(final String pathname, final String timeval) throws IOException {
- return (FTPReply.isPositiveCompletion(mfmt(pathname, timeval)));
+ return FTPReply.isPositiveCompletion(mfmt(pathname, timeval));
}
/**
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 f9703fdd..c1da541c 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
@@ -214,7 +214,7 @@ public class FTPHTTPClient extends FTPClient {
String code;
final String resp = response.get(0);
- if (!resp.startsWith("HTTP/") || (resp.length() < 12)) {
+ if (!resp.startsWith("HTTP/") || resp.length() < 12) {
throw new IOException("Invalid response from proxy: " + resp);
}
code = resp.substring(9, 12);
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 b2fc0ab4..a0c92ba3 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
@@ -714,7 +714,7 @@ public class FTPSClient extends FTPClient {
return null;
}
- if ((getRestartOffset() > 0) && !restart(getRestartOffset())) {
+ if (getRestartOffset() > 0 && !restart(getRestartOffset())) {
return null;
}
@@ -795,7 +795,7 @@ public class FTPSClient extends FTPClient {
sslSocket = context.getSocketFactory().createSocket(socket, getPassiveHost(), getPassivePort(), true);
}
- if ((getRestartOffset() > 0) && !restart(getRestartOffset())) {
+ if (getRestartOffset() > 0 && !restart(getRestartOffset())) {
closeSockets(socket, sslSocket);
return null;
}
@@ -1025,7 +1025,7 @@ public class FTPSClient extends FTPClient {
_controlInput_ = new BufferedReader(new InputStreamReader(socket.getInputStream(), getControlEncoding()));
_controlOutput_ = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), getControlEncoding()));
- if (isClientMode && (hostnameVerifier != null && !hostnameVerifier.verify(_hostname_, socket.getSession()))) {
+ if (isClientMode && hostnameVerifier != null && !hostnameVerifier.verify(_hostname_, socket.getSession())) {
throw new SSLHandshakeException("Hostname doesn't match certificate");
}
}
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 496ae981..516be6fb 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
@@ -308,7 +308,7 @@ public class FTPTimestampParserImpl implements FTPTimestampParser, Configurable
// a valid year (e.g. 22:04 will parse as 22 A.D.)
// so could mistakenly confuse an hour with a year,
// if we don't insist on full length parsing.
- if ((parsed == null) || (pp.getIndex() != timestampStr.length())) {
+ if (parsed == null || pp.getIndex() != timestampStr.length()) {
throw new ParseException("Timestamp '" + timestampStr + "' could not be parsed using a server time of " + serverTime.getTime().toString(),
pp.getErrorIndex());
}
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
index 89e99f99..7b72a4aa 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
@@ -152,8 +152,8 @@ public class MacOsPeterFTPEntryParser extends ConfigurableFTPFileEntryParserImpl
int g = 4;
for (int access = 0; access < 3; access++, g += 4) {
// Use != '-' to avoid having to check for suid and sticky bits
- file.setPermission(access, FTPFile.READ_PERMISSION, (!group(g).equals("-")));
- file.setPermission(access, FTPFile.WRITE_PERMISSION, (!group(g + 1).equals("-")));
+ file.setPermission(access, FTPFile.READ_PERMISSION, !group(g).equals("-"));
+ file.setPermission(access, FTPFile.WRITE_PERMISSION, !group(g + 1).equals("-"));
final String execPerm = group(g + 2);
file.setPermission(access, FTPFile.EXECUTE_PERMISSION, !execPerm.equals("-") && !Character.isUpperCase(execPerm.charAt(0)));
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
index 7320886e..e5e9e374 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java
@@ -325,7 +325,7 @@ public class OS400FTPEntryParser extends ConfigurableFTPFileEntryParserImpl {
// file.
// Save files are a special type of files which are used
// to save objects, e.g. for backups.
- if ((name == null) || !name.toUpperCase(Locale.ROOT).endsWith(".SAVF")) {
+ if (name == null || !name.toUpperCase(Locale.ROOT).endsWith(".SAVF")) {
return null;
}
mustScanForPathSeparator = false;
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
index 3dd78e9a..71a2af14 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
@@ -103,7 +103,7 @@ public class VMSVersioningFTPEntryParser extends VMSFTPEntryParser {
final String version = result.group(2);
final Integer nv = Integer.valueOf(version);
final Integer existing = existingEntries.get(name);
- if ((null != existing) && (nv.intValue() < existing.intValue())) {
+ if (null != existing && nv.intValue() < existing.intValue()) {
iter.remove(); // removes older version from original list.
continue;
}
@@ -125,7 +125,7 @@ public class VMSVersioningFTPEntryParser extends VMSFTPEntryParser {
final String version = result.group(2);
final int nv = Integer.parseInt(version);
final Integer existing = existingEntries.get(name);
- if ((null != existing) && (nv < existing.intValue())) {
+ if (null != existing && nv < existing.intValue()) {
iter.remove(); // removes older version from original list.
}
}
diff --git a/src/main/java/org/apache/commons/net/nntp/Article.java b/src/main/java/org/apache/commons/net/nntp/Article.java
index 8418af76..1c274dc6 100644
--- a/src/main/java/org/apache/commons/net/nntp/Article.java
+++ b/src/main/java/org/apache/commons/net/nntp/Article.java
@@ -161,7 +161,7 @@ public class Article implements Threadable {
@Override
public boolean isDummy() {
- return (articleNumber == -1);
+ return articleNumber == -1;
}
@Override
@@ -246,13 +246,13 @@ public class Article implements Threadable {
start++;
}
- if (start < (len - 2) && (subject.charAt(start) == 'r' || subject.charAt(start) == 'R')
+ if (start < len - 2 && (subject.charAt(start) == 'r' || subject.charAt(start) == 'R')
&& (subject.charAt(start + 1) == 'e' || subject.charAt(start + 1) == 'E')) {
if (subject.charAt(start + 2) == ':') {
start += 3; // Skip "Re:"
done = false;
- } else if (start < (len - 2) && (subject.charAt(start + 2) == '[' || subject.charAt(start + 2) == '(')) {
+ } else if (start < len - 2 && (subject.charAt(start + 2) == '[' || subject.charAt(start + 2) == '(')) {
int i = start + 3;
@@ -260,7 +260,7 @@ public class Article implements Threadable {
i++;
}
- if (i < (len - 1) && (subject.charAt(i) == ']' || subject.charAt(i) == ')') && subject.charAt(i + 1) == ':') {
+ if (i < len - 1 && (subject.charAt(i) == ']' || subject.charAt(i) == ')') && subject.charAt(i + 1) == ':') {
start = i + 2;
done = false;
}
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 59363669..471400fc 100644
--- a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
+++ b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
@@ -141,7 +141,7 @@ public class NNTPClient extends NNTP {
final long firstNum = Long.parseLong(tokens[i++]);
result.setFirstArticle(firstNum);
result.setLastArticle(lastNum);
- if ((firstNum == 0) && (lastNum == 0)) {
+ if (firstNum == 0 && lastNum == 0) {
result.setArticleCount(0);
} else {
result.setArticleCount(lastNum - firstNum + 1);
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 9c11c68d..8f1a0b40 100644
--- a/src/main/java/org/apache/commons/net/nntp/Threader.java
+++ b/src/main/java/org/apache/commons/net/nntp/Threader.java
@@ -46,7 +46,7 @@ public class Threader {
if (container != null) {
if (container.threadable != null) { // oops! duplicate ids...
bogusIdCount++; // Avoid dead local store warning
- id = "<Bogus-id:" + (bogusIdCount) + ">";
+ id = "<Bogus-id:" + bogusIdCount + ">";
container = null;
} else {
// The container just contained a forward reference to this message, so let's
@@ -79,7 +79,7 @@ public class Threader {
// Link references together in the order they appear in the References: header,
// IF they don't have a parent already &&
// IF it will not cause a circular reference
- if ((parentRef != null) && (ref.parent == null) && (parentRef != ref) && !(ref.findChild(parentRef))) {
+ if (parentRef != null && ref.parent == null && parentRef != ref && !ref.findChild(parentRef)) {
// Link ref into the parent's child list
ref.parent = parentRef;
ref.next = parentRef.child;
@@ -193,8 +193,8 @@ public class Threader {
// - The container in the table has a "Re:" version of this subject, and
// this container has a non-"Re:" version of this subject. The non-"Re:" version
// is the more interesting of the two.
- if (old == null || (c.threadable == null && old.threadable != null)
- || (old.threadable != null && old.threadable.subjectIsReply() && c.threadable != null && !c.threadable.subjectIsReply())) {
+ if (old == null || c.threadable == null && old.threadable != null
+ || old.threadable != null && old.threadable.subjectIsReply() && c.threadable != null && !c.threadable.subjectIsReply()) {
subjectTable.put(subj, c);
count++;
}
@@ -208,7 +208,7 @@ 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;
- for (prev = null, c = root.child, rest = c.next; c != null; prev = c, c = rest, rest = (rest == null ? null : rest.next)) {
+ 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;
// is it a dummy node?
@@ -254,7 +254,7 @@ public class Threader {
}
c.child = null;
- } else if (old.threadable == null || (c.threadable != null && c.threadable.subjectIsReply() && !old.threadable.subjectIsReply())) {
+ } else if (old.threadable == null || c.threadable != null && c.threadable.subjectIsReply() && !old.threadable.subjectIsReply()) {
// Else if old is empty, or c has "Re:" and old does not ==> make this message a child of old
c.parent = old;
c.next = old.child;
@@ -296,9 +296,9 @@ public class Threader {
*/
private void pruneEmptyContainers(final NntpThreadContainer parent) {
NntpThreadContainer container, prev, next;
- for (prev = null, container = parent.child, next = container.next; container != null; prev = container, container = next, next = (container == null
+ for (prev = null, container = parent.child, next = container.next; container != null; prev = container, container = next, next = container == null
? null
- : container.next)) {
+ : container.next) {
// Is it empty and without any children? If so,delete it
if (container.threadable == null && container.child == null) {
@@ -393,7 +393,7 @@ public class Threader {
}
}
- final Threadable result = (root.child == null ? null : root.child.threadable);
+ final Threadable result = root.child == null ? null : root.child.threadable;
root.flush();
return result;
diff --git a/src/main/java/org/apache/commons/net/ntp/NtpUtils.java b/src/main/java/org/apache/commons/net/ntp/NtpUtils.java
index 4280e0b3..3981a0f4 100644
--- a/src/main/java/org/apache/commons/net/ntp/NtpUtils.java
+++ b/src/main/java/org/apache/commons/net/ntp/NtpUtils.java
@@ -29,7 +29,7 @@ public final class NtpUtils {
* @return the raw IP address in a string format.
*/
public static String getHostAddress(final int address) {
- return ((address >>> 24) & 0xFF) + "." + ((address >>> 16) & 0xFF) + "." + ((address >>> 8) & 0xFF) + "." + ((address >>> 0) & 0xFF);
+ return (address >>> 24 & 0xFF) + "." + (address >>> 16 & 0xFF) + "." + (address >>> 8 & 0xFF) + "." + (address >>> 0 & 0xFF);
}
/**
@@ -68,7 +68,7 @@ public final class NtpUtils {
* @return the packet reference id (as IP address) in "%d.%d.%d.%d" format.
*/
public static String getRefAddress(final NtpV3Packet packet) {
- final int address = (packet == null) ? 0 : packet.getReferenceId();
+ final int address = packet == null ? 0 : packet.getReferenceId();
return getHostAddress(address);
}
@@ -90,7 +90,7 @@ public final class NtpUtils {
final StringBuilder buf = new StringBuilder(4);
// start at highest-order byte (0x4c434c00 -> LCL)
for (int shiftBits = 24; shiftBits >= 0; shiftBits -= 8) {
- final char c = (char) ((refId >>> shiftBits) & 0xff);
+ final char c = (char) (refId >>> shiftBits & 0xff);
if (c == 0) { // 0-terminated ASCII string
break;
}
diff --git a/src/main/java/org/apache/commons/net/telnet/Telnet.java b/src/main/java/org/apache/commons/net/telnet/Telnet.java
index c198ff4c..f4177aa9 100644
--- a/src/main/java/org/apache/commons/net/telnet/Telnet.java
+++ b/src/main/java/org/apache/commons/net/telnet/Telnet.java
@@ -822,7 +822,7 @@ class Telnet extends SocketClient {
options[option] |= DO_MASK;
/* open TelnetOptionHandler functionality (start) */
- if (requestedDo(option) && (optionHandlers[option] != null)) {
+ if (requestedDo(option) && optionHandlers[option] != null) {
optionHandlers[option].setDo(true);
final int[] subneg = optionHandlers[option].startSubnegotiationRemote();
@@ -895,7 +895,7 @@ class Telnet extends SocketClient {
options[option] |= WILL_MASK;
/* open TelnetOptionHandler functionality (start) */
- if (requestedWill(option) && (optionHandlers[option] != null)) {
+ if (requestedWill(option) && optionHandlers[option] != null) {
optionHandlers[option].setWill(true);
final int[] subneg = optionHandlers[option].startSubnegotiationLocal();
diff --git a/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java b/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
index d0b91fff..d02daf86 100644
--- a/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
+++ b/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
@@ -80,8 +80,8 @@ public class TerminalTypeOptionHandler extends TelnetOptionHandler {
*/
@Override
public int[] answerSubnegotiation(final int suboptionData[], final int suboptionLength) {
- if ((suboptionData != null) && (suboptionLength > 1) && (termType != null)) {
- if ((suboptionData[0] == TERMINAL_TYPE) && (suboptionData[1] == TERMINAL_TYPE_SEND)) {
+ if (suboptionData != null && suboptionLength > 1 && termType != null) {
+ if (suboptionData[0] == TERMINAL_TYPE && suboptionData[1] == TERMINAL_TYPE_SEND) {
final int[] response = new int[termType.length() + 2];
response[0] = TERMINAL_TYPE;
diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java
index 2a1c7477..32ba24c2 100644
--- a/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java
+++ b/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java
@@ -69,7 +69,7 @@ public final class TFTPDataPacket extends TFTPPacket {
throw new TFTPPacketException("TFTP operator code does not match type.");
}
- this.blockNumber = (((this.data[2] & 0xff) << 8) | (this.data[3] & 0xff));
+ this.blockNumber = (this.data[2] & 0xff) << 8 | this.data[3] & 0xff;
this.length = datagram.getLength() - 4;
diff --git a/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
index b46e7d43..2772d420 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
@@ -44,7 +44,7 @@ public class MVSFTPEntryParserTest extends AbstractFTPParseTest {
"FPFS41 3390 2004/06/23 1 1 FB 128 6144 PS INCOMING.RPTBM056.D061704",
"FPFS25 3390 2004/06/23 1 1 FB 128 6144 PS INCOMING.WTM204.D061704",
"PEX26F 3390 2017/07/03 115807 FB 29600 29600 PS INCOMING.FIN.D170630.T160630",
- "VVVVVV 3390 2020/04/18 1 60 U 32760 32760 PO NAME",
+ "VVVVVV 3390 2020/04/18 1 60 U 32760 32760 PO NAME",
"TST017 3390 2023/09/08 2 59 FBA 133 32718 PO NAME",
"TST063 3390 2023/09/11 1 1 VBA 133 27930 PS NAME",
"Migrated NAME",
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java b/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
index 28c00699..3c7bb7d4 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
@@ -77,7 +77,7 @@ public class TelnetClientFunctionalTest extends TestCase {
final long starttime = System.currentTimeMillis();
String readbytes = "";
- while ((readbytes.indexOf(end) < 0) && ((System.currentTimeMillis() - starttime) < timeout)) {
+ while (readbytes.indexOf(end) < 0 && System.currentTimeMillis() - starttime < timeout) {
if (is.available() > 0) {
final int ret_read = is.read(buffer);
readbytes = readbytes + new String(buffer, 0, ret_read);
@@ -87,8 +87,8 @@ public class TelnetClientFunctionalTest extends TestCase {
}
if (readbytes.indexOf(end) >= 0) {
- return (true);
+ return true;
}
- return (false);
+ return false;
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java b/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
index 972cd007..006b04fc 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
@@ -94,7 +94,7 @@ public class TFTPServerPathTest {
try (final FileInputStream fis = new FileInputStream(file)) {
tftp.sendFile(out.getName(), TFTP.BINARY_MODE, fis, "localhost", SERVER_PORT);
fail("Server allowed write");
- }
+ }
});
} finally {
deleteFixture(file);
@@ -122,7 +122,7 @@ public class TFTPServerPathTest {
try (final FileOutputStream output = new FileOutputStream(out)) {
tftp.receiveFile(file.getName(), TFTP.BINARY_MODE, output, "localhost", SERVER_PORT);
fail("Server allowed read");
- }
+ }
});
out.delete();