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 2018/06/30 10:28:50 UTC
[1/3] tinkerpop git commit: Added some javadoc CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master 1f240fe25 -> 11895ceb1
Added some javadoc CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/309957bc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/309957bc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/309957bc
Branch: refs/heads/master
Commit: 309957bc210eacc93114a261e3dbf1bb0db40231
Parents: 34a648b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Jun 30 06:24:23 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Jun 30 06:24:23 2018 -0400
----------------------------------------------------------------------
.../dsl/graph/GraphTraversalSource.java | 84 +++++++++++++++++++-
1 file changed, 83 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/309957bc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index 1b6a218..baba19c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -122,11 +122,17 @@ public class GraphTraversalSource implements TraversalSource {
//// CONFIGURATIONS
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphTraversalSource withStrategies(final TraversalStrategy... traversalStrategies) {
return (GraphTraversalSource) TraversalSource.super.withStrategies(traversalStrategies);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
@SuppressWarnings({"unchecked"})
public GraphTraversalSource withoutStrategies(final Class<? extends TraversalStrategy>... traversalStrategyClasses) {
@@ -139,76 +145,121 @@ public class GraphTraversalSource implements TraversalSource {
return (GraphTraversalSource) TraversalSource.super.withBindings(bindings);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphTraversalSource withComputer(final Computer computer) {
return (GraphTraversalSource) TraversalSource.super.withComputer(computer);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphTraversalSource withComputer(final Class<? extends GraphComputer> graphComputerClass) {
return (GraphTraversalSource) TraversalSource.super.withComputer(graphComputerClass);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphTraversalSource withComputer() {
return (GraphTraversalSource) TraversalSource.super.withComputer();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSideEffect(final String key, final Supplier<A> initialValue, final BinaryOperator<A> reducer) {
return (GraphTraversalSource) TraversalSource.super.withSideEffect(key, initialValue, reducer);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSideEffect(final String key, final A initialValue, final BinaryOperator<A> reducer) {
return (GraphTraversalSource) TraversalSource.super.withSideEffect(key, initialValue, reducer);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSideEffect(final String key, final A initialValue) {
return (GraphTraversalSource) TraversalSource.super.withSideEffect(key, initialValue);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSideEffect(final String key, final Supplier<A> initialValue) {
return (GraphTraversalSource) TraversalSource.super.withSideEffect(key, initialValue);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSack(final Supplier<A> initialValue, final UnaryOperator<A> splitOperator, final BinaryOperator<A> mergeOperator) {
return (GraphTraversalSource) TraversalSource.super.withSack(initialValue, splitOperator, mergeOperator);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSack(final A initialValue, final UnaryOperator<A> splitOperator, final BinaryOperator<A> mergeOperator) {
return (GraphTraversalSource) TraversalSource.super.withSack(initialValue, splitOperator, mergeOperator);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSack(final A initialValue) {
return (GraphTraversalSource) TraversalSource.super.withSack(initialValue);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSack(final Supplier<A> initialValue) {
return (GraphTraversalSource) TraversalSource.super.withSack(initialValue);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSack(final Supplier<A> initialValue, final UnaryOperator<A> splitOperator) {
return (GraphTraversalSource) TraversalSource.super.withSack(initialValue, splitOperator);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSack(final A initialValue, final UnaryOperator<A> splitOperator) {
return (GraphTraversalSource) TraversalSource.super.withSack(initialValue, splitOperator);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSack(final Supplier<A> initialValue, final BinaryOperator<A> mergeOperator) {
return (GraphTraversalSource) TraversalSource.super.withSack(initialValue, mergeOperator);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <A> GraphTraversalSource withSack(final A initialValue, final BinaryOperator<A> mergeOperator) {
return (GraphTraversalSource) TraversalSource.super.withSack(initialValue, mergeOperator);
@@ -230,16 +281,25 @@ public class GraphTraversalSource implements TraversalSource {
return clone;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphTraversalSource withRemote(final Configuration conf) {
return (GraphTraversalSource) TraversalSource.super.withRemote(conf);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphTraversalSource withRemote(final String configFile) throws Exception {
return (GraphTraversalSource) TraversalSource.super.withRemote(configFile);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphTraversalSource withRemote(final RemoteConnection connection) {
try {
@@ -280,6 +340,9 @@ public class GraphTraversalSource implements TraversalSource {
}
}
+ /**
+ * Spawns a {@link GraphTraversal} by adding a vertex with the specified label.
+ */
public GraphTraversal<Vertex, Vertex> addV(final String label) {
final GraphTraversalSource clone = this.clone();
clone.bytecode.addStep(GraphTraversal.Symbols.addV, label);
@@ -287,6 +350,9 @@ public class GraphTraversalSource implements TraversalSource {
return traversal.addStep(new AddVertexStartStep(traversal, label));
}
+ /**
+ * Spawns a {@link GraphTraversal} by adding a vertex with the default label.
+ */
public GraphTraversal<Vertex, Vertex> addV() {
final GraphTraversalSource clone = this.clone();
clone.bytecode.addStep(GraphTraversal.Symbols.addV);
@@ -294,6 +360,9 @@ public class GraphTraversalSource implements TraversalSource {
return traversal.addStep(new AddVertexStartStep(traversal, null));
}
+ /**
+ * Spawns a {@link GraphTraversal} starting it with arbitrary values.
+ */
public <S> GraphTraversal<S, S> inject(S... starts) {
final GraphTraversalSource clone = this.clone();
clone.bytecode.addStep(GraphTraversal.Symbols.inject, starts);
@@ -301,6 +370,10 @@ public class GraphTraversalSource implements TraversalSource {
return traversal.addStep(new InjectStep<S>(traversal, starts));
}
+ /**
+ * Spawns a {@link GraphTraversal} starting with all vertices or some subset of vertices as specified by their
+ * unique identifier.
+ */
public GraphTraversal<Vertex, Vertex> V(final Object... vertexIds) {
final GraphTraversalSource clone = this.clone();
clone.bytecode.addStep(GraphTraversal.Symbols.V, vertexIds);
@@ -308,6 +381,10 @@ public class GraphTraversalSource implements TraversalSource {
return traversal.addStep(new GraphStep<>(traversal, Vertex.class, true, vertexIds));
}
+ /**
+ * Spawns a {@link GraphTraversal} starting with all edges or some subset of edges as specified by their unique
+ * identifier.
+ */
public GraphTraversal<Edge, Edge> E(final Object... edgesIds) {
final GraphTraversalSource clone = this.clone();
clone.bytecode.addStep(GraphTraversal.Symbols.E, edgesIds);
@@ -315,11 +392,16 @@ public class GraphTraversalSource implements TraversalSource {
return traversal.addStep(new GraphStep<>(traversal, Edge.class, true, edgesIds));
}
-
+ /**
+ * Proxies calls through to the underlying {@link Graph#tx()}.
+ */
public Transaction tx() {
return this.graph.tx();
}
+ /**
+ * If there is an underlying {@link RemoteConnection} it will be closed by this method.
+ */
@Override
public void close() throws Exception {
if (connection != null) connection.close();
[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1f15781a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1f15781a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1f15781a
Branch: refs/heads/master
Commit: 1f15781ac049008e50b63e3632c86158e570ef15
Parents: 65ba04f 309957b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Jun 30 06:28:22 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Jun 30 06:28:22 2018 -0400
----------------------------------------------------------------------
.../dsl/graph/GraphTraversalSource.java | 94 +++++++++++++++++++-
1 file changed, 93 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1f15781a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index 81a0a71,baba19c..bc3ef9e
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@@ -127,6 -139,15 +133,9 @@@ public class GraphTraversalSource imple
return (GraphTraversalSource) TraversalSource.super.withoutStrategies(traversalStrategyClasses);
}
- @Override
- @Deprecated
- public GraphTraversalSource withBindings(final Bindings bindings) {
- return (GraphTraversalSource) TraversalSource.super.withBindings(bindings);
- }
-
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphTraversalSource withComputer(final Computer computer) {
return (GraphTraversalSource) TraversalSource.super.withComputer(computer);
@@@ -247,6 -319,30 +307,10 @@@
//// SPAWNS
- /**
- * @deprecated As of release 3.1.0, replaced by {@link #addV()}
- */
- @Deprecated
- public GraphTraversal<Vertex, Vertex> addV(final Object... keyValues) {
- ElementHelper.legalPropertyKeyValueArray(keyValues);
- if (keyValues.length != 0 && keyValues[0].equals(T.label)) {
- final GraphTraversal<Vertex, Vertex> traversal = this.addV(keyValues[1].toString());
- for (int i = 2; i < keyValues.length; i = i + 2) {
- traversal.property(keyValues[i], keyValues[i + 1]);
- }
- return traversal;
- } else {
- final GraphTraversal<Vertex, Vertex> traversal = this.addV();
- for (int i = 0; i < keyValues.length; i = i + 2) {
- traversal.property(keyValues[i], keyValues[i + 1]);
- }
- return traversal;
- }
- }
+
+ /**
+ * Spawns a {@link GraphTraversal} by adding a vertex with the specified label.
+ */
public GraphTraversal<Vertex, Vertex> addV(final String label) {
final GraphTraversalSource clone = this.clone();
clone.bytecode.addStep(GraphTraversal.Symbols.addV, label);
@@@ -254,34 -350,19 +318,49 @@@
return traversal.addStep(new AddVertexStartStep(traversal, label));
}
+ /**
++ * Spawns a {@link GraphTraversal} by adding a vertex with the label as determined by a {@link Traversal}.
++ */
+ public GraphTraversal<Vertex, Vertex> addV(final Traversal<?, String> vertexLabelTraversal) {
+ final GraphTraversalSource clone = this.clone();
+ clone.bytecode.addStep(GraphTraversal.Symbols.addV, vertexLabelTraversal);
+ final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
+ return traversal.addStep(new AddVertexStartStep(traversal, vertexLabelTraversal));
+ }
+
++ /**
+ * Spawns a {@link GraphTraversal} by adding a vertex with the default label.
+ */
public GraphTraversal<Vertex, Vertex> addV() {
final GraphTraversalSource clone = this.clone();
clone.bytecode.addStep(GraphTraversal.Symbols.addV);
final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone);
- return traversal.addStep(new AddVertexStartStep(traversal, null));
+ return traversal.addStep(new AddVertexStartStep(traversal, (String)null));
+ }
+
++ /**
++ * Spawns a {@link GraphTraversal} by adding a edge with the specified label.
++ */
+ public GraphTraversal<Edge, Edge> addE(final String label) {
+ final GraphTraversalSource clone = this.clone();
+ clone.bytecode.addStep(GraphTraversal.Symbols.addE, label);
+ final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
+ return traversal.addStep(new AddEdgeStartStep(traversal, label));
+ }
+
++ /**
++ * Spawns a {@link GraphTraversal} by adding a edge with a label as specified by the provided {@link Traversal}.
++ */
+ public GraphTraversal<Edge, Edge> addE(final Traversal<?, String> edgeLabelTraversal) {
+ final GraphTraversalSource clone = this.clone();
+ clone.bytecode.addStep(GraphTraversal.Symbols.addE, edgeLabelTraversal);
+ final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone);
+ return traversal.addStep(new AddEdgeStartStep(traversal, edgeLabelTraversal));
}
+ /**
+ * Spawns a {@link GraphTraversal} starting it with arbitrary values.
+ */
public <S> GraphTraversal<S, S> inject(S... starts) {
final GraphTraversalSource clone = this.clone();
clone.bytecode.addStep(GraphTraversal.Symbols.inject, starts);
[3/3] tinkerpop git commit: Merge branch 'tp33'
Posted by sp...@apache.org.
Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/11895ceb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/11895ceb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/11895ceb
Branch: refs/heads/master
Commit: 11895ceb1de2fd918ae51b168dddd75e18712ecf
Parents: 1f240fe 1f15781
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Jun 30 06:28:31 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Jun 30 06:28:31 2018 -0400
----------------------------------------------------------------------
.../dsl/graph/GraphTraversalSource.java | 94 +++++++++++++++++++-
1 file changed, 93 insertions(+), 1 deletion(-)
----------------------------------------------------------------------