This commit is contained in:
Looly 2023-04-24 12:40:34 +08:00
parent 59ae673ab5
commit 1516bd289c
12 changed files with 13 additions and 20 deletions

View File

@ -12,6 +12,7 @@
package org.dromara.hutool.extra.template.engine;
import org.dromara.hutool.core.func.Wrapper;
import org.dromara.hutool.extra.template.Template;
import org.dromara.hutool.extra.template.TemplateConfig;
@ -20,7 +21,7 @@ import org.dromara.hutool.extra.template.TemplateConfig;
*
* @author looly
*/
public interface TemplateEngine {
public interface TemplateEngine extends Wrapper<Object> {
/**
* 使用指定配置文件初始化模板引擎
@ -37,12 +38,4 @@ public interface TemplateEngine {
* @return 模板实现
*/
Template getTemplate(String resource);
/**
* 获取原始引擎的钩子方法用于自定义特殊属性如插件等
*
* @return 对应模板实现的引擎对象
* @since 6.0.0
*/
Object getRawEngine();
}

View File

@ -46,7 +46,7 @@ public class TemplateEngineFactory {
* @since 5.3.3
*/
public static TemplateEngine createEngine() {
return createEngine(new TemplateConfig());
return createEngine(TemplateConfig.DEFAULT);
}
/**

View File

@ -91,7 +91,7 @@ public class BeetlEngine implements TemplateEngine {
* @since 5.8.7
*/
@Override
public GroupTemplate getRawEngine() {
public GroupTemplate getRaw() {
return this.engine;
}

View File

@ -96,7 +96,7 @@ public class EnjoyEngine implements TemplateEngine {
* @since 5.8.7
*/
@Override
public com.jfinal.template.Engine getRawEngine() {
public com.jfinal.template.Engine getRaw() {
return this.engine;
}

View File

@ -101,7 +101,7 @@ public class FreemarkerEngine implements TemplateEngine {
* @since 5.8.7
*/
@Override
public Configuration getRawEngine() {
public Configuration getRaw() {
return this.cfg;
}

View File

@ -85,7 +85,7 @@ public class JetbrickEngine implements TemplateEngine {
* @since 5.8.7
*/
@Override
public JetEngine getRawEngine() {
public JetEngine getRaw() {
return this.engine;
}

View File

@ -122,7 +122,7 @@ public class PebbleTemplateEngine implements TemplateEngine {
}
@Override
public Object getRawEngine() {
public PebbleEngine getRaw() {
return this.engine;
}

View File

@ -86,7 +86,7 @@ public class RythmEngine implements TemplateEngine {
* @since 5.8.7
*/
@Override
public org.rythmengine.RythmEngine getRawEngine() {
public org.rythmengine.RythmEngine getRaw() {
return this.engine;
}

View File

@ -97,7 +97,7 @@ public class ThymeleafEngine implements TemplateEngine {
* @since 5.8.7
*/
@Override
public org.thymeleaf.TemplateEngine getRawEngine() {
public org.thymeleaf.TemplateEngine getRaw() {
return this.engine;
}

View File

@ -83,7 +83,7 @@ public class VelocityEngine implements TemplateEngine {
* @since 5.5.8
*/
@Override
public org.apache.velocity.app.VelocityEngine getRawEngine() {
public org.apache.velocity.app.VelocityEngine getRaw() {
return this.engine;
}

View File

@ -92,7 +92,7 @@ public class WitEngine implements TemplateEngine {
* @since 5.8.7
*/
@Override
public Engine getRawEngine() {
public Engine getRaw() {
return this.engine;
}

View File

@ -32,7 +32,7 @@ public class ThymeleafTest {
public void addDialectTest(){
final TemplateEngine engine = TemplateEngineFactory.createEngine();
if(engine instanceof ThymeleafEngine){
final org.thymeleaf.TemplateEngine rawEngine = ((ThymeleafEngine) engine).getRawEngine();
final org.thymeleaf.TemplateEngine rawEngine = ((ThymeleafEngine) engine).getRaw();
rawEngine.addDialect(new StandardDialect());
}
}