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

add Calculator

Browse Source
This commit is contained in:
Looly
2020-09-17 10:07:50 +08:00
parent db7c54bf69
commit 6b89c841d3
6 changed files with 225 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/BeetlEngine.java
View File

@@ -1,7 +1,9 @@
package cn.hutool.extra.template.engine.beetl;
import java.io.IOException;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.extra.template.Template;
import cn.hutool.extra.template.TemplateConfig;
import cn.hutool.extra.template.TemplateEngine;
import org.beetl.core.Configuration;
import org.beetl.core.GroupTemplate;
import org.beetl.core.ResourceLoader;
@@ -11,10 +13,7 @@ import org.beetl.core.resource.FileResourceLoader;
import org.beetl.core.resource.StringTemplateResourceLoader;
import org.beetl.core.resource.WebAppResourceLoader;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.extra.template.Template;
import cn.hutool.extra.template.TemplateConfig;
import cn.hutool.extra.template.TemplateEngine;
import java.io.IOException;
/**
* Beetl模板引擎封装
@@ -109,7 +108,7 @@ public class BeetlEngine implements TemplateEngine {
* @return {@link GroupTemplate}
* @since 3.2.0
*/
private static GroupTemplate createGroupTemplate(ResourceLoader loader) {
private static GroupTemplate createGroupTemplate(ResourceLoader<?> loader) {
try {
return createGroupTemplate(loader, Configuration.defaultConfiguration());
} catch (IOException e) {
@@ -124,7 +123,7 @@ public class BeetlEngine implements TemplateEngine {
* @param conf {@link Configuration} 配置文件
* @return {@link GroupTemplate}
*/
private static GroupTemplate createGroupTemplate(ResourceLoader loader, Configuration conf) {
private static GroupTemplate createGroupTemplate(ResourceLoader<?> loader, Configuration conf) {
return new GroupTemplate(loader, conf);
}
}

8
hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/BeetlUtil.java
View File

@@ -106,7 +106,7 @@ public final class BeetlUtil {
* @return {@link GroupTemplate}
* @since 3.2.0
*/
public static GroupTemplate createGroupTemplate(ResourceLoader loader) {
public static GroupTemplate createGroupTemplate(ResourceLoader<?> loader) {
try {
return createGroupTemplate(loader, Configuration.defaultConfiguration());
} catch (IOException e) {
@@ -121,7 +121,7 @@ public final class BeetlUtil {
* @param conf {@link Configuration} 配置文件
* @return {@link GroupTemplate}
*/
public static GroupTemplate createGroupTemplate(ResourceLoader loader, Configuration conf) {
public static GroupTemplate createGroupTemplate(ResourceLoader<?> loader, Configuration conf) {
return new GroupTemplate(loader, conf);
}
@@ -273,7 +273,7 @@ public final class BeetlUtil {
* @param resourceLoader {@link ResourceLoader} 匹配时对应的资源加载器
* @return {@link ResourceLoaderBuilder}
*/
public ResourceLoaderBuilder add(Matcher matcher, ResourceLoader resourceLoader) {
public ResourceLoaderBuilder add(Matcher matcher, ResourceLoader<?> resourceLoader) {
compositeResourceLoader.addResourceLoader(matcher, resourceLoader);
return this;
}
@@ -283,7 +283,7 @@ public final class BeetlUtil {
*
* @return {@link ResourceLoader} 资源加载器
*/
public ResourceLoader build() {
public ResourceLoader<?> build() {
return compositeResourceLoader;
}
}