[commons-fileupload] branch master updated: Replace indexOf() with contains()

[jochen]

This is an automated email from the ASF dual-hosted git repository.

jochen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git


The following commit(s) were added to refs/heads/master by this push:
     new 7f02be4  Replace indexOf() with contains()
     new e7ecf9e  Merge pull request #94 from arturobernalg/feature/use_contains
7f02be4 is described below

commit 7f02be4a08481fe319126b797353f641e9a42214
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Tue May 25 06:32:09 2021 +0200

    Replace indexOf() with contains()
---
 .../java/org/apache/commons/fileupload2/util/mime/MimeUtility.java    | 2 +-
 src/test/java/org/apache/commons/fileupload2/StreamingTest.java       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java 
b/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
index 460c890..c3f2387 100644
--- a/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
+++ b/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
@@ -95,7 +95,7 @@ public final class MimeUtility {
     public static String decodeText(final String text) throws 
UnsupportedEncodingException {
         // if the text contains any encoded tokens, those tokens will be 
marked with "=?".  If the
         // source string doesn't contain that sequent, no decoding is required.
-        if (text.indexOf(ENCODED_TOKEN_MARKER) < 0) {
+        if (!text.contains(ENCODED_TOKEN_MARKER)) {
             return text;
         }
 
diff --git a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java 
b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
index 0ee80cd..bf4fa98 100644
--- a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
@@ -265,7 +265,7 @@ public class StreamingTest {
         } catch (final InvalidFileNameException e) {
             assertEquals(fileName, e.getName());
             assertEquals(-1, e.getMessage().indexOf(fileName));
-            assertTrue(e.getMessage().indexOf("foo.exe\\0.png") != -1);
+            assertTrue(e.getMessage().contains("foo.exe\\0.png"));
         }
 
         try {
@@ -274,7 +274,7 @@ public class StreamingTest {
         } catch (final InvalidFileNameException e) {
             assertEquals(fileName, e.getName());
             assertEquals(-1, e.getMessage().indexOf(fileName));
-            assertTrue(e.getMessage().indexOf("foo.exe\\0.png") != -1);
+            assertTrue(e.getMessage().contains("foo.exe\\0.png"));
         }
     }