Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3063D18823 for ; Mon, 13 Jul 2015 06:35:37 +0000 (UTC) Received: (qmail 18633 invoked by uid 500); 13 Jul 2015 06:35:37 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 18602 invoked by uid 500); 13 Jul 2015 06:35:37 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 18593 invoked by uid 99); 13 Jul 2015 06:35:37 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jul 2015 06:35:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id A42001828B4 for ; Mon, 13 Jul 2015 06:35:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.791 X-Spam-Level: X-Spam-Status: No, score=0.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id sojAsDSeUKg3 for ; Mon, 13 Jul 2015 06:35:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 34BC72C696 for ; Mon, 13 Jul 2015 06:35:04 +0000 (UTC) Received: (qmail 16336 invoked by uid 99); 13 Jul 2015 06:35:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jul 2015 06:35:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9E7F7DFFB9; Mon, 13 Jul 2015 06:35:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ivasilinets@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 13 Jul 2015 06:35:40 -0000 Message-Id: In-Reply-To: <71bd6ae969d146f0a51e7d244e2e4261@git.apache.org> References: <71bd6ae969d146f0a51e7d244e2e4261@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [39/50] [abbrv] incubator-ignite git commit: #ignite-964: java8 js is working #ignite-964: java8 js is working Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eebdd647 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eebdd647 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eebdd647 Branch: refs/heads/ignite-961 Commit: eebdd64755d215fb24262e0542d691a623af475c Parents: 4e4547a Author: ivasilinets Authored: Fri Jul 10 18:03:17 2015 +0300 Committer: ivasilinets Committed: Fri Jul 10 18:03:17 2015 +0300 ---------------------------------------------------------------------- .../handlers/scripting/IgniteScriptingCommandHandler.java | 7 +++---- .../processors/scripting/IgniteScriptingProcessor.java | 6 +++--- .../ScriptingObjectConverter8.java | 7 +++++++ 3 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eebdd647/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java index 21381f1..088e6be 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java @@ -156,7 +156,7 @@ public class IgniteScriptingCommandHandler extends GridRestCommandHandlerAdapter List> jsMapRes = emitRes.getEmitResult(); for (T3 task : jsMapRes) { - map.put(new JsCallFunctionJob((String)task.get1(), task.get2()), + map.put(new JsCallFunctionJob(ctx.scripting(), (String)task.get1(), task.get2()), (ClusterNode)task.get3()); } @@ -207,14 +207,13 @@ public class IgniteScriptingCommandHandler extends GridRestCommandHandlerAdapter private Ignite ignite; /** + * @param proc Scripting processor. * @param func Function to call. * @param argv Function argument. */ - public JsCallFunctionJob(String func, Object argv) { + public JsCallFunctionJob(IgniteScriptingProcessor proc, String func, Object argv) { this.func = func; - IgniteScriptingProcessor proc = ((IgniteKernal) ignite).context().scripting(); - this.argv = proc.toScriptingObject(proc.toJavaObject(argv)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eebdd647/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java index e5eba31..733fc10 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptingProcessor.java @@ -32,7 +32,7 @@ import static javax.script.ScriptContext.*; */ public class IgniteScriptingProcessor extends GridProcessorAdapter { /** Javascript engine name. */ - public static final String JAVA_SCRIPT_ENGINE_NAME = "rhino"; + public static final String JAVA_SCRIPT_ENGINE_NAME = "JavaScript"; /** Java8 scripting converter class. */ private static final String CONV_CLS_JAVA8 = @@ -56,9 +56,9 @@ public class IgniteScriptingProcessor extends GridProcessorAdapter { try { Class cls = Class.forName(CONV_CLS_JAVA8); - Constructor ctor = cls.getConstructor(GridKernalContext.class); + Constructor ctor = cls.getConstructor(); - converter = (ScriptingObjectConverter)ctor.newInstance(ctx); + converter = (ScriptingObjectConverter)ctor.newInstance(); System.out.println("JDK 8 is found!!!!"); } catch (ClassNotFoundException ignored) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eebdd647/modules/core/src/main/java8/org.apache.ignite.internal.processors.scripting/ScriptingObjectConverter8.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java8/org.apache.ignite.internal.processors.scripting/ScriptingObjectConverter8.java b/modules/core/src/main/java8/org.apache.ignite.internal.processors.scripting/ScriptingObjectConverter8.java index 1355b46..ae4051e 100644 --- a/modules/core/src/main/java8/org.apache.ignite.internal.processors.scripting/ScriptingObjectConverter8.java +++ b/modules/core/src/main/java8/org.apache.ignite.internal.processors.scripting/ScriptingObjectConverter8.java @@ -31,6 +31,13 @@ public class ScriptingObjectConverter8 extends ScriptingObjectConverter implemen private final JSONCacheObject fields; /** + * Default constructor. + */ + public ScriptingObjectConverter8() { + fields = null; + } + + /** * @param o JSON object. */ private ScriptingObjectConverter8(JSONCacheObject o) {