This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
The following commit(s) were added to refs/heads/master by this push:
new 70c390b9 * Use contains method.
new 9943c1b0 Merge pull request #105 from
arturobernalg/feature/improvements
70c390b9 is described below
commit 70c390b93b97fe64526aea7fee92899d3615f5f4
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Fri Apr 15 18:34:40 2022 +0200
* Use contains method.
---
.../parser/DefaultFTPFileEntryParserFactory.java | 22 +++++++++++-----------
.../commons/net/ftp/parser/MVSFTPEntryParser.java | 4 ++--
.../java/org/apache/commons/net/ntp/TimeStamp.java | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
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 7981293e..3ba52b78 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
@@ -148,45 +148,45 @@ public class DefaultFTPFileEntryParserFactory
if (parser == null) { // Now try for aliases
final String ukey = key.toUpperCase(java.util.Locale.ENGLISH);
- if (ukey.indexOf(FTPClientConfig.SYST_UNIX_TRIM_LEADING) >= 0)
+ if (ukey.contains(FTPClientConfig.SYST_UNIX_TRIM_LEADING))
{
parser = new UnixFTPEntryParser(config, true);
}
// must check this after SYST_UNIX_TRIM_LEADING as it is a
substring of it
- else if (ukey.indexOf(FTPClientConfig.SYST_UNIX) >= 0)
+ else if (ukey.contains(FTPClientConfig.SYST_UNIX))
{
parser = new UnixFTPEntryParser(config, false);
}
- else if (ukey.indexOf(FTPClientConfig.SYST_VMS) >= 0)
+ else if (ukey.contains(FTPClientConfig.SYST_VMS))
{
parser = new VMSVersioningFTPEntryParser(config);
}
- else if (ukey.indexOf(FTPClientConfig.SYST_NT) >= 0)
+ else if (ukey.contains(FTPClientConfig.SYST_NT))
{
parser = createNTFTPEntryParser(config);
}
- else if (ukey.indexOf(FTPClientConfig.SYST_OS2) >= 0)
+ else if (ukey.contains(FTPClientConfig.SYST_OS2))
{
parser = new OS2FTPEntryParser(config);
}
- else if (ukey.indexOf(FTPClientConfig.SYST_OS400) >= 0 ||
- ukey.indexOf(FTPClientConfig.SYST_AS400) >= 0)
+ else if (ukey.contains(FTPClientConfig.SYST_OS400) ||
+ ukey.contains(FTPClientConfig.SYST_AS400))
{
parser = createOS400FTPEntryParser(config);
}
- else if (ukey.indexOf(FTPClientConfig.SYST_MVS) >= 0)
+ else if (ukey.contains(FTPClientConfig.SYST_MVS))
{
parser = new MVSFTPEntryParser(); // Does not currently
support config parameter
}
- else if (ukey.indexOf(FTPClientConfig.SYST_NETWARE) >= 0)
+ else if (ukey.contains(FTPClientConfig.SYST_NETWARE))
{
parser = new NetwareFTPEntryParser(config);
}
- else if (ukey.indexOf(FTPClientConfig.SYST_MACOS_PETER) >= 0)
+ else if (ukey.contains(FTPClientConfig.SYST_MACOS_PETER))
{
parser = new MacOsPeterFTPEntryParser(config);
}
- else if (ukey.indexOf(FTPClientConfig.SYST_L8) >= 0)
+ else if (ukey.contains(FTPClientConfig.SYST_L8))
{
// L8 normally means Unix, but move it to the end for some L8
systems that aren't.
// This check should be last!
diff --git
a/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
b/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
index a84f77e5..6fdc1e95 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
@@ -486,10 +486,10 @@ public class MVSFTPEntryParser extends
ConfigurableFTPFileEntryParserImpl {
// list in short order.
if (orig != null && !orig.isEmpty()) {
final String header = orig.get(0);
- if (header.indexOf("Volume") >= 0 && header.indexOf("Dsname") >=
0) {
+ if (header.contains("Volume") && header.contains("Dsname")) {
setType(FILE_LIST_TYPE);
super.setRegex(FILE_LIST_REGEX);
- } else if (header.indexOf("Name") >= 0 && header.indexOf("Id") >=
0) {
+ } else if (header.contains("Name") && header.contains("Id")) {
setType(MEMBER_LIST_TYPE);
super.setRegex(MEMBER_LIST_REGEX);
} else if (header.indexOf("total") == 0) {
diff --git a/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
b/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
index e79c994e..20a10755 100644
--- a/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
+++ b/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
@@ -306,7 +306,7 @@ public class TimeStamp implements java.io.Serializable,
Comparable<TimeStamp>
{
final long thisVal = this.ntpTime;
final long anotherVal = anotherTimeStamp.ntpTime;
- return (thisVal < anotherVal ? -1 : (thisVal == anotherVal ? 0 : 1));
+ return (Long.compare(thisVal, anotherVal));
}
/**
