diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngine.java index 95e29e89b..960028ca9 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngine.java @@ -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 { /** * 使用指定配置文件初始化模板引擎 @@ -37,12 +38,4 @@ public interface TemplateEngine { * @return 模板实现 */ Template getTemplate(String resource); - - /** - * 获取原始引擎的钩子方法,用于自定义特殊属性,如插件等 - * - * @return 对应模板实现的引擎对象 - * @since 6.0.0 - */ - Object getRawEngine(); } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngineFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngineFactory.java index 8ecc27ebb..2e5462d0d 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngineFactory.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateEngineFactory.java @@ -46,7 +46,7 @@ public class TemplateEngineFactory { * @since 5.3.3 */ public static TemplateEngine createEngine() { - return createEngine(new TemplateConfig()); + return createEngine(TemplateConfig.DEFAULT); } /** diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlEngine.java index 65787235e..43efcf6e9 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/beetl/BeetlEngine.java @@ -91,7 +91,7 @@ public class BeetlEngine implements TemplateEngine { * @since 5.8.7 */ @Override - public GroupTemplate getRawEngine() { + public GroupTemplate getRaw() { return this.engine; } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java index db7a323b8..0005e5623 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/enjoy/EnjoyEngine.java @@ -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; } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerEngine.java index 4ede005ab..1fa0dc65e 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/freemarker/FreemarkerEngine.java @@ -101,7 +101,7 @@ public class FreemarkerEngine implements TemplateEngine { * @since 5.8.7 */ @Override - public Configuration getRawEngine() { + public Configuration getRaw() { return this.cfg; } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickEngine.java index d347dd2d8..f46855295 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickEngine.java @@ -85,7 +85,7 @@ public class JetbrickEngine implements TemplateEngine { * @since 5.8.7 */ @Override - public JetEngine getRawEngine() { + public JetEngine getRaw() { return this.engine; } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java index 95f9f86c4..5d4be2175 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplateEngine.java @@ -122,7 +122,7 @@ public class PebbleTemplateEngine implements TemplateEngine { } @Override - public Object getRawEngine() { + public PebbleEngine getRaw() { return this.engine; } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmEngine.java index 6c3ddf436..82f5b9968 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmEngine.java @@ -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; } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java index 4d1c43c5a..c5f75eb55 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java @@ -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; } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityEngine.java index 5e14dd931..4ec1cffa5 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityEngine.java @@ -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; } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitEngine.java index c7e9a85bd..2511409e4 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitEngine.java @@ -92,7 +92,7 @@ public class WitEngine implements TemplateEngine { * @since 5.8.7 */ @Override - public Engine getRawEngine() { + public Engine getRaw() { return this.engine; } diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/template/ThymeleafTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/template/ThymeleafTest.java index 73c0451dd..b03a114a2 100644 --- a/hutool-extra/src/test/java/org/dromara/hutool/extra/template/ThymeleafTest.java +++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/template/ThymeleafTest.java @@ -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()); } }