@@ -68,20 +66,20 @@ public final class RandomTools {
* @param length 字符串长度
* @return 随机字符串
*/
- public static String randomStr(@Nonnull Random random, @Nonnull char[] sourceCharacters, int length) {
+ public static String randomStr(Random random, char[] sourceCharacters, int length) {
AssertTools.checkArgument(Objects.nonNull(random), "Random cannot be null.");
AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
return randomStrInternal(random, sourceCharacters, length);
}
- public static String randomStr(@Nonnull char[] sourceCharacters, int length) {
+ public static String randomStr(char[] sourceCharacters, int length) {
AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
return randomStrInternal(ThreadLocalRandom.current(), sourceCharacters, length);
}
- public static String secureRandomStr(@Nonnull char[] sourceCharacters, int length) {
+ public static String secureRandomStr(char[] sourceCharacters, int length) {
AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
return randomStrInternal(DEFAULT_SECURE_RANDOM, sourceCharacters, length);
@@ -97,20 +95,20 @@ public final class RandomTools {
* @param length 字符串长度
* @return 随机字符串
*/
- public static String randomStr(@Nonnull Random random, @Nonnull String sourceCharacters, int length) {
+ public static String randomStr(Random random, String sourceCharacters, int length) {
AssertTools.checkArgument(Objects.nonNull(random), "Random cannot be null.");
AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
return randomStrInternal(random, sourceCharacters, length);
}
- public static String randomStr(@Nonnull String sourceCharacters, int length) {
+ public static String randomStr(String sourceCharacters, int length) {
AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
return randomStrInternal(ThreadLocalRandom.current(), sourceCharacters, length);
}
- public static String secureRandomStr(@Nonnull String sourceCharacters, int length) {
+ public static String secureRandomStr(String sourceCharacters, int length) {
AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
return randomStrInternal(DEFAULT_SECURE_RANDOM, sourceCharacters, length);
@@ -126,7 +124,7 @@ public final class RandomTools {
* @param length 字符串长度
* @return 随机字符串
*/
- private static String randomStrInternal(@Nonnull Random random, @Nonnull char[] sourceCharacters, int length) {
+ private static String randomStrInternal(Random random, char[] sourceCharacters, int length) {
if (length == 0) {
return StringTools.EMPTY_STRING;
}
@@ -147,7 +145,7 @@ public final class RandomTools {
* @param length 字符串长度
* @return 随机字符串
*/
- private static String randomStrInternal(@Nonnull Random random, @Nonnull String sourceCharacters, int length) {
+ private static String randomStrInternal(Random random, String sourceCharacters, int length) {
if (length == 0) {
return StringTools.EMPTY_STRING;
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java b/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java
index 53551f8..564c875 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java
@@ -272,7 +272,7 @@ public final class RegexTools {
* @return {@link Pattern} 实例
*/
@Nonnull
- private static Pattern cacheAndGetPatternInternal(@Nonnull final String pattern) {
+ private static Pattern cacheAndGetPatternInternal(final String pattern) {
if (PATTERN_CACHE.size() < MAX_CACHE_SIZE) {
return PATTERN_CACHE.computeIfAbsent(pattern, Pattern::compile);
}
@@ -290,7 +290,7 @@ public final class RegexTools {
* @return {@link Pattern} 实例
*/
@Nonnull
- private static Pattern getPatternInternal(@Nonnull final String pattern) {
+ private static Pattern getPatternInternal(final String pattern) {
Pattern result = PATTERN_CACHE.get(pattern);
if (result == null) {
result = Pattern.compile(pattern);
@@ -305,7 +305,7 @@ public final class RegexTools {
* @return {@link Pattern} 实例数组
*/
@Nonnull
- private static Pattern[] cacheAndGetPatternsInternal(@Nonnull final String[] patterns) {
+ private static Pattern[] cacheAndGetPatternsInternal(final String[] patterns) {
return Arrays.stream(patterns)
.map(RegexTools::cacheAndGetPatternInternal)
.toArray(Pattern[]::new);
@@ -318,7 +318,7 @@ public final class RegexTools {
* @return {@link Pattern} 实例数组
*/
@Nonnull
- private static Pattern[] getPatternsInternal(@Nonnull final String[] patterns) {
+ private static Pattern[] getPatternsInternal(final String[] patterns) {
return Arrays.stream(patterns)
.map(RegexTools::getPatternInternal)
.toArray(Pattern[]::new);
@@ -331,17 +331,17 @@ public final class RegexTools {
* @param pattern 正则
* @return 判断结果
*/
- private static boolean matchesInternal(@Nullable final CharSequence input, @Nonnull final Pattern pattern) {
+ private static boolean matchesInternal(@Nullable final CharSequence input, final Pattern pattern) {
return input != null && pattern.matcher(input).matches();
}
- private static boolean matchesOneInternal(@Nullable final CharSequence input, @Nonnull final Pattern[] patterns) {
+ private static boolean matchesOneInternal(@Nullable final CharSequence input, final Pattern[] patterns) {
return input != null
&& Arrays.stream(patterns)
.anyMatch(pattern -> pattern.matcher(input).matches());
}
- private static boolean matchesAllInternal(@Nullable final CharSequence input, @Nonnull final Pattern[] patterns) {
+ private static boolean matchesAllInternal(@Nullable final CharSequence input, final Pattern[] patterns) {
return input != null
&& Arrays.stream(patterns)
.allMatch(pattern -> pattern.matcher(input).matches());
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/StringTools.java b/src/main/java/xyz/zhouxy/plusone/commons/util/StringTools.java
index 5dd5659..1a3f189 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/StringTools.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/StringTools.java
@@ -18,14 +18,13 @@ package xyz.zhouxy.plusone.commons.util;
import java.util.Objects;
-import com.google.common.annotations.Beta;
+import javax.annotation.Nullable;
-@Beta
public class StringTools {
public static final String EMPTY_STRING = "";
- public static boolean isNotBlank(final String cs) {
+ public static boolean isNotBlank(@Nullable final String cs) {
if (cs == null || cs.isEmpty()) {
return false;
}
@@ -41,7 +40,7 @@ public class StringTools {
return repeat(str, times, Integer.MAX_VALUE);
}
- public static String repeat(String str, int times, int maxLength) {
+ public static String repeat(final String str, int times, int maxLength) {
AssertTools.checkArgument(Objects.nonNull(str));
return String.valueOf(ArrayTools.repeat(str.toCharArray(), times, maxLength));
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java b/src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java
index 824d645..b6e28b0 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java
@@ -45,7 +45,7 @@ public class TreeBuilder