summaryrefslogtreecommitdiff
path: root/test/framework
diff options
context:
space:
mode:
authorTal Levy <JubBoy333@gmail.com>2017-06-08 15:24:03 -0700
committerGitHub <noreply@github.com>2017-06-08 15:24:03 -0700
commit340909582ff76bffc7cf168e2fbec1291130f0d8 (patch)
treefbf75bbca53e86c82203acceaa3f09cd4c0c3e09 /test/framework
parent119f8ed9f025c4280f5540fac1f6e2fb096c1df8 (diff)
remove Ingest's Internal Template Service (#25085)
Ingest was using it's own wrapper around TemplateScripts and the ScriptService. This commit removes that abstraction
Diffstat (limited to 'test/framework')
-rw-r--r--test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java44
1 files changed, 33 insertions, 11 deletions
diff --git a/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java b/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java
index 190674ff61..4777d7c4ef 100644
--- a/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java
+++ b/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java
@@ -19,48 +19,70 @@
package org.elasticsearch.ingest;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.script.MockScriptEngine;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptContext;
+import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.TemplateScript;
+
+import java.util.Collections;
import java.util.Map;
-public class TestTemplateService implements TemplateService {
+import static org.elasticsearch.script.Script.DEFAULT_TEMPLATE_LANG;
+
+public class TestTemplateService extends ScriptService {
private boolean compilationException;
- public static TemplateService instance() {
+ public static ScriptService instance() {
return new TestTemplateService(false);
}
- public static TemplateService instance(boolean compilationException) {
+ public static ScriptService instance(boolean compilationException) {
return new TestTemplateService(compilationException);
}
private TestTemplateService(boolean compilationException) {
+ super(Settings.EMPTY, Collections.singletonMap(DEFAULT_TEMPLATE_LANG,
+ new MockScriptEngine(MockScriptEngine.NAME, Collections.emptyMap())), Collections.emptyMap());
this.compilationException = compilationException;
}
@Override
- public Template compile(String template) {
+ public <FactoryType> FactoryType compile(Script script, ScriptContext<FactoryType> context) {
if (this.compilationException) {
throw new RuntimeException("could not compile script");
} else {
- return new MockTemplate(template);
+ return (FactoryType) new MockTemplateScript.Factory(script.getIdOrCode());
}
}
- public static class MockTemplate implements TemplateService.Template {
+ public static class MockTemplateScript extends TemplateScript {
private final String expected;
- public MockTemplate(String expected) {
+ MockTemplateScript(String expected) {
+ super(Collections.emptyMap());
this.expected = expected;
}
@Override
- public String execute(Map<String, Object> model) {
+ public String execute() {
return expected;
}
- @Override
- public String getKey() {
- return expected;
+ public static class Factory implements TemplateScript.Factory {
+
+ private final String expected;
+
+ public Factory(String expected) {
+ this.expected = expected;
+ }
+
+ @Override
+ public TemplateScript newInstance(Map<String, Object> params) {
+ return new MockTemplateScript(expected);
+ }
}
}
}