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 2015/04/24 21:41:04 UTC
[2/3] incubator-tinkerpop git commit: Rename parameters for
readVertex attachment methods.
Rename parameters for readVertex attachment methods.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/86b78b73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/86b78b73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/86b78b73
Branch: refs/heads/p-predicate-model
Commit: 86b78b73d1ea62ef48c690adda1b90c4ba41c6b2
Parents: 7bc9531
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 24 15:31:55 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 24 15:31:55 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/GraphReader.java | 24 ++++++++---------
.../structure/io/graphml/GraphMLReader.java | 12 ++++-----
.../structure/io/graphson/GraphSONReader.java | 28 ++++++++++----------
.../io/graphson/LegacyGraphSONReader.java | 12 ++++-----
.../gremlin/structure/io/gryo/GryoReader.java | 20 +++++++-------
5 files changed, 48 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/86b78b73/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
index 73d929c..5aad86f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
@@ -48,26 +48,26 @@ public interface GraphReader {
* Reads a single vertex from an {@link InputStream}. This method will read vertex properties but not edges.
*
* @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
- * @param vertexMaker a function to create a vertex where the first argument is the vertex identifier, the
+ * @param vertexAttachMethod a function to create a vertex where the first argument is the vertex identifier, the
* second argument is vertex label and the last is the list of properties for it
*/
- public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexMaker) throws IOException;
+ public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException;
/**
* Reads a single vertex from an {@link InputStream}. This method will read vertex properties as well as edges
* given the direction supplied as an argument.
*
* @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
- * @param vertexMaker a function to create a vertex where the first argument is the vertex identifier, the
+ * @param vertexAttachMethod a function to create a vertex where the first argument is the vertex identifier, the
* second argument is vertex label and the last is the list of properties for it
- * @param edgeMaker a function that creates an edge from the stream where the first argument is the edge
+ * @param edgeAttachMethod a function that creates an edge from the stream where the first argument is the edge
* identifier, the second argument is the out vertex id, the third is the in vertex id,
* the fourth is the label, and the fifth is the list of properties as key/value pairs.
* @param attachEdgesOfThisDirection only edges of this direction are passed to the {@code edgeMaker}.
*/
public Vertex readVertex(final InputStream inputStream,
- final Function<Attachable<Vertex>, Vertex> vertexMaker,
- final Function<Attachable<Edge>, Edge> edgeMaker,
+ final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
final Direction attachEdgesOfThisDirection) throws IOException;
/**
@@ -76,27 +76,27 @@ public interface GraphReader {
* will read vertex properties as well as edges given the direction supplied as an argument.
*
* @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
- * @param vertexMaker a function to create a vertex where the first argument is the vertex identifier, the
+ * @param vertexAttachMethod a function to create a vertex where the first argument is the vertex identifier, the
* second argument is vertex label and the last is the list of properties for it
- * @param edgeMaker a function that creates an edge from the stream where the first argument is the edge
+ * @param edgeAttachMethod a function that creates an edge from the stream where the first argument is the edge
* identifier, the second argument is the out vertex id, the third is the in vertex id,
* the fourth is the label, and the fifth is the list of properties as key/value pairs.
* @param attachEdgesOfThisDirection only edges of this direction are passed to the {@code edgeMaker}.
*/
public Iterator<Vertex> readVertices(final InputStream inputStream,
- final Function<Attachable<Vertex>, Vertex> vertexMaker,
- final Function<Attachable<Edge>, Edge> edgeMaker,
+ final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
final Direction attachEdgesOfThisDirection) throws IOException;
/**
* Reads a single edge from an {@link InputStream}.
*
* @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
- * @param reattach a function that creates an edge from the stream where the first argument is the edge
+ * @param edgeAttachMethod a function that creates an edge from the stream where the first argument is the edge
* identifier, the second argument is the out vertex id, the third is the in vertex id,
* the fourth is the label, and the fifth is the list of properties as key/value pairs.
*/
- public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> reattach) throws IOException;
+ public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException;
/**
* Reads an arbitrary object using the standard serializers.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/86b78b73/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
index 23c5b96..209c320 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
@@ -73,25 +73,25 @@ public class GraphMLReader implements GraphReader {
@Override
public Iterator<Vertex> readVertices(final InputStream inputStream,
- final Function<Attachable<Vertex>, Vertex> vertexMaker,
- final Function<Attachable<Edge>, Edge> edgeMaker,
+ final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
final Direction attachEdgesOfThisDirection) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
@Override
- public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeMaker) throws IOException {
+ public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
@Override
- public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexMaker) throws IOException {
+ public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
@Override
- public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexMaker,
- final Function<Attachable<Edge>, Edge> edgeMaker,
+ public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
final Direction attachEdgesOfThisDirection) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/86b78b73/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
index 31af797..d3e3204 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
@@ -139,15 +139,15 @@ public class GraphSONReader implements GraphReader {
@Override
public Iterator<Vertex> readVertices(final InputStream inputStream,
- final Function<Attachable<Vertex>, Vertex> vertexMaker,
- final Function<Attachable<Edge>, Edge> edgeMaker,
+ final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
final Direction attachEdgesOfThisDirection) throws IOException {
final BufferedReader br = new BufferedReader(new InputStreamReader(inputStream));
- return br.lines().<Vertex>map(FunctionUtils.wrapFunction(line -> readVertex(new ByteArrayInputStream(line.getBytes()), vertexMaker, edgeMaker, attachEdgesOfThisDirection))).iterator();
+ return br.lines().<Vertex>map(FunctionUtils.wrapFunction(line -> readVertex(new ByteArrayInputStream(line.getBytes()), vertexAttachMethod, edgeAttachMethod, attachEdgesOfThisDirection))).iterator();
}
@Override
- public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeMaker) throws IOException {
+ public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
final Map<String, Object> edgeData = mapper.readValue(inputStream, mapTypeReference);
final DetachedEdge edge = new DetachedEdge(edgeData.get(GraphSONTokens.ID),
@@ -156,28 +156,28 @@ public class GraphSONReader implements GraphReader {
Pair.with(edgeData.get(GraphSONTokens.OUT), edgeData.get(GraphSONTokens.OUT_LABEL).toString()),
Pair.with(edgeData.get(GraphSONTokens.IN), edgeData.get(GraphSONTokens.IN_LABEL).toString()));
- return edgeMaker.apply(edge);
+ return edgeAttachMethod.apply(edge);
}
@Override
- public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexMaker) throws IOException {
+ public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
final Map<String, Object> vertexData = mapper.readValue(inputStream, mapTypeReference);
- return readVertexData(vertexData, vertexMaker);
+ return readVertexData(vertexData, vertexAttachMethod);
}
@Override
public Vertex readVertex(final InputStream inputStream,
- final Function<Attachable<Vertex>, Vertex> vertexMaker,
- final Function<Attachable<Edge>, Edge> edgeMaker,
+ final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
final Direction attachEdgesOfThisDirection) throws IOException {
final Map<String, Object> vertexData = mapper.readValue(inputStream, mapTypeReference);
- final Vertex v = readVertexData(vertexData, vertexMaker);
+ final Vertex v = readVertexData(vertexData, vertexAttachMethod);
- if (edgeMaker != null && vertexData.containsKey(GraphSONTokens.OUT_E) && (attachEdgesOfThisDirection == Direction.BOTH || attachEdgesOfThisDirection == Direction.OUT))
- readVertexEdges(edgeMaker, vertexData, GraphSONTokens.OUT_E);
+ if (edgeAttachMethod != null && vertexData.containsKey(GraphSONTokens.OUT_E) && (attachEdgesOfThisDirection == Direction.BOTH || attachEdgesOfThisDirection == Direction.OUT))
+ readVertexEdges(edgeAttachMethod, vertexData, GraphSONTokens.OUT_E);
- if (edgeMaker != null && vertexData.containsKey(GraphSONTokens.IN_E) && (attachEdgesOfThisDirection == Direction.BOTH || attachEdgesOfThisDirection == Direction.IN))
- readVertexEdges(edgeMaker, vertexData, GraphSONTokens.IN_E);
+ if (edgeAttachMethod != null && vertexData.containsKey(GraphSONTokens.IN_E) && (attachEdgesOfThisDirection == Direction.BOTH || attachEdgesOfThisDirection == Direction.IN))
+ readVertexEdges(edgeAttachMethod, vertexData, GraphSONTokens.IN_E);
return v;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/86b78b73/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
index d607795..0009432 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
@@ -118,25 +118,25 @@ public class LegacyGraphSONReader implements GraphReader {
@Override
public Iterator<Vertex> readVertices(final InputStream inputStream,
- final Function<Attachable<Vertex>, Vertex> vertexMaker,
- final Function<Attachable<Edge>, Edge> edgeMaker,
+ final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
final Direction attachEdgesOfThisDirection) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
@Override
- public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeMaker) throws IOException {
+ public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
@Override
- public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexMaker) throws IOException {
+ public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
@Override
- public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexMaker,
- final Function<Attachable<Edge>, Edge> edgeMaker,
+ public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
final Direction attachEdgesOfThisDirection) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/86b78b73/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
index 9279580..95dce2c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
@@ -63,32 +63,32 @@ public class GryoReader implements GraphReader {
@Override
public Iterator<Vertex> readVertices(final InputStream inputStream,
- final Function<Attachable<Vertex>, Vertex> vertexMaker,
- final Function<Attachable<Edge>, Edge> edgeMaker,
+ final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
final Direction attachEdgesOfThisDirection) throws IOException {
- return new VertexInputIterator(new Input(inputStream), vertexMaker, attachEdgesOfThisDirection, edgeMaker);
+ return new VertexInputIterator(new Input(inputStream), vertexAttachMethod, attachEdgesOfThisDirection, edgeAttachMethod);
}
@Override
- public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeMaker) throws IOException {
+ public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
final Input input = new Input(inputStream);
readHeader(input);
final Attachable<Edge> attachable = kryo.readObject(input, DetachedEdge.class);
- return edgeMaker.apply(attachable);
+ return edgeAttachMethod.apply(attachable);
}
@Override
- public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexMaker) throws IOException {
- return readVertex(inputStream, vertexMaker, null, null);
+ public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
+ return readVertex(inputStream, vertexAttachMethod, null, null);
}
@Override
public Vertex readVertex(final InputStream inputStream,
- final Function<Attachable<Vertex>, Vertex> vertexMaker,
- final Function<Attachable<Edge>, Edge> edgeMaker,
+ final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
final Direction attachEdgesOfThisDirection) throws IOException {
final Input input = new Input(inputStream);
- return readVertexInternal(vertexMaker, edgeMaker, attachEdgesOfThisDirection, input);
+ return readVertexInternal(vertexAttachMethod, edgeAttachMethod, attachEdgesOfThisDirection, input);
}
@Override