diff options
author | Nik Everett <nik9000@gmail.com> | 2017-03-01 14:54:27 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-01 14:54:27 -0500 |
commit | 2dcdaa1c9d401bce510a3d40a9d165bee5c90681 (patch) | |
tree | 61a247aae6c4db22ae67f59c7b9ae75e68147123 /modules/lang-mustache/src/main | |
parent | e71d9c1960709d67ca7ee66d7e6987c115e93221 (diff) |
Mustache: don't extend AbstractComponent (#23419)
Don't extend `AbstractComponent` in `MustacheScriptEngine` because
it doesn't buy anything.
Diffstat (limited to 'modules/lang-mustache/src/main')
2 files changed, 6 insertions, 11 deletions
diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustachePlugin.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustachePlugin.java index 36f598a821..9315a0fbd4 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustachePlugin.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustachePlugin.java @@ -45,7 +45,7 @@ public class MustachePlugin extends Plugin implements ScriptPlugin, ActionPlugin @Override public ScriptEngineService getScriptEngineService(Settings settings) { - return new MustacheScriptEngineService(settings); + return new MustacheScriptEngineService(); } @Override diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java index ce9a894a7b..2d39eb080e 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java @@ -20,15 +20,16 @@ package org.elasticsearch.script.mustache; import com.github.mustachejava.Mustache; import com.github.mustachejava.MustacheFactory; + +import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.util.Supplier; import org.elasticsearch.SpecialPermission; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.io.FastStringReader; import org.elasticsearch.common.io.UTF8StreamWriter; import org.elasticsearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.script.CompiledScript; import org.elasticsearch.script.ExecutableScript; import org.elasticsearch.script.GeneralScriptException; @@ -52,7 +53,8 @@ import java.util.Map; * process: First compile the string representing the template, the resulting * {@link Mustache} object can then be re-used for subsequent executions. */ -public final class MustacheScriptEngineService extends AbstractComponent implements ScriptEngineService { +public final class MustacheScriptEngineService implements ScriptEngineService { + private static final Logger logger = ESLoggerFactory.getLogger(MustacheScriptEngineService.class); public static final String NAME = "mustache"; @@ -72,13 +74,6 @@ public final class MustacheScriptEngineService extends AbstractComponent impleme } /** - * @param settings automatically wired by Guice. - * */ - public MustacheScriptEngineService(Settings settings) { - super(settings); - } - - /** * Compile a template string to (in this case) a Mustache object than can * later be re-used for execution to fill in missing parameter values. * |