honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-18 19:05:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow script engines to have several types

Browse Source
This commit is contained in:
kimchy 2010-10-02 21:18:01 +02:00
parent a127499e3c
commit 5a7c8fe2cb
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptEngineService.java
View File

@ -26,7 +26,7 @@ import java.util.Map;
*/ */
public interface ScriptEngineService { public interface ScriptEngineService {
String type(); String[] types();
Object compile(String script); Object compile(String script);

4
modules/elasticsearch/src/main/java/org/elasticsearch/script/ScriptService.java
View File

@ -57,7 +57,9 @@ public class ScriptService extends AbstractComponent {
ImmutableMap.Builder<String, ScriptEngineService> builder = ImmutableMap.builder(); ImmutableMap.Builder<String, ScriptEngineService> builder = ImmutableMap.builder();
for (ScriptEngineService scriptEngine : scriptEngines) { for (ScriptEngineService scriptEngine : scriptEngines) {
builder.put(scriptEngine.type(), scriptEngine); for (String type : scriptEngine.types()) {
builder.put(type, scriptEngine);
}
} }
this.scriptEngines = builder.build(); this.scriptEngines = builder.build();
} }

4
modules/elasticsearch/src/main/java/org/elasticsearch/script/mvel/MvelScriptEngineService.java
View File

@ -55,8 +55,8 @@ public class MvelScriptEngineService extends AbstractComponent implements Script
} }
} }
@Override public String type() { @Override public String[] types() {
return "mvel"; return new String[]{"mvel"};
} }
@Override public Object compile(String script) { @Override public Object compile(String script) {

4
plugins/lang/groovy/src/main/java/org/elasticsearch/script/groovy/GroovyScriptEngineService.java
View File

@ -46,8 +46,8 @@ public class GroovyScriptEngineService extends AbstractComponent implements Scri
this.loader = new GroovyClassLoader(settings.getClassLoader()); this.loader = new GroovyClassLoader(settings.getClassLoader());
} }
@Override public String type() { @Override public String[] types() {
return "groovy"; return new String[]{"groovy"};
} }
@Override public Object compile(String script) { @Override public Object compile(String script) {