[commons-lang] branch master updated: LANG-1631 - Check if the char to be searched is defined (#682)

[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-lang.git


The following commit(s) were added to refs/heads/master by this push:
     new 9fa1d73  LANG-1631 - Check if the char to be searched is defined (#682)
9fa1d73 is described below

commit 9fa1d734f66f1ad236cafea54bfcc94a1ba8fd1a
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Dec 27 18:05:33 2020 +0100

    LANG-1631 - Check if the char to be searched is defined (#682)
---
 src/main/java/org/apache/commons/lang3/CharSequenceUtils.java     | 8 +++++---
 .../org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java    | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java 
b/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
index 8681b7f..17669ba 100644
--- a/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
@@ -109,6 +109,7 @@ public class CharSequenceUtils {
                     return i;
                 }
             }
+            return NOT_FOUND;
         }
         //supplementary characters (LANG1300)
         if (searchChar <= Character.MAX_CODE_POINT) {
@@ -195,6 +196,7 @@ public class CharSequenceUtils {
                     return i;
                 }
             }
+            return NOT_FOUND;
         }
         //supplementary characters (LANG1300)
         //NOTE - we must do a forward traversal for this to avoid duplicating 
code points
@@ -244,7 +246,7 @@ public class CharSequenceUtils {
         }
 
         if (start < 0 || len2 < 0 || len2 > len1) {
-            return -1;
+            return NOT_FOUND;
         }
 
         if (len2 == 0) {
@@ -272,7 +274,7 @@ public class CharSequenceUtils {
             while (cs.charAt(i) != char0) {
                 i--;
                 if (i < 0) {
-                    return -1;
+                    return NOT_FOUND;
                 }
             }
             if (checkLaterThan1(cs, searchChar, len2, i)) {
@@ -280,7 +282,7 @@ public class CharSequenceUtils {
             }
             i--;
             if (i < 0) {
-                return -1;
+                return NOT_FOUND;
             }
         }
     }
diff --git 
a/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java 
b/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
index 32a9f58..a597ef2 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.nio.CharBuffer;
 import java.util.Locale;
 
 import org.hamcrest.core.IsNot;
@@ -275,6 +276,7 @@ public class StringUtilsEqualsIndexOfTest  {
         assertEquals(2, StringUtils.indexOf("aabaabaa", 'b'));
 
         assertEquals(2, StringUtils.indexOf(new StringBuilder("aabaabaa"), 
'b'));
+        assertEquals(StringUtils.INDEX_NOT_FOUND, StringUtils.indexOf(new 
StringBuilder("aabaabaa"), -1738));
     }
 
     @Test
@@ -564,6 +566,7 @@ public class StringUtilsEqualsIndexOfTest  {
         assertEquals(1, StringUtils.lastIndexOf(builder, CODE_POINT, 1 ));
         assertEquals(-1, StringUtils.lastIndexOf(builder.toString(), 
CODE_POINT, 0));
         assertEquals(1, StringUtils.lastIndexOf(builder.toString(), 
CODE_POINT, 1));
+        assertEquals(StringUtils.INDEX_NOT_FOUND, 
StringUtils.lastIndexOf(CharBuffer.wrap("[%{.c.0rro"), -1738, 982));
     }
 
     @Test