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

refactor!: 将 RegexTools 的 matchesOne 方法重命名为 matchesAny

Browse Source
This commit is contained in:
zhouxy108 2025-06-04 17:12:29 +08:00
parent fb2036c038
commit f8a2046d2d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java
View File

@ -126,9 +126,9 @@ public final class RegexTools {
* @param patterns 正则 * @param patterns 正则
* @return 判断结果 * @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)); AssertTools.checkArgument(ArrayTools.isAllElementsNotNull(patterns));
return matchesOneInternal(input, patterns); return matchesAnyInternal(input, patterns);
} }
/** /**
@ -319,7 +319,7 @@ public final class RegexTools {
* @param patterns 正则表达式 * @param patterns 正则表达式
* @return 判断结果 * @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 return input != null
&& Arrays.stream(patterns) && Arrays.stream(patterns)
.anyMatch(pattern -> pattern.matcher(input).matches()); .anyMatch(pattern -> pattern.matcher(input).matches());

10
plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/RegexToolsTests.java
View File

@ -111,24 +111,24 @@ class RegexToolsTests {
} }
@Test @Test
void matchesOne_InputMatchesOnePattern_ReturnsTrue() { void matchesAny_InputMatchesAnyPattern_ReturnsTrue() {
String[] patterns = {"abc", "def"}; String[] patterns = {"abc", "def"};
Pattern[] compiledPatterns = new Pattern[patterns.length]; Pattern[] compiledPatterns = new Pattern[patterns.length];
for (int i = 0; i < patterns.length; i++) { for (int i = 0; i < patterns.length; i++) {
compiledPatterns[i] = Pattern.compile(patterns[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 @Test
void matchesOne_InputDoesNotMatchAnyPattern_ReturnsFalse() { void matchesAny_InputDoesNotMatchAnyPattern_ReturnsFalse() {
String[] patterns = {"abc", "def"}; String[] patterns = {"abc", "def"};
Pattern[] compiledPatterns = new Pattern[patterns.length]; Pattern[] compiledPatterns = new Pattern[patterns.length];
for (int i = 0; i < patterns.length; i++) { for (int i = 0; i < patterns.length; i++) {
compiledPatterns[i] = Pattern.compile(patterns[i]); compiledPatterns[i] = Pattern.compile(patterns[i]);
} }
assertFalse(RegexTools.matchesOne("xyz", compiledPatterns), "Input should not match any pattern"); assertFalse(RegexTools.matchesAny("xyz", compiledPatterns), "Input should not match any pattern");
assertFalse(RegexTools.matchesOne(null, compiledPatterns), "Input should not match any pattern"); assertFalse(RegexTools.matchesAny(null, compiledPatterns), "Input should not match any pattern");
} }
@Test @Test