chore(script-engine): remove nashorn

SHACL-X · Apr 11, 2022 · 302fddd · 302fddd
1 parent 69fd535
commit 302fddd
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 338 deletions.
diff --git a/.../topbraid/shacl/js/GraalScriptEngine.java → ...opbraid/shacl/js/GraalJSScriptEngine.java b/.../topbraid/shacl/js/GraalScriptEngine.java → ...opbraid/shacl/js/GraalJSScriptEngine.java
@@ -5,11 +5,14 @@
 import org.graalvm.polyglot.Value;
 import org.topbraid.shacl.js.model.TermFactory;
 
-public class GraalScriptEngine extends JSScriptEngineImpl {
+/**
+ * @author Ashley Caselli
+ */
+public class GraalJSScriptEngine extends JSScriptEngineImpl {
 
     private Context context;
 
-    public GraalScriptEngine() {
+    public GraalJSScriptEngine() {
         initEngine();
         context.getBindings("js").putMember("TermFactory", new TermFactory());
         context.eval("js", ARGS_FUNCTION);
@@ -21,7 +24,6 @@ public void initEngine() {
                 //.allowHostClassLookup(s -> true)
                 .allowHostAccess(HostAccess.ALL)
                 .allowExperimentalOptions(true)
-
                 //.allowNativeAccess(true)
                 //.allowCreateThread(true)
                 //.allowIO(true)

diff --git a/src/main/java/org/topbraid/shacl/js/JSScriptEngineFactory.java b/src/main/java/org/topbraid/shacl/js/JSScriptEngineFactory.java
@@ -35,11 +35,8 @@ public static void set(JSScriptEngineFactory value) {
     }
 
     public JSScriptEngine createScriptEngine(final String engineName) {
-        if (engineName.equals("Nashorn")) {
-            return new NashornScriptEngine();
-        }
         if (engineName.equals("Graal")) {
-            return new GraalScriptEngine();
+            return new GraalJSScriptEngine();
         }
         // TODO integrate another Script engines
         return null;

diff --git a/src/main/java/org/topbraid/shacl/js/JSScriptEngineImpl.java b/src/main/java/org/topbraid/shacl/js/JSScriptEngineImpl.java
@@ -78,9 +78,9 @@ public void executeScriptFromURL(String url) throws Exception {
 
     protected Reader createScriptReader(String url) throws Exception {
         if (DASH_JS.equals(url)) {
-            return new InputStreamReader(GraalScriptEngine.class.getResourceAsStream("/js/dash.js"));
+            return new InputStreamReader(GraalJSScriptEngine.class.getResourceAsStream("/js/dash.js"));
         } else if (RDFQUERY_JS.equals(url)) {
-            return new InputStreamReader(GraalScriptEngine.class.getResourceAsStream("/js/rdfquery.js"));
+            return new InputStreamReader(GraalJSScriptEngine.class.getResourceAsStream("/js/rdfquery.js"));
         } else {
             return new InputStreamReader(new URL(url).openStream());
         }

diff --git a/src/main/java/org/topbraid/shacl/js/NashornScriptEngine.java b/src/main/java/org/topbraid/shacl/js/NashornScriptEngine.java
diff --git a/src/main/java/org/topbraid/shacl/js/NashornUtil.java b/src/main/java/org/topbraid/shacl/js/NashornUtil.java
diff --git a/src/main/java/org/topbraid/shacl/js/SHACLScriptEngineManager.java b/src/main/java/org/topbraid/shacl/js/SHACLScriptEngineManager.java
@@ -49,7 +49,7 @@ public static JSScriptEngine getCurrentEngine() {
 		JSScriptEngine engine = engines.get();
 		if(engine == null) {
 			// TODO decide how to manage the Engine creation
-			engine = JSScriptEngineFactory.get().createScriptEngine("Nashorn");
+			engine = JSScriptEngineFactory.get().createScriptEngine("Graal");
 			engines.set(engine);
 		}
 		return engine;

diff --git a/src/main/java/org/topbraid/shacl/js/ScriptEngineUtil.java b/src/main/java/org/topbraid/shacl/js/ScriptEngineUtil.java
@@ -1,6 +1,5 @@
 package org.topbraid.shacl.js;
 
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
 import org.graalvm.polyglot.Value;
 
 import java.util.List;
@@ -10,8 +9,6 @@ public class ScriptEngineUtil {
     public static List<Object> asArray(Object obj) throws Exception {
         if (obj instanceof Value) {
             return GraalUtil.asArray(obj);
-        } else if (obj instanceof ScriptObjectMirror) {
-            return NashornUtil.asArray(obj);
         } else {
             throw new Exception("Object not supported");
         }
@@ -23,8 +20,6 @@ public static boolean isArray(Object obj) throws Exception {
         }
         if (obj instanceof Value) {
             return GraalUtil.isArray(obj);
-        } else if (obj instanceof ScriptObjectMirror) {
-            return NashornUtil.isArray(obj);
         } else {
             return false;
         }

diff --git a/src/main/java/org/topbraid/shacl/js/model/TermFactory.java b/src/main/java/org/topbraid/shacl/js/model/TermFactory.java
@@ -26,7 +26,7 @@
 /**
  * A partial implementation of DataFactory from
  * https://github.com/rdfjs/representation-task-force/blob/master/interface-spec.md
- * to be used by JavaScript via Nashorn.
+ * to be used by JavaScript.
  * 
  * @author Holger Knublauch
  */

diff --git a/src/test/java/org/topbraid/shacl/TestDASHTestCases.java b/src/test/java/org/topbraid/shacl/TestDASHTestCases.java
@@ -29,9 +29,9 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.topbraid.jenax.util.JenaUtil;
+import org.topbraid.shacl.js.GraalJSScriptEngine;
 import org.topbraid.shacl.js.JSScriptEngine;
 import org.topbraid.shacl.js.JSScriptEngineFactory;
-import org.topbraid.shacl.js.NashornScriptEngine;
 import org.topbraid.shacl.testcases.TestCase;
 import org.topbraid.shacl.testcases.TestCaseType;
 import org.topbraid.shacl.testcases.TestCaseTypes;
@@ -53,16 +53,16 @@ public class TestDASHTestCases {
         JSScriptEngineFactory.set(new JSScriptEngineFactory() {
             @Override
             public JSScriptEngine createScriptEngine(final String engineName) {
-                return new NashornScriptEngine() {
+                return new GraalJSScriptEngine() {
                     @Override
                     protected Reader createScriptReader(String url) throws Exception {
                         if (DASH_JS.equals(url)) {
-                            return new InputStreamReader(NashornScriptEngine.class.getResourceAsStream("/js/dash.js"));
+                            return new InputStreamReader(GraalJSScriptEngine.class.getResourceAsStream("/js/dash.js"));
                         } else if (RDFQUERY_JS.equals(url)) {
                             //return new InputStreamReader(new FileInputStream("/Users/ashleycaselli/git/shacl/src/main/ts/rdfquery.js"));
-                            return new InputStreamReader(NashornScriptEngine.class.getResourceAsStream("/js/rdfquery.js"));
+                            return new InputStreamReader(GraalJSScriptEngine.class.getResourceAsStream("/js/rdfquery.js"));
                         } else if (url.startsWith("http://datashapes.org/js/")) {
-                            return new InputStreamReader(NashornScriptEngine.class.getResourceAsStream(url.substring(21)));
+                            return new InputStreamReader(GraalJSScriptEngine.class.getResourceAsStream(url.substring(21)));
                         } else {
                             return new InputStreamReader(new URL(url).openStream());
                         }

diff --git a/src/test/java/org/topbraid/shacl/TestDASHTestCasesGraal.java b/src/test/java/org/topbraid/shacl/TestDASHTestCasesGraal.java