From 6f26613f309bad23c48dcda200f8476421d67161 Mon Sep 17 00:00:00 2001 From: ZhouXY108 Date: Wed, 2 Apr 2025 15:19:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor!:=20=E9=87=8D=E5=91=BD=E5=90=8D=20Arra?= =?UTF-8?q?yTools=20=E4=B8=AD=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `indexOfWithPredicate` 重命名为 `indexOf`， `lastIndexOfWithPredicate` 重命名为 `lastIndexOf`。 --- .../plusone/commons/util/ArrayTools.java | 10 ++-- .../plusone/commons/util/ArrayToolsTests.java | 48 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java b/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java index 98b4cec..f641c88 100644 --- a/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java +++ b/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java @@ -863,7 +863,7 @@ public class ArrayTools { // #region - indexOf - public static int indexOfWithPredicate(@Nullable T[] arr, Predicate predicate) { + public static int indexOf(@Nullable T[] arr, Predicate predicate) { AssertTools.checkNotNull(predicate); if (arr == null || arr.length == 0) { return NOT_FOUND_INDEX; @@ -877,7 +877,7 @@ public class ArrayTools { } public static 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) { @@ -968,7 +968,7 @@ public class ArrayTools { // #region - lastIndexOf - public static int lastIndexOfWithPredicate(@Nullable T[] arr, Predicate predicate) { + public static int lastIndexOf(@Nullable T[] arr, Predicate predicate) { // TODO [优化] rename AssertTools.checkNotNull(predicate); if (arr == null || arr.length == 0) { return NOT_FOUND_INDEX; @@ -982,7 +982,7 @@ public class ArrayTools { } public static 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) { @@ -1106,7 +1106,7 @@ public class ArrayTools { } 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 diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/ArrayToolsTests.java b/src/test/java/xyz/zhouxy/plusone/commons/util/ArrayToolsTests.java index 3521906..7bd5067 100644 --- a/src/test/java/xyz/zhouxy/plusone/commons/util/ArrayToolsTests.java +++ b/src/test/java/xyz/zhouxy/plusone/commons/util/ArrayToolsTests.java @@ -730,37 +730,37 @@ public class ArrayToolsTests { // ================================ @Test - void indexOfWithPredicate_NullPredicate_ThrowsNullPointerException() { - assertThrows(NullPointerException.class, () -> ArrayTools.indexOfWithPredicate(new String[] {}, null)); + void indexOf_NullPredicate_ThrowsNullPointerException() { + assertThrows(NullPointerException.class, () -> ArrayTools.indexOf(new String[] {}, null)); } @Test - void indexOfWithPredicate_NullArray_ReturnsNotFoundIndex() { + void indexOf_NullArray_ReturnsNotFoundIndex() { Predicate predicate = s -> s.equals("test"); - int result = ArrayTools.indexOfWithPredicate(null, predicate); + int result = ArrayTools.indexOf(null, predicate); assertEquals(ArrayTools.NOT_FOUND_INDEX, result); } @Test - void indexOfWithPredicate_EmptyArray_ReturnsNotFoundIndex() { + void indexOf_EmptyArray_ReturnsNotFoundIndex() { Predicate 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); } @Test - void indexOfWithPredicate_ArrayContainsMatchingElement_ReturnsIndex() { + void indexOf_ArrayContainsMatchingElement_ReturnsIndex() { String[] array = { "apple", "banana", "cherry" }; Predicate predicate = s -> s.equals("banana"); - int result = ArrayTools.indexOfWithPredicate(array, predicate); + int result = ArrayTools.indexOf(array, predicate); assertEquals(1, result); } @Test - void indexOfWithPredicate_ArrayDoesNotContainMatchingElement_ReturnsNotFoundIndex() { + void indexOf_ArrayDoesNotContainMatchingElement_ReturnsNotFoundIndex() { String[] array = { "apple", "banana", "cherry" }; Predicate predicate = s -> s.equals("orange"); - int result = ArrayTools.indexOfWithPredicate(array, predicate); + int result = ArrayTools.indexOf(array, predicate); assertEquals(ArrayTools.NOT_FOUND_INDEX, result); } @@ -847,12 +847,12 @@ public class ArrayToolsTests { @Test 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 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 - void lastIndexOfWithPredicate_NullPredicate_ThrowsNullPointerException() { - assertThrows(NullPointerException.class, () -> ArrayTools.lastIndexOfWithPredicate(new String[] {}, null)); + void lastIndexOf_NullPredicate_ThrowsNullPointerException() { + assertThrows(NullPointerException.class, () -> ArrayTools.lastIndexOf(new String[] {}, null)); } @Test - void lastIndexOfWithPredicate_NullArray_ReturnsNotFoundIndex() { + void lastIndexOf_NullArray_ReturnsNotFoundIndex() { Predicate predicate = s -> s.equals("test"); - int result = ArrayTools.lastIndexOfWithPredicate(null, predicate); + int result = ArrayTools.lastIndexOf(null, predicate); assertEquals(ArrayTools.NOT_FOUND_INDEX, result); } @Test - void lastIndexOfWithPredicate_EmptyArray_ReturnsNotFoundIndex() { + void lastIndexOf_EmptyArray_ReturnsNotFoundIndex() { Predicate 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); } @Test - void lastIndexOfWithPredicate_ArrayContainsMatchingElement_ReturnsIndex() { + void lastIndexOf_ArrayContainsMatchingElement_ReturnsIndex() { String[] array = { "apple", "banana", "banana", "cherry" }; Predicate predicate = s -> s.equals("banana"); - int result = ArrayTools.lastIndexOfWithPredicate(array, predicate); + int result = ArrayTools.lastIndexOf(array, predicate); assertEquals(2, result); } @Test - void lastIndexOfWithPredicate_ArrayDoesNotContainMatchingElement_ReturnsNotFoundIndex() { + void lastIndexOf_ArrayDoesNotContainMatchingElement_ReturnsNotFoundIndex() { String[] array = { "apple", "banana", "cherry" }; Predicate predicate = s -> s.equals("orange"); - int result = ArrayTools.lastIndexOfWithPredicate(array, predicate); + int result = ArrayTools.lastIndexOf(array, predicate); assertEquals(ArrayTools.NOT_FOUND_INDEX, result); } @@ -982,12 +982,12 @@ public class ArrayToolsTests { @Test 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 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)); } // ================================