zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2024-07-11 10:33:30 +08:00
parent b0d443e8e9
commit dc561b12e3
14 changed files with 397 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanDescTest.java
View File

@@ -12,6 +12,7 @@
package org.dromara.hutool.core.bean;
import org.dromara.hutool.core.bean.path.AbstractBeanDesc;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -25,10 +26,12 @@ public class BeanDescTest {
@Test
public void propDescTes() {
final StrictBeanDesc desc = BeanUtil.getBeanDesc(User.class);
Assertions.assertEquals("User", desc.getSimpleName());
final BeanDesc desc = BeanUtil.getBeanDesc(User.class);
if(desc instanceof AbstractBeanDesc){
Assertions.assertEquals("User", ((AbstractBeanDesc) desc).getSimpleName());
}
Assertions.assertEquals("age", desc.getField("age").getName());
Assertions.assertEquals("age", desc.getProp("age").getFieldName());
Assertions.assertEquals("getAge", desc.getGetter("age").getName());
Assertions.assertEquals("setAge", desc.getSetter("age").getName());
Assertions.assertEquals(1, desc.getSetter("age").getParameterTypes().length);
@@ -38,7 +41,7 @@ public class BeanDescTest {
@Test
public void propDescTes2() {
final StrictBeanDesc desc = BeanUtil.getBeanDesc(User.class);
final BeanDesc desc = BeanUtil.getBeanDesc(User.class);
final PropDesc prop = desc.getProp("name");
Assertions.assertEquals("name", prop.getFieldName());
@@ -50,7 +53,7 @@ public class BeanDescTest {
@Test
public void propDescOfBooleanTest() {
final StrictBeanDesc desc = BeanUtil.getBeanDesc(User.class);
final BeanDesc desc = BeanUtil.getBeanDesc(User.class);
Assertions.assertEquals("isAdmin", desc.getGetter("isAdmin").getName());
Assertions.assertEquals("setAdmin", desc.getSetter("isAdmin").getName());
@@ -60,7 +63,7 @@ public class BeanDescTest {
@Test
public void propDescOfBooleanTest2() {
final StrictBeanDesc desc = BeanUtil.getBeanDesc(User.class);
final BeanDesc desc = BeanUtil.getBeanDesc(User.class);
Assertions.assertEquals("isIsSuper", desc.getGetter("isSuper").getName());
Assertions.assertEquals("setIsSuper", desc.getSetter("isSuper").getName());
@@ -68,7 +71,7 @@ public class BeanDescTest {
@Test
public void propDescOfBooleanTest3() {
final StrictBeanDesc desc = BeanUtil.getBeanDesc(User.class);
final BeanDesc desc = BeanUtil.getBeanDesc(User.class);
Assertions.assertEquals("setLastPage", desc.getSetter("lastPage").getName());
Assertions.assertEquals("setIsLastPage", desc.getSetter("isLastPage").getName());
@@ -76,7 +79,7 @@ public class BeanDescTest {
@Test
public void getSetTest() {
final StrictBeanDesc desc = BeanUtil.getBeanDesc(User.class);
final BeanDesc desc = BeanUtil.getBeanDesc(User.class);
final User user = new User();
desc.getProp("name").setValue(user, "张三");

2
hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java
View File

@@ -745,7 +745,7 @@ public class BeanUtilTest {
new LinkedHashMap<>(),
false,
entry -> {
if(!Arrays.asList("id", "name", "code", "sortOrder").contains(entry.getKey())){
if(!ArrayUtil.contains(new String[]{"id", "name", "code", "sortOrder"}, entry.getKey())){
entry.setKey(null);
}
return entry;

2
hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanWithReturnThisTest.java
View File

@@ -20,7 +20,7 @@ public class BeanWithReturnThisTest {
@Test
public void setValueTest() {
final BeanWithRetuenThis bean = new BeanWithRetuenThis();
final StrictBeanDesc beanDesc = BeanUtil.getBeanDesc(BeanWithRetuenThis.class);
final BeanDesc beanDesc = BeanUtil.getBeanDesc(BeanWithRetuenThis.class);
final PropDesc prop = beanDesc.getProp("a");
prop.setValue(bean, "123");

2
hutool-core/src/test/java/org/dromara/hutool/core/bean/Issue3096Test.java
View File

@@ -19,7 +19,7 @@ public class Issue3096Test {
@Test
void beanDescTest() {
final StrictBeanDesc desc = BeanUtil.getBeanDesc(User.class);
final BeanDesc desc = BeanUtil.getBeanDesc(User.class);
// https://github.com/dromara/hutool/issues/3096
// 新修改的规则中，isLastPage字段优先匹配setIsLastPage，这个顺序固定。

356
hutool-core/src/test/java/org/dromara/hutool/core/text/StrTemplateTest.java
View File

@@ -31,6 +31,8 @@ import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* test for {@link StrTemplate}
*
@@ -57,19 +59,19 @@ public class StrTemplateTest {
public void namedPlaceholderFormatSequenceTest() {
final String text = "select * from #[tableName] where id = #[id]";
final NamedPlaceholderStrTemplate strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").build();
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.formatSequence("user", 1001)
);
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.formatArraySequence(new String[]{"user", "1001"})
);
Assertions.assertEquals(
assertEquals(
"select * from 123 where id = 456",
strTemplate.formatArraySequence(new int[]{123, 456})
);
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.formatSequence(ListUtil.of("user", 1001))
);
@@ -80,23 +82,23 @@ public class StrTemplateTest {
final String text = "select * from #[1] where id = #[2]";
final NamedPlaceholderStrTemplate strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").build();
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.formatIndexed("hutool", "user", 1001)
);
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.formatArrayIndexed(new String[]{"hutool", "user", "1001"})
);
Assertions.assertEquals(
assertEquals(
"select * from 123 where id = 456",
strTemplate.formatArrayIndexed(new int[]{666, 123, 456})
);
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.formatIndexed(ListUtil.of("hutool", "user", 1001))
);
Assertions.assertEquals(
assertEquals(
"select * from user where id = ?",
strTemplate.formatIndexed(ListUtil.of("hutool", "user"), idx -> "?")
);
@@ -108,22 +110,22 @@ public class StrTemplateTest {
final NamedPlaceholderStrTemplate strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").build();
final Map<String, Object> map = MapUtil.<String, Object>builder().put("tableName", "user").put("id", 1001).build();
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.format(map)
);
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.format((Object) map)
);
FormatEntity entity = new FormatEntity().setTableName("user").setId(1001);
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.format(entity)
);
entity = new FormatEntity().setTableName("user").setId(1001);
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.format(entity)
);
@@ -143,19 +145,19 @@ public class StrTemplateTest {
String text = "i {a}{m} a {jvav} programmer";
NamedPlaceholderStrTemplate.Builder strTemplate = StrTemplate.ofNamed(text)
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_DEFAULT_VALUE);
Assertions.assertEquals(
assertEquals(
"i a programmer",
strTemplate.defaultValue(s -> "")
.build()
.formatSequence()
);
Assertions.assertEquals(
assertEquals(
"i ?? a ? programmer",
strTemplate.defaultValue(s -> "?")
.build()
.formatSequence()
);
Assertions.assertEquals(
assertEquals(
"i $$$$$$ a $$$ programmer",
strTemplate.defaultValue(s -> "$$$")
.build()
@@ -164,26 +166,26 @@ public class StrTemplateTest {
text = "select * from #[tableName] where id = #[id]";
strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]");
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.defaultValue(s -> "?")
.build()
.formatSequence("user", 1001)
);
Assertions.assertEquals(
assertEquals(
"select * from user where id = ?",
strTemplate.defaultValue(s -> "?")
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_DEFAULT_VALUE)
.build()
.formatSequence("user")
);
Assertions.assertEquals(
assertEquals(
"select * from user where id = ?",
strTemplate.defaultValue(s -> "?")
.build()
.formatArraySequence(new String[]{"user"})
);
Assertions.assertEquals(
assertEquals(
"select * from user where id = ?",
strTemplate.defaultValue(s -> "?")
.build()
@@ -192,19 +194,19 @@ public class StrTemplateTest {
text = "select * from #[1] where id = #[2]";
strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_DEFAULT_VALUE);
Assertions.assertEquals(
assertEquals(
"select * from user where id = ?",
strTemplate.defaultValue(s -> "?")
.build()
.formatIndexed("hutool", "user")
);
Assertions.assertEquals(
assertEquals(
"select * from user where id = ?",
strTemplate.defaultValue(s -> "?")
.build()
.formatArrayIndexed(new String[]{"hutool", "user"})
);
Assertions.assertEquals(
assertEquals(
"select * from user where id = ?",
strTemplate.defaultValue(s -> "?")
.build()
@@ -218,13 +220,13 @@ public class StrTemplateTest {
// 转义符
String text = "select * from \\#[tableName] where id = \\#[id]";
NamedPlaceholderStrTemplate strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").build();
Assertions.assertEquals(
assertEquals(
"select * from #[tableName] where id = #[id]",
strTemplate.format(map)
);
text = "select * from \\#[tableName] where id = #[id\\]]";
strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").build();
Assertions.assertEquals(
assertEquals(
"select * from #[tableName] where id = 1001",
strTemplate.format(MapUtil.<String, Object>builder().put("tableName", "user").put("id]", 1001).build())
);
@@ -232,25 +234,25 @@ public class StrTemplateTest {
// 转义 转义符
text = "select * from \\\\#[tableName] where id = #[id]";
strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").build();
Assertions.assertEquals(
assertEquals(
"select * from \\user where id = 1001",
strTemplate.format(map)
);
text = "select * from \\\\#[tableName] where id = \\\\#[id]";
strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").build();
Assertions.assertEquals(
assertEquals(
"select * from \\user where id = \\1001",
strTemplate.format(map)
);
text = "select * from \\\\#[tableName] where id = #[id\\\\]";
strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").build();
Assertions.assertEquals(
assertEquals(
"select * from \\user where id = 1001",
strTemplate.format(MapUtil.<String, Object>builder().put("tableName", "user").put("id\\", 1001).build())
);
text = "select * from #[tableName\\\\] where id = #[id\\\\]";
strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").build();
Assertions.assertEquals(
assertEquals(
"select * from user where id = 1001",
strTemplate.format(MapUtil.<String, Object>builder().put("tableName\\", "user").put("id\\", 1001).build())
);
@@ -258,19 +260,19 @@ public class StrTemplateTest {
// 自定义 转义符
text = "select * from /#[tableName] where id = /#[id]";
strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").escape('/').build();
Assertions.assertEquals(
assertEquals(
"select * from #[tableName] where id = #[id]",
strTemplate.format(map)
);
text = "select * from //#[tableName] where id = //#[id]";
strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").escape('/').build();
Assertions.assertEquals(
assertEquals(
"select * from /user where id = /1001",
strTemplate.format(map)
);
text = "select * from /#[tableName] where id = #[id/]]";
strTemplate = StrTemplate.ofNamed(text).prefix("#[").suffix("]").escape('/').build();
Assertions.assertEquals(
assertEquals(
"select * from #[tableName] where id = 1001",
strTemplate.format(MapUtil.<String, Object>builder().put("tableName", "user").put("id]", 1001).build())
);
@@ -286,21 +288,21 @@ public class StrTemplateTest {
// 普通使用
Assertions.assertEquals("this is a for 666",
assertEquals("this is a for 666",
template.format("a", 666)
);
Assertions.assertEquals("this is a for 666",
assertEquals("this is a for 666",
template.format(ListUtil.of("a", 666))
);
Assertions.assertEquals("this is 123 for 456",
assertEquals("this is 123 for 456",
template.formatArray(new int[]{123, 456})
);
Assertions.assertEquals("this is 123 for 456",
assertEquals("this is 123 for 456",
template.formatArray(new Integer[]{123, 456})
);
// 转义占位符
Assertions.assertEquals("this is " + placeholder + " for a",
assertEquals("this is " + placeholder + " for a",
StrTemplate.of("this is " + escape + placeholder + " for " + placeholder)
.placeholder(placeholder)
.escape(escape)
@@ -308,7 +310,7 @@ public class StrTemplateTest {
.format("a", "b")
);
// 转义"转义符"
Assertions.assertEquals("this is " + escape + "a for b",
assertEquals("this is " + escape + "a for b",
StrTemplate.of("this is " + escape + escape + placeholder + " for " + placeholder)
.placeholder(placeholder)
.escape(escape)
@@ -316,15 +318,15 @@ public class StrTemplateTest {
.format("a", "b")
);
// 填充null值
Assertions.assertEquals("this is " + null + " for b",
assertEquals("this is " + null + " for b",
template.format(null, "b")
);
Assertions.assertEquals("this is a for null",
assertEquals("this is a for null",
template.format("a", null)
);
// 序列化参数 小于 占位符数量
Assertions.assertEquals("this is a for " + placeholder,
assertEquals("this is a for " + placeholder,
template.format("a")
);
@@ -334,12 +336,12 @@ public class StrTemplateTest {
.escape(escape)
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_DEFAULT_VALUE);
Assertions.assertEquals("this is a for ",
assertEquals("this is a for ",
builder.defaultValue("")
.build()
.format("a")
);
Assertions.assertEquals("this is a for 666",
assertEquals("this is a for 666",
builder.defaultValue("666")
.build()
.format("a")
@@ -349,41 +351,41 @@ public class StrTemplateTest {
.placeholder(placeholder)
.escape(escape)
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_DEFAULT_VALUE);
Assertions.assertEquals("this is a for ",
assertEquals("this is a for ",
builder.defaultValue(s -> "")
.build()
.format("a")
);
Assertions.assertEquals("this is a for 666",
assertEquals("this is a for 666",
builder.defaultValue(s -> "666")
.build()
.format("a")
);
// 序列化参数 超过 占位符数量
Assertions.assertEquals("this is a for b",
assertEquals("this is a for b",
builder.build()
.format("a", "b", "c")
);
// 残缺的占位符
if (placeholder.length() >= 2) {
Assertions.assertEquals("this is " + placeholder.charAt(0) + " for a",
assertEquals("this is " + placeholder.charAt(0) + " for a",
StrTemplate.of("this is " + placeholder.charAt(0) + " for " + placeholder)
.placeholder(placeholder)
.escape(escape)
.build()
.format("a")
);
Assertions.assertEquals("this is " + placeholder.charAt(1) + " for a",
assertEquals("this is " + placeholder.charAt(1) + " for a",
StrTemplate.of("this is " + placeholder.charAt(1) + " for " + placeholder)
.placeholder(placeholder)
.escape(escape)
.build()
.format("a")
);
Assertions.assertEquals("this is " + placeholder.charAt(0) + ' ' + placeholder.charAt(1) + " for a",
assertEquals("this is " + placeholder.charAt(0) + ' ' + placeholder.charAt(1) + " for a",
StrTemplate.of("this is " + placeholder.charAt(0) + ' ' + placeholder.charAt(1) + " for " + placeholder)
.placeholder(placeholder)
.escape(escape)
@@ -440,127 +442,127 @@ public class StrTemplateTest {
@Test
public void singlePlaceholderMatchesTest() {
SinglePlaceholderStrTemplate strTemplate = StrTemplate.of("this is {} for {}").build();
Assertions.assertEquals(ListUtil.of("a", "b"), strTemplate.matches("this is a for b"));
Assertions.assertEquals(ListUtil.of("aaa", "666"), strTemplate.matches("this is aaa for 666"));
Assertions.assertEquals(ListUtil.of("a", "b "), strTemplate.matches("this is a for b "));
Assertions.assertEquals(ListUtil.of("a x", "b"), strTemplate.matches("this is a x for b"));
Assertions.assertEquals(ListUtil.of("{}", "{}"), strTemplate.matches("this is {} for {}"));
Assertions.assertEquals(ListUtil.of("{ }", "{}"), strTemplate.matches("this is { } for {}"));
Assertions.assertEquals(ListUtil.of("{ }", "{ }"), strTemplate.matches("this is { } for { }"));
Assertions.assertEquals(ListUtil.of(" a", "b"), strTemplate.matches("this is a for b"));
Assertions.assertEquals(ListUtil.of(" a", " b"), strTemplate.matches("this is a for b"));
Assertions.assertEquals(ListUtil.of("a ", "b"), strTemplate.matches("this is a for b"));
Assertions.assertEquals(ListUtil.of("a", null), strTemplate.matches("this is a for "));
Assertions.assertEquals(ListUtil.of(null, "b"), strTemplate.matches("this is for b"));
Assertions.assertEquals(ListUtil.of(null, null), strTemplate.matches("this is for "));
assertEquals(ListUtil.of("a", "b"), strTemplate.matches("this is a for b"));
assertEquals(ListUtil.of("aaa", "666"), strTemplate.matches("this is aaa for 666"));
assertEquals(ListUtil.of("a", "b "), strTemplate.matches("this is a for b "));
assertEquals(ListUtil.of("a x", "b"), strTemplate.matches("this is a x for b"));
assertEquals(ListUtil.of("{}", "{}"), strTemplate.matches("this is {} for {}"));
assertEquals(ListUtil.of("{ }", "{}"), strTemplate.matches("this is { } for {}"));
assertEquals(ListUtil.of("{ }", "{ }"), strTemplate.matches("this is { } for { }"));
assertEquals(ListUtil.of(" a", "b"), strTemplate.matches("this is a for b"));
assertEquals(ListUtil.of(" a", " b"), strTemplate.matches("this is a for b"));
assertEquals(ListUtil.of("a ", "b"), strTemplate.matches("this is a for b"));
assertEquals(ListUtil.of("a", null), strTemplate.matches("this is a for "));
assertEquals(ListUtil.of(null, "b"), strTemplate.matches("this is for b"));
assertEquals(ListUtil.of(null, null), strTemplate.matches("this is for "));
final List<Object> emptyList = Collections.emptyList();
Assertions.assertEquals(emptyList, strTemplate.matches(""));
Assertions.assertEquals(emptyList, strTemplate.matches(" "));
Assertions.assertEquals(emptyList, strTemplate.matches(" \r\n \n "));
Assertions.assertEquals(emptyList, strTemplate.matches(" this is a for b"));
Assertions.assertEquals(emptyList, strTemplate.matches("this is a forb"));
Assertions.assertEquals(emptyList, strTemplate.matches("this is a for b"));
Assertions.assertEquals(emptyList, strTemplate.matches("this are a for b"));
Assertions.assertEquals(emptyList, strTemplate.matches("that is a for b"));
assertEquals(emptyList, strTemplate.matches(""));
assertEquals(emptyList, strTemplate.matches(" "));
assertEquals(emptyList, strTemplate.matches(" \r\n \n "));
assertEquals(emptyList, strTemplate.matches(" this is a for b"));
assertEquals(emptyList, strTemplate.matches("this is a forb"));
assertEquals(emptyList, strTemplate.matches("this is a for b"));
assertEquals(emptyList, strTemplate.matches("this are a for b"));
assertEquals(emptyList, strTemplate.matches("that is a for b"));
strTemplate = StrTemplate.of("{}, this is for {}").build();
Assertions.assertEquals(ListUtil.of("Cleveland", "you"), strTemplate.matches("Cleveland, this is for you"));
Assertions.assertEquals(ListUtil.of(" Cleveland", "you"), strTemplate.matches(" Cleveland, this is for you"));
Assertions.assertEquals(ListUtil.of("Cleveland ", "you"), strTemplate.matches("Cleveland , this is for you"));
Assertions.assertEquals(ListUtil.of("Cleveland", "you "), strTemplate.matches("Cleveland, this is for you "));
Assertions.assertEquals(ListUtil.of("Cleveland", " you"), strTemplate.matches("Cleveland, this is for you"));
Assertions.assertEquals(ListUtil.of("Cleveland", " you "), strTemplate.matches("Cleveland, this is for you "));
Assertions.assertEquals(ListUtil.of("Cleveland", "you ?"), strTemplate.matches("Cleveland, this is for you ?"));
Assertions.assertEquals(ListUtil.of(":)Cleveland", "you:("), strTemplate.matches(":)Cleveland, this is for you:("));
assertEquals(ListUtil.of("Cleveland", "you"), strTemplate.matches("Cleveland, this is for you"));
assertEquals(ListUtil.of(" Cleveland", "you"), strTemplate.matches(" Cleveland, this is for you"));
assertEquals(ListUtil.of("Cleveland ", "you"), strTemplate.matches("Cleveland , this is for you"));
assertEquals(ListUtil.of("Cleveland", "you "), strTemplate.matches("Cleveland, this is for you "));
assertEquals(ListUtil.of("Cleveland", " you"), strTemplate.matches("Cleveland, this is for you"));
assertEquals(ListUtil.of("Cleveland", " you "), strTemplate.matches("Cleveland, this is for you "));
assertEquals(ListUtil.of("Cleveland", "you ?"), strTemplate.matches("Cleveland, this is for you ?"));
assertEquals(ListUtil.of(":)Cleveland", "you:("), strTemplate.matches(":)Cleveland, this is for you:("));
Assertions.assertEquals(emptyList, strTemplate.matches("Cleveland, this is for you"));
Assertions.assertEquals(emptyList, strTemplate.matches("Cleveland, this is for you"));
Assertions.assertEquals(emptyList, strTemplate.matches("Cleveland, this is for you"));
Assertions.assertEquals(emptyList, strTemplate.matches("Cleveland, this is four you"));
Assertions.assertEquals(emptyList, strTemplate.matches("Cleveland, this are for you"));
Assertions.assertEquals(emptyList, strTemplate.matches("Cleveland, that is for you"));
assertEquals(emptyList, strTemplate.matches("Cleveland, this is for you"));
assertEquals(emptyList, strTemplate.matches("Cleveland, this is for you"));
assertEquals(emptyList, strTemplate.matches("Cleveland, this is for you"));
assertEquals(emptyList, strTemplate.matches("Cleveland, this is four you"));
assertEquals(emptyList, strTemplate.matches("Cleveland, this are for you"));
assertEquals(emptyList, strTemplate.matches("Cleveland, that is for you"));
}
@Test
public void namedPlaceholderMatchesSequenceTest() {
NamedPlaceholderStrTemplate strTemplate = StrTemplate.ofNamed("this is {a} for {b}").build();
Assertions.assertEquals(ListUtil.of("a", "b"), strTemplate.matchesSequence("this is a for b"));
Assertions.assertEquals(ListUtil.of("aaa", "666"), strTemplate.matchesSequence("this is aaa for 666"));
Assertions.assertEquals(ListUtil.of("a", "b "), strTemplate.matchesSequence("this is a for b "));
Assertions.assertEquals(ListUtil.of("a x", "b"), strTemplate.matchesSequence("this is a x for b"));
Assertions.assertEquals(ListUtil.of("{}", "{}"), strTemplate.matchesSequence("this is {} for {}"));
Assertions.assertEquals(ListUtil.of("{ }", "{}"), strTemplate.matchesSequence("this is { } for {}"));
Assertions.assertEquals(ListUtil.of("{ }", "{ }"), strTemplate.matchesSequence("this is { } for { }"));
Assertions.assertEquals(ListUtil.of(" a", "b"), strTemplate.matchesSequence("this is a for b"));
Assertions.assertEquals(ListUtil.of(" a", " b"), strTemplate.matchesSequence("this is a for b"));
Assertions.assertEquals(ListUtil.of("a ", "b"), strTemplate.matchesSequence("this is a for b"));
Assertions.assertEquals(ListUtil.of("a", null), strTemplate.matchesSequence("this is a for "));
Assertions.assertEquals(ListUtil.of(null, "b"), strTemplate.matchesSequence("this is for b"));
Assertions.assertEquals(ListUtil.of(null, null), strTemplate.matchesSequence("this is for "));
assertEquals(ListUtil.of("a", "b"), strTemplate.matchesSequence("this is a for b"));
assertEquals(ListUtil.of("aaa", "666"), strTemplate.matchesSequence("this is aaa for 666"));
assertEquals(ListUtil.of("a", "b "), strTemplate.matchesSequence("this is a for b "));
assertEquals(ListUtil.of("a x", "b"), strTemplate.matchesSequence("this is a x for b"));
assertEquals(ListUtil.of("{}", "{}"), strTemplate.matchesSequence("this is {} for {}"));
assertEquals(ListUtil.of("{ }", "{}"), strTemplate.matchesSequence("this is { } for {}"));
assertEquals(ListUtil.of("{ }", "{ }"), strTemplate.matchesSequence("this is { } for { }"));
assertEquals(ListUtil.of(" a", "b"), strTemplate.matchesSequence("this is a for b"));
assertEquals(ListUtil.of(" a", " b"), strTemplate.matchesSequence("this is a for b"));
assertEquals(ListUtil.of("a ", "b"), strTemplate.matchesSequence("this is a for b"));
assertEquals(ListUtil.of("a", null), strTemplate.matchesSequence("this is a for "));
assertEquals(ListUtil.of(null, "b"), strTemplate.matchesSequence("this is for b"));
assertEquals(ListUtil.of(null, null), strTemplate.matchesSequence("this is for "));
final List<Object> emptyList = Collections.emptyList();
Assertions.assertEquals(emptyList, strTemplate.matchesSequence(""));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence(" "));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence(" \r\n \n "));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence(" this is a for b"));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence("this is a forb"));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence("this is a for b"));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence("this are a for b"));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence("that is a for b"));
assertEquals(emptyList, strTemplate.matchesSequence(""));
assertEquals(emptyList, strTemplate.matchesSequence(" "));
assertEquals(emptyList, strTemplate.matchesSequence(" \r\n \n "));
assertEquals(emptyList, strTemplate.matchesSequence(" this is a for b"));
assertEquals(emptyList, strTemplate.matchesSequence("this is a forb"));
assertEquals(emptyList, strTemplate.matchesSequence("this is a for b"));
assertEquals(emptyList, strTemplate.matchesSequence("this are a for b"));
assertEquals(emptyList, strTemplate.matchesSequence("that is a for b"));
strTemplate = StrTemplate.ofNamed("{a}, this is for {b}").build();
Assertions.assertEquals(ListUtil.of("Cleveland", "you"), strTemplate.matchesSequence("Cleveland, this is for you"));
Assertions.assertEquals(ListUtil.of(" Cleveland", "you"), strTemplate.matchesSequence(" Cleveland, this is for you"));
Assertions.assertEquals(ListUtil.of("Cleveland ", "you"), strTemplate.matchesSequence("Cleveland , this is for you"));
Assertions.assertEquals(ListUtil.of("Cleveland", "you "), strTemplate.matchesSequence("Cleveland, this is for you "));
Assertions.assertEquals(ListUtil.of("Cleveland", " you"), strTemplate.matchesSequence("Cleveland, this is for you"));
Assertions.assertEquals(ListUtil.of("Cleveland", " you "), strTemplate.matchesSequence("Cleveland, this is for you "));
Assertions.assertEquals(ListUtil.of("Cleveland", "you ?"), strTemplate.matchesSequence("Cleveland, this is for you ?"));
Assertions.assertEquals(ListUtil.of(":)Cleveland", "you:("), strTemplate.matchesSequence(":)Cleveland, this is for you:("));
assertEquals(ListUtil.of("Cleveland", "you"), strTemplate.matchesSequence("Cleveland, this is for you"));
assertEquals(ListUtil.of(" Cleveland", "you"), strTemplate.matchesSequence(" Cleveland, this is for you"));
assertEquals(ListUtil.of("Cleveland ", "you"), strTemplate.matchesSequence("Cleveland , this is for you"));
assertEquals(ListUtil.of("Cleveland", "you "), strTemplate.matchesSequence("Cleveland, this is for you "));
assertEquals(ListUtil.of("Cleveland", " you"), strTemplate.matchesSequence("Cleveland, this is for you"));
assertEquals(ListUtil.of("Cleveland", " you "), strTemplate.matchesSequence("Cleveland, this is for you "));
assertEquals(ListUtil.of("Cleveland", "you ?"), strTemplate.matchesSequence("Cleveland, this is for you ?"));
assertEquals(ListUtil.of(":)Cleveland", "you:("), strTemplate.matchesSequence(":)Cleveland, this is for you:("));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, this is for you"));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, this is for you"));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, this is for you"));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, this is four you"));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, this are for you"));
Assertions.assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, that is for you"));
assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, this is for you"));
assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, this is for you"));
assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, this is for you"));
assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, this is four you"));
assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, this are for you"));
assertEquals(emptyList, strTemplate.matchesSequence("Cleveland, that is for you"));
}
@Test
public void namedPlaceholderMatchesIndexedTest() {
NamedPlaceholderStrTemplate strTemplate = StrTemplate.ofNamed("this is {2} for {1}").build();
Assertions.assertEquals(ListUtil.of(null, "b", "a"), strTemplate.matchesIndexed("this is a for b", null));
Assertions.assertEquals(ListUtil.of(null, "666", "aaa"), strTemplate.matchesIndexed("this is aaa for 666", null));
Assertions.assertEquals(ListUtil.of(null, "b", null), strTemplate.matchesIndexed("this is for b", null));
Assertions.assertEquals(ListUtil.of(null, null, "aaa"), strTemplate.matchesIndexed("this is aaa for ", null));
Assertions.assertEquals(ListUtil.of(null, null, null), strTemplate.matchesIndexed("this is for ", null));
assertEquals(ListUtil.of(null, "b", "a"), strTemplate.matchesIndexed("this is a for b", null));
assertEquals(ListUtil.of(null, "666", "aaa"), strTemplate.matchesIndexed("this is aaa for 666", null));
assertEquals(ListUtil.of(null, "b", null), strTemplate.matchesIndexed("this is for b", null));
assertEquals(ListUtil.of(null, null, "aaa"), strTemplate.matchesIndexed("this is aaa for ", null));
assertEquals(ListUtil.of(null, null, null), strTemplate.matchesIndexed("this is for ", null));
strTemplate = StrTemplate.ofNamed("this is {2} for {1}")
.addFeatures(StrTemplate.Feature.MATCH_EMPTY_VALUE_TO_DEFAULT_VALUE)
.build();
Assertions.assertEquals(ListUtil.of(null, "b", "a"), strTemplate.matchesIndexed("this is a for b", idx -> "?"));
Assertions.assertEquals(ListUtil.of(null, "666", "aaa"), strTemplate.matchesIndexed("this is aaa for 666", idx -> "?"));
Assertions.assertEquals(ListUtil.of(null, "b", "?"), strTemplate.matchesIndexed("this is for b", idx -> "?"));
Assertions.assertEquals(ListUtil.of(null, "?", "aaa"), strTemplate.matchesIndexed("this is aaa for ", idx -> "?"));
Assertions.assertEquals(ListUtil.of(null, "?", "?"), strTemplate.matchesIndexed("this is for ", idx -> "?"));
assertEquals(ListUtil.of(null, "b", "a"), strTemplate.matchesIndexed("this is a for b", idx -> "?"));
assertEquals(ListUtil.of(null, "666", "aaa"), strTemplate.matchesIndexed("this is aaa for 666", idx -> "?"));
assertEquals(ListUtil.of(null, "b", "?"), strTemplate.matchesIndexed("this is for b", idx -> "?"));
assertEquals(ListUtil.of(null, "?", "aaa"), strTemplate.matchesIndexed("this is aaa for ", idx -> "?"));
assertEquals(ListUtil.of(null, "?", "?"), strTemplate.matchesIndexed("this is for ", idx -> "?"));
strTemplate = StrTemplate.ofNamed("this is {2} for {1}").build();
final List<Object> emptyList = Collections.emptyList();
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed("", null));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed(" ", null));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed(" \r\n \n ", null));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed(" this is a for b", null));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed("this is a forb", null));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed("this is a for b", null));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed("this are a for b", null));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed("that is a for b", null));
assertEquals(emptyList, strTemplate.matchesIndexed("", null));
assertEquals(emptyList, strTemplate.matchesIndexed(" ", null));
assertEquals(emptyList, strTemplate.matchesIndexed(" \r\n \n ", null));
assertEquals(emptyList, strTemplate.matchesIndexed(" this is a for b", null));
assertEquals(emptyList, strTemplate.matchesIndexed("this is a forb", null));
assertEquals(emptyList, strTemplate.matchesIndexed("this is a for b", null));
assertEquals(emptyList, strTemplate.matchesIndexed("this are a for b", null));
assertEquals(emptyList, strTemplate.matchesIndexed("that is a for b", null));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed(" this is a for b", idx -> "?"));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed("this is a forb", idx -> "?"));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed("this is a for b", idx -> "?"));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed("this are a for b", idx -> "?"));
Assertions.assertEquals(emptyList, strTemplate.matchesIndexed("that is a for b", idx -> "?"));
assertEquals(emptyList, strTemplate.matchesIndexed(" this is a for b", idx -> "?"));
assertEquals(emptyList, strTemplate.matchesIndexed("this is a forb", idx -> "?"));
assertEquals(emptyList, strTemplate.matchesIndexed("this is a for b", idx -> "?"));
assertEquals(emptyList, strTemplate.matchesIndexed("this are a for b", idx -> "?"));
assertEquals(emptyList, strTemplate.matchesIndexed("that is a for b", idx -> "?"));
}
@@ -568,19 +570,19 @@ public class StrTemplateTest {
public void namedPlaceholderMatchesTest() {
final NamedPlaceholderStrTemplate strTemplate = StrTemplate.ofNamed("this is {tableName} for {id}").build();
final Supplier<Map<String, String>> mapSupplier = HashMap::new;
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").put("id", "666").build(), strTemplate.matches("this is aaa for 666", mapSupplier));
Assertions.assertEquals(MapUtil.builder("tableName", null).put("id", "666").build(), strTemplate.matches("this is for 666", mapSupplier));
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").put("id", null).build(), strTemplate.matches("this is aaa for ", mapSupplier));
Assertions.assertEquals(MapUtil.builder("tableName", null).put("id", null).build(), strTemplate.matches("this is for ", mapSupplier));
Assertions.assertEquals(Collections.emptyMap(), strTemplate.matches("", mapSupplier));
assertEquals(MapUtil.builder("tableName", "aaa").put("id", "666").build(), strTemplate.matches("this is aaa for 666", mapSupplier));
assertEquals(MapUtil.builder("tableName", null).put("id", "666").build(), strTemplate.matches("this is for 666", mapSupplier));
assertEquals(MapUtil.builder("tableName", "aaa").put("id", null).build(), strTemplate.matches("this is aaa for ", mapSupplier));
assertEquals(MapUtil.builder("tableName", null).put("id", null).build(), strTemplate.matches("this is for ", mapSupplier));
assertEquals(Collections.emptyMap(), strTemplate.matches("", mapSupplier));
final Supplier<FormatEntity> beanSupplier = FormatEntity::new;
Assertions.assertEquals(new FormatEntity("aaa", 666), strTemplate.matches("this is aaa for 666", beanSupplier));
Assertions.assertEquals(new FormatEntity(null, 666), strTemplate.matches("this is for 666", beanSupplier));
Assertions.assertEquals(new FormatEntity("aaa", null), strTemplate.matches("this is aaa for ", beanSupplier));
Assertions.assertEquals(new FormatEntity(null, null), strTemplate.matches("this is for ", beanSupplier));
Assertions.assertEquals(new FormatEntity(), strTemplate.matches("", beanSupplier));
assertEquals(new FormatEntity("aaa", 666), strTemplate.matches("this is aaa for 666", beanSupplier));
assertEquals(new FormatEntity(null, 666), strTemplate.matches("this is for 666", beanSupplier));
assertEquals(new FormatEntity("aaa", null), strTemplate.matches("this is aaa for ", beanSupplier));
assertEquals(new FormatEntity(null, null), strTemplate.matches("this is for ", beanSupplier));
assertEquals(new FormatEntity(), strTemplate.matches("", beanSupplier));
}
@Test
@@ -603,7 +605,7 @@ public class StrTemplateTest {
final NamedPlaceholderStrTemplate template2 = StrTemplate.ofNamed(commonTemplate)
.removeFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_WHOLE_PLACEHOLDER)
.build();
Assertions.assertEquals("this is aaa for 666", template2.format(MapUtil.builder("tableName", "aaa").put("id", "666").build()));
assertEquals("this is aaa for 666", template2.format(MapUtil.builder("tableName", "aaa").put("id", "666").build()));
Assertions.assertThrows(HutoolException.class, () -> template2.format(MapUtil.builder("tableName", "aaa").build()));
// ##### 空字符串策略 #####
@@ -611,73 +613,73 @@ public class StrTemplateTest {
// 解析时，空字符串 转为 null值
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_EMPTY, StrTemplate.Feature.MATCH_EMPTY_VALUE_TO_NULL)
.build();
Assertions.assertEquals("this is aaa for ", template.format(MapUtil.builder("tableName", "aaa").build()));
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").put("id", null).build(), template.matches("this is aaa for null"));
assertEquals("this is aaa for ", template.format(MapUtil.builder("tableName", "aaa").build()));
assertEquals(MapUtil.builder("tableName", "aaa").put("id", null).build(), template.matches("this is aaa for null"));
// 解析时，空字符串 转为 默认值
template = StrTemplate.ofNamed(commonTemplate)
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_EMPTY, StrTemplate.Feature.MATCH_EMPTY_VALUE_TO_DEFAULT_VALUE)
.defaultValue("?")
.build();
Assertions.assertEquals("this is aaa for ", template.format(MapUtil.builder("tableName", "aaa").build()));
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").put("id", "?").build(), template.matches("this is aaa for "));
assertEquals("this is aaa for ", template.format(MapUtil.builder("tableName", "aaa").build()));
assertEquals(MapUtil.builder("tableName", "aaa").put("id", "?").build(), template.matches("this is aaa for "));
// 默认值 为 空字符串，解析时，空字符串 转为 默认值
template = StrTemplate.ofNamed(commonTemplate)
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_EMPTY, StrTemplate.Feature.MATCH_EMPTY_VALUE_TO_DEFAULT_VALUE)
.defaultValue("")
.build();
Assertions.assertEquals("this is aaa for ", template.format(MapUtil.builder("tableName", "aaa").build()));
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").put("id", "").build(), template.matches("this is aaa for "));
assertEquals("this is aaa for ", template.format(MapUtil.builder("tableName", "aaa").build()));
assertEquals(MapUtil.builder("tableName", "aaa").put("id", "").build(), template.matches("this is aaa for "));
// ##### null值策略 #####
// 解析时，null字符串 转为 null值
template = StrTemplate.ofNamed(commonTemplate)
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_NULL, StrTemplate.Feature.MATCH_NULL_STR_TO_NULL)
.build();
Assertions.assertEquals("this is aaa for null", template.format(MapUtil.builder("tableName", "aaa").build()));
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").put("id", null).build(), template.matches("this is aaa for null"));
assertEquals("this is aaa for null", template.format(MapUtil.builder("tableName", "aaa").build()));
assertEquals(MapUtil.builder("tableName", "aaa").put("id", null).build(), template.matches("this is aaa for null"));
// 格式化时，null值 转为 默认值 ；解析时，null字符串 转为 null值
template = StrTemplate.ofNamed(commonTemplate)
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_DEFAULT_VALUE, StrTemplate.Feature.MATCH_NULL_STR_TO_NULL)
.defaultValue("null")
.build();
Assertions.assertEquals("this is aaa for null", template.format(MapUtil.builder("tableName", "aaa").build()));
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").put("id", null).build(), template.matches("this is aaa for null"));
assertEquals("this is aaa for null", template.format(MapUtil.builder("tableName", "aaa").build()));
assertEquals(MapUtil.builder("tableName", "aaa").put("id", null).build(), template.matches("this is aaa for null"));
// 解析时，忽略 null字符串
template = StrTemplate.ofNamed(commonTemplate)
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_NULL, StrTemplate.Feature.MATCH_IGNORE_NULL_STR)
.build();
Assertions.assertEquals("this is aaa for null", template.format(MapUtil.builder("tableName", "aaa").build()));
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").build(), template.matches("this is aaa for null"));
assertEquals("this is aaa for null", template.format(MapUtil.builder("tableName", "aaa").build()));
assertEquals(MapUtil.builder("tableName", "aaa").build(), template.matches("this is aaa for null"));
// 格式化时，null值 转为 默认值 ；解析时，忽略 null字符串
template = StrTemplate.ofNamed(commonTemplate)
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_DEFAULT_VALUE, StrTemplate.Feature.MATCH_IGNORE_NULL_STR)
.defaultValue("null")
.build();
Assertions.assertEquals("this is aaa for null", template.format(MapUtil.builder("tableName", "aaa").build()));
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").build(), template.matches("this is aaa for null"));
assertEquals("this is aaa for null", template.format(MapUtil.builder("tableName", "aaa").build()));
assertEquals(MapUtil.builder("tableName", "aaa").build(), template.matches("this is aaa for null"));
// 解析时，null字符串 依然为 "null"字符串
template = StrTemplate.ofNamed(commonTemplate)
.addFeatures(StrTemplate.Feature.FORMAT_MISSING_KEY_PRINT_NULL, StrTemplate.Feature.MATCH_KEEP_NULL_STR)
.build();
Assertions.assertEquals("this is aaa for null", template.format(MapUtil.builder("tableName", "aaa").build()));
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").put("id", "null").build(), template.matches("this is aaa for null"));
assertEquals("this is aaa for null", template.format(MapUtil.builder("tableName", "aaa").build()));
assertEquals(MapUtil.builder("tableName", "aaa").put("id", "null").build(), template.matches("this is aaa for null"));
}
private void testFeature(final NamedPlaceholderStrTemplate template) {
// 格式化
Assertions.assertEquals("this is aaa for 666", template.format(MapUtil.builder("tableName", "aaa").put("id", "666").build()));
Assertions.assertEquals("this is aaa for ", template.format(MapUtil.builder("tableName", "aaa").build()));
Assertions.assertEquals("this is for 666", template.format(MapUtil.builder("id", "666").build()));
Assertions.assertEquals("this is for ", template.format(MapUtil.builder().build()));
assertEquals("this is aaa for 666", template.format(MapUtil.builder("tableName", "aaa").put("id", "666").build()));
assertEquals("this is aaa for ", template.format(MapUtil.builder("tableName", "aaa").build()));
assertEquals("this is for 666", template.format(MapUtil.builder("id", "666").build()));
assertEquals("this is for ", template.format(MapUtil.builder().build()));
// 解析
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").put("id", "666").build(), template.matches("this is aaa for 666"));
Assertions.assertEquals(MapUtil.builder("tableName", "aaa").build(), template.matches("this is aaa for "));
Assertions.assertEquals(MapUtil.builder("id", "666").build(), template.matches("this is for 666"));
Assertions.assertEquals(MapUtil.builder().build(), template.matches("this is for "));
assertEquals(MapUtil.builder("tableName", "aaa").put("id", "666").build(), template.matches("this is aaa for 666"));
assertEquals(MapUtil.builder("tableName", "aaa").build(), template.matches("this is aaa for "));
assertEquals(MapUtil.builder("id", "666").build(), template.matches("this is for 666"));
assertEquals(MapUtil.builder().build(), template.matches("this is for "));
}
}