This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/master by this push:
new fbeb255 Switch to GraalJS #99
fbeb255 is described below
commit fbeb255a967f9933e6a72ef6bdeafd8f6cc2bc00
Author: lburgazzoli <[email protected]>
AuthorDate: Mon Jul 15 21:40:08 2019 +0200
Switch to GraalJS #99
---
camel-k-runtime-jvm/pom.xml | 6 +++
.../camel/k/jvm/loader/JavaScriptLoader.java | 46 +++++++++++-----------
pom.xml | 1 +
3 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/camel-k-runtime-jvm/pom.xml b/camel-k-runtime-jvm/pom.xml
index 4c5caab..48bcb2e 100644
--- a/camel-k-runtime-jvm/pom.xml
+++ b/camel-k-runtime-jvm/pom.xml
@@ -72,6 +72,12 @@
<version>${commons-lang.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.graalvm.js</groupId>
+ <artifactId>js</artifactId>
+ <version>${graalvm.version}</version>
+ </dependency>
+
<!-- ****************************** -->
<!-- -->
<!-- TESTS -->
diff --git
a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaScriptLoader.java
b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaScriptLoader.java
index e638a47..5b519ab 100644
---
a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaScriptLoader.java
+++
b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/JavaScriptLoader.java
@@ -20,12 +20,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Collections;
import java.util.List;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import javax.script.Bindings;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.SimpleBindings;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
@@ -33,9 +27,9 @@ import org.apache.camel.k.RoutesLoader;
import org.apache.camel.k.Source;
import org.apache.camel.k.jvm.dsl.Components;
import org.apache.camel.k.support.URIResolver;
-import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.model.rest.RestConfigurationDefinition;
-import org.apache.camel.model.rest.RestDefinition;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Value;
+import org.graalvm.polyglot.proxy.ProxyExecutable;
public class JavaScriptLoader implements RoutesLoader {
@Override
@@ -49,24 +43,30 @@ public class JavaScriptLoader implements RoutesLoader {
@Override
public void configure() throws Exception {
final CamelContext context = getContext();
- final ScriptEngineManager manager = new ScriptEngineManager();
- final ScriptEngine engine = manager.getEngineByName("nashorn");
- final Bindings bindings = new SimpleBindings();
- // Exposed to the underlying script, but maybe better to have
- // a nice dsl
- bindings.put("builder", this);
- bindings.put("context", context);
- bindings.put("components", new Components(context));
- bindings.put("registry", camelContext.getRegistry());
- bindings.put("from", (Function<String, RouteDefinition>) uri
-> from(uri));
- bindings.put("rest", (Supplier<RestDefinition>) () -> rest());
- bindings.put("restConfiguration",
(Supplier<RestConfigurationDefinition>) () -> restConfiguration());
+ try (Context ctx = createPolyglotContext(); InputStream is =
URIResolver.resolve(context, source)) {
+ Value bindings = ctx.getBindings("js");
+ bindings.putMember("builder", this);
+ bindings.putMember("context", context);
+ bindings.putMember("components", new Components(context));
+ bindings.putMember("registry", context.getRegistry());
- try (InputStream is = URIResolver.resolve(context, source)) {
- engine.eval(new InputStreamReader(is), bindings);
+ bindings.putMember("from", (ProxyExecutable) args ->
from(args[0].asString()));
+ bindings.putMember("rest", (ProxyExecutable) args ->
rest());
+ bindings.putMember("restConfiguration", (ProxyExecutable)
args -> restConfiguration());
+
+ ctx.eval(
+ org.graalvm.polyglot.Source.newBuilder(
+ "js",
+ new InputStreamReader(is), source.getName()
+ ).build()
+ );
}
}
};
}
+
+ private static Context createPolyglotContext() {
+ return Context.newBuilder("js").allowAllAccess(true).build();
+ }
}
diff --git a/pom.xml b/pom.xml
index 0098453..a92cbc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
<immutables.version>2.7.5</immutables.version>
<semver4j.version>2.2.0</semver4j.version>
<undertow.version>1.4.26.Final</undertow.version>
+ <graalvm.version>19.0.2</graalvm.version>
<gmavenplus-plugin.version>1.7.1</gmavenplus-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>