honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-25 22:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/show-username

Browse Source 
Original commit: elastic/x-pack-elasticsearch@40649abc6c
This commit is contained in:
Lukas Olson 2016-05-13 12:54:48 -07:00
commit b576cccde9
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java
View File

@ -46,12 +46,11 @@ public class MockMustacheScriptEngine extends MockScriptEngine {
} }
@Override @Override
public Object compile(String script, Map<String, String> params) { public Object compile(String name, String script, Map<String, String> params) {
if (script.contains("{{") && script.contains("}}")) { if (script.contains("{{") && script.contains("}}")) {
throw new IllegalArgumentException("Fix your test to not rely on mustache"); throw new IllegalArgumentException("Fix your test to not rely on mustache");
} }
return script; return super.compile(name, script, params);
} }
} }

4
elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java
View File

@ -55,8 +55,8 @@ public class SleepScriptEngine implements ScriptEngineService {
} }
@Override @Override
public Object compile(String script, Map<String, String> params) { public Object compile(String scriptName, String scriptSource, Map<String, String> params) {
return script; return scriptSource;
} }
@Override @Override