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 405bbdfc0e7acc600417a4428bbc5b11e69c2624 Author: Gary Gregory <[email protected]> AuthorDate: Sun Sep 20 18:23:56 2020 -0400 Remove some extra parentheses that are truly useless, for example: "return(false);" -> "return false;" --- .../org/apache/commons/net/bsd/RCommandClient.java | 2 +- .../org/apache/commons/net/bsd/RExecClient.java | 2 +- .../commons/net/examples/mail/IMAPExportMbox.java | 2 +- .../apache/commons/net/examples/ntp/NTPClient.java | 4 +- .../net/examples/telnet/TelnetClientExample.java | 4 +- src/main/java/org/apache/commons/net/ftp/FTP.java | 8 ++-- .../java/org/apache/commons/net/ftp/FTPFile.java | 10 ++--- .../org/apache/commons/net/ftp/FTPHTTPClient.java | 2 +- .../java/org/apache/commons/net/ftp/FTPReply.java | 12 +++--- .../parser/DefaultFTPFileEntryParserFactory.java | 4 +- .../commons/net/ftp/parser/NTFTPEntryParser.java | 4 +- .../net/ftp/parser/NetwareFTPEntryParser.java | 2 +- .../commons/net/ftp/parser/OS2FTPEntryParser.java | 2 +- .../commons/net/ftp/parser/UnixFTPEntryParser.java | 4 +- .../commons/net/ftp/parser/VMSFTPEntryParser.java | 2 +- .../java/org/apache/commons/net/imap/IMAP.java | 2 +- .../org/apache/commons/net/imap/IMAPSClient.java | 2 +- .../apache/commons/net/io/CopyStreamAdapter.java | 4 +- .../commons/net/io/DotTerminatedMessageReader.java | 2 +- .../commons/net/io/FromNetASCIIInputStream.java | 6 +-- .../commons/net/io/ToNetASCIIInputStream.java | 4 +- .../java/org/apache/commons/net/nntp/NNTP.java | 2 +- .../org/apache/commons/net/nntp/NNTPReply.java | 10 ++--- .../commons/net/nntp/NewGroupsOrNewsQuery.java | 4 +- .../apache/commons/net/nntp/ThreadContainer.java | 2 +- .../org/apache/commons/net/pop3/POP3Client.java | 10 ++--- .../org/apache/commons/net/pop3/POP3SClient.java | 2 +- .../java/org/apache/commons/net/smtp/SMTP.java | 2 +- .../org/apache/commons/net/smtp/SMTPClient.java | 4 +- .../org/apache/commons/net/smtp/SMTPReply.java | 10 ++--- .../org/apache/commons/net/smtp/SMTPSClient.java | 2 +- .../net/telnet/InvalidTelnetOptionException.java | 2 +- .../java/org/apache/commons/net/telnet/Telnet.java | 44 +++++++++++----------- .../apache/commons/net/telnet/TelnetClient.java | 8 ++-- .../apache/commons/net/telnet/TelnetCommand.java | 2 +- .../commons/net/telnet/TelnetInputStream.java | 8 ++-- .../apache/commons/net/telnet/TelnetOption.java | 2 +- .../commons/net/telnet/TelnetOptionHandler.java | 10 ++--- .../net/telnet/WindowSizeOptionHandler.java | 8 ++-- .../org/apache/commons/net/tftp/TFTPClient.java | 2 +- .../apache/commons/net/tftp/TFTPErrorPacket.java | 2 +- .../org/apache/commons/net/time/TimeTCPClient.java | 2 +- .../org/apache/commons/net/util/SubnetUtils.java | 28 +++++++------- .../ftp/parser/CompositeFTPParseTestFramework.java | 4 +- .../parser/EnterpriseUnixFTPEntryParserTest.java | 6 +-- .../net/ftp/parser/MLSxEntryParserTest.java | 6 +-- .../ftp/parser/MacOsPeterFTPEntryParserTest.java | 6 +-- .../net/ftp/parser/NetwareFTPEntryParserTest.java | 6 +-- .../net/ftp/parser/OS2FTPEntryParserTest.java | 4 +- .../net/ftp/parser/UnixFTPEntryParserTest.java | 6 +-- .../net/ftp/parser/VMSFTPEntryParserTest.java | 22 +++++------ .../commons/net/io/ToNetASCIIInputStreamTest.java | 2 +- .../commons/net/pop3/POP3ClientCommandsTest.java | 4 +- .../commons/net/smtp/SimpleSMTPHeaderTestCase.java | 2 +- .../commons/net/telnet/TelnetClientTest.java | 6 +-- .../commons/net/telnet/TelnetTestResponder.java | 2 +- .../commons/net/telnet/TelnetTestSimpleServer.java | 4 +- .../net/telnet/TerminalTypeOptionHandlerTest.java | 4 +- .../org/apache/commons/net/tftp/TFTPServer.java | 16 ++++---- 59 files changed, 175 insertions(+), 175 deletions(-) diff --git a/src/main/java/org/apache/commons/net/bsd/RCommandClient.java b/src/main/java/org/apache/commons/net/bsd/RCommandClient.java index d6c313a..e7c204e 100644 --- a/src/main/java/org/apache/commons/net/bsd/RCommandClient.java +++ b/src/main/java/org/apache/commons/net/bsd/RCommandClient.java @@ -148,7 +148,7 @@ public class RCommandClient extends RExecClient socket.getInetAddress().getHostAddress()); } - return (new SocketInputStream(socket, socket.getInputStream())); + return new SocketInputStream(socket, socket.getInputStream()); } /*** 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 7bc5a1a..23e9d21 100644 --- a/src/main/java/org/apache/commons/net/bsd/RExecClient.java +++ b/src/main/java/org/apache/commons/net/bsd/RExecClient.java @@ -108,7 +108,7 @@ public class RExecClient extends SocketClient socket.getInetAddress().getHostAddress()); } - return (new SocketInputStream(socket, socket.getInputStream())); + return new SocketInputStream(socket, socket.getInputStream()); } 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 035271a..f98acf9 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 @@ -260,7 +260,7 @@ public final class IMAPExportMbox final String replyString = imap.getReplyString(); //includes EOL if (startsWith(replyString, PATTEMPFAIL)) { System.err.println("Temporary error detected, will retry in " + retryWaitSecs + "seconds"); - sequenceSet = (chunkListener.lastSeq+1)+":*"; + sequenceSet = chunkListener.lastSeq+1+":*"; try { Thread.sleep(retryWaitSecs * 1000); } catch (final InterruptedException e) { diff --git a/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java b/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java index 4f7446f..f26acf7 100644 --- a/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java +++ b/src/main/java/org/apache/commons/net/examples/ntp/NTPClient.java @@ -139,8 +139,8 @@ public final class NTPClient info.computeDetails(); // compute offset/delay if not already done final Long offsetValue = info.getOffset(); final Long delayValue = info.getDelay(); - final String delay = (delayValue == null) ? "N/A" : delayValue.toString(); - final String offset = (offsetValue == null) ? "N/A" : offsetValue.toString(); + final String delay = delayValue == null ? "N/A" : delayValue.toString(); + final String offset = offsetValue == null ? "N/A" : offsetValue.toString(); System.out.println(" Roundtrip delay(ms)=" + delay + ", clock offset(ms)=" + offset); // offset in ms diff --git a/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java b/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java index 6d1caba..365e9a5 100644 --- a/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java +++ b/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java @@ -195,7 +195,7 @@ public class TelnetClientExample implements Runnable, TelnetNotificationHandler try { st.nextToken(); - final int opcode = (new Integer(st.nextToken())).intValue(); + final int opcode = new Integer(st.nextToken()).intValue(); tc.deleteOptionHandler(opcode); } catch (final Exception e) @@ -250,7 +250,7 @@ public class TelnetClientExample implements Runnable, TelnetNotificationHandler end_loop = true; } } - while((ret_read > 0) && (end_loop == false)); + while(ret_read > 0 && end_loop == false); try { diff --git a/src/main/java/org/apache/commons/net/ftp/FTP.java b/src/main/java/org/apache/commons/net/ftp/FTP.java index df6a75a..c144005 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTP.java +++ b/src/main/java/org/apache/commons/net/ftp/FTP.java @@ -278,7 +278,7 @@ public class FTP extends SocketClient // The RFC-compliant multiline termination check private boolean __strictCheck(final String line, final String code) { - return (!(line.startsWith(code) && line.charAt(REPLY_CODE_LEN) == ' ')); + return !(line.startsWith(code) && line.charAt(REPLY_CODE_LEN) == ' '); } // The strict check is too strong a condition because of non-conforming ftp @@ -287,8 +287,8 @@ public class FTP extends SocketClient // test that the line starts with a digit rather than starting with // the code. private boolean __lenientCheck(final String line) { - return (!(line.length() > REPLY_CODE_LEN&& line.charAt(REPLY_CODE_LEN) != '-' && - Character.isDigit(line.charAt(0)))); + return !(line.length() > REPLY_CODE_LEN&& line.charAt(REPLY_CODE_LEN) != '-' && + Character.isDigit(line.charAt(0))); } /** @@ -766,7 +766,7 @@ public class FTP extends SocketClient _newReplyString = false; - return (_replyString = buffer.toString()); + return _replyString = buffer.toString(); } 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 b443dcb..7b3e02d 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPFile.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPFile.java @@ -135,7 +135,7 @@ public class FTPFile implements Serializable ***/ public boolean isDirectory() { - return (_type == DIRECTORY_TYPE); + return _type == DIRECTORY_TYPE; } /*** @@ -146,7 +146,7 @@ public class FTPFile implements Serializable ***/ public boolean isFile() { - return (_type == FILE_TYPE); + return _type == FILE_TYPE; } /*** @@ -157,7 +157,7 @@ public class FTPFile implements Serializable ***/ public boolean isSymbolicLink() { - return (_type == SYMBOLIC_LINK_TYPE); + return _type == SYMBOLIC_LINK_TYPE; } /*** @@ -168,7 +168,7 @@ public class FTPFile implements Serializable ***/ public boolean isUnknown() { - return (_type == UNKNOWN_TYPE); + return _type == UNKNOWN_TYPE; } /** @@ -182,7 +182,7 @@ public class FTPFile implements Serializable * @since 3.4 */ public boolean isValid() { - return (_permissions != null); + return _permissions != null; } /*** 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 bb118f0..573c180 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java @@ -155,7 +155,7 @@ public class FTPHTTPClient extends FTPClient { final InputStream is = socket.getInputStream(); final OutputStream os = socket.getOutputStream(); tunnelHandshake(passiveHost, this.getPassivePort(), is, os); - if ((getRestartOffset() > 0) && !restart(getRestartOffset())) { + if (getRestartOffset() > 0 && !restart(getRestartOffset())) { socket.close(); return null; } diff --git a/src/main/java/org/apache/commons/net/ftp/FTPReply.java b/src/main/java/org/apache/commons/net/ftp/FTPReply.java index 3cd521d..f9a6e67 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPReply.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPReply.java @@ -117,7 +117,7 @@ public final class FTPReply ***/ public static boolean isPositivePreliminary(final int reply) { - return (reply >= 100 && reply < 200); + return reply >= 100 && reply < 200; } /*** @@ -132,7 +132,7 @@ public final class FTPReply ***/ public static boolean isPositiveCompletion(final int reply) { - return (reply >= 200 && reply < 300); + return reply >= 200 && reply < 300; } /*** @@ -150,7 +150,7 @@ public final class FTPReply ***/ public static boolean isPositiveIntermediate(final int reply) { - return (reply >= 300 && reply < 400); + return reply >= 300 && reply < 400; } /*** @@ -165,7 +165,7 @@ public final class FTPReply ***/ public static boolean isNegativeTransient(final int reply) { - return (reply >= 400 && reply < 500); + return reply >= 400 && reply < 500; } /*** @@ -180,7 +180,7 @@ public final class FTPReply ***/ public static boolean isNegativePermanent(final int reply) { - return (reply >= 500 && reply < 600); + return reply >= 500 && reply < 600; } /** @@ -194,7 +194,7 @@ public final class FTPReply { // actually, only 3 protected reply codes are // defined in RFC 2228: 631, 632 and 633. - return (reply >= 600 && reply < 700); + return reply >= 600 && reply < 700; } diff --git a/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java b/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java index bd9ddbc..0fbbbb0 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java @@ -241,7 +241,7 @@ public class DefaultFTPFileEntryParserFactory return new NTFTPEntryParser(config); } // clone the config as it may be changed by the parsers (NET-602) - final FTPClientConfig config2 = (config != null) ? new FTPClientConfig(config) : null; + final FTPClientConfig config2 = config != null ? new FTPClientConfig(config) : null; return new CompositeFileEntryParser(new FTPFileEntryParser[] { new NTFTPEntryParser(config), @@ -275,7 +275,7 @@ public class DefaultFTPFileEntryParserFactory return new OS400FTPEntryParser(config); } // clone the config as it may be changed by the parsers (NET-602) - final FTPClientConfig config2 = (config != null) ? new FTPClientConfig(config) : null; + final FTPClientConfig config2 = config != null ? new FTPClientConfig(config) : null; return new CompositeFileEntryParser(new FTPFileEntryParser[] { new OS400FTPEntryParser(config), diff --git a/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java index 010f9fb..31570b6 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java @@ -126,7 +126,7 @@ public class NTFTPEntryParser extends ConfigurableFTPFileEntryParserImpl if (null == name || name.equals(".") || name.equals("..")) { - return (null); + return null; } f.setName(name); @@ -144,7 +144,7 @@ public class NTFTPEntryParser extends ConfigurableFTPFileEntryParserImpl f.setSize(Long.parseLong(size)); } } - return (f); + return f; } return null; } diff --git a/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java index ea81a5b..67f66a9 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java @@ -155,7 +155,7 @@ public class NetwareFTPEntryParser extends ConfigurableFTPFileEntryParserImpl { true); } - return (f); + return f; } return null; diff --git a/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java index a5ddc5b..33dfc96 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java @@ -122,7 +122,7 @@ public class OS2FTPEntryParser extends ConfigurableFTPFileEntryParserImpl //set the size f.setSize(Long.parseLong(size.trim())); - return (f); + return f; } return null; diff --git a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java index 625e322..80ee9fb 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java @@ -295,9 +295,9 @@ public class UnixFTPEntryParser extends ConfigurableFTPFileEntryParserImpl { // Use != '-' to avoid having to check for suid and sticky bits file.setPermission(access, FTPFile.READ_PERMISSION, - (!group(g).equals("-"))); + !group(g).equals("-")); file.setPermission(access, FTPFile.WRITE_PERMISSION, - (!group(g + 1).equals("-"))); + !group(g + 1).equals("-")); final String execPerm = group(g + 2); if (!execPerm.equals("-") && !Character.isUpperCase(execPerm.charAt(0))) diff --git a/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java index 3756181..f13e9ff 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java @@ -226,7 +226,7 @@ public class VMSFTPEntryParser extends ConfigurableFTPFileEntryParserImpl } line = reader.readLine(); } - return (entry.length() == 0 ? null : entry.toString()); + return entry.length() == 0 ? null : entry.toString(); } protected boolean isVersioning() { 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 3650a95..89c9dfc 100644 --- a/src/main/java/org/apache/commons/net/imap/IMAP.java +++ b/src/main/java/org/apache/commons/net/imap/IMAP.java @@ -163,7 +163,7 @@ public class IMAP extends SocketClient throw new EOFException("Connection closed without indication."); } _replyLines.add(line); - literalCount -= (line.length() + 2); // Allow for CRLF + literalCount -= line.length() + 2; // Allow for CRLF } if (isMultiLine) { final IMAPChunkListener il = __chunkListener; diff --git a/src/main/java/org/apache/commons/net/imap/IMAPSClient.java b/src/main/java/org/apache/commons/net/imap/IMAPSClient.java index 70de0ac..8f6b4d9 100644 --- a/src/main/java/org/apache/commons/net/imap/IMAPSClient.java +++ b/src/main/java/org/apache/commons/net/imap/IMAPSClient.java @@ -198,7 +198,7 @@ public class IMAPSClient extends IMAPClient initSSLContext(); final SSLSocketFactory ssf = context.getSocketFactory(); - final String host = (_hostname_ != null) ? _hostname_ : getRemoteAddress().getHostAddress(); + final String host = _hostname_ != null ? _hostname_ : getRemoteAddress().getHostAddress(); final int port = getRemotePort(); final SSLSocket socket = (SSLSocket) ssf.createSocket(_socket_, host, port, true); diff --git a/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java b/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java index 745f532..d80a2a2 100644 --- a/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java +++ b/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java @@ -64,7 +64,7 @@ public class CopyStreamAdapter implements CopyStreamListener { for (final EventListener listener : internalListeners) { - ((CopyStreamListener) (listener)).bytesTransferred(event); + ((CopyStreamListener) listener).bytesTransferred(event); } } @@ -89,7 +89,7 @@ public class CopyStreamAdapter implements CopyStreamListener { for (final EventListener listener : internalListeners) { - ((CopyStreamListener) (listener)).bytesTransferred( + ((CopyStreamListener) listener).bytesTransferred( totalBytesTransferred, bytesTransferred, streamSize); } } diff --git a/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java b/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java index a02ab26..66a1dbd 100644 --- a/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java +++ b/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java @@ -185,7 +185,7 @@ public final class DotTerminatedMessageReader extends BufferedReader } while (--length > 0 && (ch = read()) != -1); - return (offset - off); + return offset - off; } } diff --git a/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java b/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java index f825b13..6495e91 100644 --- a/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java +++ b/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java @@ -175,7 +175,7 @@ public final class FromNetASCIIInputStream extends PushbackInputStream ch = available(); - __length = (length > ch ? ch : length); + __length = length > ch ? ch : length; // If nothing is available, block to read only one character if (__length < 1) { @@ -196,7 +196,7 @@ public final class FromNetASCIIInputStream extends PushbackInputStream while (--__length > 0 && (ch = __read()) != -1); - return (offset - off); + return offset - off; } @@ -215,7 +215,7 @@ public final class FromNetASCIIInputStream extends PushbackInputStream if (in == null) { throw new IOException("Stream closed"); } - return (buf.length - pos) + in.available(); + return buf.length - pos + in.available(); } } diff --git a/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java b/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java index ca559c6..580401c 100644 --- a/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java +++ b/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java @@ -159,7 +159,7 @@ public final class ToNetASCIIInputStream extends FilterInputStream } while (--length > 0 && (ch = read()) != -1); - return (offset - off); + return offset - off; } /*** Returns false. Mark is not supported. ***/ @@ -177,7 +177,7 @@ public final class ToNetASCIIInputStream extends FilterInputStream result = in.available(); if (__status == __LAST_WAS_NL) { - return (result + 1); + return result + 1; } return result; 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 a871099..4b5c265 100644 --- a/src/main/java/org/apache/commons/net/nntp/NNTP.java +++ b/src/main/java/org/apache/commons/net/nntp/NNTP.java @@ -180,7 +180,7 @@ public class NNTP extends SocketClient __DEFAULT_ENCODING)); __getReply(); - _isAllowedToPost = (_replyCode == NNTPReply.SERVER_READY_POSTING_ALLOWED); + _isAllowedToPost = _replyCode == NNTPReply.SERVER_READY_POSTING_ALLOWED; } /*** diff --git a/src/main/java/org/apache/commons/net/nntp/NNTPReply.java b/src/main/java/org/apache/commons/net/nntp/NNTPReply.java index 2afaf28..0f16f71 100644 --- a/src/main/java/org/apache/commons/net/nntp/NNTPReply.java +++ b/src/main/java/org/apache/commons/net/nntp/NNTPReply.java @@ -84,7 +84,7 @@ public final class NNTPReply ***/ public static boolean isInformational(final int reply) { - return (reply >= 100 && reply < 200); + return reply >= 100 && reply < 200; } /*** @@ -99,7 +99,7 @@ public final class NNTPReply ***/ public static boolean isPositiveCompletion(final int reply) { - return (reply >= 200 && reply < 300); + return reply >= 200 && reply < 300; } /*** @@ -117,7 +117,7 @@ public final class NNTPReply ***/ public static boolean isPositiveIntermediate(final int reply) { - return (reply >= 300 && reply < 400); + return reply >= 300 && reply < 400; } /*** @@ -134,7 +134,7 @@ public final class NNTPReply ***/ public static boolean isNegativeTransient(final int reply) { - return (reply >= 400 && reply < 500); + return reply >= 400 && reply < 500; } /*** @@ -150,7 +150,7 @@ public final class NNTPReply ***/ public static boolean isNegativePermanent(final int reply) { - return (reply >= 500 && reply < 600); + return reply >= 500 && reply < 600; } } diff --git a/src/main/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java b/src/main/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java index 4c1d029..ea72039 100644 --- a/src/main/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java +++ b/src/main/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java @@ -262,7 +262,7 @@ public final class NewGroupsOrNewsQuery ***/ public String getDistributions() { - return (__distributions == null ? null : __distributions.toString()); + return __distributions == null ? null : __distributions.toString(); } /*** @@ -274,6 +274,6 @@ public final class NewGroupsOrNewsQuery ***/ public String getNewsgroups() { - return (__newsgroups == null ? null : __newsgroups.toString()); + return __newsgroups == null ? null : __newsgroups.toString(); } } diff --git a/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java b/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java index 5ab030f..be2b68f 100644 --- a/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java +++ b/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java @@ -89,7 +89,7 @@ class ThreadContainer { kid != null; prev = kid, kid = rest, - rest = (rest == null ? null : rest.next)) + rest = rest == null ? null : rest.next) { kid.next = prev; } diff --git a/src/main/java/org/apache/commons/net/pop3/POP3Client.java b/src/main/java/org/apache/commons/net/pop3/POP3Client.java index 14ac252..9a2973a 100644 --- a/src/main/java/org/apache/commons/net/pop3/POP3Client.java +++ b/src/main/java/org/apache/commons/net/pop3/POP3Client.java @@ -261,7 +261,7 @@ public class POP3Client extends POP3 setState(UPDATE_STATE); } sendCommand(POP3Command.QUIT); - return (_replyCode == POP3Reply.OK); + return _replyCode == POP3Reply.OK; } @@ -280,7 +280,7 @@ public class POP3Client extends POP3 public boolean noop() throws IOException { if (getState() == TRANSACTION_STATE) { - return (sendCommand(POP3Command.NOOP) == POP3Reply.OK); + return sendCommand(POP3Command.NOOP) == POP3Reply.OK; } return false; } @@ -304,8 +304,8 @@ public class POP3Client extends POP3 public boolean deleteMessage(final int messageId) throws IOException { if (getState() == TRANSACTION_STATE) { - return (sendCommand(POP3Command.DELE, Integer.toString(messageId)) - == POP3Reply.OK); + return sendCommand(POP3Command.DELE, Integer.toString(messageId)) + == POP3Reply.OK; } return false; } @@ -325,7 +325,7 @@ public class POP3Client extends POP3 public boolean reset() throws IOException { if (getState() == TRANSACTION_STATE) { - return (sendCommand(POP3Command.RSET) == POP3Reply.OK); + return sendCommand(POP3Command.RSET) == POP3Reply.OK; } return false; } diff --git a/src/main/java/org/apache/commons/net/pop3/POP3SClient.java b/src/main/java/org/apache/commons/net/pop3/POP3SClient.java index 7c2700c..8c23f00 100644 --- a/src/main/java/org/apache/commons/net/pop3/POP3SClient.java +++ b/src/main/java/org/apache/commons/net/pop3/POP3SClient.java @@ -207,7 +207,7 @@ public class POP3SClient extends POP3Client initSSLContext(); final SSLSocketFactory ssf = context.getSocketFactory(); - final String host = (_hostname_ != null) ? _hostname_ : getRemoteAddress().getHostAddress(); + final String host = _hostname_ != null ? _hostname_ : getRemoteAddress().getHostAddress(); final int port = getRemotePort(); final SSLSocket socket = (SSLSocket) ssf.createSocket(_socket_, host, port, true); 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 0b73e03..6d85b41 100644 --- a/src/main/java/org/apache/commons/net/smtp/SMTP.java +++ b/src/main/java/org/apache/commons/net/smtp/SMTP.java @@ -466,7 +466,7 @@ public class SMTP extends SocketClient _newReplyString = false; _replyString = buffer.toString(); - return (_replyString); + return _replyString; } 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 d6e1cc3..bdf447f 100644 --- a/src/main/java/org/apache/commons/net/smtp/SMTPClient.java +++ b/src/main/java/org/apache/commons/net/smtp/SMTPClient.java @@ -552,8 +552,8 @@ public class SMTPClient extends SMTP result = vrfy(username); - return (result == SMTPReply.ACTION_OK || - result == SMTPReply.USER_NOT_LOCAL_WILL_FORWARD); + return result == SMTPReply.ACTION_OK || + result == SMTPReply.USER_NOT_LOCAL_WILL_FORWARD; } diff --git a/src/main/java/org/apache/commons/net/smtp/SMTPReply.java b/src/main/java/org/apache/commons/net/smtp/SMTPReply.java index 8968ccf..29f32e7 100644 --- a/src/main/java/org/apache/commons/net/smtp/SMTPReply.java +++ b/src/main/java/org/apache/commons/net/smtp/SMTPReply.java @@ -70,7 +70,7 @@ public final class SMTPReply ***/ public static boolean isPositivePreliminary(final int reply) { - return (reply >= 100 && reply < 200); + return reply >= 100 && reply < 200; } /*** @@ -85,7 +85,7 @@ public final class SMTPReply ***/ public static boolean isPositiveCompletion(final int reply) { - return (reply >= 200 && reply < 300); + return reply >= 200 && reply < 300; } /*** @@ -103,7 +103,7 @@ public final class SMTPReply ***/ public static boolean isPositiveIntermediate(final int reply) { - return (reply >= 300 && reply < 400); + return reply >= 300 && reply < 400; } /*** @@ -118,7 +118,7 @@ public final class SMTPReply ***/ public static boolean isNegativeTransient(final int reply) { - return (reply >= 400 && reply < 500); + return reply >= 400 && reply < 500; } /*** @@ -133,7 +133,7 @@ public final class SMTPReply ***/ public static boolean isNegativePermanent(final int reply) { - return (reply >= 500 && reply < 600); + return reply >= 500 && reply < 600; } } diff --git a/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java b/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java index c525d4c..9eef19f 100644 --- a/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java +++ b/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java @@ -196,7 +196,7 @@ public class SMTPSClient extends SMTPClient initSSLContext(); final SSLSocketFactory ssf = context.getSocketFactory(); - final String host = (_hostname_ != null) ? _hostname_ : getRemoteAddress().getHostAddress(); + final String host = _hostname_ != null ? _hostname_ : getRemoteAddress().getHostAddress(); final int port = getRemotePort(); final SSLSocket socket = (SSLSocket) ssf.createSocket(_socket_, host, port, true); diff --git a/src/main/java/org/apache/commons/net/telnet/InvalidTelnetOptionException.java b/src/main/java/org/apache/commons/net/telnet/InvalidTelnetOptionException.java index 462e7e8..6f6137a 100644 --- a/src/main/java/org/apache/commons/net/telnet/InvalidTelnetOptionException.java +++ b/src/main/java/org/apache/commons/net/telnet/InvalidTelnetOptionException.java @@ -57,6 +57,6 @@ public class InvalidTelnetOptionException extends Exception @Override public String getMessage() { - return (msg + ": " + optionCode); + return msg + ": " + optionCode; } } 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 1f18eaf..e7a4e0f 100644 --- a/src/main/java/org/apache/commons/net/telnet/Telnet.java +++ b/src/main/java/org/apache/commons/net/telnet/Telnet.java @@ -168,7 +168,7 @@ class Telnet extends SocketClient ***/ boolean _stateIsWill(final int option) { - return ((_options[option] & _WILL_MASK) != 0); + return (_options[option] & _WILL_MASK) != 0; } /*** @@ -192,7 +192,7 @@ class Telnet extends SocketClient ***/ boolean _stateIsDo(final int option) { - return ((_options[option] & _DO_MASK) != 0); + return (_options[option] & _DO_MASK) != 0; } /*** @@ -216,7 +216,7 @@ class Telnet extends SocketClient ***/ boolean _requestedWill(final int option) { - return ((_options[option] & _REQUESTED_WILL_MASK) != 0); + return (_options[option] & _REQUESTED_WILL_MASK) != 0; } /*** @@ -240,7 +240,7 @@ class Telnet extends SocketClient ***/ boolean _requestedDo(final int option) { - return ((_options[option] & _REQUESTED_DO_MASK) != 0); + return (_options[option] & _REQUESTED_DO_MASK) != 0; } /*** @@ -441,7 +441,7 @@ class Telnet extends SocketClient /* TERMINAL-TYPE option (start)*/ if (option == TERMINAL_TYPE) { - if ((terminalType != null) && (terminalType.length() > 0)) + if (terminalType != null && terminalType.length() > 0) { acceptNewState = true; } @@ -543,7 +543,7 @@ class Telnet extends SocketClient } /* FIX for a BUG in the negotiation (start)*/ - if ((_stateIsWill(option)) || (_requestedWill(option))) + if (_stateIsWill(option) || _requestedWill(option)) { _sendWont(option); } @@ -664,7 +664,7 @@ class Telnet extends SocketClient } /* FIX for a BUG in the negotiation (start)*/ - if ((_stateIsDo(option)) || (_requestedDo(option))) + if (_stateIsDo(option) || _requestedDo(option)) { _sendDont(option); } @@ -714,8 +714,8 @@ class Telnet extends SocketClient + suboption[ii]); } } - if ((suboption[0] == TERMINAL_TYPE) - && (suboption[1] == TERMINAL_TYPE_SEND)) + if (suboption[0] == TERMINAL_TYPE + && suboption[1] == TERMINAL_TYPE_SEND) { _sendTerminalType(); } @@ -894,7 +894,7 @@ class Telnet extends SocketClient final synchronized void _requestDo(final int option) throws IOException { - if ((_doResponse[option] == 0 && _stateIsDo(option)) + if (_doResponse[option] == 0 && _stateIsDo(option) || _requestedDo(option)) { return ; @@ -934,7 +934,7 @@ class Telnet extends SocketClient final synchronized void _requestDont(final int option) throws IOException { - if ((_doResponse[option] == 0 && _stateIsDont(option)) + if (_doResponse[option] == 0 && _stateIsDont(option) || _requestedDont(option)) { return ; @@ -975,7 +975,7 @@ class Telnet extends SocketClient final synchronized void _requestWill(final int option) throws IOException { - if ((_willResponse[option] == 0 && _stateIsWill(option)) + if (_willResponse[option] == 0 && _stateIsWill(option) || _requestedWill(option)) { return ; @@ -1015,7 +1015,7 @@ class Telnet extends SocketClient final synchronized void _requestWont(final int option) throws IOException { - if ((_willResponse[option] == 0 && _stateIsWont(option)) + if (_willResponse[option] == 0 && _stateIsWont(option) || _requestedWont(option)) { return ; @@ -1076,7 +1076,7 @@ class Telnet extends SocketClient } } - return (retValue); + return retValue; } /* Code Section added for supporting AYT (end)*/ @@ -1113,14 +1113,14 @@ class Telnet extends SocketClient } else { - throw (new InvalidTelnetOptionException( - "Already registered option", optcode)); + throw new InvalidTelnetOptionException( + "Already registered option", optcode); } } else { - throw (new InvalidTelnetOptionException( - "Invalid Option Code", optcode)); + throw new InvalidTelnetOptionException( + "Invalid Option Code", optcode); } } @@ -1138,8 +1138,8 @@ class Telnet extends SocketClient { if (optionHandlers[optcode] == null) { - throw (new InvalidTelnetOptionException( - "Unregistered option", optcode)); + throw new InvalidTelnetOptionException( + "Unregistered option", optcode); } final TelnetOptionHandler opthand = optionHandlers[optcode]; optionHandlers[optcode] = null; @@ -1156,8 +1156,8 @@ class Telnet extends SocketClient } else { - throw (new InvalidTelnetOptionException( - "Invalid Option Code", optcode)); + throw new InvalidTelnetOptionException( + "Invalid Option Code", optcode); } } /* open TelnetOptionHandler functionality (end)*/ 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 67517e6..e5e03b6 100644 --- a/src/main/java/org/apache/commons/net/telnet/TelnetClient.java +++ b/src/main/java/org/apache/commons/net/telnet/TelnetClient.java @@ -199,7 +199,7 @@ public class TelnetClient extends Telnet public boolean getLocalOptionState(final int option) { /* BUG (option active when not already acknowledged) (start)*/ - return (_stateIsWill(option) && _requestedWill(option)); + return _stateIsWill(option) && _requestedWill(option); /* BUG (option active when not already acknowledged) (end)*/ } @@ -213,7 +213,7 @@ public class TelnetClient extends Telnet public boolean getRemoteOptionState(final int option) { /* BUG (option active when not already acknowledged) (start)*/ - return (_stateIsDo(option) && _requestedDo(option)); + return _stateIsDo(option) && _requestedDo(option); /* BUG (option active when not already acknowledged) (end)*/ } /* open TelnetOptionHandler functionality (end)*/ @@ -234,7 +234,7 @@ public class TelnetClient extends Telnet public boolean sendAYT(final long timeout) throws IOException, IllegalArgumentException, InterruptedException { - return (_sendAYT(timeout)); + return _sendAYT(timeout); } /* Code Section added for supporting AYT (start)*/ @@ -400,7 +400,7 @@ public class TelnetClient extends Telnet ***/ public boolean getReaderThread() { - return (readerThread); + return readerThread; } /*** diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetCommand.java b/src/main/java/org/apache/commons/net/telnet/TelnetCommand.java index 003a3a5..f66d1fd 100644 --- a/src/main/java/org/apache/commons/net/telnet/TelnetCommand.java +++ b/src/main/java/org/apache/commons/net/telnet/TelnetCommand.java @@ -122,7 +122,7 @@ public final class TelnetCommand **/ public static boolean isValidCommand(final int code) { - return (code <= __FIRST_COMMAND && code >= __LAST_COMMAND); + return code <= __FIRST_COMMAND && code >= __LAST_COMMAND; } // Cannot be instantiated diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java index c15a7ed..c5047c7 100644 --- a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java +++ b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java @@ -134,7 +134,7 @@ final class TelnetInputStream extends BufferedInputStream implements Runnable return EOF; } - ch = (ch & 0xff); + ch = ch & 0xff; /* Code Section added for supporting AYT (start)*/ synchronized (__client) @@ -307,7 +307,7 @@ final class TelnetInputStream extends BufferedInputStream implements Runnable boolean bufferWasEmpty; synchronized (__queue) { - bufferWasEmpty = (__bytesAvailable == 0); + bufferWasEmpty = __bytesAvailable == 0; while (__bytesAvailable >= __queue.length - 1) { // The queue is full. We need to wait before adding any more data to it. Hopefully the stream owner @@ -402,7 +402,7 @@ final class TelnetInputStream extends BufferedInputStream implements Runnable { if ((ch = __read(mayBlock)) < 0) { // must be EOF if(ch != WOULD_BLOCK) { - return (ch); + return ch; } } } @@ -534,7 +534,7 @@ final class TelnetInputStream extends BufferedInputStream implements Runnable while (--length > 0 && (ch = read()) != EOF); //__client._spyRead(buffer, off, offset - off); - return (offset - off); + return offset - off; } diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetOption.java b/src/main/java/org/apache/commons/net/telnet/TelnetOption.java index fc08944..aa96331 100644 --- a/src/main/java/org/apache/commons/net/telnet/TelnetOption.java +++ b/src/main/java/org/apache/commons/net/telnet/TelnetOption.java @@ -181,7 +181,7 @@ public class TelnetOption **/ public static final boolean isValidOption(final int code) { - return (code <= __LAST_OPTION); + return code <= __LAST_OPTION; } // Cannot be instantiated diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java b/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java index 791a1a4..0e623df 100644 --- a/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java +++ b/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java @@ -95,7 +95,7 @@ public abstract class TelnetOptionHandler ***/ public int getOptionCode() { - return (optionCode); + return optionCode; } /*** @@ -106,7 +106,7 @@ public abstract class TelnetOptionHandler ***/ public boolean getAcceptLocal() { - return (acceptLocal); + return acceptLocal; } /*** @@ -117,7 +117,7 @@ public abstract class TelnetOptionHandler ***/ public boolean getAcceptRemote() { - return (acceptRemote); + return acceptRemote; } /*** @@ -150,7 +150,7 @@ public abstract class TelnetOptionHandler ***/ public boolean getInitLocal() { - return (initialLocal); + return initialLocal; } /*** @@ -161,7 +161,7 @@ public abstract class TelnetOptionHandler ***/ public boolean getInitRemote() { - return (initialRemote); + return initialRemote; } /*** diff --git a/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java b/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java index 4c0c347..485f178 100644 --- a/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java +++ b/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java @@ -109,19 +109,19 @@ public class WindowSizeOptionHandler extends TelnetOptionHandler int nShift; int nTurnedOnBits; - if ((m_nWidth % 0x100) == 0xFF) { + if (m_nWidth % 0x100 == 0xFF) { nResponseSize += 1; } - if ((m_nWidth / 0x100) == 0xFF) { + if (m_nWidth / 0x100 == 0xFF) { nResponseSize += 1; } - if ((m_nHeight % 0x100) == 0xFF) { + if (m_nHeight % 0x100 == 0xFF) { nResponseSize += 1; } - if ((m_nHeight / 0x100) == 0xFF) { + if (m_nHeight / 0x100 == 0xFF) { nResponseSize += 1; } diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPClient.java b/src/main/java/org/apache/commons/net/tftp/TFTPClient.java index f13e657..ba58c59 100644 --- a/src/main/java/org/apache/commons/net/tftp/TFTPClient.java +++ b/src/main/java/org/apache/commons/net/tftp/TFTPClient.java @@ -226,7 +226,7 @@ public class TFTPClient extends TFTP wantReply = false; // got the next block, drop out to ack it } else { // unexpected block number discardPackets(); - if (lastBlock == (block == 0 ? 65535 : (block - 1))) { + if (lastBlock == (block == 0 ? 65535 : block - 1)) { wantReply = false; // Resend last acknowledgemen } } diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java index ee41bc4..a11f1db 100644 --- a/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java +++ b/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java @@ -116,7 +116,7 @@ public final class TFTPErrorPacket extends TFTPPacket throw new TFTPPacketException("TFTP operator code does not match type."); } - _error = (((data[2] & 0xff) << 8) | (data[3] & 0xff)); + _error = (data[2] & 0xff) << 8 | data[3] & 0xff; if (length < 5) { throw new TFTPPacketException("Bad error packet. No message."); diff --git a/src/main/java/org/apache/commons/net/time/TimeTCPClient.java b/src/main/java/org/apache/commons/net/time/TimeTCPClient.java index 5f82c2a..43cf29a 100644 --- a/src/main/java/org/apache/commons/net/time/TimeTCPClient.java +++ b/src/main/java/org/apache/commons/net/time/TimeTCPClient.java @@ -80,7 +80,7 @@ public final class TimeTCPClient extends SocketClient { DataInputStream input; input = new DataInputStream(_input_); - return (input.readInt() & 0xffffffffL); + return input.readInt() & 0xffffffffL; } /*** diff --git a/src/main/java/org/apache/commons/net/util/SubnetUtils.java b/src/main/java/org/apache/commons/net/util/SubnetUtils.java index 1cfc70d..9da3a5a 100644 --- a/src/main/java/org/apache/commons/net/util/SubnetUtils.java +++ b/src/main/java/org/apache/commons/net/util/SubnetUtils.java @@ -69,10 +69,10 @@ public class SubnetUtils { this.netmask = (int) (0x0FFFFFFFFL << trailingZeroes ); /* Calculate base network address */ - this.network = (address & netmask); + this.network = address & netmask; /* Calculate broadcast address */ - this.broadcast = network | ~(netmask); + this.broadcast = network | ~netmask; } else { throw new IllegalArgumentException(String.format(PARSE_FAIL, cidrNotation)); } @@ -94,10 +94,10 @@ public class SubnetUtils { } /* Calculate base network address */ - this.network = (this.address & this.netmask); + this.network = this.address & this.netmask; /* Calculate broadcast address */ - this.broadcast = this.network | ~(this.netmask); + this.broadcast = this.network | ~this.netmask; } @@ -139,13 +139,13 @@ public class SubnetUtils { private long broadcastLong(){ return broadcast & UNSIGNED_INT_MASK; } private int low() { - return (isInclusiveHostCount() ? network : - broadcastLong() - networkLong() > 1 ? network + 1 : 0); + return isInclusiveHostCount() ? network : + broadcastLong() - networkLong() > 1 ? network + 1 : 0; } private int high() { - return (isInclusiveHostCount() ? broadcast : - broadcastLong() - networkLong() > 1 ? broadcast -1 : 0); + return isInclusiveHostCount() ? broadcast : + broadcastLong() - networkLong() > 1 ? broadcast -1 : 0; } /** @@ -279,7 +279,7 @@ public class SubnetUtils { private int[] toArray(final int val) { final int ret[] = new int[4]; for (int j = 3; j >= 0; --j) { - ret[j] |= ((val >>> 8*(3-j)) & (0xff)); + ret[j] |= val >>> 8*(3-j) & 0xff; } return ret; } @@ -340,8 +340,8 @@ public class SubnetUtils { private static int matchAddress(final Matcher matcher) { int addr = 0; for (int i = 1; i <= 4; ++i) { - final int n = (rangeCheck(Integer.parseInt(matcher.group(i)), 0, 255)); - addr |= ((n & 0xff) << 8*(4-i)); + final int n = rangeCheck(Integer.parseInt(matcher.group(i)), 0, 255); + addr |= (n & 0xff) << 8*(4-i); } return addr; } @@ -364,9 +364,9 @@ public class SubnetUtils { * see Hacker's Delight section 5.1 */ int pop(int x) { - x = x - ((x >>> 1) & 0x55555555); - x = (x & 0x33333333) + ((x >>> 2) & 0x33333333); - x = (x + (x >>> 4)) & 0x0F0F0F0F; + x = x - (x >>> 1 & 0x55555555); + x = (x & 0x33333333) + (x >>> 2 & 0x33333333); + x = x + (x >>> 4) & 0x0F0F0F0F; x = x + (x >>> 8); x = x + (x >>> 16); return x & 0x0000003F; diff --git a/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java b/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java index 0a4f556..e612640 100644 --- a/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java +++ b/src/test/java/org/apache/commons/net/ftp/parser/CompositeFTPParseTestFramework.java @@ -31,7 +31,7 @@ public abstract class CompositeFTPParseTestFramework extends FTPParseTestFramewo @Override protected String[] getGoodListing() { - return (getGoodListings()[0]); + return getGoodListings()[0]; } /** @@ -55,7 +55,7 @@ public abstract class CompositeFTPParseTestFramework extends FTPParseTestFramewo @Override protected String[] getBadListing() { - return (getBadListings()[0]); + return getBadListings()[0]; } /* (non-Javadoc) diff --git a/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java index 448f021..be496ea 100644 --- a/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java +++ b/src/test/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParserTest.java @@ -129,7 +129,7 @@ public class EnterpriseUnixFTPEntryParserTest extends FTPParseTestFramework @Override protected String[] getBadListing() { - return (BADSAMPLES); + return BADSAMPLES; } /** @@ -138,7 +138,7 @@ public class EnterpriseUnixFTPEntryParserTest extends FTPParseTestFramework @Override protected String[] getGoodListing() { - return (GOODSAMPLES); + return GOODSAMPLES; } /** @@ -147,7 +147,7 @@ public class EnterpriseUnixFTPEntryParserTest extends FTPParseTestFramework @Override protected FTPFileEntryParser getParser() { - return (new EnterpriseUnixFTPEntryParser()); + return new EnterpriseUnixFTPEntryParser(); } /** diff --git a/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java index d2687ff..775884a 100644 --- a/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java +++ b/src/test/java/org/apache/commons/net/ftp/parser/MLSxEntryParserTest.java @@ -59,18 +59,18 @@ public class MLSxEntryParserTest extends FTPParseTestFramework { @Override protected String[] getBadListing() { - return (badsamples); + return badsamples; } @Override protected String[] getGoodListing() { - return (goodsamples); + return goodsamples; } @Override protected FTPFileEntryParser getParser() { - return (MLSxEntryParser.getInstance()); + return MLSxEntryParser.getInstance(); } /** diff --git a/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java index b2d3bd4..dbec26a 100644 --- a/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java +++ b/src/test/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParserTest.java @@ -48,17 +48,17 @@ public class MacOsPeterFTPEntryParserTest extends FTPParseTestFramework { @Override protected String[] getBadListing() { - return (badsamples); + return badsamples; } @Override protected String[] getGoodListing() { - return (goodsamples); + return goodsamples; } @Override protected FTPFileEntryParser getParser() { - return (new MacOsPeterFTPEntryParser()); + return new MacOsPeterFTPEntryParser(); } @Override diff --git a/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java index 29bc398..6433323 100644 --- a/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java +++ b/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java @@ -44,17 +44,17 @@ public class NetwareFTPEntryParserTest extends FTPParseTestFramework { @Override protected String[] getBadListing() { - return (badsamples); + return badsamples; } @Override protected String[] getGoodListing() { - return (goodsamples); + return goodsamples; } @Override protected FTPFileEntryParser getParser() { - return (new NetwareFTPEntryParser()); + return new NetwareFTPEntryParser(); } @Override diff --git a/src/test/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParserTest.java index 42f0cf1..38934f6 100644 --- a/src/test/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParserTest.java +++ b/src/test/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParserTest.java @@ -84,14 +84,14 @@ public class OS2FTPEntryParserTest extends FTPParseTestFramework protected String[] getBadListing() { - return (badsamples); + return badsamples; } @Override protected String[] getGoodListing() { - return (goodsamples); + return goodsamples; } @Override diff --git a/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java index 13408ab..79e2fe4 100644 --- a/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java +++ b/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java @@ -88,12 +88,12 @@ public class UnixFTPEntryParserTest extends FTPParseTestFramework { @Override protected String[] getBadListing() { - return (badsamples); + return badsamples; } @Override protected String[] getGoodListing() { - return (goodsamples); + return goodsamples; } public void testNumericDateFormat() @@ -128,7 +128,7 @@ public class UnixFTPEntryParserTest extends FTPParseTestFramework { @Override protected FTPFileEntryParser getParser() { - return (new UnixFTPEntryParser()); + return new UnixFTPEntryParser(); } public void testOwnerNameWithSpaces() { diff --git a/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java index b2d4e3f..89353a6 100644 --- a/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java +++ b/src/test/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParserTest.java @@ -226,14 +226,14 @@ public class VMSFTPEntryParserTest extends FTPParseTestFramework protected String[] getBadListing() { - return (badsamples); + return badsamples; } @Override protected String[] getGoodListing() { - return (goodsamples); + return goodsamples; } @Override @@ -260,39 +260,39 @@ public class VMSFTPEntryParserTest extends FTPParseTestFramework { int permMask = 1<<8; assertTrue("Owner should not have read permission.", - ((permMask & octalPerm) != 0) == dir.hasPermission(FTPFile.USER_ACCESS, + (permMask & octalPerm) != 0 == dir.hasPermission(FTPFile.USER_ACCESS, FTPFile.READ_PERMISSION)); permMask >>= 1; assertTrue("Owner should not have write permission.", - ((permMask & octalPerm) != 0) == dir.hasPermission(FTPFile.USER_ACCESS, + (permMask & octalPerm) != 0 == dir.hasPermission(FTPFile.USER_ACCESS, FTPFile.WRITE_PERMISSION)); permMask >>= 1; assertTrue("Owner should not have execute permission.", - ((permMask & octalPerm) != 0) == dir.hasPermission(FTPFile.USER_ACCESS, + (permMask & octalPerm) != 0 == dir.hasPermission(FTPFile.USER_ACCESS, FTPFile.EXECUTE_PERMISSION)); permMask >>= 1; assertTrue("Group should not have read permission.", - ((permMask & octalPerm) != 0) == dir.hasPermission(FTPFile.GROUP_ACCESS, + (permMask & octalPerm) != 0 == dir.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.READ_PERMISSION)); permMask >>= 1; assertTrue("Group should not have write permission.", - ((permMask & octalPerm) != 0) == dir.hasPermission(FTPFile.GROUP_ACCESS, + (permMask & octalPerm) != 0 == dir.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.WRITE_PERMISSION)); permMask >>= 1; assertTrue("Group should not have execute permission.", - ((permMask & octalPerm) != 0) == dir.hasPermission(FTPFile.GROUP_ACCESS, + (permMask & octalPerm) != 0 == dir.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.EXECUTE_PERMISSION)); permMask >>= 1; assertTrue("World should not have read permission.", - ((permMask & octalPerm) != 0) == dir.hasPermission(FTPFile.WORLD_ACCESS, + (permMask & octalPerm) != 0 == dir.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.READ_PERMISSION)); permMask >>= 1; assertTrue("World should not have write permission.", - ((permMask & octalPerm) != 0) == dir.hasPermission(FTPFile.WORLD_ACCESS, + (permMask & octalPerm) != 0 == dir.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.WRITE_PERMISSION)); permMask >>= 1; assertTrue("World should not have execute permission.", - ((permMask & octalPerm) != 0) == dir.hasPermission(FTPFile.WORLD_ACCESS, + (permMask & octalPerm) != 0 == dir.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.EXECUTE_PERMISSION)); } } diff --git a/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java b/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java index baa5710..3936aea 100644 --- a/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java +++ b/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java @@ -27,7 +27,7 @@ import org.junit.Test; public class ToNetASCIIInputStreamTest { - private static final String ASCII = /*Charset.forName*/("ASCII"); + private static final String ASCII = /*Charset.forName*/"ASCII"; @Test public void testToNetASCIIInputStream1() throws Exception diff --git a/src/test/java/org/apache/commons/net/pop3/POP3ClientCommandsTest.java b/src/test/java/org/apache/commons/net/pop3/POP3ClientCommandsTest.java index a29a926..bef4e9a 100644 --- a/src/test/java/org/apache/commons/net/pop3/POP3ClientCommandsTest.java +++ b/src/test/java/org/apache/commons/net/pop3/POP3ClientCommandsTest.java @@ -466,7 +466,7 @@ public class POP3ClientCommandsTest extends TestCase numDeleted++; } //Check to see that they are marked as deleted - assertEquals(numMessages, (numDeleted + 1)); + assertEquals(numMessages, numDeleted + 1); //Now reset to unmark the messages as deleted p.reset(); @@ -500,7 +500,7 @@ public class POP3ClientCommandsTest extends TestCase numDeleted++; } //Check to see that they are marked as deleted - assertEquals(numMessages, (numDeleted + 3)); + assertEquals(numMessages, numDeleted + 3); //Logout and come back in p.logout(); diff --git a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java index 17e3c3a..135e96d 100644 --- a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java +++ b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java @@ -104,7 +104,7 @@ public class SimpleSMTPHeaderTestCase { if (sentSecs < beforeDateSecs) { fail(sentDate + " should be after "+beforeDate); } - if (sentSecs > (afterDateSecs)) { + if (sentSecs > afterDateSecs) { fail(sentDate+" should be before "+afterDate); } } catch (final ParseException e) { 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 d6a0eff..80da73f 100644 --- a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java +++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java @@ -814,7 +814,7 @@ extends TestCase implements TelnetNotificationHandler int ret_read = 0; ret_read = instr.read(buff); - if((ret_read == 1) && (buff[0] == 'A')) + if(ret_read == 1 && buff[0] == 'A') { read_ok = true; } @@ -926,7 +926,7 @@ extends TestCase implements TelnetNotificationHandler { if(a1.length != a2.length) { - return(false); + return false; } boolean result = true; for(int ii=0; ii<a1.length; ii++) @@ -936,7 +936,7 @@ extends TestCase implements TelnetNotificationHandler result = false; } } - return(result); + return result; } /* diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java b/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java index c8298d6..e64d6da 100644 --- a/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java +++ b/src/test/java/org/apache/commons/net/telnet/TelnetTestResponder.java @@ -69,7 +69,7 @@ public class TelnetTestResponder implements Runnable { String readbytes = ""; while(!result && - ((System.currentTimeMillis() - starttime) < _timeout)) + System.currentTimeMillis() - starttime < _timeout) { if(_is.available() > 0) { diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java b/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java index 0b4d95e..3b26e8b 100644 --- a/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java +++ b/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java @@ -128,7 +128,7 @@ public class TelnetTestSimpleServer implements Runnable { if(clientSocket != null) { - return(clientSocket.getInputStream()); + return clientSocket.getInputStream(); } return null; } @@ -137,7 +137,7 @@ public class TelnetTestSimpleServer implements Runnable { if(clientSocket != null) { - return(clientSocket.getOutputStream()); + return clientSocket.getOutputStream(); } return null; } diff --git a/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java b/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java index 8d2425b..253e585 100644 --- a/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java +++ b/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java @@ -86,7 +86,7 @@ public class TerminalTypeOptionHandlerTest extends TelnetOptionHandlerTestAbstra { if(a1.length != a2.length) { - return(false); + return false; } boolean result = true; for(int ii=0; ii<a1.length; ii++) @@ -95,6 +95,6 @@ public class TerminalTypeOptionHandlerTest extends TelnetOptionHandlerTestAbstra result = false; } } - return(result); + return result; } } 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 aa0c17d..57d1477 100644 --- a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java +++ b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java @@ -163,8 +163,8 @@ public class TFTPServer implements Runnable { port_ = port; mode_ = mode; - log_ = (log == null ? nullStream: log); - logError_ = (errorLog == null ? nullStream : errorLog); + log_ = log == null ? nullStream: log; + logError_ = errorLog == null ? nullStream : errorLog; laddr_ = null; launch(serverReadDirectory, serverWriteDirectory); } @@ -196,8 +196,8 @@ public class TFTPServer implements Runnable port_ = port; mode_ = mode; laddr_ = localaddr; - log_ = (log == null ? nullStream: log); - logError_ = (errorLog == null ? nullStream : errorLog); + log_ = log == null ? nullStream: log; + logError_ = errorLog == null ? nullStream : errorLog; launch(serverReadDirectory, serverWriteDirectory); } @@ -239,8 +239,8 @@ public class TFTPServer implements Runnable } } } - log_ = (log == null ? nullStream: log); - logError_ = (errorLog == null ? nullStream : errorLog); + log_ = log == null ? nullStream: log; + logError_ = errorLog == null ? nullStream : errorLog; laddr_ = iaddr; launch(serverReadDirectory, serverWriteDirectory); } @@ -472,7 +472,7 @@ public class TFTPServer implements Runnable if (tftpPacket_ instanceof TFTPReadRequestPacket) { - handleRead(((TFTPReadRequestPacket) tftpPacket_)); + handleRead((TFTPReadRequestPacket) tftpPacket_); } else if (tftpPacket_ instanceof TFTPWriteRequestPacket) { @@ -781,7 +781,7 @@ public class TFTPServer implements Runnable final int dataLength = ((TFTPDataPacket) dataPacket).getDataLength(); final int dataOffset = ((TFTPDataPacket) dataPacket).getDataOffset(); - if (block > lastBlock || (lastBlock == 65535 && block == 0)) + if (block > lastBlock || lastBlock == 65535 && block == 0) { // it might resend a data block if it missed our ack // - don't rewrite the block.
