Removing params from execute

Author: eyalkoren

server/src/main/java/org/elasticsearch/ingest/ConditionalProcessor.java

@@ -150,9 +150,9 @@ boolean evaluate(IngestDocument ingestDocument) {
             IngestConditionalScript.Factory factory = scriptService.compile(condition, IngestConditionalScript.CONTEXT);
             script = factory.newInstance(condition.getParams(), ctxMapWrapper);
         }
-        ctxMapWrapper.setCtxMap(ingestDocument.getCtxMap());
+        ctxMapWrapper.setCtxMap(new UnmodifiableIngestData(new DynamicMap(ingestDocument.getSourceAndMetadata(), FUNCTIONS)));
         try {
-            return script.execute(new UnmodifiableIngestData(new DynamicMap(ingestDocument.getSourceAndMetadata(), FUNCTIONS)));
+            return script.execute();
         } finally {
             ctxMapWrapper.clearCtxMap();
         }

server/src/main/java/org/elasticsearch/script/CtxMapWrapper.java

@@ -9,22 +9,24 @@
 
 package org.elasticsearch.script;
 
+import java.util.Map;
+
 /**
  * A wrapper for a {@link CtxMap} that allows for ad-hoc setting for script execution.
  * This allows for precompilation of scripts that can be executed with different contexts.
  * The wrapped {@link CtxMap} should be cleared after use to avoid leaks.
  */
 public class CtxMapWrapper {
-    private CtxMap<?> ctxMap;
+    private Map<String, Object> ctxMap;
 
-    public CtxMap<?> getCtxMap() {
+    public Map<String, Object> getCtxMap() {
         if (ctxMap == null) {
             throw new IllegalStateException("CtxMap is not set");
         }
         return ctxMap;
     }
 
-    public void setCtxMap(CtxMap<?> ctxMap) {
+    public void setCtxMap(Map<String, Object> ctxMap) {
         this.ctxMap = ctxMap;
     }
 

server/src/main/java/org/elasticsearch/script/IngestConditionalScript.java

@@ -20,7 +20,7 @@
  */
 public abstract class IngestConditionalScript extends SourceMapFieldScript {
 
-    public static final String[] PARAMETERS = { "runtime-params" };
+    public static final String[] PARAMETERS = {};
 
     /** The context used to compile {@link IngestConditionalScript} factories. */
     public static final ScriptContext<Factory> CONTEXT = new ScriptContext<>(
@@ -45,7 +45,7 @@ public Map<String, Object> getParams() {
         return params;
     }
 
-    public abstract boolean execute(Map<String, Object> params);
+    public abstract boolean execute();
 
     public interface Factory {
         IngestConditionalScript newInstance(Map<String, Object> params, CtxMapWrapper ctxMapWrapper);

server/src/main/java/org/elasticsearch/script/SourceMapFieldScript.java

@@ -29,12 +29,7 @@ public Map<String, Object> getCtx() {
         return ctxMapWrapper.getCtxMap();
     }
 
-    /** Return the metadata for this script */
-    public Metadata metadata() {
-        return ctxMapWrapper.getCtxMap().getMetadata();
-    }
-
     public SourceMapField field(String path) {
-        return new SourceMapField(path, () -> ctxMapWrapper.getCtxMap().getSource());
+        return new SourceMapField(path, ctxMapWrapper::getCtxMap);
     }
 }

server/src/test/java/org/elasticsearch/ingest/ConditionalProcessorTests.java

@@ -208,7 +208,7 @@ public void testRuntimeCompileError() {
             } else {
                 return (params, ctxMap) -> new IngestConditionalScript(params, ctxMap) {
                     @Override
-                    public boolean execute(Map<String, Object> params) {
+                    public boolean execute() {
                         return false;
                     }
                 };
@@ -228,7 +228,7 @@ public void testRuntimeError() {
             IngestConditionalScript.CONTEXT,
             code -> (params, ctxMapWrapper) -> new IngestConditionalScript(params, ctxMapWrapper) {
                 @Override
-                public boolean execute(Map<String, Object> params) {
+                public boolean execute() {
                     throw new IllegalArgumentException("runtime problem");
                 }
             },

test/framework/src/main/java/org/elasticsearch/script/MockScriptEngine.java

@@ -174,8 +174,8 @@ public void execute() {
                 ctxMapWrapper
             ) {
                 @Override
-                public boolean execute(Map<String, Object> params) {
-                    return (boolean) script.apply(params);
+                public boolean execute() {
+                    return (boolean) script.apply(ctxMapWrapper.getCtxMap());
                 }
             };
             return context.factoryClazz.cast(factory);