This commit is contained in:
Looly
2020-12-02 04:37:06 +08:00
parent 77e6759d9a
commit 61f58a9b62
36 changed files with 132 additions and 126 deletions

View File

@@ -1,12 +1,12 @@
package cn.hutool.extra.template.engine.beetl;
import cn.hutool.extra.template.AbstractTemplate;
import java.io.OutputStream;
import java.io.Serializable;
import java.io.Writer;
import java.util.Map;
import cn.hutool.extra.template.AbstractTemplate;
/**
* Beetl模板实现
*
@@ -21,7 +21,7 @@ public class BeetlTemplate extends AbstractTemplate implements Serializable{
* 包装Beetl模板
*
* @param beetlTemplate Beetl的模板对象 {@link org.beetl.core.Template}
* @return {@link BeetlTemplate}
* @return BeetlTemplate
*/
public static BeetlTemplate wrap(org.beetl.core.Template beetlTemplate) {
return (null == beetlTemplate) ? null : new BeetlTemplate(beetlTemplate);

View File

@@ -260,7 +260,7 @@ public final class BeetlUtil {
/**
* 创建
*
* @return {@link ResourceLoaderBuilder}
* @return ResourceLoaderBuilder
*/
public static ResourceLoaderBuilder create() {
return new ResourceLoaderBuilder();
@@ -271,7 +271,7 @@ public final class BeetlUtil {
*
* @param matcher {@link Matcher} 匹配器
* @param resourceLoader {@link ResourceLoader} 匹配时对应的资源加载器
* @return {@link ResourceLoaderBuilder}
* @return ResourceLoaderBuilder
*/
public ResourceLoaderBuilder add(Matcher matcher, ResourceLoader<?> resourceLoader) {
compositeResourceLoader.addResourceLoader(matcher, resourceLoader);

View File

@@ -20,9 +20,9 @@ public class EmojiUtilTest {
@Test
public void containsEmojiTest() {
boolean containsEmoji = EmojiUtil.containsEmoji("测试一下是否包含EMOJ:😄");
Assert.assertEquals(containsEmoji, true);
Assert.assertTrue(containsEmoji);
boolean notContainsEmoji = EmojiUtil.containsEmoji("不包含EMOJ:^_^");
Assert.assertEquals(notContainsEmoji, false);
Assert.assertFalse(notContainsEmoji);
}
}