You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/06/27 14:18:26 UTC
tinkerpop git commit: smart about GLOBAL_SCOPE vs. ENGINE_SCOPE and
context bindings.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 7dd618595 -> 099a33c77
smart about GLOBAL_SCOPE vs. ENGINE_SCOPE and context bindings.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/099a33c7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/099a33c7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/099a33c7
Branch: refs/heads/TINKERPOP-1278
Commit: 099a33c77eb9429ae371aa1ee8082a120fc56a47
Parents: 7dd6185
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jun 27 08:18:23 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jun 27 08:18:23 2016 -0600
----------------------------------------------------------------------
.../java/translator/groovy/PythonGroovyTranslator.java | 7 ++-----
.../java/translator/jython/PythonJythonTranslator.java | 7 ++-----
.../gremlin/python/driver/RESTRemoteConnectionTest.java | 7 ++-----
.../python/jsr223/GremlinJythonScriptEngineTest.java | 9 +++------
4 files changed, 9 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/099a33c7/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/java/translator/groovy/PythonGroovyTranslator.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/java/translator/groovy/PythonGroovyTranslator.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/java/translator/groovy/PythonGroovyTranslator.java
index 0911e5b..97905f7 100644
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/java/translator/groovy/PythonGroovyTranslator.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/java/translator/groovy/PythonGroovyTranslator.java
@@ -25,11 +25,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.Translator;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.apache.tinkerpop.gremlin.util.ScriptEngineCache;
-import javax.script.Bindings;
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import javax.script.ScriptException;
-import javax.script.SimpleBindings;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -71,9 +69,8 @@ public class PythonGroovyTranslator extends PythonTranslator {
if (!this.alias.equals("__")) {
try {
final ScriptEngine jythonEngine = ScriptEngineCache.get("jython");
- final Bindings jythonBindings = new SimpleBindings();
- jythonBindings.put(this.alias, jythonEngine.eval("PythonGraphTraversalSource(GroovyTranslator(\"" + this.alias + "\"))"));
- jythonEngine.getContext().setBindings(jythonBindings, ScriptContext.GLOBAL_SCOPE);
+ jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE)
+ .put(this.alias, jythonEngine.eval("PythonGraphTraversalSource(GroovyTranslator(\"" + this.alias + "\"))"));
return jythonEngine.eval(traversal).toString();
} catch (final ScriptException e) {
throw new IllegalArgumentException(e.getMessage(), e);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/099a33c7/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/java/translator/jython/PythonJythonTranslator.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/java/translator/jython/PythonJythonTranslator.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/java/translator/jython/PythonJythonTranslator.java
index d1cee14..d690687 100644
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/java/translator/jython/PythonJythonTranslator.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/java/translator/jython/PythonJythonTranslator.java
@@ -25,11 +25,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.Translator;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.apache.tinkerpop.gremlin.util.ScriptEngineCache;
-import javax.script.Bindings;
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import javax.script.ScriptException;
-import javax.script.SimpleBindings;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -71,9 +69,8 @@ public class PythonJythonTranslator extends PythonTranslator {
if (!this.alias.equals("__")) {
try {
final ScriptEngine jythonEngine = ScriptEngineCache.get("jython");
- final Bindings jythonBindings = new SimpleBindings();
- jythonBindings.put(this.alias, jythonEngine.eval("PythonGraphTraversalSource(JythonTranslator(\"" + this.alias + "\"))"));
- jythonEngine.getContext().setBindings(jythonBindings, ScriptContext.GLOBAL_SCOPE);
+ jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE)
+ .put(this.alias, jythonEngine.eval("PythonGraphTraversalSource(JythonTranslator(\"" + this.alias + "\"))"));
return jythonEngine.eval(traversal).toString();
} catch (final ScriptException e) {
throw new IllegalArgumentException(e.getMessage(), e);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/099a33c7/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/driver/RESTRemoteConnectionTest.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/driver/RESTRemoteConnectionTest.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/driver/RESTRemoteConnectionTest.java
index cb20265..6075250 100644
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/driver/RESTRemoteConnectionTest.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/driver/RESTRemoteConnectionTest.java
@@ -26,10 +26,8 @@ import org.apache.tinkerpop.gremlin.util.ScriptEngineCache;
import org.junit.Before;
import org.junit.Test;
-import javax.script.Bindings;
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
-import javax.script.SimpleBindings;
import java.util.List;
import static org.junit.Assert.assertEquals;
@@ -46,9 +44,8 @@ public class RESTRemoteConnectionTest {
public void setup() {
try {
JythonScriptEngineSetup.setup();
- final Bindings jythonBindings = new SimpleBindings();
- jythonBindings.put("g", jython.eval("PythonGraphTraversalSource(GroovyTranslator('g'), RESTRemoteConnection('http://localhost:8182'))"));
- jython.getContext().setBindings(jythonBindings, ScriptContext.GLOBAL_SCOPE);
+ jython.getContext().getBindings(ScriptContext.ENGINE_SCOPE)
+ .put("g", jython.eval("PythonGraphTraversalSource(GroovyTranslator('g'), RESTRemoteConnection('http://localhost:8182'))"));
final GremlinServer server = new GremlinServer(Settings.read(RESTRemoteConnectionTest.class.getResourceAsStream("gremlin-server-rest-modern.yaml")));
server.start().join();
} catch (Exception ex) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/099a33c7/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngineTest.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngineTest.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngineTest.java
index f75c426..819c722 100644
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngineTest.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngineTest.java
@@ -25,6 +25,7 @@ import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
import org.junit.Test;
import javax.script.Bindings;
@@ -75,9 +76,7 @@ public class GremlinJythonScriptEngineTest {
@Test
public void shouldSupportJavaBasedGraphTraversal() throws Exception {
final ScriptEngine engine = new ScriptEngineManager().getEngineByName("gremlin-jython");
- final Bindings bindings = engine.createBindings();
- bindings.put("graph", TinkerFactory.createModern());
- engine.setBindings(bindings, ScriptContext.GLOBAL_SCOPE);
+ engine.getBindings(ScriptContext.ENGINE_SCOPE).put("graph", TinkerFactory.createModern());
engine.eval("g = graph.traversal()");
assertEquals(new HashSet<>(Arrays.asList("ripple", "lop")), engine.eval("g.V().repeat(out()).times(2).values('name').toSet()"));
assertEquals(new HashSet<>(Arrays.asList("ripple", "lop")), engine.eval("g.V().repeat(__.out()).times(2).values('name').toSet()"));
@@ -90,9 +89,7 @@ public class GremlinJythonScriptEngineTest {
@Test
public void shouldSupportSugarMethods() throws Exception {
final ScriptEngine engine = new ScriptEngineManager().getEngineByName("gremlin-jython");
- final Bindings bindings = engine.createBindings();
- bindings.put("graph", TinkerFactory.createModern());
- engine.setBindings(bindings, ScriptContext.GLOBAL_SCOPE);
+ engine.getBindings(ScriptContext.ENGINE_SCOPE).put("graph", TinkerFactory.createModern());
engine.eval("g = graph.traversal()");
assertEquals(new HashSet<>(Arrays.asList("ripple", "lop")), engine.eval("g.V().repeat(__.out()).times(2)[0:2].name.toSet()"));
assertEquals(new HashSet<>(Arrays.asList("ripple", "lop")), engine.eval("g.V().repeat(__.out()).times(2).name[0:3].toSet()"));