From a61fc8ba209bf67f922585c564cb50b416be76c0 Mon Sep 17 00:00:00 2001 From: Michael Lieberman Date: Tue, 30 Dec 2014 15:10:21 -0500 Subject: [PATCH] Refactor getEdges to use Vertex object --- src/main/java/edu/jhuapl/tinkerpop/AccumuloVertex.java | 2 +- .../java/edu/jhuapl/tinkerpop/tables/VertexTableWrapper.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/jhuapl/tinkerpop/AccumuloVertex.java b/src/main/java/edu/jhuapl/tinkerpop/AccumuloVertex.java index c35e5e7..9fc9f23 100644 --- a/src/main/java/edu/jhuapl/tinkerpop/AccumuloVertex.java +++ b/src/main/java/edu/jhuapl/tinkerpop/AccumuloVertex.java @@ -28,7 +28,7 @@ public class AccumuloVertex extends AccumuloElement implements Vertex { @Override public Iterable getEdges(Direction direction, String... labels) { - return globals.getVertexWrapper().getEdges(id, direction, labels); + return globals.getVertexWrapper().getEdges(this, direction, labels); } @Override diff --git a/src/main/java/edu/jhuapl/tinkerpop/tables/VertexTableWrapper.java b/src/main/java/edu/jhuapl/tinkerpop/tables/VertexTableWrapper.java index 5bcd7ee..33945b9 100644 --- a/src/main/java/edu/jhuapl/tinkerpop/tables/VertexTableWrapper.java +++ b/src/main/java/edu/jhuapl/tinkerpop/tables/VertexTableWrapper.java @@ -62,10 +62,10 @@ public class VertexTableWrapper extends ElementTableWrapper { Mutators.apply(getWriter(), new EdgeEndpointsMutator.Delete(edge)); } - public Iterable getEdges(String vertexId, Direction direction, + public Iterable getEdges(Vertex vertex, Direction direction, String... labels) { Scanner scan = getScanner(); - scan.setRange(new Range(vertexId)); + scan.setRange(new Range(vertex.getId().toString())); if (direction.equals(Direction.IN)) { scan.fetchColumnFamily(AccumuloGraph.TINEDGE); } else if (direction.equals(Direction.OUT)) {