plusone/plusone-commons
1
1
Fork 1
Code Issues Pull Requests Projects Releases 5 Activity

refactor!: 重命名 ArrayTools 中的方法

Browse Source 
`indexOfWithPredicate` 重命名为 `indexOf`，
`lastIndexOfWithPredicate` 重命名为 `lastIndexOf`。
This commit is contained in:
zhouxy108 2025-04-02 15:19:01 +08:00
parent 9ad82bdb57
commit 6f26613f30
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java
View File

@ -863,7 +863,7 @@ public class ArrayTools {
// #region - indexOf // #region - indexOf
public static <T> int indexOfWithPredicate(@Nullable T[] arr, Predicate<? super T> predicate) { public static <T> int indexOf(@Nullable T[] arr, Predicate<? super T> predicate) {
AssertTools.checkNotNull(predicate); AssertTools.checkNotNull(predicate);
if (arr == null || arr.length == 0) { if (arr == null || arr.length == 0) {
return NOT_FOUND_INDEX; return NOT_FOUND_INDEX;
@ -877,7 +877,7 @@ public class ArrayTools {
} }
public static <T> int indexOf(@Nullable T[] arr, @Nullable T obj) { public static <T> int indexOf(@Nullable T[] arr, @Nullable T obj) {
return indexOfWithPredicate(arr, item -> Objects.equals(item, obj)); return indexOf(arr, item -> Objects.equals(item, obj));
} }
public static int indexOf(@Nullable char[] arr, char value) { public static int indexOf(@Nullable char[] arr, char value) {
@ -968,7 +968,7 @@ public class ArrayTools {
// #region - lastIndexOf // #region - lastIndexOf
public static <T> int lastIndexOfWithPredicate(@Nullable T[] arr, Predicate<? super T> predicate) { public static <T> int lastIndexOf(@Nullable T[] arr, Predicate<? super T> predicate) { // TODO [优化] rename
AssertTools.checkNotNull(predicate); AssertTools.checkNotNull(predicate);
if (arr == null || arr.length == 0) { if (arr == null || arr.length == 0) {
return NOT_FOUND_INDEX; return NOT_FOUND_INDEX;
@ -982,7 +982,7 @@ public class ArrayTools {
} }
public static <T> int lastIndexOf(T[] arr, T obj) { public static <T> int lastIndexOf(T[] arr, T obj) {
return lastIndexOfWithPredicate(arr, item -> Objects.equals(item, obj)); return lastIndexOf(arr, item -> Objects.equals(item, obj));
} }
public static int lastIndexOf(@Nullable char[] arr, char value) { public static int lastIndexOf(@Nullable char[] arr, char value) {
@ -1106,7 +1106,7 @@ public class ArrayTools {
} }
public static boolean containsValue(@Nullable BigDecimal[] arr, @Nullable BigDecimal obj) { public static boolean containsValue(@Nullable BigDecimal[] arr, @Nullable BigDecimal obj) {
return indexOfWithPredicate(arr, item -> BigDecimals.equalsValue(item, obj)) > NOT_FOUND_INDEX; return indexOf(arr, item -> BigDecimals.equalsValue(item, obj)) > NOT_FOUND_INDEX;
} }
// #endregion // #endregion

48
src/test/java/xyz/zhouxy/plusone/commons/util/ArrayToolsTests.java
View File

@ -730,37 +730,37 @@ public class ArrayToolsTests {
// ================================ // ================================
@Test @Test
void indexOfWithPredicate_NullPredicate_ThrowsNullPointerException() { void indexOf_NullPredicate_ThrowsNullPointerException() {
assertThrows(NullPointerException.class, () -> ArrayTools.indexOfWithPredicate(new String[] {}, null)); assertThrows(NullPointerException.class, () -> ArrayTools.indexOf(new String[] {}, null));
} }
@Test @Test
void indexOfWithPredicate_NullArray_ReturnsNotFoundIndex() { void indexOf_NullArray_ReturnsNotFoundIndex() {
Predicate<String> predicate = s -> s.equals("test"); Predicate<String> predicate = s -> s.equals("test");
int result = ArrayTools.indexOfWithPredicate(null, predicate); int result = ArrayTools.indexOf(null, predicate);
assertEquals(ArrayTools.NOT_FOUND_INDEX, result); assertEquals(ArrayTools.NOT_FOUND_INDEX, result);
} }
@Test @Test
void indexOfWithPredicate_EmptyArray_ReturnsNotFoundIndex() { void indexOf_EmptyArray_ReturnsNotFoundIndex() {
Predicate<String> predicate = s -> s.equals("test"); Predicate<String> predicate = s -> s.equals("test");
int result = ArrayTools.indexOfWithPredicate(new String[] {}, predicate); int result = ArrayTools.indexOf(new String[] {}, predicate);
assertEquals(ArrayTools.NOT_FOUND_INDEX, result); assertEquals(ArrayTools.NOT_FOUND_INDEX, result);
} }
@Test @Test
void indexOfWithPredicate_ArrayContainsMatchingElement_ReturnsIndex() { void indexOf_ArrayContainsMatchingElement_ReturnsIndex() {
String[] array = { "apple", "banana", "cherry" }; String[] array = { "apple", "banana", "cherry" };
Predicate<String> predicate = s -> s.equals("banana"); Predicate<String> predicate = s -> s.equals("banana");
int result = ArrayTools.indexOfWithPredicate(array, predicate); int result = ArrayTools.indexOf(array, predicate);
assertEquals(1, result); assertEquals(1, result);
} }
@Test @Test
void indexOfWithPredicate_ArrayDoesNotContainMatchingElement_ReturnsNotFoundIndex() { void indexOf_ArrayDoesNotContainMatchingElement_ReturnsNotFoundIndex() {
String[] array = { "apple", "banana", "cherry" }; String[] array = { "apple", "banana", "cherry" };
Predicate<String> predicate = s -> s.equals("orange"); Predicate<String> predicate = s -> s.equals("orange");
int result = ArrayTools.indexOfWithPredicate(array, predicate); int result = ArrayTools.indexOf(array, predicate);
assertEquals(ArrayTools.NOT_FOUND_INDEX, result); assertEquals(ArrayTools.NOT_FOUND_INDEX, result);
} }
@ -847,12 +847,12 @@ public class ArrayToolsTests {
@Test @Test
void indexOf_NullObject_ReturnsNotFound() { void indexOf_NullObject_ReturnsNotFound() {
assertEquals(ArrayTools.NOT_FOUND_INDEX, ArrayTools.indexOf(new String[] { "a", "b", "c" }, null)); assertEquals(ArrayTools.NOT_FOUND_INDEX, ArrayTools.indexOf(new String[] { "a", "b", "c" }, (String) null));
} }
@Test @Test
void indexOf_ArrayContainsNull_ReturnsIndex() { void indexOf_ArrayContainsNull_ReturnsIndex() {
assertEquals(1, ArrayTools.indexOf(new String[] { "a", null, "c" }, null)); assertEquals(1, ArrayTools.indexOf(new String[] { "a", null, "c" }, (String) null));
} }
// ================================ // ================================
@ -864,37 +864,37 @@ public class ArrayToolsTests {
// ================================ // ================================
@Test @Test
void lastIndexOfWithPredicate_NullPredicate_ThrowsNullPointerException() { void lastIndexOf_NullPredicate_ThrowsNullPointerException() {
assertThrows(NullPointerException.class, () -> ArrayTools.lastIndexOfWithPredicate(new String[] {}, null)); assertThrows(NullPointerException.class, () -> ArrayTools.lastIndexOf(new String[] {}, null));
} }
@Test @Test
void lastIndexOfWithPredicate_NullArray_ReturnsNotFoundIndex() { void lastIndexOf_NullArray_ReturnsNotFoundIndex() {
Predicate<String> predicate = s -> s.equals("test"); Predicate<String> predicate = s -> s.equals("test");
int result = ArrayTools.lastIndexOfWithPredicate(null, predicate); int result = ArrayTools.lastIndexOf(null, predicate);
assertEquals(ArrayTools.NOT_FOUND_INDEX, result); assertEquals(ArrayTools.NOT_FOUND_INDEX, result);
} }
@Test @Test
void lastIndexOfWithPredicate_EmptyArray_ReturnsNotFoundIndex() { void lastIndexOf_EmptyArray_ReturnsNotFoundIndex() {
Predicate<String> predicate = s -> s.equals("test"); Predicate<String> predicate = s -> s.equals("test");
int result = ArrayTools.lastIndexOfWithPredicate(new String[] {}, predicate); int result = ArrayTools.lastIndexOf(new String[] {}, predicate);
assertEquals(ArrayTools.NOT_FOUND_INDEX, result); assertEquals(ArrayTools.NOT_FOUND_INDEX, result);
} }
@Test @Test
void lastIndexOfWithPredicate_ArrayContainsMatchingElement_ReturnsIndex() { void lastIndexOf_ArrayContainsMatchingElement_ReturnsIndex() {
String[] array = { "apple", "banana", "banana", "cherry" }; String[] array = { "apple", "banana", "banana", "cherry" };
Predicate<String> predicate = s -> s.equals("banana"); Predicate<String> predicate = s -> s.equals("banana");
int result = ArrayTools.lastIndexOfWithPredicate(array, predicate); int result = ArrayTools.lastIndexOf(array, predicate);
assertEquals(2, result); assertEquals(2, result);
} }
@Test @Test
void lastIndexOfWithPredicate_ArrayDoesNotContainMatchingElement_ReturnsNotFoundIndex() { void lastIndexOf_ArrayDoesNotContainMatchingElement_ReturnsNotFoundIndex() {
String[] array = { "apple", "banana", "cherry" }; String[] array = { "apple", "banana", "cherry" };
Predicate<String> predicate = s -> s.equals("orange"); Predicate<String> predicate = s -> s.equals("orange");
int result = ArrayTools.lastIndexOfWithPredicate(array, predicate); int result = ArrayTools.lastIndexOf(array, predicate);
assertEquals(ArrayTools.NOT_FOUND_INDEX, result); assertEquals(ArrayTools.NOT_FOUND_INDEX, result);
} }
@ -982,12 +982,12 @@ public class ArrayToolsTests {
@Test @Test
void lastIndexOf_NullObject_ReturnsNotFound() { void lastIndexOf_NullObject_ReturnsNotFound() {
assertEquals(ArrayTools.NOT_FOUND_INDEX, ArrayTools.lastIndexOf(new String[] { "a", "b", "c" }, null)); assertEquals(ArrayTools.NOT_FOUND_INDEX, ArrayTools.lastIndexOf(new String[] { "a", "b", "c" }, (String) null));
} }
@Test @Test
void lastIndexOf_ArrayContainsNull_ReturnsIndex() { void lastIndexOf_ArrayContainsNull_ReturnsIndex() {
assertEquals(3, ArrayTools.lastIndexOf(new String[] { "a", null, "c", null, "e" }, null)); assertEquals(3, ArrayTools.lastIndexOf(new String[] { "a", null, "c", null, "e" }, (String) null));
} }
// ================================ // ================================