(commons-net) branch master updated: Use String#startsWith(String)

[ggregory]

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 1634da82 Use String#startsWith(String)
1634da82 is described below

commit 1634da8284d0e8398b74034b6b2c37869d464c7f
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Mar 22 09:50:46 2024 -0400

    Use String#startsWith(String)
---
 .../java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java     | 4 ++--
 .../java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java  | 2 +-
 .../apache/commons/net/telnet/InvalidTelnetOptionExceptionTest.java   | 4 ++--
 .../org/apache/commons/net/telnet/TelnetClientFunctionalTest.java     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

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 533a2476..fc2bdb56 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
@@ -456,13 +456,13 @@ public class MVSFTPEntryParser extends 
ConfigurableFTPFileEntryParserImpl {
             } else if (header.contains("Name") && header.contains("Id")) {
                 setType(MEMBER_LIST_TYPE);
                 super.setRegex(MEMBER_LIST_REGEX);
-            } else if (header.indexOf("total") == 0) {
+            } else if (header.startsWith("total")) {
                 setType(UNIX_LIST_TYPE);
                 unixFTPEntryParser = new UnixFTPEntryParser();
             } else if (header.indexOf("Spool Files") >= 30) {
                 setType(JES_LEVEL_1_LIST_TYPE);
                 super.setRegex(JES_LEVEL_1_LIST_REGEX);
-            } else if (header.indexOf("JOBNAME") == 0 && 
header.indexOf("JOBID") > 8) {// header contains JOBNAME JOBID OWNER // STATUS 
CLASS
+            } else if (header.startsWith("JOBNAME") && header.indexOf("JOBID") 
> 8) {// header contains JOBNAME JOBID OWNER // STATUS CLASS
                 setType(JES_LEVEL_2_LIST_TYPE);
                 super.setRegex(JES_LEVEL_2_LIST_REGEX);
             } else {
diff --git 
a/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java 
b/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
index c40edcef..6dbeafab 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
@@ -105,7 +105,7 @@ public class NTFTPEntryParserTest extends 
CompositeFTPParseTestFramework {
 
     @Override
     protected void doAdditionalGoodTests(final String test, final FTPFile f) {
-        if (test.indexOf("<DIR>") >= 0) {
+        if (test.contains("<DIR>")) {
             assertEquals("directory.type", FTPFile.DIRECTORY_TYPE, 
f.getType());
         }
     }
diff --git 
a/src/test/java/org/apache/commons/net/telnet/InvalidTelnetOptionExceptionTest.java
 
b/src/test/java/org/apache/commons/net/telnet/InvalidTelnetOptionExceptionTest.java
index 3b052fa9..dc537d81 100644
--- 
a/src/test/java/org/apache/commons/net/telnet/InvalidTelnetOptionExceptionTest.java
+++ 
b/src/test/java/org/apache/commons/net/telnet/InvalidTelnetOptionExceptionTest.java
@@ -40,7 +40,7 @@ public class InvalidTelnetOptionExceptionTest extends 
TestCase {
      * test of the constructors.
      */
     public void testConstructors() {
-        assertTrue(exc1.getMessage().indexOf(msg1) >= 0);
-        assertTrue(exc1.getMessage().indexOf("" + code1) >= 0);
+        assertTrue(exc1.getMessage().contains(msg1));
+        assertTrue(exc1.getMessage().contains("" + code1));
     }
 }
\ No newline at end of file
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 56e1aba1..a18d1807 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.contains(end) && System.currentTimeMillis() - 
starttime < timeout) {
             if (is.available() > 0) {
                 final int ret_read = is.read(buffer);
                 readbytes += new String(buffer, 0, ret_read);