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

调整代码。

dev
ZhouXY108 2024-04-16 21:05:07 +08:00
parent b9d4901b67
commit 22687605b2
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,7 +291,6 @@ public final class RegexTools {
* @param cachePattern 是否缓存 {@link Pattern} 实例 * @param cachePattern 是否缓存 {@link Pattern} 实例
* @return {@link Pattern} 实例 * @return {@link Pattern} 实例
*/ */
@SuppressWarnings("null")
@Nonnull @Nonnull
private static Pattern getAndCachePatternInternal(@Nonnull final String pattern) { private static Pattern getAndCachePatternInternal(@Nonnull final String pattern) {
if (PATTERN_CACHE.size() < MAX_CACHE_SIZE) { if (PATTERN_CACHE.size() < MAX_CACHE_SIZE) {
@ -310,7 +309,6 @@ public final class RegexTools {
* @param pattern 正则表达式 * @param pattern 正则表达式
* @return {@link Pattern} 实例 * @return {@link Pattern} 实例
*/ */
@SuppressWarnings("null")
@Nonnull @Nonnull
private static Pattern getPatternInternal(@Nonnull final String pattern) { private static Pattern getPatternInternal(@Nonnull final String pattern) {
Pattern result = PATTERN_CACHE.get(pattern); Pattern result = PATTERN_CACHE.get(pattern);
@ -326,7 +324,6 @@ public final class RegexTools {
* @param patterns 正则表达式 * @param patterns 正则表达式
* @return {@link Pattern} 实例数组 * @return {@link Pattern} 实例数组
*/ */
@SuppressWarnings("null")
@Nonnull @Nonnull
private static Pattern[] getAndCachePatternsInternal(@Nonnull final String[] patterns) { private static Pattern[] getAndCachePatternsInternal(@Nonnull final String[] patterns) {
return Arrays.stream(patterns) return Arrays.stream(patterns)
@ -340,7 +337,6 @@ public final class RegexTools {
* @param patterns 正则表达式 * @param patterns 正则表达式
* @return {@link Pattern} 实例数组 * @return {@link Pattern} 实例数组
*/ */
@SuppressWarnings("null")
@Nonnull @Nonnull
private static Pattern[] getPatternsInternal(@Nonnull final String[] patterns) { private static Pattern[] getPatternsInternal(@Nonnull final String[] patterns) {
return Arrays.stream(patterns) return Arrays.stream(patterns)
@ -359,26 +355,24 @@ public final class RegexTools {
return input != null && pattern.matcher(input).matches(); return input != null && pattern.matcher(input).matches();
} }
@SuppressWarnings("null")
private static boolean matchesOneInternal(@Nullable final CharSequence input, @Nonnull final Pattern[] patterns) { private static boolean matchesOneInternal(@Nullable final CharSequence input, @Nonnull final Pattern[] patterns) {
if (input == null) { if (input == null) {
return false; return false;
} }
for (Pattern pattern : patterns) { for (Pattern pattern : patterns) {
if (matchesInternal(input, pattern)) { if (matchesInternal(input, Objects.requireNonNull(pattern))) {
return true; return true;
} }
} }
return false; return false;
} }
@SuppressWarnings("null") private static boolean matchesAllInternal(@Nullable final CharSequence input, @Nonnull final Pattern[] patterns) {
private static boolean matchesAllInternal(final CharSequence input, final Pattern[] patterns) {
if (input == null) { if (input == null) {
return false; return false;
} }
for (Pattern pattern : patterns) { for (Pattern pattern : patterns) {
if (!matchesInternal(input, pattern)) { if (!matchesInternal(input, Objects.requireNonNull(pattern))) {
return false; return false;
} }
} }