diff options
author | Ryan Ernst <ryan@iernst.net> | 2017-04-24 15:45:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-24 15:45:20 -0700 |
commit | 6ebf08759bbb224401fb44a08665aa2c4c428f5e (patch) | |
tree | 170cbd102ef01a9c1fd54a5a8cd87fab2128b88f /modules/lang-mustache/src/main | |
parent | 3ae671aaf3dfdedf7871641c4a4617106b903999 (diff) |
Templates: Add compileTemplate method to ScriptService for template consumers (#24280)
This commit adds a compileTemplate method to the ScriptService.
Eventually this will be used to easily cutover all consumers to a new
TemplateService.
relates #16314
Diffstat (limited to 'modules/lang-mustache/src/main')
-rw-r--r-- | modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java index 61f099f6c2..60435e72a4 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java @@ -19,6 +19,7 @@ package org.elasticsearch.script.mustache; +import org.apache.logging.log4j.util.Supplier; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; @@ -39,6 +40,7 @@ import org.elasticsearch.script.ExecutableScript; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService; import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.elasticsearch.template.CompiledTemplate; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; @@ -72,10 +74,8 @@ public class TransportSearchTemplateAction extends HandledTransportAction<Search try { Script script = new Script(request.getScriptType(), TEMPLATE_LANG, request.getScript(), request.getScriptParams() == null ? Collections.emptyMap() : request.getScriptParams()); - CompiledScript compiledScript = scriptService.compile(script, SEARCH); - ExecutableScript executable = scriptService.executable(compiledScript, script.getParams()); - - BytesReference source = (BytesReference) executable.run(); + CompiledTemplate compiledScript = scriptService.compileTemplate(script, SEARCH); + BytesReference source = compiledScript.run(script.getParams()); response.setSource(source); if (request.isSimulate()) { |