diff --git a/README.md b/README.md index 8921e04d66..55cbfbb78b 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -97,7 +97,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件,它基于Java17
toString
+ * @param object the value to add to the toString
* @return this
*/
- public ToStringBuilder append(final String fieldName, final Object obj) {
- style.append(buffer, fieldName, obj, null);
+ public ToStringBuilder append(final String fieldName, final Object object) {
+ style.append(buffer, fieldName, object, null);
return this;
}
@@ -780,13 +780,13 @@ public ToStringBuilder append(final String fieldName, final Object obj) {
* value.
*
* @param fieldName the field name
- * @param obj the value to add to the toString
+ * @param object the value to add to the toString
* @param fullDetail true
for detail,
* false
for summary info
* @return this
*/
- public ToStringBuilder append(final String fieldName, final Object obj, final boolean fullDetail) {
- style.append(buffer, fieldName, obj, Boolean.valueOf(fullDetail));
+ public ToStringBuilder append(final String fieldName, final Object object, final boolean fullDetail) {
+ style.append(buffer, fieldName, object, Boolean.valueOf(fullDetail));
return this;
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java b/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java
index d8aa6d54d2..e4818e0d9f 100644
--- a/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java
@@ -45,6 +45,7 @@ public class BCD {
* @return BCD
*/
public static byte[] strToBcd(String asc) {
+ Assert.notNull(asc, "ASCII must not be null!");
int len = asc.length();
int mod = len % 2;
if (mod != 0) {
@@ -115,7 +116,7 @@ public static byte[] ascToBcd(byte[] ascii, int ascLength) {
* @param bytes BCD byte数组
* @return ASCII字符串
*/
- public static String bcdToStr(byte[] bytes) {
+ public static String bcdToString(byte[] bytes) {
Assert.notNull(bytes, "Bcd bytes must be not null!");
char[] temp = new char[bytes.length * 2];
char val;
diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java
index c3b58e3ea3..e1fcf9b761 100644
--- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java
@@ -118,8 +118,8 @@ public static byte[] decode(String base32) {
* @param source 被解码的base32字符串
* @return 被加密后的字符串
*/
- public static String decodeStr(String source) {
- return decodeStr(source, org.aoju.bus.core.lang.Charset.UTF_8);
+ public static String decodeString(String source) {
+ return decodeString(source, org.aoju.bus.core.lang.Charset.UTF_8);
}
/**
@@ -129,7 +129,7 @@ public static String decodeStr(String source) {
* @param charset 字符集
* @return 被加密后的字符串
*/
- public static String decodeStr(String source, java.nio.charset.Charset charset) {
+ public static String decodeString(String source, java.nio.charset.Charset charset) {
return StringKit.toString(decode(source), charset);
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base58.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base58.java
index c51274506e..5ebb00cd4f 100644
--- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base58.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base58.java
@@ -34,7 +34,6 @@
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
-
/**
* Base58工具类,提供Base58的编码和解码方案
* 参考: https://github.com/Anujraval24/Base58Encoding
diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base62.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base62.java
index 46e5106a7d..c21c2e3b0f 100644
--- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base62.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base62.java
@@ -145,8 +145,6 @@ public static String encodeInverted(File file) {
return encodeInverted(FileKit.readBytes(file));
}
- // -------------------------------------------------------------------- decode
-
/**
* Base62解码
*
@@ -154,7 +152,7 @@ public static String encodeInverted(File file) {
* @return 被加密后的字符串
*/
public static String decodeStrGbk(CharSequence source) {
- return decodeStr(source, org.aoju.bus.core.lang.Charset.GBK);
+ return decodeString(source, org.aoju.bus.core.lang.Charset.GBK);
}
/**
@@ -163,8 +161,8 @@ public static String decodeStrGbk(CharSequence source) {
* @param source 被解码的Base62字符串
* @return 被加密后的字符串
*/
- public static String decodeStr(CharSequence source) {
- return decodeStr(source, org.aoju.bus.core.lang.Charset.UTF_8);
+ public static String decodeString(CharSequence source) {
+ return decodeString(source, org.aoju.bus.core.lang.Charset.UTF_8);
}
/**
@@ -174,7 +172,7 @@ public static String decodeStr(CharSequence source) {
* @param charset 字符集
* @return 被加密后的字符串
*/
- public static String decodeStr(CharSequence source, Charset charset) {
+ public static String decodeString(CharSequence source, Charset charset) {
return StringKit.toString(decode(source), charset);
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java
index 8264155d4a..db5b3043a8 100644
--- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java
@@ -205,7 +205,7 @@ public static String encodeUrlSafe(File file) {
* @param isUrlSafe 是否使用URL安全字符,一般为{@code false}
* @return 编码后的bytes
*/
- public static String encodeStr(byte[] arr, boolean isMultiLine, boolean isUrlSafe) {
+ public static String encodeString(byte[] arr, boolean isMultiLine, boolean isUrlSafe) {
return StringKit.toString(encode(arr, isMultiLine, isUrlSafe), org.aoju.bus.core.lang.Charset.UTF_8);
}
@@ -333,8 +333,8 @@ public static String decodeStrGbk(CharSequence source) {
* @param source 被解码的base64字符串
* @return 解码后的字符串
*/
- public static String decodeStr(CharSequence source) {
- return decodeStr(source, Charset.UTF_8);
+ public static String decodeString(CharSequence source) {
+ return decodeString(source, Charset.UTF_8);
}
/**
@@ -344,8 +344,8 @@ public static String decodeStr(CharSequence source) {
* @param charset 字符集
* @return 解码后的字符串
*/
- public static String decodeStr(CharSequence source, String charset) {
- return decodeStr(source, Charset.charset(charset));
+ public static String decodeString(CharSequence source, String charset) {
+ return decodeString(source, Charset.charset(charset));
}
/**
@@ -355,7 +355,7 @@ public static String decodeStr(CharSequence source, String charset) {
* @param charset 字符集
* @return 解码后的字符串
*/
- public static String decodeStr(CharSequence source, java.nio.charset.Charset charset) {
+ public static String decodeString(CharSequence source, java.nio.charset.Charset charset) {
return StringKit.toString(decode(source), charset);
}
@@ -507,6 +507,9 @@ public static boolean isBase64(CharSequence base64) {
* @return 是否为Base64
*/
public static boolean isBase64(byte[] base64Bytes) {
+ if (base64Bytes == null || base64Bytes.length < 3) {
+ return false;
+ }
boolean hasPadding = false;
for (byte base64Byte : base64Bytes) {
if (hasPadding) {
diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java
index 8cdf9f9ba1..5b28c89413 100644
--- a/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java
@@ -25,6 +25,7 @@
********************************************************************************/
package org.aoju.bus.core.codec;
+import org.aoju.bus.core.lang.Assert;
import org.aoju.bus.core.lang.Normal;
/**
@@ -43,6 +44,7 @@ public class Caesar {
* @return 加密后的内容
*/
public static String encode(String message, int offset) {
+ Assert.notNull(message, "message must be not null!");
final int len = message.length();
final char[] plain = message.toCharArray();
char c;
@@ -64,6 +66,7 @@ public static String encode(String message, int offset) {
* @return 解密后的内容
*/
public static String decode(String cipher, int offset) {
+ Assert.notNull(cipher, "cipherText must be not null!");
final int len = cipher.length();
final char[] plain = cipher.toCharArray();
char c;
diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Percent.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Percent.java
index 35722e205d..85d7aa08b8 100644
--- a/bus-core/src/main/java/org/aoju/bus/core/codec/Percent.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Percent.java
@@ -25,6 +25,7 @@
********************************************************************************/
package org.aoju.bus.core.codec;
+import org.aoju.bus.core.lang.Assert;
import org.aoju.bus.core.lang.Normal;
import org.aoju.bus.core.lang.Symbol;
import org.aoju.bus.core.toolkit.HexKit;
@@ -96,6 +97,7 @@ public static Percent of(Percent codec) {
* @return this
*/
public static Percent of(CharSequence chars) {
+ Assert.notNull(chars, "chars must not be null");
final Percent codec = new Percent();
final int length = chars.length();
for (int i = 0; i < length; i++) {
diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/PunyCode.java b/bus-core/src/main/java/org/aoju/bus/core/codec/PunyCode.java
index 5ed02c5919..f259d8b275 100644
--- a/bus-core/src/main/java/org/aoju/bus/core/codec/PunyCode.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/codec/PunyCode.java
@@ -70,6 +70,7 @@ public static String encode(CharSequence input) throws InstrumentException {
* @throws InstrumentException 计算异常
*/
public static String encode(CharSequence input, boolean withPrefix) throws InstrumentException {
+ Assert.notNull(input, "input must not be null!");
int n = INITIAL_N;
int delta = 0;
int bias = INITIAL_BIAS;
@@ -152,6 +153,7 @@ public static String encode(CharSequence input, boolean withPrefix) throws Instr
* @throws InstrumentException 计算异常
*/
public static String decode(String input) throws InstrumentException {
+ Assert.notNull(input, "input must not be null!");
input = StringKit.removePrefixIgnoreCase(input, PUNY_CODE_PREFIX);
int n = INITIAL_N;
diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java
index be6e4c4364..79c6a3decb 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java
@@ -46,22 +46,22 @@ public class IndexedCompare
* 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值(每一位均相同)时,结果才为 {@code true}
*
- * @param obj 要与之比较的对象
+ * @param object 要与之比较的对象
* @return 如果对象相同, 则返回 {@code true};否则返回 {@code false}
*/
- public boolean equals(Object obj) {
- if ((null == obj) || (obj.getClass() != UUID.class)) {
+ public boolean equals(Object object) {
+ if ((null == object) || (object.getClass() != UUID.class)) {
return false;
}
- UUID id = (UUID) obj;
+ UUID id = (UUID) object;
return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java
index a2ed0b059b..17a3b27ad9 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java
@@ -789,15 +789,15 @@ public static
* 第一部分:登记管理部门代码1位 (数字或大写英文字母)
* 第二部分:机构类别代码1位 (数字或大写英文字母)
@@ -321,7 +321,6 @@ public class RegEx {
public static final String CREDIT_CODE_PATTERN = "^[0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}$";
public static final Pattern CREDIT_CODE = Pattern.compile(CREDIT_CODE_PATTERN);
-
/**
* 正则中需要被转义的关键字
*/
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/System.java b/bus-core/src/main/java/org/aoju/bus/core/lang/System.java
index d0305dd7aa..dbd815842e 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/System.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/System.java
@@ -26,6 +26,7 @@
package org.aoju.bus.core.lang;
import org.aoju.bus.core.convert.Convert;
+import org.aoju.bus.core.toolkit.BooleanKit;
import org.aoju.bus.core.toolkit.StringKit;
import java.util.Properties;
@@ -317,12 +318,7 @@ public static boolean getBoolean(String key, boolean defaultValue) {
return defaultValue;
}
- value = value.trim().toLowerCase();
- if (value.isEmpty()) {
- return true;
- }
-
- return Convert.toBool(value, defaultValue);
+ return BooleanKit.toBoolean(value);
}
/**
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java
index 3676f09755..5573785e56 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java
@@ -29,7 +29,6 @@
import org.aoju.bus.core.toolkit.*;
import java.net.MalformedURLException;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
@@ -50,132 +49,6 @@ public static boolean isNull(Object value) {
return null == value;
}
- /**
- * 给定值是否不为{@code null}
- *
- * @param value 值
- * @return 是否不为
*
* @param null
- */
- public static boolean isNotNull(Object value) {
- return null != value;
- }
-
- /**
- * 验证是否为空
- * 对于String类型判定是否为empty(null 或 "")
- *
- * @param value 值
- * @return 是否为空
- */
- public static boolean isEmpty(Object value) {
- return (null == value || (value instanceof String && StringKit.isEmpty((String) value)));
- }
-
- /**
- * 验证是否为非空
- * 对于String类型判定是否为empty(null 或 "")
- *
- * @param value 值
- * @return 是否为空
- */
- public static boolean isNotEmpty(Object value) {
- return false == isEmpty(value);
- }
-
- /**
- * 给定值是否为{@code true}
- *
- * @param value 值
- * @return 是否为true
- */
- public static boolean isTrue(boolean value) {
- return value;
- }
-
- /**
- * 给定值是否不为{@code false}
- *
- * @param value 值
- * @return 是否不为false
- */
- public static boolean isFalse(boolean value) {
- return false == value;
- }
-
- /**
- * 验证是否为英文字母 、数字和下划线
- *
- * @param value 值
- * @return 是否为英文字母 、数字和下划线
- */
- public static boolean isGeneral(CharSequence value) {
- return isMatchRegex(RegEx.GENERAL, value);
- }
-
- /**
- * 验证是否为给定最小长度的英文字母 、数字和下划线
- *
- * @param value 值
- * @param min 最小长度,负数自动识别为0
- * @return 是否为给定最小长度的英文字母 、数字和下划线
- */
- public static boolean isGeneral(CharSequence value, int min) {
- return isGeneral(value, min, 0);
- }
-
- /**
- * 验证是否为给定长度范围的英文字母 、数字和下划线
- *
- * @param value 值
- * @param min 最小长度,负数自动识别为0
- * @param max 最大长度,0或负数表示不限制最大长度
- * @return 是否为给定长度范围的英文字母 、数字和下划线
- */
- public static boolean isGeneral(CharSequence value, int min, int max) {
- if (min < 0) {
- min = 0;
- }
- String reg = "^\\w{" + min + Symbol.COMMA + max + "}$";
- if (max <= 0) {
- reg = "^\\w{" + min + ",}$";
- }
- return isMatchRegex(reg, value);
- }
-
- /**
- * 通过正则表达式验证
- *
- * @param regex 正则
- * @param value 值
- * @return 是否匹配正则
- */
- public static boolean isMatchRegex(String regex, CharSequence value) {
- return PatternKit.isMatch(regex, value);
- }
-
- /**
- * 通过正则表达式验证
- *
- * @param pattern 正则模式
- * @param value 值
- * @return 是否匹配正则
- */
- public static boolean isMatchRegex(Pattern pattern, CharSequence value) {
- return PatternKit.isMatch(pattern, value);
- }
-
- /**
- * 验证是否相等
- * 当两值都为null返回true
- *
- * @param t1 对象1
- * @param t2 对象2
- * @return 当两值都为null或相等返回true
- */
- public static boolean equal(Object t1, Object t2) {
- return ObjectKit.equal(t1, t2);
- }
-
/**
* 检查指定值是否为{@code null}
*
@@ -193,6 +66,16 @@ public static null
+ */
+ public static boolean isNotNull(Object value) {
+ return null != value;
+ }
+
/**
* 检查指定值是否非{@code null}
*
@@ -210,6 +93,17 @@ public static true
+ */
+ public static boolean isTrue(boolean value) {
+ return value;
+ }
+
/**
* 检查指定值是否为{@code true}
*
@@ -260,6 +175,16 @@ public static boolean validateTrue(boolean value, String errorMsgTemplate, Objec
return true;
}
+ /**
+ * 给定值是否不为{@code false}
+ *
+ * @param value 值
+ * @return 是否不为false
+ */
+ public static boolean isFalse(boolean value) {
+ return false == value;
+ }
+
/**
* 检查指定值是否为{@code false}
*
@@ -276,6 +201,18 @@ public static boolean validateFalse(boolean value, String errorMsgTemplate, Obje
return false;
}
+ /**
+ * 验证是否相等
+ * 当两值都为null返回true
+ *
+ * @param t1 对象1
+ * @param t2 对象2
+ * @return 当两值都为null或相等返回true
+ */
+ public static boolean equal(Object t1, Object t2) {
+ return ObjectKit.equal(t1, t2);
+ }
+
/**
* 验证是否相等,不相等抛出异常
*
@@ -337,205 +274,268 @@ public static void validateNotEmptyAndNotEqual(Object t1, Object t2, String erro
}
/**
- * 通过正则表达式验证
- * 不符合正则抛出{@link ValidateException} 异常
+ * 判断字符串是否全部为大写字母
+ *
+ * @param value 值
+ * @return 是否全部为大写字母
+ */
+ public static boolean isUpperCase(CharSequence value) {
+ return StringKit.isAllCharMatch(value, Character::isUpperCase);
+ }
+
+ /**
+ * 验证字符串是否全部为大写字母
*
* @param
+ * 第一部分:登记管理部门代码1位 (数字或大写英文字母)
+ * 第二部分:机构类别代码1位 (数字或大写英文字母)
+ * 第三部分:登记管理机关行政区划码6位 (数字)
+ * 第四部分:主体标识码(组织机构代码)9位 (数字或大写英文字母)
+ * 第五部分:校验码1位 (数字或大写英文字母)
+ *
+ *
+ * @param value 统一社会信用代码
+ * @return 校验结果
+ */
+ public static boolean isCreditCode(CharSequence value) {
+ return LicenseKit.isCreditCode(value);
+ }
+
/**
* 是否是有效的统一社会信用代码
*
@@ -1070,11 +1075,15 @@ public static void validateBetween(Number value, Number min, Number max, String
* 第五部分:校验码1位 (数字或大写英文字母)
*
*
- * @param creditCode 统一社会信用代码
+ * @param value 统一社会信用代码
* @return 校验结果
+ * @throws ValidateException 验证异常
*/
- public static boolean isCreditCode(CharSequence creditCode) {
- return LicenseKit.isCreditCode(creditCode);
+ public static
- * 霍加阿卜杜拉·麦提喀斯木
- * 玛合萨提别克·哈斯木别克
- * 阿布都热依木江·艾斯卡尔
- * 阿卜杜尼亚孜·毛力尼亚孜
- *
- * 总结中文姓名:2-60位,只能是中文和·
- *
- * @param value 中文姓名
- * @return 是否是正确的中文姓名
- */
- public static boolean isChineseName(CharSequence value) {
- return isMatchRegex(RegEx.CHINESE_NAME_PATTERN, value);
- }
-
-
/**
* 验证是否为驾驶证 别名:驾驶证档案编号、行驶证编号
*
@@ -1179,4 +1168,36 @@ public static void validatePassword(String value, String errorMsg, boolean... we
}
}
+ /**
+ * 是否是中文姓名
+ * 维吾尔族姓名里面的点是·
+ * 正确维吾尔族姓名:
+ *
+ * 霍加阿卜杜拉·麦提喀斯木
+ * 玛合萨提别克·哈斯木别克
+ * 阿布都热依木江·艾斯卡尔
+ * 阿卜杜尼亚孜·毛力尼亚孜
+ *
+ * 总结中文姓名:2-60位,只能是中文和·
+ *
+ * @param value 中文姓名
+ * @return 是否是正确的中文姓名
+ */
+ public static boolean isChineseName(CharSequence value) {
+ return isMatchRegex(RegEx.CHINESE_NAME_PATTERN, value);
+ }
+
+ /**
+ * 验证是是否符合密码要求
+ *
+ * @param value 值
+ * @param errorMsg 验证错误的信息
+ * @throws ValidateException 验证异常
+ */
+ public static void validateisChineseName(String value, String errorMsg) throws ValidateException {
+ if (false == isChineseName(value)) {
+ throw new ValidateException(errorMsg);
+ }
+ }
+
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java
index 7b446d5789..a1fe804960 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java
@@ -67,7 +67,7 @@ public Weighing() {
*
* @param weightObj 带有权重的对象
*/
- public Weighing(WeightObj
*
*
- * @param obj 比对的对象
+ * @param object 比对的对象
* @return 相同返回true
,否则 false
*/
@Override
- public boolean equals(final Object obj) {
- if (obj instanceof MutableBool) {
- return value == ((MutableBool) obj).value;
+ public boolean equals(final Object object) {
+ if (object instanceof MutableBoolean) {
+ return value == ((MutableBoolean) object).value;
}
return false;
}
@@ -108,11 +108,11 @@ public int hashCode() {
/**
* 比较
*
- * @param other 其它 {@link MutableBool} 对象
+ * @param other 其它 {@link MutableBoolean} 对象
* @return x==y返回0,x<y返回-1,x>y返回1
*/
@Override
- public int compareTo(final MutableBool other) {
+ public int compareTo(final MutableBoolean other) {
return Boolean.compare(this.value, other.value);
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java
index ffb3bd9bc4..2ee23db3dd 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java
@@ -193,13 +193,13 @@ public double doubleValue() {
* true
,否则 false
*/
@Override
- public boolean equals(final Object obj) {
- if (obj instanceof MutableByte) {
- return value == ((MutableByte) obj).byteValue();
+ public boolean equals(final Object object) {
+ if (object instanceof MutableByte) {
+ return value == ((MutableByte) object).byteValue();
}
return false;
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java
index f98fc9688b..d2845c27c2 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java
@@ -187,13 +187,13 @@ public double doubleValue() {
* true
,否则 false
*/
@Override
- public boolean equals(final Object obj) {
- if (obj instanceof MutableDouble) {
- return (Double.doubleToLongBits(((MutableDouble) obj).value) == Double.doubleToLongBits(value));
+ public boolean equals(final Object object) {
+ if (object instanceof MutableDouble) {
+ return (Double.doubleToLongBits(((MutableDouble) object).value) == Double.doubleToLongBits(value));
}
return false;
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java
index d1121ea647..a7acb78a3a 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java
@@ -188,13 +188,13 @@ public double doubleValue() {
* true
,否则 false
*/
@Override
- public boolean equals(final Object obj) {
- if (obj instanceof MutableFloat) {
- return (Float.floatToIntBits(((MutableFloat) obj).value) == Float.floatToIntBits(value));
+ public boolean equals(final Object object) {
+ if (object instanceof MutableFloat) {
+ return (Float.floatToIntBits(((MutableFloat) object).value) == Float.floatToIntBits(value));
}
return false;
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java
index 92839fe208..f8906f63ce 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java
@@ -188,13 +188,13 @@ public double doubleValue() {
* true
,否则 false
*/
@Override
- public boolean equals(final Object obj) {
- if (obj instanceof MutableInt) {
- return value == ((MutableInt) obj).intValue();
+ public boolean equals(final Object object) {
+ if (object instanceof MutableInt) {
+ return value == ((MutableInt) object).intValue();
}
return false;
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java
index dfae0dcd8f..eb1b5b8ba5 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java
@@ -189,13 +189,13 @@ public double doubleValue() {
* true
,否则 false
*/
@Override
- public boolean equals(final Object obj) {
- if (obj instanceof MutableLong) {
- return value == ((MutableLong) obj).longValue();
+ public boolean equals(final Object object) {
+ if (object instanceof MutableLong) {
+ return value == ((MutableLong) object).longValue();
}
return false;
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java
index 72619005c2..d806e64f5d 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java
@@ -73,15 +73,15 @@ public void set(final T value) {
}
@Override
- public boolean equals(final Object obj) {
- if (null == obj) {
+ public boolean equals(final Object object) {
+ if (null == object) {
return false;
}
- if (this == obj) {
+ if (this == object) {
return true;
}
- if (this.getClass() == obj.getClass()) {
- final MutableObject> that = (MutableObject>) obj;
+ if (this.getClass() == object.getClass()) {
+ final MutableObject> that = (MutableObject>) object;
return this.value.equals(that.value);
}
return false;
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java
index 0079daf8e7..0ffd3c5474 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java
@@ -193,13 +193,13 @@ public double doubleValue() {
* true
,否则 false
*/
@Override
- public boolean equals(final Object obj) {
- if (obj instanceof MutableShort) {
- return value == ((MutableShort) obj).shortValue();
+ public boolean equals(final Object object) {
+ if (object instanceof MutableShort) {
+ return value == ((MutableShort) object).shortValue();
}
return false;
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/reflect/MethodHandle.java b/bus-core/src/main/java/org/aoju/bus/core/lang/reflect/MethodHandle.java
index ee89f08000..077bba52df 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/lang/reflect/MethodHandle.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/lang/reflect/MethodHandle.java
@@ -149,33 +149,33 @@ public static java.lang.invoke.MethodHandle findConstructor(Class> callerClass
*
* 比如:若存在 a -> b -> c 的关系,此时输入 b 将返回 c,输入 a 将返回 b
diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java b/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java
index e42db02bca..2a8e3a7458 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java
@@ -73,7 +73,7 @@ public static MapProxy create(Map, ?> map) {
return (map instanceof MapProxy) ? (MapProxy) map : new MapProxy(map);
}
- public Object getObj(Object key, Object defaultValue) {
+ public Object getObject(Object key, Object defaultValue) {
final Object value = map.get(key);
return null != value ? value : defaultValue;
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java b/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java
index f853aa2057..192e8eff92 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java
@@ -47,6 +47,8 @@
*/
public class MapWrappertoString
* 如果物体比长度大,右边的部分就会丢失
* 如果对象为空,则使用空文本值
*
- * @param obj 要追加的对象null使用空文本
+ * @param object 要追加的对象null使用空文本
* @param width 固定的字段宽度,零或负没有影响
* @param padChar 要使用的填充字符
* @return this
*/
- public TextBuilder appendFixedWidthPadRight(final Object obj, final int width, final char padChar) {
+ public TextBuilder appendFixedWidthPadRight(final Object object, final int width, final char padChar) {
if (width > 0) {
ensureCapacity(this.indexes + width);
- String text = null == obj ? getNullText() : obj.toString();
+ String text = null == object ? getNullText() : object.toString();
if (null == text) {
text = Normal.EMPTY;
}
@@ -1265,15 +1265,15 @@ public TextBuilder appendFixedWidthPadRight(final int value, final int width, fi
* 插入null将使用存储的空文本值
*
* @param index 要添加的索引必须有效
- * @param obj 要插入的对象
+ * @param object 要插入的对象
* @return this
* @throws IndexOutOfBoundsException 如果索引无效
*/
- public TextBuilder insert(final int index, final Object obj) {
- if (null == obj) {
+ public TextBuilder insert(final int index, final Object object) {
+ if (null == object) {
return insert(index, nullText);
}
- return insert(index, obj.toString());
+ return insert(index, object.toString());
}
/**
@@ -2262,12 +2262,12 @@ public String build() {
/**
* 检查此生成器的内容与另一个生成器的内容是否包含相同的字符内容.
*
- * @param obj 要检查的对象null返回false
+ * @param object 要检查的对象null返回false
* @return 如果生成器以相同的顺序包含相同的字符,则为真
*/
@Override
- public boolean equals(final Object obj) {
- return obj instanceof TextBuilder && equals((TextBuilder) obj);
+ public boolean equals(final Object object) {
+ return object instanceof TextBuilder && equals((TextBuilder) object);
}
@Override
diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/TextJoiner.java b/bus-core/src/main/java/org/aoju/bus/core/text/TextJoiner.java
index ee5223dc4b..b52d3abde0 100644
--- a/bus-core/src/main/java/org/aoju/bus/core/text/TextJoiner.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/text/TextJoiner.java
@@ -212,20 +212,20 @@ public TextJoiner setEmptyResult(String text) {
/**
* 追加对象到拼接器中
*
- * @param obj 对象,支持数组、集合等
+ * @param object 对象,支持数组、集合等
* @return this
*/
- public TextJoiner append(Object obj) {
- if (null == obj) {
+ public TextJoiner append(Object object) {
+ if (null == object) {
append((CharSequence) null);
- } else if (ArrayKit.isArray(obj)) {
- append(new ArrayIterator<>(obj));
- } else if (obj instanceof Iterator) {
- append((Iterator>) obj);
- } else if (obj instanceof Iterable) {
- append(((Iterable>) obj).iterator());
+ } else if (ArrayKit.isArray(object)) {
+ append(new ArrayIterator<>(object));
+ } else if (object instanceof Iterator) {
+ append((Iterator>) object);
+ } else if (object instanceof Iterable) {
+ append(((Iterable>) object).iterator());
} else {
- append(ObjectKit.toString(obj));
+ append(ObjectKit.toString(object));
}
return this;
}
diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java
index 2a2a0589b6..8a3a8a5fdf 100755
--- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java
+++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java
@@ -273,14 +273,14 @@ public Rangenull
,则返回true
*/
- public static boolean equals(CharSequence stra, CharSequence strb) {
- return equals(stra, strb, false);
+ public static boolean equals(CharSequence x, CharSequence y) {
+ return equals(x, y, false);
}
/**
* 比较两个字符串是否相等
*
- *
*
- * @param stra 要比较的字符串
- * @param strb 要比较的字符串
+ * @param x 要比较的字符串
+ * @param y 要比较的字符串
* @param ignoreCase 是否忽略大小写
* @return 如果两个字符串相同,或者都是null
,则返回true
*/
- public static boolean equals(CharSequence stra, CharSequence strb, boolean ignoreCase) {
- if (null == stra) {
+ public static boolean equals(CharSequence x, CharSequence y, boolean ignoreCase) {
+ if (null == x) {
// 只有两个都为null才判断相等
- return null == strb;
+ return null == y;
}
- if (null == strb) {
+ if (null == y) {
// 字符串2空,字符串1非空,直接false
return false;
}
if (ignoreCase) {
- return stra.toString().equalsIgnoreCase(strb.toString());
+ return x.toString().equalsIgnoreCase(y.toString());
} else {
- return stra.equals(strb);
+ return x.equals(y);
}
}
@@ -1917,54 +1917,54 @@ public static boolean equals(CharSequence stra, CharSequence strb, boolean ignor
* equalsIgnoreCase("abc", "ABC") = true
*
*
- * @param stra 要比较的字符串
- * @param strb 要比较的字符串
+ * @param x 要比较的字符串
+ * @param y 要比较的字符串
* @return 如果两个字符串相同,或者都是null
,则返回true
*/
- public static boolean equalsIgnoreCase(CharSequence stra, CharSequence strb) {
- return equals(stra, strb, true);
+ public static boolean equalsIgnoreCase(CharSequence x, CharSequence y) {
+ return equals(x, y, true);
}
/**
* 给定字符串是否与提供的中任一字符串相同(忽略大小写),相同则返回{@code true},没有相同的返回{@code false}
* 如果参与比对的字符串列表为空,返回{@code false}
*
- * @param stra 给定需要检查的字符串
- * @param strb 需要参与比对的字符串列表
+ * @param x 给定需要检查的字符串
+ * @param y 需要参与比对的字符串列表
* @return 是否相同
*/
- public static boolean equalsAnyIgnoreCase(CharSequence stra, CharSequence... strb) {
- return equalsAny(stra, true, strb);
+ public static boolean equalsAnyIgnoreCase(CharSequence x, CharSequence... y) {
+ return equalsAny(x, true, y);
}
/**
* 给定字符串是否与提供的中任一字符串相同,相同则返回{@code true},没有相同的返回{@code false}
* 如果参与比对的字符串列表为空,返回{@code false}
*
- * @param str1 给定需要检查的字符串
- * @param texts 需要参与比对的字符串列表
+ * @param text 给定需要检查的字符串
+ * @param args 需要参与比对的字符串列表
* @return 是否相同
*/
- public static boolean equalsAny(CharSequence str1, CharSequence... texts) {
- return equalsAny(str1, false, texts);
+ public static boolean equalsAny(CharSequence text, CharSequence... args) {
+ return equalsAny(text, false, args);
}
/**
* 给定字符串是否与提供的中任一字符串相同,相同则返回{@code true},没有相同的返回{@code false}
* 如果参与比对的字符串列表为空,返回{@code false}
*
- * @param str1 给定需要检查的字符串
+ * @param text 给定需要检查的字符串
* @param ignoreCase 是否忽略大小写
- * @param texts 需要参与比对的字符串列表
+ * @param args 需要参与比对的字符串列表
* @return 是否相同
*/
- public static boolean equalsAny(CharSequence str1, boolean ignoreCase, CharSequence... texts) {
- if (ArrayKit.isEmpty(texts)) {
+ public static boolean equalsAny(CharSequence text, boolean ignoreCase, CharSequence... args) {
+ if (ArrayKit.isEmpty(text)) {
return false;
}
- for (CharSequence text : texts) {
- if (equals(str1, text, ignoreCase)) {
+ for (CharSequence t : args) {
+ if (equals(text, t, ignoreCase)) {
return true;
}
}
@@ -1974,44 +1974,44 @@ public static boolean equalsAny(CharSequence str1, boolean ignoreCase, CharSeque
/**
* 指定范围内查找指定字符
*
- * @param text 字符串
- * @param searchChar 被查找的字符
+ * @param text 字符串
+ * @param word 被查找的字符
* @return 位置
*/
- public static int indexOf(final CharSequence text, char searchChar) {
- return indexOf(text, searchChar, 0);
+ public static int indexOf(final CharSequence text, char word) {
+ return indexOf(text, word, 0);
}
/**
* 指定范围内查找指定字符
*
- * @param text 字符串
- * @param searchChar 被查找的字符
- * @param start 起始位置,如果小于0,从0开始查找
+ * @param text 字符串
+ * @param word 被查找的字符
+ * @param start 起始位置,如果小于0,从0开始查找
* @return 位置
*/
- public static int indexOf(final CharSequence text, char searchChar, int start) {
+ public static int indexOf(final CharSequence text, char word, int start) {
if (text instanceof String) {
- return ((String) text).indexOf(searchChar, start);
+ return ((String) text).indexOf(word, start);
} else {
- return indexOf(text, searchChar, start, -1);
+ return indexOf(text, word, start, -1);
}
}
/**
* 指定范围内查找指定字符
*
- * @param text 字符串
- * @param searchChar 被查找的字符
- * @param start 起始位置,如果小于0,从0开始查找
- * @param end 终止位置,如果超过text.length()则默认查找到字符串末尾
+ * @param text 字符串
+ * @param word 被查找的字符
+ * @param start 起始位置,如果小于0,从0开始查找
+ * @param end 终止位置,如果超过text.length()则默认查找到字符串末尾
* @return 位置
*/
- public static int indexOf(final CharSequence text, char searchChar, int start, int end) {
+ public static int indexOf(final CharSequence text, char word, int start, int end) {
if (isEmpty(text)) {
return Normal.__1;
}
- return new CharFinder(searchChar).setText(text).setEndIndex(end).start(start);
+ return new CharFinder(word).setText(text).setEndIndex(end).start(start);
}
/**
@@ -2981,11 +2981,11 @@ public static String wrap(CharSequence text, CharSequence prefix, CharSequence s
* 包装多个字符串
*
* @param prefixAndSuffix 前缀和后缀
- * @param texts 多个字符串
+ * @param args 多个字符串
* @return 包装的字符串数组
*/
- public static String[] wrapAll(CharSequence prefixAndSuffix, CharSequence... texts) {
- return wrapAll(prefixAndSuffix, prefixAndSuffix, texts);
+ public static String[] wrapAll(CharSequence prefixAndSuffix, CharSequence... args) {
+ return wrapAll(prefixAndSuffix, prefixAndSuffix, args);
}
/**
@@ -2993,13 +2993,13 @@ public static String[] wrapAll(CharSequence prefixAndSuffix, CharSequence... tex
*
* @param prefix 前缀
* @param suffix 后缀
- * @param texts 多个字符串
+ * @param args 多个字符串
* @return 包装的字符串数组
*/
- public static String[] wrapAll(CharSequence prefix, CharSequence suffix, CharSequence... texts) {
- final String[] results = new String[texts.length];
- for (int i = 0; i < texts.length; i++) {
- results[i] = wrap(texts[i], prefix, suffix);
+ public static String[] wrapAll(CharSequence prefix, CharSequence suffix, CharSequence... args) {
+ final String[] results = new String[args.length];
+ for (int i = 0; i < args.length; i++) {
+ results[i] = wrap(args[i], prefix, suffix);
}
return results;
}
@@ -3121,28 +3121,28 @@ public static String wrapIfMissing(CharSequence text, CharSequence prefix, CharS
if (isNotEmpty(suffix)) {
len += suffix.length();
}
- StringBuilder sb = new StringBuilder(len);
+ StringBuilder stringBuilder = new StringBuilder(len);
if (isNotEmpty(prefix) && false == startWith(text, prefix)) {
- sb.append(prefix);
+ stringBuilder.append(prefix);
}
if (isNotEmpty(text)) {
- sb.append(text);
+ stringBuilder.append(text);
}
if (isNotEmpty(suffix) && false == endWith(text, suffix)) {
- sb.append(suffix);
+ stringBuilder.append(suffix);
}
- return sb.toString();
+ return stringBuilder.toString();
}
/**
* 包装多个字符串,如果已经包装,则不再包装
*
* @param prefixAndSuffix 前缀和后缀
- * @param texts 多个字符串
+ * @param args 多个字符串
* @return 包装的字符串数组
*/
- public static String[] wrapAllIfMissing(CharSequence prefixAndSuffix, CharSequence... texts) {
- return wrapAllIfMissing(prefixAndSuffix, prefixAndSuffix, texts);
+ public static String[] wrapAllIfMissing(CharSequence prefixAndSuffix, CharSequence... args) {
+ return wrapAllIfMissing(prefixAndSuffix, prefixAndSuffix, args);
}
/**
@@ -3150,13 +3150,13 @@ public static String[] wrapAllIfMissing(CharSequence prefixAndSuffix, CharSequen
*
* @param prefix 前缀
* @param suffix 后缀
- * @param texts 多个字符串
+ * @param args 多个字符串
* @return 包装的字符串数组
*/
- public static String[] wrapAllIfMissing(CharSequence prefix, CharSequence suffix, CharSequence... texts) {
- final String[] results = new String[texts.length];
- for (int i = 0; i < texts.length; i++) {
- results[i] = wrapIfMissing(texts[i], prefix, suffix);
+ public static String[] wrapAllIfMissing(CharSequence prefix, CharSequence suffix, CharSequence... args) {
+ final String[] results = new String[args.length];
+ for (int i = 0; i < args.length; i++) {
+ results[i] = wrapIfMissing(args[i], prefix, suffix);
}
return results;
}
@@ -3165,14 +3165,14 @@ public static String[] wrapAllIfMissing(CharSequence prefix, CharSequence suffix
* 字符串是否以给定字符开始
*
* @param text 字符串
- * @param c 字符
+ * @param word 字符
* @return 是否开始
*/
- public static boolean startWith(CharSequence text, char c) {
+ public static boolean startWith(CharSequence text, char word) {
if (true == isEmpty(text)) {
return false;
}
- return c == text.charAt(0);
+ return word == text.charAt(0);
}
/**
@@ -3241,16 +3241,16 @@ public static boolean startWithIgnoreEquals(CharSequence text, CharSequence pref
* 给定字符串是否以任何一个字符串开始
* 给定字符串和数组为空都返回false
*
- * @param text 给定字符串
- * @param prefixes 需要检测的开始字符串
+ * @param text 给定字符串
+ * @param args 需要检测的开始字符串
* @return 给定字符串是否以任何一个字符串开始
*/
- public static boolean startWithAny(CharSequence text, CharSequence... prefixes) {
- if (isEmpty(text) || ArrayKit.isEmpty(prefixes)) {
+ public static boolean startWithAny(CharSequence text, CharSequence... args) {
+ if (isEmpty(text) || ArrayKit.isEmpty(args)) {
return false;
}
- for (CharSequence suffix : prefixes) {
+ for (CharSequence suffix : args) {
if (startWith(text, suffix, false)) {
return true;
}
@@ -3263,16 +3263,16 @@ public static boolean startWithAny(CharSequence text, CharSequence... prefixes)
* 给定字符串是否以任何一个字符串结尾(忽略大小写)
* 给定字符串和数组为空都返回false
*
- * @param text 给定字符串
- * @param suffixes 需要检测的结尾字符串
+ * @param text 给定字符串
+ * @param args 需要检测的结尾字符串
* @return 给定字符串是否以任何一个字符串结尾
*/
- public static boolean startWithAnyIgnoreCase(final CharSequence text, final CharSequence... suffixes) {
- if (isEmpty(text) || ArrayKit.isEmpty(suffixes)) {
+ public static boolean startWithAnyIgnoreCase(final CharSequence text, final CharSequence... args) {
+ if (isEmpty(text) || ArrayKit.isEmpty(args)) {
return false;
}
- for (final CharSequence suffix : suffixes) {
+ for (final CharSequence suffix : args) {
if (startWith(text, suffix, true)) {
return true;
}
@@ -3362,16 +3362,16 @@ public static boolean endWith(CharSequence text, CharSequence suffix) {
* 给定字符串是否以任何一个字符串结尾
* 给定字符串和数组为空都返回false
*
- * @param text 给定字符串
- * @param suffixes 需要检测的结尾字符串
+ * @param text 给定字符串
+ * @param args 需要检测的结尾字符串
* @return 给定字符串是否以任何一个字符串结尾
*/
- public static boolean endWithAny(CharSequence text, CharSequence... suffixes) {
- if (isEmpty(text) || ArrayKit.isEmpty(suffixes)) {
+ public static boolean endWithAny(CharSequence text, CharSequence... args) {
+ if (isEmpty(text) || ArrayKit.isEmpty(args)) {
return false;
}
- for (CharSequence suffix : suffixes) {
+ for (CharSequence suffix : args) {
if (endWith(text, suffix, false)) {
return true;
}
@@ -3383,16 +3383,16 @@ public static boolean endWithAny(CharSequence text, CharSequence... suffixes) {
* 给定字符串是否以任何一个字符串结尾(忽略大小写)
* 给定字符串和数组为空都返回false
*
- * @param text 给定字符串
- * @param suffixes 需要检测的结尾字符串
+ * @param text 给定字符串
+ * @param args 需要检测的结尾字符串
* @return 给定字符串是否以任何一个字符串结尾
*/
- public static boolean endWithAnyIgnoreCase(CharSequence text, CharSequence... suffixes) {
- if (isEmpty(text) || ArrayKit.isEmpty(suffixes)) {
+ public static boolean endWithAnyIgnoreCase(CharSequence text, CharSequence... args) {
+ if (isEmpty(text) || ArrayKit.isEmpty(args)) {
return false;
}
- for (CharSequence suffix : suffixes) {
+ for (CharSequence suffix : args) {
if (endWith(text, suffix, true)) {
return true;
}
@@ -3437,14 +3437,14 @@ public static String strip(CharSequence text, CharSequence prefix, CharSequence
int from = 0;
int to = text.length();
- String str2 = text.toString();
- if (startWith(str2, prefix)) {
+ String value = text.toString();
+ if (startWith(value, prefix)) {
from = prefix.length();
}
- if (endWith(str2, suffix)) {
+ if (endWith(value, suffix)) {
to -= suffix.length();
}
- return str2.substring(from, to);
+ return value.substring(from, to);
}
/**
@@ -3473,14 +3473,14 @@ public static String stripIgnoreCase(CharSequence text, CharSequence prefix, Cha
int from = 0;
int to = text.length();
- String str2 = text.toString();
- if (startWithIgnoreCase(str2, prefix)) {
+ String value = text.toString();
+ if (startWithIgnoreCase(value, prefix)) {
from = prefix.length();
}
- if (endWithIgnoreCase(str2, suffix)) {
+ if (endWithIgnoreCase(value, suffix)) {
to -= suffix.length();
}
- return str2.substring(from, to);
+ return value.substring(from, to);
}
/**
@@ -3495,12 +3495,12 @@ public static String addPrefixIfNot(CharSequence text, CharSequence prefix) {
return toString(text);
}
- final String str2 = text.toString();
- final String prefix2 = prefix.toString();
- if (false == str2.startsWith(prefix2)) {
- return prefix2.concat(str2);
+ final String value = text.toString();
+ final String xSuffix = prefix.toString();
+ if (false == value.startsWith(xSuffix)) {
+ return xSuffix.concat(value);
}
- return str2;
+ return value;
}
/**
@@ -3515,23 +3515,23 @@ public static String addSuffixIfNot(CharSequence text, CharSequence suffix) {
return toString(text);
}
- final String str2 = text.toString();
- final String suffix2 = suffix.toString();
- if (false == str2.endsWith(suffix2)) {
- return str2.concat(suffix2);
+ final String value = text.toString();
+ final String xSuffix = suffix.toString();
+ if (false == value.endsWith(xSuffix)) {
+ return value.concat(xSuffix);
}
- return str2;
+ return value;
}
/**
* 指定字符是否在字符串中出现过
*
- * @param text 字符串
- * @param searchChar 被查找的字符
+ * @param text 字符串
+ * @param word 被查找的字符
* @return 是否包含
*/
- public static boolean contains(CharSequence text, char searchChar) {
- return indexOf(text, searchChar) > -1;
+ public static boolean contains(CharSequence text, char word) {
+ return indexOf(text, word) > -1;
}
/**
@@ -3597,6 +3597,25 @@ public static boolean containsOnly(CharSequence text, char... testChars) {
return true;
}
+ /**
+ * 检查指定字符串中是否含给定的所有字符串
+ *
+ * @param text 字符串
+ * @param args 检查的字符
+ * @return 字符串含有非检查的字符,返回false
+ */
+ public static boolean containsAll(CharSequence text, CharSequence... args) {
+ if (isBlank(text) || ArrayKit.isEmpty(args)) {
+ return false;
+ }
+ for (CharSequence value : args) {
+ if (false == contains(text, value)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
/**
* 给定字符串是否包含空白符(空白符包括空格、制表符、全角空格和不间断空格)
* 如果给定字符串为null或者"",则返回false
@@ -3624,15 +3643,15 @@ public static boolean containsBlank(CharSequence text) {
/**
* 查找指定字符串是否包含指定字符串列表中的任意一个字符串,如果包含返回找到的第一个字符串
*
- * @param text 指定字符串
- * @param testStrs 需要检查的字符串数组
+ * @param text 指定字符串
+ * @param args 需要检查的字符串数组
* @return 被包含的第一个字符串
*/
- public static String getContainsAny(CharSequence text, CharSequence... testStrs) {
- if (isEmpty(text) || ArrayKit.isEmpty(testStrs)) {
+ public static String getContainsAny(CharSequence text, CharSequence... args) {
+ if (isEmpty(text) || ArrayKit.isEmpty(args)) {
return null;
}
- for (CharSequence val : testStrs) {
+ for (CharSequence val : args) {
if (val.toString().contains(text)) {
return val.toString();
}
@@ -3643,45 +3662,45 @@ public static String getContainsAny(CharSequence text, CharSequence... testStrs)
/**
* 是否包含特定字符,忽略大小写,如果给定两个参数都为null
,返回true
*
- * @param text 被检测字符串
- * @param testStr 被测试是否包含的字符串
+ * @param text 被检测字符串
+ * @param word 被测试是否包含的字符串
* @return 是否包含
*/
- public static boolean containsIgnoreCase(CharSequence text, CharSequence testStr) {
+ public static boolean containsIgnoreCase(CharSequence text, CharSequence word) {
if (null == text) {
// 如果被监测字符串和
- return null == testStr;
+ return null == word;
}
- return indexOfIgnoreCase(text, testStr) > -1;
+ return indexOfIgnoreCase(text, word) > -1;
}
/**
* 查找指定字符串是否包含指定字符串列表中的任意一个字符串
* 忽略大小写
*
- * @param text 指定字符串
- * @param testStrs 需要检查的字符串数组
+ * @param text 指定字符串
+ * @param args 需要检查的字符串数组
* @return 是否包含任意一个字符串
*/
- public static boolean containsAnyIgnoreCase(CharSequence text, CharSequence... testStrs) {
- return null != getContainsStrIgnoreCase(text, testStrs);
+ public static boolean containsAnyIgnoreCase(CharSequence text, CharSequence... args) {
+ return null != getContainsStrIgnoreCase(text, args);
}
/**
* 查找指定字符串是否包含指定字符串列表中的任意一个字符串,如果包含返回找到的第一个字符串
* 忽略大小写
*
- * @param text 指定字符串
- * @param testStrs 需要检查的字符串数组
+ * @param text 指定字符串
+ * @param args 需要检查的字符串数组
* @return 被包含的第一个字符串
*/
- public static String getContainsStrIgnoreCase(CharSequence text, CharSequence... testStrs) {
- if (isEmpty(text) || ArrayKit.isEmpty(testStrs)) {
+ public static String getContainsStrIgnoreCase(CharSequence text, CharSequence... args) {
+ if (isEmpty(text) || ArrayKit.isEmpty(args)) {
return null;
}
- for (CharSequence testStr : testStrs) {
- if (containsIgnoreCase(text, testStr)) {
- return testStr.toString();
+ for (CharSequence value : args) {
+ if (containsIgnoreCase(text, value)) {
+ return value.toString();
}
}
return null;
@@ -3815,11 +3834,11 @@ public static String[] cut(CharSequence text, int partLength) {
* 将给定字符串,变成 "xxx...xxx" 形式的字符串
*
*
- *
*
* @param text 字符串
@@ -3856,21 +3875,23 @@ public static String brief(CharSequence text, int maxLength) {
/**
- * 如果字符串还没有以后缀结尾,则将后缀追加到字符串的末尾.
+ * 如果字符串还没有以后缀结尾,则将后缀追加到字符串的末尾
*
* @param text 字符串.
- * @param suffix 附加到字符串末尾的后缀.
- * @param ignoreCase 指示比较是否应忽略大小写.
- * @param suffixes 有效终止符的附加后缀(可选).
- * @return 如果添加了后缀,则为新字符串,否则为相同的字符串.
- */
- private static String appendIfMissing(final String text, final CharSequence suffix, final boolean ignoreCase,
- final CharSequence... suffixes) {
+ * @param suffix 附加到字符串末尾的后缀
+ * @param ignoreCase 指示比较是否应忽略大小写
+ * @param args 有效终止符的附加后缀(可选)
+ * @return 如果添加了后缀,则为新字符串,否则为相同的字符
+ */
+ private static String appendIfMissing(final String text,
+ final CharSequence suffix,
+ final boolean ignoreCase,
+ final CharSequence... args) {
if (null == text || isEmpty(suffix) || endWith(text, suffix, ignoreCase)) {
return toString(text);
}
- if (null != suffixes && suffixes.length > 0) {
- for (final CharSequence s : suffixes) {
+ if (null != args && args.length > 0) {
+ for (final CharSequence s : args) {
if (endWith(text, s, ignoreCase)) {
return text;
}
@@ -3881,7 +3902,7 @@ private static String appendIfMissing(final String text, final CharSequence suff
/**
- * 如果字符串还没有以任何后缀结尾,则将后缀追加到字符串的末尾.
+ * 如果字符串还没有以任何后缀结尾,则将后缀追加到字符串的末尾
*
*
* StringKit.appendIfMissing(null, null) = null
@@ -3905,14 +3926,15 @@ private static String appendIfMissing(final String text, final CharSequence suff
* StringKit.appendIfMissing("abcMNO", "xyz", "mno") = "abcMNOxyz"
*
*
- * @param text 字符串.
- * @param suffix 附加到字符串末尾的后缀.
- * @param suffixes 有效终止符的附加后缀(可选).
- * @return 如果添加了后缀,则为新字符串,否则为相同的字符串.
+ * @param text 字符串
+ * @param suffix 附加到字符串末尾的后缀
+ * @param args 有效终止符的附加后缀(可选)
+ * @return 如果添加了后缀,则为新字符串,否则为相同的字符串
*/
- public static String appendIfMissing(final String text, final CharSequence suffix, final CharSequence...
- suffixes) {
- return appendIfMissing(text, suffix, false, suffixes);
+ public static String appendIfMissing(final String text,
+ final CharSequence suffix,
+ final CharSequence... args) {
+ return appendIfMissing(text, suffix, false, args);
}
/**
@@ -3940,32 +3962,35 @@ public static String appendIfMissing(final String text, final CharSequence suffi
* StringKit.appendIfMissingIgnoreCase("abcMNO", "xyz", "mno") = "abcMNO"
*
*
- * @param text 字符串.
- * @param suffix 附加到字符串末尾的后缀.
- * @param suffixes 有效终止符的附加后缀(可选).
- * @return 如果添加了后缀,则为新字符串,否则为相同的字符串.
+ * @param text 字符串
+ * @param suffix 附加到字符串末尾的后缀
+ * @param args 有效终止符的附加后缀(可选)
+ * @return 如果添加了后缀,则为新字符串,否则为相同的字符串
*/
- public static String appendIfMissingIgnoreCase(final String text, final CharSequence suffix, final CharSequence...
- suffixes) {
- return appendIfMissing(text, suffix, true, suffixes);
+ public static String appendIfMissingIgnoreCase(final String text,
+ final CharSequence suffix,
+ final CharSequence... args) {
+ return appendIfMissing(text, suffix, true, args);
}
/**
- * 如果字符串还没有以任何前缀开始,则将前缀添加到字符串的开头.
+ * 如果字符串还没有以任何前缀开始,则将前缀添加到字符串的开头
*
- * @param text 字符串.
- * @param prefix 在字符串开始前的前缀.
- * @param ignoreCase 指示比较是否应忽略大小写.
- * @param prefixes 有效的附加前缀(可选).
- * @return 如果前缀是前缀,则为新字符串,否则为相同的字符串.
- */
- private static String prependIfMissing(final String text, final CharSequence prefix, final boolean ignoreCase,
- final CharSequence... prefixes) {
+ * @param text 字符串
+ * @param prefix 在字符串开始前的前缀
+ * @param ignoreCase 指示比较是否应忽略大小写
+ * @param args 有效的附加前缀(可选)
+ * @return 如果前缀是前缀,则为新字符串,否则为相同的字符串
+ */
+ private static String prependIfMissing(final String text,
+ final CharSequence prefix,
+ final boolean ignoreCase,
+ final CharSequence... args) {
if (null == text || isEmpty(prefix) || startWith(text, prefix, ignoreCase)) {
return toString(text);
}
- if (null != prefixes && prefixes.length > 0) {
- for (final CharSequence s : prefixes) {
+ if (null != args && args.length > 0) {
+ for (final CharSequence s : args) {
if (startWith(text, s, ignoreCase)) {
return text;
}
@@ -3975,7 +4000,7 @@ private static String prependIfMissing(final String text, final CharSequence pre
}
/**
- * 如果字符串还没有以任何前缀开始,则将前缀添加到字符串的开头.
+ * 如果字符串还没有以任何前缀开始,则将前缀添加到字符串的开头
*
*
* StringKit.prependIfMissing(null, null) = null
@@ -3999,18 +4024,19 @@ private static String prependIfMissing(final String text, final CharSequence pre
* StringKit.prependIfMissing("MNOabc", "xyz", "mno") = "xyzMNOabc"
*
*
- * @param text T字符串.
- * @param prefix 在字符串开始前的前缀.
- * @param prefixes 有效的附加前缀(可选).
- * @return 如果前缀是前缀,则为新字符串,否则为相同的字符串.
+ * @param text T字符串
+ * @param prefix 在字符串开始前的前缀
+ * @param args 有效的附加前缀(可选)
+ * @return 如果前缀是前缀,则为新字符串,否则为相同的字符串
*/
- public static String prependIfMissing(final String text, final CharSequence prefix, final CharSequence...
- prefixes) {
- return prependIfMissing(text, prefix, false, prefixes);
+ public static String prependIfMissing(final String text,
+ final CharSequence prefix,
+ final CharSequence... args) {
+ return prependIfMissing(text, prefix, false, args);
}
/**
- * 如果字符串尚未开始,则将前缀添加到字符串的开头,不区分大小写,并使用任何前缀.
+ * 如果字符串尚未开始,则将前缀添加到字符串的开头,不区分大小写,并使用任何前缀
*
*
* StringKit.prependIfMissingIgnoreCase(null, null) = null
@@ -4034,14 +4060,15 @@ public static String prependIfMissing(final String text, final CharSequence pref
* StringKit.prependIfMissingIgnoreCase("MNOabc", "xyz", "mno") = "MNOabc"
*
*
- * @param text T字符串.
- * @param prefix 在字符串开始前的前缀.
- * @param prefixes 有效的附加前缀(可选).
- * @return 如果前缀是前缀,则为新字符串,否则为相同的字符串.
+ * @param text 字符串
+ * @param prefix 在字符串开始前的前缀
+ * @param args 有效的附加前缀(可选)
+ * @return 如果前缀是前缀,则为新字符串,否则为相同的字符串
*/
- public static String prependIfMissingIgnoreCase(final String text, final CharSequence prefix,
- final CharSequence... prefixes) {
- return prependIfMissing(text, prefix, true, prefixes);
+ public static String prependIfMissingIgnoreCase(final String text,
+ final CharSequence prefix,
+ final CharSequence... args) {
+ return prependIfMissing(text, prefix, true, args);
}
/**
@@ -4132,23 +4159,23 @@ public static String center(CharSequence text, final int size, char padChar) {
*
* @param text 字符串
* @param size 指定长度
- * @param padStr 两边补充的字符串
+ * @param padText 两边补充的字符串
* @return 补充后的字符串
*/
- public static String center(CharSequence text, final int size, CharSequence padStr) {
+ public static String center(CharSequence text, final int size, CharSequence padText) {
if (null == text || size <= 0) {
return toString(text);
}
- if (isEmpty(padStr)) {
- padStr = Symbol.SPACE;
+ if (isEmpty(padText)) {
+ padText = Symbol.SPACE;
}
final int strLen = text.length();
final int pads = size - strLen;
if (pads <= 0) {
return text.toString();
}
- text = padPre(text, strLen + pads / 2, padStr);
- text = padAfter(text, size, padStr);
+ text = padPre(text, strLen + pads / 2, padText);
+ text = padAfter(text, size, padText);
return text.toString();
}
@@ -4163,10 +4190,10 @@ public static String center(CharSequence text, final int size, CharSequence padS
*
* @param text 字符串
* @param minLength 最小长度
- * @param padStr 补充的字符
+ * @param padText 补充的字符
* @return 补充后的字符串
*/
- public static String padPre(CharSequence text, int minLength, CharSequence padStr) {
+ public static String padPre(CharSequence text, int minLength, CharSequence padText) {
if (null == text) {
return null;
}
@@ -4177,7 +4204,7 @@ public static String padPre(CharSequence text, int minLength, CharSequence padSt
return subPre(text, minLength);
}
- return repeatByLength(padStr, minLength - strLen).concat(text.toString());
+ return repeatByLength(padText, minLength - strLen).concat(text.toString());
}
/**
@@ -4247,10 +4274,10 @@ public static String padAfter(CharSequence text, int minLength, char padChar) {
*
* @param text 字符串,如果为null
,直接返回null
* @param minLength 最小长度
- * @param padStr 补充的字符
+ * @param padText 补充的字符
* @return 补充后的字符串
*/
- public static String padAfter(CharSequence text, int minLength, CharSequence padStr) {
+ public static String padAfter(CharSequence text, int minLength, CharSequence padText) {
if (null == text) {
return null;
}
@@ -4261,7 +4288,7 @@ public static String padAfter(CharSequence text, int minLength, CharSequence pad
return subByLength(text, minLength);
}
- return text.toString().concat(repeatByLength(padStr, minLength - strLen));
+ return text.toString().concat(repeatByLength(padText, minLength - strLen));
}
/**
@@ -4309,13 +4336,13 @@ public static String filter(CharSequence text, Filter> split(List
> result = new ArrayList<>(list.size() / size + 1);
@@ -2101,6 +2122,80 @@ public static HashMap