|
@@ -83,19 +83,30 @@ public final class PainlessPlugin extends Plugin implements ScriptPlugin, Extens
|
|
|
|
|
|
// Moving Function Pipeline Agg
|
|
// Moving Function Pipeline Agg
|
|
List<Whitelist> movFn = new ArrayList<>(Whitelist.BASE_WHITELISTS);
|
|
List<Whitelist> movFn = new ArrayList<>(Whitelist.BASE_WHITELISTS);
|
|
- movFn.add(WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.elasticsearch.aggs.movfn.txt"));
|
|
|
|
|
|
+ Whitelist movFnWhitelist = WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.elasticsearch.aggs.movfn.txt");
|
|
|
|
+ movFn.add(movFnWhitelist);
|
|
map.put(MovingFunctionScript.CONTEXT, movFn);
|
|
map.put(MovingFunctionScript.CONTEXT, movFn);
|
|
|
|
|
|
// Functions used for scoring docs
|
|
// Functions used for scoring docs
|
|
List<Whitelist> scoreFn = new ArrayList<>(Whitelist.BASE_WHITELISTS);
|
|
List<Whitelist> scoreFn = new ArrayList<>(Whitelist.BASE_WHITELISTS);
|
|
- scoreFn.add(WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.elasticsearch.score.txt"));
|
|
|
|
|
|
+ Whitelist scoreFnWhitelist = WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.elasticsearch.score.txt");
|
|
|
|
+ scoreFn.add(scoreFnWhitelist);
|
|
map.put(ScoreScript.CONTEXT, scoreFn);
|
|
map.put(ScoreScript.CONTEXT, scoreFn);
|
|
|
|
|
|
// Functions available to ingest pipelines
|
|
// Functions available to ingest pipelines
|
|
List<Whitelist> ingest = new ArrayList<>(Whitelist.BASE_WHITELISTS);
|
|
List<Whitelist> ingest = new ArrayList<>(Whitelist.BASE_WHITELISTS);
|
|
- ingest.add(WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.elasticsearch.ingest.txt"));
|
|
|
|
|
|
+ Whitelist ingestWhitelist = WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.elasticsearch.ingest.txt");
|
|
|
|
+ ingest.add(ingestWhitelist);
|
|
map.put(IngestScript.CONTEXT, ingest);
|
|
map.put(IngestScript.CONTEXT, ingest);
|
|
|
|
|
|
|
|
+ // Execute context gets everything
|
|
|
|
+ List<Whitelist> test = new ArrayList<>(Whitelist.BASE_WHITELISTS);
|
|
|
|
+ test.add(movFnWhitelist);
|
|
|
|
+ test.add(scoreFnWhitelist);
|
|
|
|
+ test.add(ingestWhitelist);
|
|
|
|
+ test.add(WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.elasticsearch.json.txt"));
|
|
|
|
+ map.put(PainlessExecuteAction.PainlessTestScript.CONTEXT, test);
|
|
|
|
+
|
|
whitelists = map;
|
|
whitelists = map;
|
|
}
|
|
}
|
|
|
|
|