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/03/26 19:54:36 UTC
[1/2] incubator-tinkerpop git commit: Simplified the identification
of Mutating steps in EventStrategy.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master d047f3d72 -> 9770afa63
Simplified the identification of Mutating steps in EventStrategy.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/bd16654a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/bd16654a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/bd16654a
Branch: refs/heads/master
Commit: bd16654a9a04bfe9169f78f881a0d377db497b39
Parents: d047f3d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 26 14:43:08 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 26 14:43:08 2015 -0400
----------------------------------------------------------------------
.../traversal/strategy/decoration/EventStrategy.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bd16654a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategy.java
index a3d42d9..22b1345 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategy.java
@@ -65,14 +65,7 @@ public class EventStrategy extends AbstractTraversalStrategy {
throw new IllegalStateException(String.format("%s requires a graph instance is present on the traversal", EventStrategy.class.getName()));
final EventStrategyCallback callback = new EventStrategyCallback(new EventTrigger(traversal.getGraph().get()));
- final List<Mutating> mutators = new ArrayList<>();
- mutators.addAll(TraversalHelper.getStepsOfAssignableClass(AddVertexStep.class, traversal));
- mutators.addAll(TraversalHelper.getStepsOfAssignableClass(AddVertexStartStep.class, traversal));
- mutators.addAll(TraversalHelper.getStepsOfAssignableClass(AddEdgeStep.class, traversal));
- mutators.addAll(TraversalHelper.getStepsOfAssignableClass(AddEdgeByPathStep.class, traversal));
- mutators.addAll(TraversalHelper.getStepsOfAssignableClass(AddPropertyStep.class, traversal));
- mutators.addAll(TraversalHelper.getStepsOfAssignableClass(DropStep.class, traversal));
- mutators.forEach(s -> s.addCallback(callback));
+ TraversalHelper.getStepsOfAssignableClass(Mutating.class, traversal).forEach(s -> s.addCallback(callback));
}
public static Builder build() {
[2/2] incubator-tinkerpop git commit: Removed a todo referring to
more asserts on Subgraph testing.
Posted by sp...@apache.org.
Removed a todo referring to more asserts on Subgraph testing.
Will rely on tests in the gremlin-test suite for such things. It is covered pretty well under there.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9770afa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9770afa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9770afa6
Branch: refs/heads/master
Commit: 9770afa63acfc2f60742f2349843237fb0294c52
Parents: bd16654
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 26 14:52:52 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 26 14:52:52 2015 -0400
----------------------------------------------------------------------
.../strategy/decoration/SubgraphStrategyTraverseTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9770afa6/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTraverseTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTraverseTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTraverseTest.java
index cd7f146..3bfaa34 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTraverseTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyTraverseTest.java
@@ -22,6 +22,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.LambdaFilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GraphStep;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Direction;
@@ -35,6 +36,7 @@ import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
/**
@@ -97,7 +99,5 @@ public class SubgraphStrategyTraverseTest {
final List<LambdaFilterStep> steps = TraversalHelper.getStepsOfClass(LambdaFilterStep.class, traversal.asAdmin());
assertEquals(expectedInsertedSteps, steps.size());
-
- // todo: better assert expectations when exploding g.V().out() to g.V().outE().inV() and the like
}
}