Merge pull request #13958 from jpountz/remove/ScriptEngineService_unwrap

Remove ScriptEngineService.unwrap.

core/src/main/java/org/elasticsearch/script/NativeScriptEngineService.java

@@ -98,11 +98,6 @@ public class NativeScriptEngineService extends AbstractComponent implements Scri
         return executable(compiledScript, vars).run();
     }
 
-    @Override
-    public Object unwrap(Object value) {
-        return value;
-    }
-
     @Override
     public void close() {
     }

core/src/main/java/org/elasticsearch/script/ScriptEngineService.java

@@ -44,8 +44,6 @@ public interface ScriptEngineService extends Closeable {
 
     Object execute(CompiledScript compiledScript, Map<String, Object> vars);
 
-    Object unwrap(Object value);
-
     /**
      * Handler method called when a script is removed from the Guava cache.
      *

core/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java

@@ -138,11 +138,6 @@ public class MustacheScriptEngineService extends AbstractComponent implements Sc
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public Object unwrap(Object value) {
-        return value;
-    }
-
     @Override
     public void close() {
         // Nothing to do here

core/src/test/java/org/elasticsearch/script/MockScriptEngine.java

@@ -108,11 +108,6 @@ public class MockScriptEngine implements ScriptEngineService {
         return null;
     }
 
-    @Override
-    public Object unwrap(Object value) {
-        return null;
-    }
-
     @Override
     public void scriptRemoved(@Nullable CompiledScript script) {
     }

core/src/test/java/org/elasticsearch/script/ScriptModesTests.java

@@ -290,11 +290,6 @@ public class ScriptModesTests extends ESTestCase {
             return null;
         }
 
-        @Override
-        public Object unwrap(Object value) {
-            return null;
-        }
-
         @Override
         public void close() {
 

core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java

@@ -501,11 +501,6 @@ public class ScriptServiceTests extends ESTestCase {
             return null;
         }
 
-        @Override
-        public Object unwrap(Object value) {
-            return null;
-        }
-
         @Override
         public void close() {
 

plugins/lang-expression/src/main/java/org/elasticsearch/script/expression/ExpressionScriptEngineService.java

@@ -242,11 +242,6 @@ public class ExpressionScriptEngineService extends AbstractComponent implements
         return expressionExecutableScript.run();
     }
 
-    @Override
-    public Object unwrap(Object value) {
-        return value;
-    }
-
     @Override
     public void close() {}
 

plugins/lang-groovy/src/main/java/org/elasticsearch/script/groovy/GroovyScriptEngineService.java

@@ -38,7 +38,6 @@ import org.codehaus.groovy.control.customizers.CompilationCustomizer;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
 import org.elasticsearch.SpecialPermission;
 import org.elasticsearch.bootstrap.BootstrapInfo;
-import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.hash.MessageDigests;
@@ -259,11 +258,6 @@ public class GroovyScriptEngineService extends AbstractComponent implements Scri
         }
     }
 
-    @Override
-    public Object unwrap(Object value) {
-        return value;
-    }
-
     public static final class GroovyScript implements ExecutableScript, LeafSearchScript {
 
         private final CompiledScript compiledScript;

plugins/lang-javascript/src/main/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineService.java

@@ -198,11 +198,6 @@ public class JavaScriptScriptEngineService extends AbstractComponent implements
         }
     }
 
-    @Override
-    public Object unwrap(Object value) {
-        return ScriptValueConverter.unwrapValue(value);
-    }
-
     private String generateScriptName() {
         return "Script" + counter.incrementAndGet() + ".js";
     }

plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineTests.java

@@ -97,9 +97,10 @@ public class JavaScriptScriptEngineTests extends ESTestCase {
         ctx.put("obj1", obj1);
         vars.put("ctx", ctx);
 
-        se.execute(new CompiledScript(ScriptService.ScriptType.INLINE, "testJavaScriptObjectMapInter", "js",
+        ExecutableScript executable = se.executable(new CompiledScript(ScriptService.ScriptType.INLINE, "testJavaScriptObjectMapInter", "js",
                 se.compile("ctx.obj2 = {}; ctx.obj2.prop2 = 'value2'; ctx.obj1.prop1 = 'uvalue1'")), vars);
-        ctx = (Map<String, Object>) se.unwrap(vars.get("ctx"));
+        executable.run();
+        ctx = (Map<String, Object>) executable.unwrap(vars.get("ctx"));
         assertThat(ctx.containsKey("obj1"), equalTo(true));
         assertThat((String) ((Map<String, Object>) ctx.get("obj1")).get("prop1"), equalTo("uvalue1"));
         assertThat(ctx.containsKey("obj2"), equalTo(true));

plugins/lang-python/src/main/java/org/elasticsearch/script/python/PythonScriptEngineService.java

@@ -136,11 +136,6 @@ public class PythonScriptEngineService extends AbstractComponent implements Scri
         return ret.__tojava__(Object.class);
     }
 
-    @Override
-    public Object unwrap(Object value) {
-        return unwrapValue(value);
-    }
-
     @Override
     public void close() {
         interp.cleanup();

plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptEngineTests.java

@@ -89,9 +89,10 @@ public class PythonScriptEngineTests extends ESTestCase {
         ctx.put("obj1", obj1);
         vars.put("ctx", ctx);
 
-        se.execute(new CompiledScript(ScriptService.ScriptType.INLINE, "testObjectInterMap", "python",
+        ExecutableScript executable = se.executable(new CompiledScript(ScriptService.ScriptType.INLINE, "testObjectInterMap", "python",
                 se.compile("ctx['obj2'] = { 'prop2' : 'value2' }; ctx['obj1']['prop1'] = 'uvalue1'")), vars);
-        ctx = (Map<String, Object>) se.unwrap(vars.get("ctx"));
+        executable.run();
+        ctx = (Map<String, Object>) executable.unwrap(vars.get("ctx"));
         assertThat(ctx.containsKey("obj1"), equalTo(true));
         assertThat((String) ((Map<String, Object>) ctx.get("obj1")).get("prop1"), equalTo("uvalue1"));
         assertThat(ctx.containsKey("obj2"), equalTo(true));