This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
The following commit(s) were added to refs/heads/master by this push:
new 400c7bba Simplify Statement.
new 2d8ec8dc Merge pull request #77 from
arturobernalg/feature/simplifyStatement
400c7bba is described below
commit 400c7bba108bad66198330e508a65a5de91b09fd
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Wed Mar 24 06:39:07 2021 +0100
Simplify Statement.
---
.../org/apache/commons/net/examples/mail/POP3ExportMbox.java | 2 +-
.../java/org/apache/commons/net/examples/mail/POP3Mail.java | 2 +-
.../commons/net/examples/telnet/TelnetClientExample.java | 2 +-
.../commons/net/ftp/parser/CompositeFileEntryParser.java | 5 +----
.../commons/net/ftp/parser/MacOsPeterFTPEntryParser.java | 10 ++--------
.../org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java | 5 +----
.../org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java | 10 ++--------
src/main/java/org/apache/commons/net/io/CRLFLineReader.java | 6 +-----
src/main/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 c6d2adc2..0333a817 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 final class POP3ExportMbox
}
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 32cf6b5b..af694036 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 final class POP3Mail
}
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 1cfa46bd..804bf673 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 @@ public class TelnetClientExample implements Runnable,
TelnetNotificationHandler
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 5628d96c..a9bc9629 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 class CompositeFileEntryParser extends
FTPFileEntryParserImpl
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 d2200f2e..5ec3e7a6 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 class MacOsPeterFTPEntryParser extends
ConfigurableFTPFileEntryParserImpl
(!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 3b6921bb..2325ad35 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 @@ public class OS400FTPEntryParser extends
ConfigurableFTPFileEntryParserImpl
* else <code>false</code>.
*/
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 101632c7..e33437a3 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 class UnixFTPEntryParser extends
ConfigurableFTPFileEntryParserImpl
!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 1081946c..5b5c9566 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 final class CRLFLineReader extends BufferedReader
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 ac0a2da2..18d40985 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 @@ class Telnet extends SocketClient
_output_.flush();
}
aytMonitor.wait(timeout);
- if (aytFlag == false)
+ if (!aytFlag)
{
retValue = false;
aytFlag = true;
