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/03/11 19:27:04 UTC
[48/50] [abbrv] incubator-tinkerpop git commit: Fixed compile errors
in gremlin-driver after refactoring for GraphTraversalContext.
Fixed compile errors in gremlin-driver after refactoring for GraphTraversalContext.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1209663d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1209663d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1209663d
Branch: refs/heads/master
Commit: 1209663db756375d66e5643ff3bdeeb244273a7d
Parents: 57b647d
Author: Stephen Mallette <sp...@apache.org>
Authored: Wed Mar 11 13:28:01 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Wed Mar 11 13:28:01 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/driver/ResultTest.java | 4 +--
.../ser/GryoMessageSerializerV1D0Test.java | 33 ++++++++++----------
.../JsonMessageSerializerGremlinV1d0Test.java | 27 +++++++++-------
.../ser/JsonMessageSerializerV1d0Test.java | 11 ++++---
4 files changed, 41 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1209663d/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultTest.java
index 0516716..3f44a55 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultTest.java
@@ -111,7 +111,7 @@ public class ResultTest {
@Test
public void shouldGetVertex() {
- final Vertex v = g.V(1).next();
+ final Vertex v = g.vertices(1).next();
final ResponseMessage msg = ResponseMessage.build(id).result(v).create();
final Result result = new Result(msg);
@@ -123,7 +123,7 @@ public class ResultTest {
@Test
public void shouldGetEdge() {
- final Edge e = g.E(11).next();
+ final Edge e = g.edges(11).next();
final ResponseMessage msg = ResponseMessage.build(id).result(e).create();
final Result result = new Result(msg);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1209663d/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1D0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1D0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1D0Test.java
index 158039a..c952e7b 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1D0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1D0Test.java
@@ -21,8 +21,8 @@ package org.apache.tinkerpop.gremlin.driver.ser;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversalContext;
import org.apache.tinkerpop.gremlin.structure.Compare;
-import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -30,10 +30,10 @@ import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.StreamFactory;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.Test;
import java.util.ArrayList;
@@ -162,7 +162,7 @@ public class GryoMessageSerializerV1D0Test {
final Edge e = v1.addEdge("test", v2);
e.property("abc", 123);
- final Iterable<Edge> iterable = g.E().toList();
+ final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
final ResponseMessage response = convertBinary(iterable);
assertCommon(response);
@@ -174,12 +174,12 @@ public class GryoMessageSerializerV1D0Test {
assertEquals(2l, deserializedEdge.id());
assertEquals("test", deserializedEdge.label());
- assertEquals(new Integer(123), (Integer) deserializedEdge.value("abc"));
- assertEquals(1, StreamFactory.stream(deserializedEdge.iterators().propertyIterator()).count());
- assertEquals(0l, deserializedEdge.iterators().vertexIterator(Direction.OUT).next().id());
- assertEquals(Vertex.DEFAULT_LABEL, deserializedEdge.iterators().vertexIterator(Direction.OUT).next().label());
- assertEquals(1l, deserializedEdge.iterators().vertexIterator(Direction.IN).next().id());
- assertEquals(Vertex.DEFAULT_LABEL, deserializedEdge.iterators().vertexIterator(Direction.IN).next().label());
+ assertEquals(123, deserializedEdge.values("abc").next());
+ assertEquals(1, IteratorUtils.count(deserializedEdge.properties()));
+ assertEquals(0l, deserializedEdge.outVertex().id());
+ assertEquals(Vertex.DEFAULT_LABEL, deserializedEdge.outVertex().label());
+ assertEquals(1l, deserializedEdge.inVertex().id());
+ assertEquals(Vertex.DEFAULT_LABEL, deserializedEdge.inVertex().label());
}
@Test
@@ -197,7 +197,7 @@ public class GryoMessageSerializerV1D0Test {
v.property("friends", friends);
- final List list = g.V().toList();
+ final List list = IteratorUtils.list(g.vertices());
final ResponseMessage response = convertBinary(list);
assertCommon(response);
@@ -209,9 +209,9 @@ public class GryoMessageSerializerV1D0Test {
assertEquals(0l, deserializedVertex.id());
assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.label());
- assertEquals(1, StreamFactory.stream(deserializedVertex.iterators().propertyIterator()).count());
+ assertEquals(1, IteratorUtils.count(deserializedVertex.properties()));
- final List<Object> deserializedInnerList = (List<Object>) deserializedVertex.iterators().valueIterator("friends").next();
+ final List<Object> deserializedInnerList = (List<Object>) deserializedVertex.values("friends").next();
assertEquals(3, deserializedInnerList.size());
assertEquals("x", deserializedInnerList.get(0));
assertEquals(5, deserializedInnerList.get(1));
@@ -224,7 +224,8 @@ public class GryoMessageSerializerV1D0Test {
@Test
public void serializeToMapWithElementForKey() throws Exception {
- final TinkerGraph g = TinkerFactory.createClassic();
+ final TinkerGraph graph = TinkerFactory.createClassic();
+ final GraphTraversalContext g = graph.traversal();
final Map<Vertex, Integer> map = new HashMap<>();
map.put(g.V().has("name", Compare.eq, "marko").next(), 1000);
@@ -235,11 +236,11 @@ public class GryoMessageSerializerV1D0Test {
assertEquals(1, deserializedMap.size());
final Vertex deserializedMarko = deserializedMap.keySet().iterator().next();
- assertEquals("marko", deserializedMarko.iterators().valueIterator("name").next().toString());
+ assertEquals("marko", deserializedMarko.values("name").next().toString());
assertEquals(1, deserializedMarko.id());
assertEquals(Vertex.DEFAULT_LABEL, deserializedMarko.label());
- assertEquals(new Integer(29), (Integer) deserializedMarko.iterators().valueIterator("age").next());
- assertEquals(2, StreamFactory.stream(deserializedMarko.iterators().propertyIterator()).count());
+ assertEquals(29, deserializedMarko.values("age").next());
+ assertEquals(2, IteratorUtils.count(deserializedMarko.properties()));
assertEquals(new Integer(1000), deserializedMap.values().iterator().next());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1209663d/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java
index da3764b..b0c5d74 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.driver.ser;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversalContext;
import org.apache.tinkerpop.gremlin.structure.Compare;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -32,6 +33,7 @@ import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.Test;
import java.util.ArrayList;
@@ -111,13 +113,13 @@ public class JsonMessageSerializerGremlinV1d0Test {
@Test
public void serializeEdge() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Vertex v2 = graph.addVertex();
final Edge e = v1.addEdge("test", v2);
e.property("abc", 123);
- final Iterable<Edge> iterable = g.E().toList();
+ final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
final ResponseMessage response = convert(iterable);
assertCommon(response);
@@ -142,13 +144,13 @@ public class JsonMessageSerializerGremlinV1d0Test {
@Test
public void serializeEdgeProperty() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v1 = g.addVertex();
- final Vertex v2 = g.addVertex();
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Vertex v2 = graph.addVertex();
final Edge e = v1.addEdge("test", v2);
e.property("abc", 123);
- final Iterable<Property<Object>> iterable = e.properties("abc").toList();
+ final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
final ResponseMessage response = convert(iterable);
assertCommon(response);
@@ -159,8 +161,8 @@ public class JsonMessageSerializerGremlinV1d0Test {
@Test
public void serializeVertexWithEmbeddedMap() throws Exception {
- final Graph g = TinkerGraph.open();
- final Vertex v = g.addVertex();
+ final Graph graph = TinkerGraph.open();
+ final Vertex v = graph.addVertex();
final Map<String, Object> map = new HashMap<>();
map.put("x", 500);
map.put("y", "some");
@@ -172,7 +174,7 @@ public class JsonMessageSerializerGremlinV1d0Test {
v.property("friends", friends);
- final List list = g.V().toList();
+ final List list = IteratorUtils.list(graph.vertices());
final ResponseMessage response = convert(list);
assertCommon(response);
@@ -200,7 +202,8 @@ public class JsonMessageSerializerGremlinV1d0Test {
@Test
public void serializeToJsonMapWithElementForKey() throws Exception {
- final TinkerGraph g = TinkerFactory.createClassic();
+ final TinkerGraph graph = TinkerFactory.createClassic();
+ final GraphTraversalContext g = graph.traversal();
final Map<Vertex, Integer> map = new HashMap<>();
map.put(g.V().has("name", Compare.eq, "marko").next(), 1000);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1209663d/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java
index cb51161..bb79ac8 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0Test.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.driver.ser;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversalContext;
import org.apache.tinkerpop.gremlin.structure.Compare;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -29,6 +30,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.junit.Test;
@@ -157,7 +159,7 @@ public class JsonMessageSerializerV1d0Test {
final Edge e = v1.addEdge("test", v2);
e.property("abc", 123);
- final Iterable<Edge> iterable = g.E().toList();
+ final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create());
final JSONObject json = new JSONObject(results);
@@ -191,7 +193,7 @@ public class JsonMessageSerializerV1d0Test {
final Edge e = v1.addEdge("test", v2);
e.property("abc", 123);
- final Iterable<Property<Object>> iterable = e.properties("abc").toList();
+ final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create());
final JSONObject json = new JSONObject(results);
@@ -224,7 +226,7 @@ public class JsonMessageSerializerV1d0Test {
v.property("friends", friends);
- final Iterable iterable = g.V().toList();
+ final Iterable iterable = IteratorUtils.list(g.vertices());
final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create());
final JSONObject json = new JSONObject(results);
@@ -258,7 +260,8 @@ public class JsonMessageSerializerV1d0Test {
@Test
public void serializeToJsonMapWithElementForKey() throws Exception {
- final TinkerGraph g = TinkerFactory.createClassic();
+ final TinkerGraph graph = TinkerFactory.createClassic();
+ final GraphTraversalContext g = graph.traversal();
final Map<Vertex, Integer> map = new HashMap<>();
map.put(g.V().has("name", Compare.eq, "marko").next(), 1000);