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/04/14 21:47:22 UTC
incubator-tinkerpop git commit: GraphProvider needed to convertId for
each Element type.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master c30e100a1 -> 6e7c7a1fc
GraphProvider needed to convertId for each Element type.
Previously assumed that all extension of Element used the same identifier type which really isn't the case. This change also uncovered a fair number of test bugs in label conversions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6e7c7a1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6e7c7a1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6e7c7a1f
Branch: refs/heads/master
Commit: 6e7c7a1fcdf6faac949a3cea0e195fab78fd5eb2
Parents: c30e100
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 14 15:46:00 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 14 15:46:00 2015 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/GraphProvider.java | 2 +-
.../tinkerpop/gremlin/structure/BatchTest.java | 22 +++++-----
.../tinkerpop/gremlin/structure/EdgeTest.java | 2 +-
.../gremlin/structure/FeatureSupportTest.java | 6 +--
.../tinkerpop/gremlin/structure/GraphTest.java | 42 ++++++++++----------
.../gremlin/structure/VertexPropertyTest.java | 2 +-
.../tinkerpop/gremlin/structure/VertexTest.java | 20 +++++-----
7 files changed, 48 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6e7c7a1f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
index 749026d..fbc2cd2 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
@@ -159,7 +159,7 @@ public interface GraphProvider {
* consistent in the return value such that calling it with "x" should always return the same transformed
* value.
*/
- default public Object convertId(final Object id) {
+ default public Object convertId(final Object id, final Class<? extends Element> c) {
return id;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6e7c7a1f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java
index c5eaf15..f23a7a8 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java
@@ -50,8 +50,8 @@ public class BatchTest extends AbstractGremlinTest {
final BatchGraph batchGraph = BatchGraph.build(graph)
.incrementalLoading(true)
.bufferSize(1).create();
- final Object id1 = GraphManager.getGraphProvider().convertId("1");
- final Object id2 = GraphManager.getGraphProvider().convertId("2");
+ final Object id1 = GraphManager.getGraphProvider().convertId("1", Vertex.class);
+ final Object id2 = GraphManager.getGraphProvider().convertId("2", Vertex.class);
batchGraph.addVertex(T.id, id1, "name", "marko", "age", 29);
final Vertex v1 = batchGraph.addVertex(T.id, id2, "name", "stephen", "age", 37);
final Vertex v2 = batchGraph.addVertex(T.id, id1, "name", "marko", "age", 34);
@@ -97,7 +97,7 @@ public class BatchTest extends AbstractGremlinTest {
final BatchGraph batchGraph = BatchGraph.build(graph)
.incrementalLoading(true, Exists.THROW, Exists.IGNORE)
.bufferSize(1).create();
- final Object id1 = GraphManager.getGraphProvider().convertId("1");
+ final Object id1 = GraphManager.getGraphProvider().convertId("1", Vertex.class);
batchGraph.addVertex(T.id, id1, "name", "marko", "age", 29);
try {
batchGraph.addVertex(T.id, id1, "name", "marko", "age", 34);
@@ -133,8 +133,8 @@ public class BatchTest extends AbstractGremlinTest {
final BatchGraph batchGraph = BatchGraph.build(graph)
.incrementalLoading(true, Exists.OVERWRITE_SINGLE, Exists.IGNORE)
.bufferSize(1).create();
- final Object id1 = GraphManager.getGraphProvider().convertId("1");
- final Object id2 = GraphManager.getGraphProvider().convertId("2");
+ final Object id1 = GraphManager.getGraphProvider().convertId("1", Vertex.class);
+ final Object id2 = GraphManager.getGraphProvider().convertId("2", Vertex.class);
batchGraph.addVertex(T.id, id1, "name", "marko", "age", 29);
final Vertex v1 = batchGraph.addVertex(T.id, id2, "name", "stephen", "age", 37);
final Vertex v2 = batchGraph.addVertex(T.id, id1, "name", "marko", "age", 34);
@@ -181,8 +181,8 @@ public class BatchTest extends AbstractGremlinTest {
final BatchGraph<?> batchGraph = BatchGraph.build(graph)
.incrementalLoading(true, Exists.OVERWRITE, Exists.IGNORE)
.bufferSize(1).create();
- final Object id1 = GraphManager.getGraphProvider().convertId("1");
- final Object id2 = GraphManager.getGraphProvider().convertId("2");
+ final Object id1 = GraphManager.getGraphProvider().convertId("1", Vertex.class);
+ final Object id2 = GraphManager.getGraphProvider().convertId("2", Vertex.class);
batchGraph.addVertex(T.id, id1, "name", "marko", "age", 29);
final Vertex v1 = batchGraph.addVertex(T.id, id2, "name", "stephen", "age", 37);
final Vertex v2 = batchGraph.addVertex(T.id, id1, "name", "marko", "age", 34);
@@ -240,7 +240,7 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- final Object id1 = GraphManager.getGraphProvider().convertId("1");
+ final Object id1 = GraphManager.getGraphProvider().convertId("1", Edge.class);
v1.addEdge("knows", v2, "weight", 1.0d, T.id, id1);
v1.addEdge("knows", v2, "weight", 0.5d, T.id, id1); // second edge is ignored as it already exists
@@ -292,7 +292,7 @@ public class BatchTest extends AbstractGremlinTest {
.bufferSize(1).create();
final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- final Object id1 = GraphManager.getGraphProvider().convertId("1");
+ final Object id1 = GraphManager.getGraphProvider().convertId("1", Edge.class);
v1.addEdge("knows", v2, "weight", 1.0d, T.id, id1);
v1.addEdge("knows", v2, "weight", 0.5d, T.id, id1); // second edge is overwrites properties of the first
tryCommit(batchGraph);
@@ -343,7 +343,7 @@ public class BatchTest extends AbstractGremlinTest {
.bufferSize(1).create();
final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- final Object id1 = GraphManager.getGraphProvider().convertId("1");
+ final Object id1 = GraphManager.getGraphProvider().convertId("1", Edge.class);
v1.addEdge("knows", v2, "weight", 1.0d, T.id, id1);
v1.addEdge("knows", v2, "weight", 0.5d, T.id, id1); // second edge is overwrites properties of the first
tryCommit(batchGraph);
@@ -394,7 +394,7 @@ public class BatchTest extends AbstractGremlinTest {
.bufferSize(1).create();
final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- final Object id1 = GraphManager.getGraphProvider().convertId("1");
+ final Object id1 = GraphManager.getGraphProvider().convertId("1", Edge.class);
v1.addEdge("knows", v2, "weight", 1.0d, T.id, id1);
try {
v1.addEdge("knows", v2, "weight", 0.5d, T.id, id1); // second edge is overwrites properties of the first
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6e7c7a1f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java
index 54368a6..1511b75 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java
@@ -149,7 +149,7 @@ public class EdgeTest {
@Test(expected = NoSuchElementException.class)
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldThrowNoSuchElementExceptionIfEdgeWithIdNotPresent() {
- g.E(graphProvider.convertId(100)).next();
+ g.E(graphProvider.convertId(100, Edge.class)).next();
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6e7c7a1f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
index bcd79a1..05a3da5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
@@ -183,7 +183,7 @@ public class FeatureSupportTest {
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS, supported = false)
public void shouldSupportUserSuppliedIdsIfAnIdCanBeAssignedToVertex() throws Exception {
try {
- graph.addVertex(T.id, GraphManager.getGraphProvider().convertId(99999943835l));
+ graph.addVertex(T.id, GraphManager.getGraphProvider().convertId(99999943835l, Vertex.class));
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), FEATURE_USER_SUPPLIED_IDS));
} catch (Exception e) {
validateException(Vertex.Exceptions.userSuppliedIdsNotSupported(), e);
@@ -358,7 +358,7 @@ public class FeatureSupportTest {
public void shouldSupportUserSuppliedIdsIfAnIdCanBeAssignedToEdge() throws Exception {
try {
final Vertex v = graph.addVertex();
- v.addEdge("friend", v, T.id, GraphManager.getGraphProvider().convertId(99999943835l));
+ v.addEdge("friend", v, T.id, GraphManager.getGraphProvider().convertId(99999943835l, Edge.class));
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), EdgeFeatures.FEATURE_USER_SUPPLIED_IDS));
} catch (Exception e) {
validateException(Edge.Exceptions.userSuppliedIdsNotSupported(), e);
@@ -624,7 +624,7 @@ public class FeatureSupportTest {
public void shouldSupportUserSuppliedIdsIfAnIdCanBeAssigned() throws Exception {
try {
final Vertex v = graph.addVertex();
- v.property("name", "me", T.id, GraphManager.getGraphProvider().convertId(99999943835l));
+ v.property("name", "me", T.id, GraphManager.getGraphProvider().convertId(99999943835l, VertexProperty.class));
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexPropertyFeatures.FEATURE_USER_SUPPLIED_IDS));
} catch (Exception ex) {
validateException(VertexProperty.Exceptions.userSuppliedIdsNotSupported(), ex);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6e7c7a1f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
index a059f0b..7bd6cd7 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/GraphTest.java
@@ -115,7 +115,7 @@ public class GraphTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS)
public void shouldHaveExceptionConsistencyWhenAssigningSameIdOnVertex() {
- final Object o = GraphManager.getGraphProvider().convertId("1");
+ final Object o = GraphManager.getGraphProvider().convertId("1", Vertex.class);
graph.addVertex(T.id, o);
try {
graph.addVertex(T.id, o);
@@ -549,7 +549,7 @@ public class GraphTest extends AbstractGremlinTest {
public void shouldNotMixTypesForGettingSpecificVerticesWithVertexFirst() {
final Vertex v1 = graph.addVertex();
try {
- graph.vertices(v1, graphProvider.convertId("1"));
+ graph.vertices(v1, graphProvider.convertId("1", Vertex.class));
fail("Should have thrown an exception because id arguments were mixed.");
} catch (Exception ex) {
final Exception expected = Graph.Exceptions.idArgsMustBeEitherIdOrElement();
@@ -563,7 +563,7 @@ public class GraphTest extends AbstractGremlinTest {
public void shouldNotMixTypesForGettingSpecificVerticesWithStringFirst() {
final Vertex v1 = graph.addVertex();
try {
- graph.vertices(graphProvider.convertId("1"), v1);
+ graph.vertices(graphProvider.convertId("1", Vertex.class), v1);
fail("Should have thrown an exception because id arguments were mixed.");
} catch (Exception ex) {
final Exception expected = Graph.Exceptions.idArgsMustBeEitherIdOrElement();
@@ -814,10 +814,10 @@ public class GraphTest extends AbstractGremlinTest {
final Vertex c;
final Vertex d;
if (graph.features().vertex().supportsUserSuppliedIds()) {
- a = graph.addVertex(T.id, graphProvider.convertId("1"));
- b = graph.addVertex(T.id, graphProvider.convertId("2"));
- c = graph.addVertex(T.id, graphProvider.convertId("3"));
- d = graph.addVertex(T.id, graphProvider.convertId("4"));
+ a = graph.addVertex(T.id, graphProvider.convertId("1", Vertex.class));
+ b = graph.addVertex(T.id, graphProvider.convertId("2", Vertex.class));
+ c = graph.addVertex(T.id, graphProvider.convertId("3", Vertex.class));
+ d = graph.addVertex(T.id, graphProvider.convertId("4", Vertex.class));
} else {
a = graph.addVertex();
b = graph.addVertex();
@@ -844,10 +844,10 @@ public class GraphTest extends AbstractGremlinTest {
});
if (graph.features().vertex().supportsUserSuppliedIds()) {
- final Vertex va = graph.vertices(graphProvider.convertId("1")).next();
- final Vertex vb = graph.vertices(graphProvider.convertId("2")).next();
- final Vertex vc = graph.vertices(graphProvider.convertId("3")).next();
- final Vertex vd = graph.vertices(graphProvider.convertId("4")).next();
+ final Vertex va = graph.vertices(graphProvider.convertId("1", Vertex.class)).next();
+ final Vertex vb = graph.vertices(graphProvider.convertId("2", Vertex.class)).next();
+ final Vertex vc = graph.vertices(graphProvider.convertId("3", Vertex.class)).next();
+ final Vertex vd = graph.vertices(graphProvider.convertId("4", Vertex.class)).next();
assertEquals(a, va);
assertEquals(b, vb);
@@ -875,12 +875,12 @@ public class GraphTest extends AbstractGremlinTest {
assertEquals(1l, IteratorUtils.count(vd.edges(Direction.OUT)));
for (Edge x : IteratorUtils.list(a.edges(Direction.OUT))) {
- assertTrue(x.label().equals(graphProvider.convertId("knows")) || x.label().equals(graphProvider.convertId("hates")));
+ assertTrue(x.label().equals(graphProvider.convertLabel("knows")) || x.label().equals(graphProvider.convertLabel("hates")));
}
- assertEquals(graphProvider.convertId("hates"), i.label());
- assertEquals(graphProvider.convertId("2"), i.inVertex().id().toString());
- assertEquals(graphProvider.convertId("1"), i.outVertex().id().toString());
+ assertEquals(graphProvider.convertLabel("hates"), i.label());
+ assertEquals(graphProvider.convertId("2", Vertex.class).toString(), i.inVertex().id().toString());
+ assertEquals(graphProvider.convertId("1", Vertex.class).toString(), i.outVertex().id().toString());
}
final Set<Object> vertexIds = new HashSet<>();
@@ -1006,15 +1006,15 @@ public class GraphTest extends AbstractGremlinTest {
assertEquals(0l, IteratorUtils.count(start.edges(Direction.IN)));
assertEquals(branchSize, IteratorUtils.count(start.edges(Direction.OUT)));
for (Edge a : IteratorUtils.list(start.edges(Direction.OUT))) {
- assertEquals(graphProvider.convertId("test1"), a.label());
+ assertEquals(graphProvider.convertLabel("test1"), a.label());
assertEquals(branchSize, IteratorUtils.count(a.inVertex().vertices(Direction.OUT)));
assertEquals(1, IteratorUtils.count(a.inVertex().vertices(Direction.IN)));
for (Edge b : IteratorUtils.list(a.inVertex().edges(Direction.OUT))) {
- assertEquals(graphProvider.convertId("test2"), b.label());
+ assertEquals(graphProvider.convertLabel("test2"), b.label());
assertEquals(branchSize, IteratorUtils.count(b.inVertex().vertices(Direction.OUT)));
assertEquals(1, IteratorUtils.count(b.inVertex().vertices(Direction.IN)));
for (Edge c : IteratorUtils.list(b.inVertex().edges(Direction.OUT))) {
- assertEquals(graphProvider.convertId("test3"), c.label());
+ assertEquals(graphProvider.convertLabel("test3"), c.label());
assertEquals(0, IteratorUtils.count(c.inVertex().vertices(Direction.OUT)));
assertEquals(1, IteratorUtils.count(c.inVertex().vertices(Direction.IN)));
}
@@ -1059,7 +1059,7 @@ public class GraphTest extends AbstractGremlinTest {
}
reopenedGraph.edges().forEachRemaining(edge -> {
- assertEquals(graphProvider.convertId("collaborator"), edge.label());
+ assertEquals(graphProvider.convertLabel("collaborator"), edge.label());
if (graph.features().edge().properties().supportsStringValues())
assertEquals("internet", edge.property("location").value());
});
@@ -1458,7 +1458,7 @@ public class GraphTest extends AbstractGremlinTest {
final Vertex v = graph.addVertex();
final Edge e1 = v.addEdge("self", v);
try {
- graph.edges(e1, graphProvider.convertId("1"));
+ graph.edges(e1, graphProvider.convertId("1", Edge.class));
fail("Should have thrown an exception because id arguments were mixed.");
} catch (Exception ex) {
final Exception expected = Graph.Exceptions.idArgsMustBeEitherIdOrElement();
@@ -1474,7 +1474,7 @@ public class GraphTest extends AbstractGremlinTest {
final Vertex v = graph.addVertex();
final Edge e1 = v.addEdge("self", v);
try {
- graph.edges(graphProvider.convertId("1"), e1);
+ graph.edges(graphProvider.convertId("1", Edge.class), e1);
fail("Should have thrown an exception because id arguments were mixed.");
} catch (Exception ex) {
final Exception expected = Graph.Exceptions.idArgsMustBeEitherIdOrElement();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6e7c7a1f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
index 099108d..8aab4d0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
@@ -90,7 +90,7 @@ public class VertexPropertyTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = Graph.Features.VertexPropertyFeatures.FEATURE_USER_SUPPLIED_IDS)
public void shouldAllowIdAssignment() {
final Vertex v = graph.addVertex();
- final Object id = graphProvider.convertId(123131231l);
+ final Object id = graphProvider.convertId(123131231l, VertexProperty.class);
v.property("name", "stephen", T.id, id);
tryCommit(graph, g -> assertEquals(id, v.property("name").id()));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6e7c7a1f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
index bbbf184..27ed923 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
@@ -258,7 +258,7 @@ public class VertexTest {
@Test(expected = NoSuchElementException.class)
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldThrowNoSuchElementExceptionIfVertexWithIdNotPresent() {
- graph.vertices(graphProvider.convertId(100)).next();
+ graph.vertices(graphProvider.convertId(100, Vertex.class)).next();
}
@Test
@@ -267,7 +267,7 @@ public class VertexTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_USER_SUPPLIED_IDS)
public void shouldHaveExceptionConsistencyWhenAssigningSameIdOnEdge() {
final Vertex v = graph.addVertex();
- final Object o = GraphManager.getGraphProvider().convertId("1");
+ final Object o = GraphManager.getGraphProvider().convertId("1", Edge.class);
v.addEdge("label", v, T.id, o);
try {
@@ -367,8 +367,8 @@ public class VertexTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
public void shouldEvaluateVerticesEquivalentWithSuppliedIdsViaTraversal() {
- final Vertex v = graph.addVertex(T.id, GraphManager.getGraphProvider().convertId("1"));
- final Vertex u = graph.vertices(GraphManager.getGraphProvider().convertId("1")).next();
+ final Vertex v = graph.addVertex(T.id, GraphManager.getGraphProvider().convertId("1", Vertex.class));
+ final Vertex u = graph.vertices(GraphManager.getGraphProvider().convertId("1", Vertex.class)).next();
assertEquals(v, u);
}
@@ -376,8 +376,8 @@ public class VertexTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
public void shouldEvaluateVerticesEquivalentWithSuppliedIdsViaIterators() {
- final Vertex v = graph.addVertex(T.id, GraphManager.getGraphProvider().convertId("1"));
- final Vertex u = graph.vertices(GraphManager.getGraphProvider().convertId("1")).next();
+ final Vertex v = graph.addVertex(T.id, GraphManager.getGraphProvider().convertId("1", Vertex.class));
+ final Vertex u = graph.vertices(GraphManager.getGraphProvider().convertId("1", Vertex.class)).next();
assertEquals(v, u);
}
@@ -400,8 +400,8 @@ public class VertexTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
public void shouldEvaluateEquivalentVertexHashCodeWithSuppliedIds() {
- final Vertex v = graph.addVertex(T.id, GraphManager.getGraphProvider().convertId("1"));
- final Vertex u = graph.vertices(GraphManager.getGraphProvider().convertId("1")).next();
+ final Vertex v = graph.addVertex(T.id, GraphManager.getGraphProvider().convertId("1", Vertex.class));
+ final Vertex u = graph.vertices(GraphManager.getGraphProvider().convertId("1", Vertex.class)).next();
assertEquals(v, u);
final Set<Vertex> set = new HashSet<>();
@@ -409,8 +409,8 @@ public class VertexTest {
set.add(v);
set.add(u);
set.add(u);
- set.add(graph.vertices(GraphManager.getGraphProvider().convertId("1")).next());
- set.add(graph.vertices(GraphManager.getGraphProvider().convertId("1")).next());
+ set.add(graph.vertices(GraphManager.getGraphProvider().convertId("1", Vertex.class)).next());
+ set.add(graph.vertices(GraphManager.getGraphProvider().convertId("1", Vertex.class)).next());
assertEquals(1, set.size());
assertEquals(v.hashCode(), u.hashCode());