From 400c7bba108bad66198330e508a65a5de91b09fd Mon Sep 17 00:00:00 2001 From: Arturo Bernal Date: Wed, 24 Mar 2021 06:39:07 +0100 Subject: [PATCH] Simplify Statement. --- .../commons/net/examples/mail/POP3ExportMbox.java | 2 +- .../org/apache/commons/net/examples/mail/POP3Mail.java | 2 +- .../net/examples/telnet/TelnetClientExample.java | 2 +- .../net/ftp/parser/CompositeFileEntryParser.java | 5 +---- .../net/ftp/parser/MacOsPeterFTPEntryParser.java | 10 ++-------- .../commons/net/ftp/parser/OS400FTPEntryParser.java | 5 +---- .../commons/net/ftp/parser/UnixFTPEntryParser.java | 10 ++-------- .../java/org/apache/commons/net/io/CRLFLineReader.java | 6 +----- .../java/org/apache/commons/net/telnet/Telnet.java | 2 +- 9 files changed, 11 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java b/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java index c6d2adc2b..0333a8173 100644 --- a/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java +++ b/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java @@ -81,7 +81,7 @@ public static void main(final String[] args) } final String proto = argCount > 3 ? args[argIdx++] : null; - final boolean implicit = argCount > 4 ? Boolean.parseBoolean(args[argIdx++]) : false; + final boolean implicit = argCount > 4 && Boolean.parseBoolean(args[argIdx++]); final POP3Client pop3; diff --git a/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java b/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java index 32cf6b5b9..af6940360 100644 --- a/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java +++ b/src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java @@ -60,7 +60,7 @@ public static void main(final String[] args) } final String proto = args.length > 3 ? args[3] : null; - final boolean implicit = args.length > 4 ? Boolean.parseBoolean(args[4]) : false; + final boolean implicit = args.length > 4 && Boolean.parseBoolean(args[4]); final POP3Client pop3; 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 1cfa46bd6..804bf6739 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 @@ -250,7 +250,7 @@ else if(line.matches("^\\^[A-Z^]\\r?\\n?$")) end_loop = true; } } - while(ret_read > 0 && end_loop == false); + while(ret_read > 0 && !end_loop); try { diff --git a/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java index 5628d96c1..a9bc9629b 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java @@ -45,10 +45,7 @@ public FTPFile parseFTPEntry(final String listEntry) if (cachedFtpFileEntryParser != null) { final FTPFile matched = cachedFtpFileEntryParser.parseFTPEntry(listEntry); - if (matched != null) - { - return matched; - } + return matched; } else { 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 d2200f2e2..5ec3e7a62 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 @@ -205,14 +205,8 @@ public FTPFile parseFTPEntry(final String entry) { (!group(g + 1).equals("-"))); final String execPerm = group(g + 2); - if (!execPerm.equals("-") && !Character.isUpperCase(execPerm.charAt(0))) - { - file.setPermission(access, FTPFile.EXECUTE_PERMISSION, true); - } - else - { - file.setPermission(access, FTPFile.EXECUTE_PERMISSION, false); - } + file.setPermission(access, FTPFile.EXECUTE_PERMISSION, !execPerm.equals("-") + && !Character.isUpperCase(execPerm.charAt(0))); } if (!isDevice) 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 3b6921bbe..2325ad359 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 @@ -300,10 +300,7 @@ protected FTPClientConfig getDefaultConfiguration() { * else false. */ private boolean isNullOrEmpty(final String string) { - if (string == null || string.isEmpty()) { - return true; - } - return false; + return string == null || string.isEmpty(); } @Override 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 101632c79..e33437a34 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 @@ -299,14 +299,8 @@ public FTPFile parseFTPEntry(final String entry) { !group(g + 1).equals("-")); final String execPerm = group(g + 2); - if (!execPerm.equals("-") && !Character.isUpperCase(execPerm.charAt(0))) - { - file.setPermission(access, FTPFile.EXECUTE_PERMISSION, true); - } - else - { - file.setPermission(access, FTPFile.EXECUTE_PERMISSION, false); - } + file.setPermission(access, FTPFile.EXECUTE_PERMISSION, !execPerm.equals("-") + && !Character.isUpperCase(execPerm.charAt(0))); } if (!isDevice) diff --git a/src/main/java/org/apache/commons/net/io/CRLFLineReader.java b/src/main/java/org/apache/commons/net/io/CRLFLineReader.java index 1081946c0..5b5c95665 100644 --- a/src/main/java/org/apache/commons/net/io/CRLFLineReader.java +++ b/src/main/java/org/apache/commons/net/io/CRLFLineReader.java @@ -60,11 +60,7 @@ public String readLine() throws IOException { if (prevWasCR && intch == LF) { return sb.substring(0, sb.length()-1); } - if (intch == CR) { - prevWasCR = true; - } else { - prevWasCR = false; - } + prevWasCR = intch == CR; sb.append((char) intch); } } 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 ac0a2da2f..18d409852 100644 --- a/src/main/java/org/apache/commons/net/telnet/Telnet.java +++ b/src/main/java/org/apache/commons/net/telnet/Telnet.java @@ -244,7 +244,7 @@ final boolean _sendAYT(final long timeout) _output_.flush(); } aytMonitor.wait(timeout); - if (aytFlag == false) + if (!aytFlag) { retValue = false; aytFlag = true;