You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/06/10 13:20:05 UTC
incubator-tinkerpop git commit: Renamed Graphs.getGraphsAsBindings()
method to getAsBindings()
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 40fdf6417 -> 53277deec
Renamed Graphs.getGraphsAsBindings() method to getAsBindings()
As this method returns Graph and TraversalSource objects it seemed better to give it a more generic name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/53277dee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/53277dee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/53277dee
Branch: refs/heads/master
Commit: 53277deec040acc55a037bf51ff6b244240936ae
Parents: 40fdf64
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 10 07:18:57 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 10 07:18:57 2015 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/server/Graphs.java | 2 +-
.../gremlin/server/op/session/Session.java | 2 +-
.../server/util/ServerGremlinExecutor.java | 2 +-
.../tinkerpop/gremlin/server/GraphsTest.java | 24 +++++++++++++++++---
4 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/53277dee/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java
index f5d8551..defe204 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Graphs.java
@@ -81,7 +81,7 @@ public class Graphs {
/**
* Get the {@link Graph} and {@link TraversalSource} list as a set of bindings.
*/
- public Bindings getGraphsAsBindings() {
+ public Bindings getAsBindings() {
final Bindings bindings = new SimpleBindings();
graphs.forEach(bindings::put);
traversalSources.forEach(bindings::put);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/53277dee/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
index 6cbc841..d91c312 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
@@ -134,7 +134,7 @@ public class Session {
this.bindings.putAll(b);
})
.enabledPlugins(new HashSet<>(settings.plugins))
- .globalBindings(graphs.getGraphsAsBindings())
+ .globalBindings(graphs.getAsBindings())
.promoteBindings(kv -> kv.getValue() instanceof Graph
|| kv.getValue() instanceof TraversalSource)
.executorService(executor)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/53277dee/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
index 8d82d53..43cef89 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
@@ -102,7 +102,7 @@ public class ServerGremlinExecutor<T extends ScheduledExecutorService> {
.beforeEval(b -> graphs.rollbackAll())
.afterTimeout(b -> graphs.rollbackAll())
.enabledPlugins(new HashSet<>(settings.plugins))
- .globalBindings(graphs.getGraphsAsBindings())
+ .globalBindings(graphs.getAsBindings())
.promoteBindings(kv -> kv.getValue() instanceof Graph
|| kv.getValue() instanceof TraversalSource
|| kv.getValue() instanceof LifeCycleHook)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/53277dee/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
index c4bafaa..1760be1 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GraphsTest.java
@@ -18,14 +18,19 @@
*/
package org.apache.tinkerpop.gremlin.server;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
import org.junit.Test;
+import javax.script.Bindings;
import java.util.Map;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -39,7 +44,20 @@ public class GraphsTest {
final Map<String, Graph> m = graphs.getGraphs();
assertNotNull(m);
- assertTrue(m.containsKey("graph"));
- assertTrue(m.get("graph") instanceof TinkerGraph);
+ assertEquals(1, m.size());
+ assertThat(m.containsKey("graph"), is(true));
+ assertThat(m.get("graph"), instanceOf(TinkerGraph.class));
+ }
+
+ @Test
+ public void shouldGetAsBindings() {
+ final Settings settings = Settings.read(GraphsTest.class.getResourceAsStream("gremlin-server-integration.yaml"));
+ final Graphs graphs = new Graphs(settings);
+ final Bindings bindings = graphs.getAsBindings();
+
+ assertNotNull(bindings);
+ assertEquals(1, bindings.size());
+ assertThat(bindings.get("graph"), instanceOf(TinkerGraph.class));
+ assertThat(bindings.containsKey("graph"), is(true));
}
}