ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

调整处理器非空校验时机

Browse Source
This commit is contained in:
huangchengxing 2022-11-08 18:09:43 +08:00
parent c4c11ffeb6
commit 0eb1ecb1b7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hutool-core/src/main/java/cn/hutool/core/text/PlaceholderParser.java
View File

@ -57,10 +57,11 @@ public class PlaceholderParser implements UnaryOperator<String> {
* @param close 占位符结束符号，不允许为空 * @param close 占位符结束符号，不允许为空
* @param escape 转义符 * @param escape 转义符
*/ */
public PlaceholderParser(UnaryOperator<String> processor, String open, String close, char escape) { public PlaceholderParser(
final UnaryOperator<String> processor, final String open, final String close, final char escape) {
Assert.isFalse(StrChecker.isEmpty(open), "开始符号不能为空"); Assert.isFalse(StrChecker.isEmpty(open), "开始符号不能为空");
Assert.isFalse(StrChecker.isEmpty(close), "结束符号不能为空"); Assert.isFalse(StrChecker.isEmpty(close), "结束符号不能为空");
this.processor = processor; this.processor = Objects.requireNonNull(processor);
this.open = open; this.open = open;
this.openLength = open.length(); this.openLength = open.length();
this.close = close; this.close = close;
@ -75,7 +76,8 @@ public class PlaceholderParser implements UnaryOperator<String> {
* @param open 占位符开始符号，不允许为空 * @param open 占位符开始符号，不允许为空
* @param close 占位符结束符号，不允许为空 * @param close 占位符结束符号，不允许为空
*/ */
public PlaceholderParser(UnaryOperator<String> processor, String open, String close) { public PlaceholderParser(
final UnaryOperator<String> processor, final String open, final String close) {
this(processor, open, close, '\\'); this(processor, open, close, '\\');
} }
@ -86,8 +88,7 @@ public class PlaceholderParser implements UnaryOperator<String> {
* @return 处理后的字符串 * @return 处理后的字符串
*/ */
@Override @Override
public String apply(String text) { public String apply(final String text) {
Objects.requireNonNull(processor);
if (StrChecker.isEmpty(text)) { if (StrChecker.isEmpty(text)) {
return StrChecker.EMPTY; return StrChecker.EMPTY;
} }