You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/07/12 16:52:05 UTC
[12/50] [abbrv] tinkerpop git commit: Removed ancient deprecated
mutation steps of addV(), addE(), and addOutE(),
addInE(). These are no longer needed given the introduction of to() and from()
constructs.
Removed ancient deprecated mutation steps of addV(), addE(), and addOutE(), addInE(). These are no longer needed given the introduction of to() and from() constructs.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1e034535
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1e034535
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1e034535
Branch: refs/heads/TINKERPOP-1682
Commit: 1e034535b0bc896beff497ed9473fcfa8b70e876
Parents: c3cfaea
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jul 10 08:14:54 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jul 10 08:14:54 2017 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +
docs/src/upgrade/release-3.3.x.asciidoc | 4 +
.../traversal/dsl/graph/GraphTraversal.java | 66 --------
.../dsl/graph/GraphTraversalSource.java | 21 ---
.../gremlin/process/traversal/dsl/graph/__.java | 32 ----
.../strategy/decoration/EventStrategyTest.java | 1 -
.../process/traversal/step/map/AddEdgeTest.java | 162 -------------------
.../traversal/step/map/AddVertexTest.java | 51 ------
.../ElementIdStrategyProcessTest.java | 10 +-
9 files changed, 13 insertions(+), 338 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bfdd43d..f0ca7f4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,10 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Removed previously deprecated `GraphTraversal#addV(Object...)`
+* Removed previously deprecated `GraphTraversal#addE(Direction, String, String, Object...)`
+* Removed previously deprecated `GraphTraversal#addOutE(String, String, Object...)`
+* Removed previously deprecated `GraphTraversal#addInV(String, String, Object...)`
* Removed previously deprecated `TraversalSource.Builder` class.
* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
* Removed previously deprecated `TraversalScriptFunction` class.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index d729da8..13c1f6c 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -211,6 +211,10 @@ The following deprecated classes, methods or fields have been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addV(Object...)`
+** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction, String, String, Object...)`
+** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String, String, Object...)`
+** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String, String, Object...)`
** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 6254b0a..b77784e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -1025,19 +1025,6 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
/**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link #addV()}
- */
- @Deprecated
- public default GraphTraversal<S, Vertex> addV(final Object... propertyKeyValues) {
- this.addV();
- for (int i = 0; i < propertyKeyValues.length; i = i + 2) {
- this.property(propertyKeyValues[i], propertyKeyValues[i + 1]);
- }
- return (GraphTraversal<S, Vertex>) this;
- }
-
- /**
* Adds an {@link Edge} with the specified edge label.
*
* @param edgeLabel the label of the newly added edge
@@ -1108,59 +1095,6 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this;
}
- /**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link #addE(String)}
- */
- @Deprecated
- public default GraphTraversal<S, Edge> addE(final Direction direction, final String firstVertexKeyOrEdgeLabel, final String edgeLabelOrSecondVertexKey, final Object... propertyKeyValues) {
- if (propertyKeyValues.length % 2 == 0) {
- // addOutE("createdBy", "a")
- this.addE(firstVertexKeyOrEdgeLabel);
- if (direction.equals(Direction.OUT))
- this.to(edgeLabelOrSecondVertexKey);
- else
- this.from(edgeLabelOrSecondVertexKey);
-
- for (int i = 0; i < propertyKeyValues.length; i = i + 2) {
- this.property(propertyKeyValues[i], propertyKeyValues[i + 1]);
- }
- //((Mutating) this.asAdmin().getEndStep()).addPropertyMutations(propertyKeyValues);
- return (GraphTraversal<S, Edge>) this;
- } else {
- // addInE("a", "codeveloper", "b", "year", 2009)
- this.addE(edgeLabelOrSecondVertexKey);
- if (direction.equals(Direction.OUT))
- this.from(firstVertexKeyOrEdgeLabel).to((String) propertyKeyValues[0]);
- else
- this.to(firstVertexKeyOrEdgeLabel).from((String) propertyKeyValues[0]);
-
- for (int i = 1; i < propertyKeyValues.length; i = i + 2) {
- this.property(propertyKeyValues[i], propertyKeyValues[i + 1]);
- }
- //((Mutating) this.asAdmin().getEndStep()).addPropertyMutations(Arrays.copyOfRange(propertyKeyValues, 1, propertyKeyValues.length));
- return (GraphTraversal<S, Edge>) this;
- }
- }
-
- /**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link #addE(String)}
- */
- @Deprecated
- public default GraphTraversal<S, Edge> addOutE(final String firstVertexKeyOrEdgeLabel, final String edgeLabelOrSecondVertexKey, final Object... propertyKeyValues) {
- return this.addE(Direction.OUT, firstVertexKeyOrEdgeLabel, edgeLabelOrSecondVertexKey, propertyKeyValues);
- }
-
- /**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link #addE(String)}
- */
- @Deprecated
- public default GraphTraversal<S, Edge> addInE(final String firstVertexKeyOrEdgeLabel, final String edgeLabelOrSecondVertexKey, final Object... propertyKeyValues) {
- return this.addE(Direction.IN, firstVertexKeyOrEdgeLabel, edgeLabelOrSecondVertexKey, propertyKeyValues);
- }
-
///////////////////// FILTER STEPS /////////////////////
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/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 bb56767..45f460e 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
@@ -259,27 +259,6 @@ public class GraphTraversalSource implements TraversalSource {
//// 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;
- }
- }
-
public GraphTraversal<Vertex, Vertex> addV(final String label) {
final GraphTraversalSource clone = this.clone();
clone.bytecode.addStep(GraphTraversal.Symbols.addV, label);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 270eef3..ac4865f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -518,38 +518,6 @@ public class __ {
}
/**
- * @see GraphTraversal#addV(Object...)
- */
- @Deprecated
- public static <A> GraphTraversal<A, Vertex> addV(final Object... propertyKeyValues) {
- return __.<A>start().addV(propertyKeyValues);
- }
-
- /**
- * @see GraphTraversal#addE(Direction, String, String, Object...)
- */
- @Deprecated
- public static <A> GraphTraversal<A, Edge> addE(final Direction direction, final String firstVertexKeyOrEdgeLabel, final String edgeLabelOrSecondVertexKey, final Object... propertyKeyValues) {
- return __.<A>start().addE(direction, firstVertexKeyOrEdgeLabel, edgeLabelOrSecondVertexKey, propertyKeyValues);
- }
-
- /**
- * @see GraphTraversal#addOutE(String, String, Object...)
- */
- @Deprecated
- public static <A> GraphTraversal<A, Edge> addOutE(final String firstVertexKeyOrEdgeLabel, final String edgeLabelOrSecondVertexKey, final Object... propertyKeyValues) {
- return __.<A>start().addOutE(firstVertexKeyOrEdgeLabel, edgeLabelOrSecondVertexKey, propertyKeyValues);
- }
-
- /**
- * @see GraphTraversal#addInE(String, String, Object...)
- */
- @Deprecated
- public static <A> GraphTraversal<A, Edge> addInE(final String firstVertexKeyOrEdgeLabel, final String edgeLabelOrSecondVertexKey, final Object... propertyKeyValues) {
- return __.<A>start().addInE(firstVertexKeyOrEdgeLabel, edgeLabelOrSecondVertexKey, propertyKeyValues);
- }
-
- /**
* @see GraphTraversal#addE(String)
*/
public static <A> GraphTraversal<A, Edge> addE(final String edgeLabel) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyTest.java
index 8dc4d24..27d9b7e 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategyTest.java
@@ -48,7 +48,6 @@ public class EventStrategyTest {
{"addE(test).to(x)", new DefaultGraphTraversal<>(EmptyGraph.instance()).addE("test").to("x"), 1},
{"addE(test).to(x).property(this,that)", new DefaultGraphTraversal<>(EmptyGraph.instance()).addE("test").to("x").property("this", "that"), 1},
{"addV()", new DefaultGraphTraversal<>(EmptyGraph.instance()).addV(), 1},
- {"addV(args)", new DefaultGraphTraversal<>(EmptyGraph.instance()).addV("test", "this"), 1},
{"addV().property(k,v)", new DefaultGraphTraversal<>(EmptyGraph.instance()).addV().property("test", "that"), 1},
{"properties().drop()", new DefaultGraphTraversal<>(EmptyGraph.instance()).properties().drop(), 1},
{"properties(k).drop()", new DefaultGraphTraversal<>(EmptyGraph.instance()).properties("test").drop(), 1},
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
index d418944..c6e76d8 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
@@ -63,43 +63,6 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Edge> get_g_addV_asXfirstX_repeatXaddEXnextX_toXaddVX_inVX_timesX5X_addEXnextX_toXselectXfirstXX();
- ///////
-
- @Deprecated
- public abstract Traversal<Vertex, Edge> get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX(final Object v1Id);
-
- @Deprecated
- public abstract Traversal<Vertex, Edge> get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X(final Object v1Id);
-
- @Deprecated
- public abstract Traversal<Vertex, Edge> get_g_withSideEffectXx__g_V_toListX_addOutEXexistsWith_x_time_nowX();
-
- @Deprecated
- public abstract Traversal<Vertex, Edge> get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_selectXa_bX_addInEXa_codeveloper_b_year_2009X();
-
- @Deprecated
- public abstract Traversal<Vertex, Edge> get_g_V_asXaX_inXcreatedX_addInEXcreatedBy_a_year_2009_acl_publicX();
-
- @Test
- @LoadGraphWith(MODERN)
- @Deprecated
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
- public void g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX() {
- final Traversal<Vertex, Edge> traversal = get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX(convertToVertexId("marko"));
- printTraversalForm(traversal);
- int count = 0;
- while (traversal.hasNext()) {
- final Edge edge = traversal.next();
- assertEquals("createdBy", edge.label());
- assertEquals(0, IteratorUtils.count(edge.properties()));
- count++;
-
- }
- assertEquals(1, count);
- assertEquals(7, IteratorUtils.count(g.E()));
- assertEquals(6, IteratorUtils.count(g.V()));
- }
-
@Test
@LoadGraphWith(MODERN)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@@ -121,28 +84,6 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- @Deprecated
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
- public void g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X() {
- final Traversal<Vertex, Edge> traversal = get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X(convertToVertexId("marko"));
- printTraversalForm(traversal);
- int count = 0;
- while (traversal.hasNext()) {
- final Edge edge = traversal.next();
- assertEquals("createdBy", edge.label());
- assertEquals(2.0d, edge.<Number>value("weight").doubleValue(), 0.00001d);
- assertEquals(1, IteratorUtils.count(edge.properties()));
- count++;
-
-
- }
- assertEquals(1, count);
- assertEquals(7, IteratorUtils.count(g.E()));
- assertEquals(6, IteratorUtils.count(g.V()));
- }
-
- @Test
- @LoadGraphWith(MODERN)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
public void g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X() {
final Traversal<Vertex, Edge> traversal = get_g_VX1X_asXaX_outXcreatedX_addEXcreatedByX_toXaX_propertyXweight_2X(convertToVertexId("marko"));
@@ -163,30 +104,6 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest {
}
@Test
- @Ignore
- @LoadGraphWith(MODERN)
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
- public void g_withSideEffectXx__g_V_toListX_addOutEXexistsWith_x_time_nowX() {
- final Traversal<Vertex, Edge> traversal = get_g_withSideEffectXx__g_V_toListX_addOutEXexistsWith_x_time_nowX();
- printTraversalForm(traversal);
- int count = 0;
- while (traversal.hasNext()) {
- final Edge edge = traversal.next();
- assertEquals("existsWith", edge.label());
- assertEquals("now", edge.value("time"));
- assertEquals(1, IteratorUtils.count(edge.properties()));
- count++;
- }
- assertEquals(36, count);
- assertEquals(42, IteratorUtils.count(g.E()));
- for (final Vertex vertex : IteratorUtils.list(g.V())) {
- assertEquals(6, IteratorUtils.count(vertex.edges(Direction.OUT, "existsWith")));
- assertEquals(6, IteratorUtils.count(vertex.edges(Direction.IN, "existsWith")));
- }
- assertEquals(6, IteratorUtils.count(g.V()));
- }
-
- @Test
@LoadGraphWith(MODERN)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
public void g_V_aggregateXxX_asXaX_selectXxX_unfold_addEXexistsWithX_toXaX_propertyXtime_nowX() {
@@ -211,32 +128,6 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- @Deprecated
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
- public void g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_selectXa_bX_addInEXa_codeveloper_b_year_2009X() {
- final Traversal<Vertex, Edge> traversal = get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_selectXa_bX_addInEXa_codeveloper_b_year_2009X();
- printTraversalForm(traversal);
- int count = 0;
- while (traversal.hasNext()) {
- final Edge edge = traversal.next();
- assertEquals("codeveloper", edge.label());
- assertEquals(2009, (int) edge.value("year"));
- assertEquals(1, IteratorUtils.count(edge.properties()));
- assertEquals("person", edge.inVertex().label());
- assertEquals("person", edge.outVertex().label());
- assertFalse(edge.inVertex().value("name").equals("vadas"));
- assertFalse(edge.outVertex().value("name").equals("vadas"));
- assertFalse(edge.inVertex().equals(edge.outVertex()));
- count++;
-
- }
- assertEquals(6, count);
- assertEquals(12, IteratorUtils.count(g.E()));
- assertEquals(6, IteratorUtils.count(g.V()));
- }
-
- @Test
- @LoadGraphWith(MODERN)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
public void g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_addEXcodeveloperX_fromXaX_toXbX_propertyXyear_2009X() {
final Traversal<Vertex, Edge> traversal = get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_addEXcodeveloperX_fromXaX_toXbX_propertyXyear_2009X();
@@ -262,32 +153,6 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- @Deprecated
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
- public void g_V_asXaX_inXcreatedX_addInEXcreatedBy_a_year_2009_acl_publicX() {
- final Traversal<Vertex, Edge> traversal = get_g_V_asXaX_inXcreatedX_addInEXcreatedBy_a_year_2009_acl_publicX();
- printTraversalForm(traversal);
- int count = 0;
- while (traversal.hasNext()) {
- final Edge edge = traversal.next();
- assertEquals("createdBy", edge.label());
- assertEquals(2009, (int) edge.value("year"));
- assertEquals("public", edge.value("acl"));
- assertEquals(2, IteratorUtils.count(edge.properties()));
- assertEquals("person", edge.inVertex().label());
- assertEquals("software", edge.outVertex().label());
- if (edge.outVertex().value("name").equals("ripple"))
- assertEquals("josh", edge.inVertex().value("name"));
- count++;
-
- }
- assertEquals(4, count);
- assertEquals(10, IteratorUtils.count(g.E()));
- assertEquals(6, IteratorUtils.count(g.V()));
- }
-
- @Test
- @LoadGraphWith(MODERN)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
public void g_V_asXaX_inXcreatedX_addEXcreatedByX_fromXaX_propertyXyear_2009X_propertyXacl_publicX() {
final Traversal<Vertex, Edge> traversal = get_g_V_asXaX_inXcreatedX_addEXcreatedByX_fromXaX_propertyXyear_2009X_propertyXacl_publicX();
@@ -354,33 +219,6 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest {
return g.V().as("a").in("created").addE("createdBy").from("a").property("year", 2009).property("acl", "public");
}
- ///////
-
- @Override
- public Traversal<Vertex, Edge> get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX(final Object v1Id) {
- return g.V(v1Id).as("a").out("created").addOutE("createdBy", "a");
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X(final Object v1Id) {
- return g.V(v1Id).as("a").out("created").addOutE("createdBy", "a", "weight", 2.0d);
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_withSideEffectXx__g_V_toListX_addOutEXexistsWith_x_time_nowX() {
- return g.withSideEffect("x", g.V().toList()).V().addOutE("existsWith", "x", "time", "now");
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_selectXa_bX_addInEXa_codeveloper_b_year_2009X() {
- return g.V().as("a").out("created").in("created").where(P.neq("a")).as("b").select("a", "b").addInE("a", "codeveloper", "b", "year", 2009);
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_V_asXaX_inXcreatedX_addInEXcreatedBy_a_year_2009_acl_publicX() {
- return g.V().as("a").in("created").addInE("createdBy", "a", "year", 2009, "acl", "public");
- }
-
@Override
public Traversal<Vertex, Edge> get_g_addV_asXfirstX_repeatXaddEXnextX_toXaddVX_inVX_timesX5X_addEXnextX_toXselectXfirstXX() {
return g.addV().as("first").repeat(__.addE("next").to(__.addV()).inV()).times(5).addE("next").to(select("first"));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
index f43c612..584ead4 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
@@ -72,13 +72,6 @@ public abstract class AddVertexTest extends AbstractGremlinTest {
public abstract Traversal<Vertex, String> get_g_withSideEffectXa_markoX_addV_propertyXname_selectXaXX_name();
- // 3.0.0 DEPRECATIONS
- @Deprecated
- public abstract Traversal<Vertex, Vertex> get_g_V_addVXlabel_animal_age_0X();
-
- @Deprecated
- public abstract Traversal<Vertex, Vertex> get_g_addVXlabel_person_name_stephenX();
-
@Test
@LoadGraphWith(MODERN)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@@ -253,40 +246,6 @@ public abstract class AddVertexTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(MODERN)
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY)
- public void g_V_addVXlabel_animal_age_0X() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_addVXlabel_animal_age_0X();
- printTraversalForm(traversal);
- int count = 0;
- while (traversal.hasNext()) {
- final Vertex vertex = traversal.next();
- assertEquals("animal", vertex.label());
- assertEquals(0, vertex.<Integer>value("age").intValue());
- count++;
- }
- assertEquals(6, count);
- assertEquals(12, IteratorUtils.count(g.V()));
-
- }
-
- @Test
- @LoadGraphWith(MODERN)
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY)
- public void g_addVXlabel_person_name_stephenX() {
- final Traversal<Vertex, Vertex> traversal = get_g_addVXlabel_person_name_stephenX();
- printTraversalForm(traversal);
- final Vertex stephen = traversal.next();
- assertFalse(traversal.hasNext());
- assertEquals("person", stephen.label());
- assertEquals("stephen", stephen.value("name"));
- assertEquals(1, IteratorUtils.count(stephen.properties()));
- assertEquals(7, IteratorUtils.count(g.V()));
- }
-
- @Test
- @LoadGraphWith(MODERN)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY)
public void g_withSideEffectXa_testX_V_hasLabelXsoftwareX_propertyXtemp_selectXaXX_valueMapXname_tempX() {
final Traversal<Vertex, Map<String, List<String>>> traversal = get_g_withSideEffectXa_testX_V_hasLabelXsoftwareX_propertyXtemp_selectXaXX_valueMapXname_tempX();
@@ -363,16 +322,6 @@ public abstract class AddVertexTest extends AbstractGremlinTest {
}
@Override
- public Traversal<Vertex, Vertex> get_g_V_addVXlabel_animal_age_0X() {
- return g.V().addV(T.label, "animal", "age", 0);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_addVXlabel_person_name_stephenX() {
- return g.addV(T.label, "person", "name", "stephen");
- }
-
- @Override
public Traversal<Vertex, Map<String, List<String>>> get_g_withSideEffectXa_testX_V_hasLabelXsoftwareX_propertyXtemp_selectXaXX_valueMapXname_tempX() {
return g.withSideEffect("a", "test").V().hasLabel("software").property("temp", select("a")).valueMap("name", "temp");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e034535/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategyProcessTest.java
index aeba8ca..9acaa3f 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/ElementIdStrategyProcessTest.java
@@ -148,7 +148,7 @@ public class ElementIdStrategyProcessTest extends AbstractGremlinProcessTest {
sg.addV().next();
assertEquals(1, IteratorUtils.count(sg.V()));
- final Vertex v = sg.V().addV(T.id, "STEPHEN", "name", "stephen").next();
+ final Vertex v = sg.V().addV().property(T.id, "STEPHEN").property("name", "stephen").next();
assertEquals("stephen", v.value("name"));
assertEquals("STEPHEN", sg.V(v).id().next());
assertEquals("STEPHEN", sg.V("STEPHEN").id().next());
@@ -160,7 +160,7 @@ public class ElementIdStrategyProcessTest extends AbstractGremlinProcessTest {
final ElementIdStrategy strategy = ElementIdStrategy.build().create();
final GraphTraversalSource sg = create(strategy);
final Vertex v = sg.addV().next();
- final Edge e = sg.withSideEffect("v", v).V(v).addE(Direction.OUT, "self", "v", "test", "value", T.id, "some-id").next();
+ final Edge e = sg.withSideEffect("v", v).V(v).addE("self").to("v").property("test", "value").property(T.id, "some-id").next();
assertEquals("value", e.value("test"));
assertEquals("some-id", sg.E(e).id().next());
assertEquals("some-id", sg.E("some-id").id().next());
@@ -172,7 +172,7 @@ public class ElementIdStrategyProcessTest extends AbstractGremlinProcessTest {
final ElementIdStrategy strategy = ElementIdStrategy.build().create();
final GraphTraversalSource sg = create(strategy);
final Vertex v = sg.addV().next();
- final Edge e = sg.withSideEffect("v", v).V(v).addE(Direction.OUT, "self", "v", "test", "value").next();
+ final Edge e = sg.withSideEffect("v", v).V(v).addE("self").to("v").property("test", "value").next();
assertEquals("value", e.value("test"));
assertNotNull(UUID.fromString(sg.E(e).id().next().toString()));
}
@@ -183,7 +183,7 @@ public class ElementIdStrategyProcessTest extends AbstractGremlinProcessTest {
final ElementIdStrategy strategy = ElementIdStrategy.build().idPropertyKey("name").create();
final GraphTraversalSource sg = create(strategy);
final Vertex v = sg.addV().next();
- final Edge e = sg.withSideEffect("v", v).V(v).addE(Direction.OUT, "self", "v", "test", "value", T.id, "some-id").next();
+ final Edge e = sg.withSideEffect("v", v).V(v).addE("self").to("v").property("test", "value").property(T.id, "some-id").next();
assertEquals("value", e.value("test"));
assertEquals("some-id", e.value("name"));
assertEquals("some-id", sg.E(e).id().next());
@@ -196,7 +196,7 @@ public class ElementIdStrategyProcessTest extends AbstractGremlinProcessTest {
final ElementIdStrategy strategy = ElementIdStrategy.build().idPropertyKey("name").create();
final GraphTraversalSource sg = create(strategy);
final Vertex v = sg.addV().next();
- final Edge e = sg.withSideEffect("v", v).V(v).addE(Direction.OUT, "self", "v", "test", "value", "name", "some-id").next();
+ final Edge e = sg.withSideEffect("v", v).V(v).addE("self").to("v").property("test", "value").property("name", "some-id").next();
assertEquals("value", e.value("test"));
assertEquals("some-id", e.value("name"));
assertEquals("some-id", sg.E(e).id().next());