diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java b/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java index e5bbc60ab..1b5bac02d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java @@ -82,7 +82,7 @@ public class StrMatcher { char c = 0; char pre; boolean inVar = false; - StrBuilder part = StrUtil.strBuilder(); + StringBuilder part = StrUtil.builder(); for (int i = 0; i < length; i++) { pre = c; c = pattern.charAt(i); @@ -92,16 +92,17 @@ public class StrMatcher { // 变量结束 inVar = false; patterns.add(part.toString()); - part.clear(); + part.setLength(0); } } else if ('{' == c && '$' == pre) { // 变量开始 inVar = true; - final String preText = part.subString(0, part.length() - 1); + final String preText = part.substring(0, part.length() - 1); if (StrUtil.isNotEmpty(preText)) { patterns.add(preText); } - part.reset().append(pre).append(c); + part.setLength(0); + part.append(pre).append(c); } else { // 普通字符 part.append(c); diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrTemplate.java b/hutool-core/src/main/java/cn/hutool/core/text/StrTemplate.java new file mode 100755 index 000000000..5293e7918 --- /dev/null +++ b/hutool-core/src/main/java/cn/hutool/core/text/StrTemplate.java @@ -0,0 +1,4 @@ +package cn.hutool.core.text; + +public class StrTemplate { +} diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java b/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java index 53720fda8..d5f88f953 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java @@ -1,6 +1,5 @@ package cn.hutool.core.text; -import cn.hutool.core.lang.Console; import org.junit.Assert; import org.junit.Test; @@ -34,7 +33,7 @@ public class StrMatcherTest { // 当有无匹配项的时候,按照全不匹配对待 final StrMatcher strMatcher = new StrMatcher("${name}经过${year}年"); final Map match = strMatcher.match("小明经过20年,成长为一个大人。"); - Console.log(match); + //Console.log(match); Assert.assertEquals("小明", match.get("name")); Assert.assertEquals("20", match.get("year")); }