From f8a2046d2d0ce8fb93d5076ad58fce2992704b68 Mon Sep 17 00:00:00 2001 From: ZhouXY108 Date: Wed, 4 Jun 2025 17:12:29 +0800 Subject: [PATCH] =?UTF-8?q?refactor!:=20=E5=B0=86=20`RegexTools`=20?= =?UTF-8?q?=E7=9A=84=20`matchesOne`=20=E6=96=B9=E6=B3=95=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E4=B8=BA=20`matchesAny`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyz/zhouxy/plusone/commons/util/RegexTools.java | 6 +++--- .../zhouxy/plusone/commons/util/RegexToolsTests.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java index 9890803..3f5b51d 100644 --- a/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java +++ b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java @@ -126,9 +126,9 @@ public final class RegexTools { * @param patterns 正则 * @return 判断结果 */ - public static boolean matchesOne(@Nullable final CharSequence input, final Pattern[] patterns) { + public static boolean matchesAny(@Nullable final CharSequence input, final Pattern[] patterns) { AssertTools.checkArgument(ArrayTools.isAllElementsNotNull(patterns)); - return matchesOneInternal(input, patterns); + return matchesAnyInternal(input, patterns); } /** @@ -319,7 +319,7 @@ public final class RegexTools { * @param patterns 正则表达式 * @return 判断结果 */ - private static boolean matchesOneInternal(@Nullable final CharSequence input, final Pattern[] patterns) { + private static boolean matchesAnyInternal(@Nullable final CharSequence input, final Pattern[] patterns) { return input != null && Arrays.stream(patterns) .anyMatch(pattern -> pattern.matcher(input).matches()); diff --git a/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/RegexToolsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/RegexToolsTests.java index db969cb..922cbab 100644 --- a/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/RegexToolsTests.java +++ b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/RegexToolsTests.java @@ -111,24 +111,24 @@ class RegexToolsTests { } @Test - void matchesOne_InputMatchesOnePattern_ReturnsTrue() { + void matchesAny_InputMatchesAnyPattern_ReturnsTrue() { String[] patterns = {"abc", "def"}; Pattern[] compiledPatterns = new Pattern[patterns.length]; for (int i = 0; i < patterns.length; i++) { compiledPatterns[i] = Pattern.compile(patterns[i]); } - assertTrue(RegexTools.matchesOne("abc", compiledPatterns), "Input should match one pattern"); + assertTrue(RegexTools.matchesAny("abc", compiledPatterns), "Input should match one pattern"); } @Test - void matchesOne_InputDoesNotMatchAnyPattern_ReturnsFalse() { + void matchesAny_InputDoesNotMatchAnyPattern_ReturnsFalse() { String[] patterns = {"abc", "def"}; Pattern[] compiledPatterns = new Pattern[patterns.length]; for (int i = 0; i < patterns.length; i++) { compiledPatterns[i] = Pattern.compile(patterns[i]); } - assertFalse(RegexTools.matchesOne("xyz", compiledPatterns), "Input should not match any pattern"); - assertFalse(RegexTools.matchesOne(null, compiledPatterns), "Input should not match any pattern"); + assertFalse(RegexTools.matchesAny("xyz", compiledPatterns), "Input should not match any pattern"); + assertFalse(RegexTools.matchesAny(null, compiledPatterns), "Input should not match any pattern"); } @Test