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/02/13 22:38:21 UTC
incubator-tinkerpop git commit: TraversalStrategy.applyStrategy() no
longer requires the TraveraslEngine. It can get it from the traversal as its
known at Traversal construction time.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master d70378f48 -> 2bc87c386
TraversalStrategy.applyStrategy() no longer requires the TraveraslEngine. It can get it from the traversal as its known at Traversal construction time.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2bc87c38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2bc87c38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2bc87c38
Branch: refs/heads/master
Commit: 2bc87c3863b6130cf750560c29b90a72fe3f9827
Parents: d70378f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Feb 13 14:38:18 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Feb 13 14:38:18 2015 -0700
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/process/TraversalStrategies.java | 2 +-
.../org/apache/tinkerpop/gremlin/process/TraversalStrategy.java | 2 +-
.../traversal/strategy/ComparatorHolderRemovalStrategy.java | 4 ++--
.../process/graph/traversal/strategy/ConjunctionStrategy.java | 2 +-
.../graph/traversal/strategy/DedupOptimizerStrategy.java | 2 +-
.../graph/traversal/strategy/EngineDependentStrategy.java | 4 ++--
.../graph/traversal/strategy/IdentityRemovalStrategy.java | 2 +-
.../graph/traversal/strategy/LabeledEndStepStrategy.java | 2 +-
.../process/graph/traversal/strategy/MatchWhereStrategy.java | 2 +-
.../process/graph/traversal/strategy/ProfileStrategy.java | 2 +-
.../graph/traversal/strategy/RangeByIsCountStrategy.java | 2 +-
.../process/graph/traversal/strategy/ReducingStrategy.java | 4 ++--
.../process/graph/traversal/strategy/SideEffectCapStrategy.java | 2 +-
.../traversal/strategy/SideEffectRegistrationStrategy.java | 2 +-
.../graph/traversal/strategy/TraversalVerificationStrategy.java | 4 ++--
.../tinkerpop/gremlin/process/traversal/DefaultTraversal.java | 2 +-
.../gremlin/process/traversal/DefaultTraversalStrategies.java | 4 ++--
.../process/traversal/util/EmptyTraversalStrategies.java | 2 +-
.../graph/traversal/strategy/HadoopElementStepStrategy.java | 4 ++--
.../graph/traversal/strategy/Neo4jGraphStepStrategy.java | 2 +-
.../graph/traversal/strategy/TinkerElementStepStrategy.java | 4 ++--
.../graph/traversal/strategy/TinkerGraphStepStrategy.java | 5 ++---
22 files changed, 30 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategies.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategies.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategies.java
index c9f474e..fc7a314 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategies.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategies.java
@@ -56,7 +56,7 @@ public interface TraversalStrategies extends Serializable, Cloneable {
* @param traversal the traversal to apply the strategies to
* @param engine the engine that the traversal is going to be executed on
*/
- public void applyStrategies(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine);
+ public void applyStrategies(final Traversal.Admin<?, ?> traversal);
/**
* Add all the provided {@link TraversalStrategy} instances to the current collection.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategy.java
index 8494a1d..24e8eaf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalStrategy.java
@@ -38,7 +38,7 @@ public interface TraversalStrategy extends Serializable{
// Make use of a singleton instance() object to reduce object creation on the JVM
// Moreover they are stateless objects.
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine traversalEngine);
+ public void apply(final Traversal.Admin<?, ?> traversal);
public default Set<Class<? extends TraversalStrategy>> applyPrior() {
return Collections.emptySet();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java
index 8cf6cec..6ea93a8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ComparatorHolderRemovalStrategy.java
@@ -35,8 +35,8 @@ public final class ComparatorHolderRemovalStrategy extends AbstractTraversalStra
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
- if (engine.isStandard())
+ public void apply(final Traversal.Admin<?, ?> traversal) {
+ if (traversal.getEngine().isStandard())
return;
if (TraversalHelper.hasStepOfAssignableClass(ComparatorHolder.class, traversal)) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java
index e5d4e1b..8b10fb7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ConjunctionStrategy.java
@@ -41,7 +41,7 @@ public final class ConjunctionStrategy extends AbstractTraversalStrategy impleme
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine traversalEngine) {
+ public void apply(final Traversal.Admin<?, ?> traversal) {
processConjunctionMarker(AndStep.AndMarker.class, traversal);
processConjunctionMarker(OrStep.OrMarker.class, traversal);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java
index cd0a7f1..903f4cd 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/DedupOptimizerStrategy.java
@@ -43,7 +43,7 @@ public final class DedupOptimizerStrategy extends AbstractTraversalStrategy {
private static final List<Class<? extends Step>> BIJECTIVE_PIPES = Arrays.asList(IdentityStep.class, OrderGlobalStep.class);
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
+ public void apply(final Traversal.Admin<?, ?> traversal) {
if (!TraversalHelper.hasStepOfClass(DedupStep.class, traversal))
return;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java
index 941ac9a..ea51480 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/EngineDependentStrategy.java
@@ -34,10 +34,10 @@ public final class EngineDependentStrategy extends AbstractTraversalStrategy imp
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine traversalEngine) {
+ public void apply(final Traversal.Admin<?, ?> traversal) {
traversal.getSteps().stream()
.filter(step -> step instanceof EngineDependent)
- .forEach(step -> ((EngineDependent) step).onEngine(traversalEngine));
+ .forEach(step -> ((EngineDependent) step).onEngine(traversal.getEngine()));
}
public static EngineDependentStrategy instance() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java
index 4a159eb..c81c1e5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/IdentityRemovalStrategy.java
@@ -34,7 +34,7 @@ public final class IdentityRemovalStrategy extends AbstractTraversalStrategy {
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
+ public void apply(final Traversal.Admin<?, ?> traversal) {
if (!TraversalHelper.hasStepOfClass(IdentityStep.class, traversal))
return;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java
index 7fd38b6..3f091e8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/LabeledEndStepStrategy.java
@@ -34,7 +34,7 @@ public final class LabeledEndStepStrategy extends AbstractTraversalStrategy {
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
+ public void apply(final Traversal.Admin<?, ?> traversal) {
if (traversal.getEndStep().getLabel().isPresent())
traversal.addStep(new MarkerIdentityStep<>(traversal));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java
index 35731ea..fa33567 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/MatchWhereStrategy.java
@@ -49,7 +49,7 @@ public final class MatchWhereStrategy extends AbstractTraversalStrategy implemen
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, TraversalEngine engine) {
+ public void apply(final Traversal.Admin<?, ?> traversal) {
if (!TraversalHelper.hasStepOfClass(MatchStep.class, traversal))
return;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java
index 25c22de..5236faf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ProfileStrategy.java
@@ -55,7 +55,7 @@ public final class ProfileStrategy extends AbstractTraversalStrategy {
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine traversalEngine) {
+ public void apply(final Traversal.Admin<?, ?> traversal) {
if (!TraversalHelper.hasStepOfClass(ProfileStep.class, traversal))
return;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategy.java
index ce19296..b2116d7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategy.java
@@ -52,7 +52,7 @@ public final class RangeByIsCountStrategy extends AbstractTraversalStrategy impl
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
+ public void apply(final Traversal.Admin<?, ?> traversal) {
final int size = traversal.getSteps().size();
Step prev = null;
for (int i = 0; i < size; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java
index e858912..5163ac8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/ReducingStrategy.java
@@ -37,8 +37,8 @@ public final class ReducingStrategy extends AbstractTraversalStrategy {
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
- if (engine.isStandard())
+ public void apply(final Traversal.Admin<?, ?> traversal) {
+ if (traversal.getEngine().isStandard())
return;
final Step endStep = traversal.getEndStep();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java
index f97c425..222d0b4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectCapStrategy.java
@@ -41,7 +41,7 @@ public final class SideEffectCapStrategy extends AbstractTraversalStrategy imple
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
+ public void apply(final Traversal.Admin<?, ?> traversal) {
if (traversal.getEndStep() instanceof SideEffectCapable && traversal.getParent() instanceof EmptyStep) {
((GraphTraversal) traversal).cap();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java
index c05a0ae..eb1d3e7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/SideEffectRegistrationStrategy.java
@@ -40,7 +40,7 @@ public final class SideEffectRegistrationStrategy extends AbstractTraversalStrat
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
+ public void apply(final Traversal.Admin<?, ?> traversal) {
TraversalHelper.getStepsOfAssignableClass(SideEffectRegistrar.class, traversal).forEach(SideEffectRegistrar::registerSideEffects);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java
index f070380..5d1c7c1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategy.java
@@ -42,8 +42,8 @@ public final class TraversalVerificationStrategy extends AbstractTraversalStrate
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
- if (engine.isStandard())
+ public void apply(final Traversal.Admin<?, ?> traversal) {
+ if (traversal.getEngine().isStandard())
return;
Step<?, ?> endStep = traversal.getEndStep() instanceof ComputerAwareStep.EndStep ?
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
index ea03c89..75872ec 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
@@ -74,7 +74,7 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
public void applyStrategies() throws IllegalStateException {
if (this.locked) throw Traversal.Exceptions.traversalIsLocked();
TraversalHelper.reIdSteps(this.stepPosition, this);
- this.strategies.applyStrategies(this, this.traversalEngine);
+ this.strategies.applyStrategies(this);
for (final Step<?, ?> step : this.getSteps()) {
if (step instanceof TraversalParent) {
for (final Traversal.Admin<?, ?> globalChild : ((TraversalParent) step).getGlobalChildren()) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java
index 22f8754..379201a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversalStrategies.java
@@ -73,8 +73,8 @@ public class DefaultTraversalStrategies implements TraversalStrategies {
}
@Override
- public void applyStrategies(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
- this.traversalStrategies.forEach(ts -> ts.apply(traversal, engine));
+ public void applyStrategies(final Traversal.Admin<?, ?> traversal) {
+ this.traversalStrategies.forEach(traversalStrategy -> traversalStrategy.apply(traversal));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java
index df53f69..19ca0c9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalStrategies.java
@@ -44,7 +44,7 @@ public final class EmptyTraversalStrategies implements TraversalStrategies {
}
@Override
- public void applyStrategies(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
+ public void applyStrategies(final Traversal.Admin<?, ?> traversal) {
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java
index fc4ef05..c3e15e1 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/graph/traversal/strategy/HadoopElementStepStrategy.java
@@ -42,8 +42,8 @@ public class HadoopElementStepStrategy extends AbstractTraversalStrategy {
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
- if (engine.isStandard())
+ public void apply(final Traversal.Admin<?, ?> traversal) {
+ if (traversal.getEngine().isStandard())
return;
final StartStep<Element> startStep = (StartStep<Element>) traversal.getStartStep();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java
index abe73a8..14a1bc3 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/graph/traversal/strategy/Neo4jGraphStepStrategy.java
@@ -39,7 +39,7 @@ public class Neo4jGraphStepStrategy extends AbstractTraversalStrategy {
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine traversalEngine) {
+ public void apply(final Traversal.Admin<?, ?> traversal) {
if (traversal.getStartStep() instanceof Neo4jGraphStep) {
final Neo4jGraphStep neo4jGraphStep = (Neo4jGraphStep) traversal.getStartStep();
Step<?, ?> currentStep = neo4jGraphStep.getNextStep();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java
index 550f41a..cf02adf 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerElementStepStrategy.java
@@ -41,8 +41,8 @@ public class TinkerElementStepStrategy extends AbstractTraversalStrategy {
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
- if (engine.isStandard())
+ public void apply(final Traversal.Admin<?, ?> traversal) {
+ if (traversal.getEngine().isStandard())
return;
final StartStep<Element> startStep = (StartStep<Element>) traversal.getStartStep();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2bc87c38/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java
index cd99c42..60f9221 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/graph/traversal/strategy/TinkerGraphStepStrategy.java
@@ -20,7 +20,6 @@ package org.apache.tinkerpop.gremlin.tinkergraph.process.graph.traversal.strateg
import org.apache.tinkerpop.gremlin.process.Step;
import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.HasContainerHolder;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.IdentityStep;
@@ -39,8 +38,8 @@ public class TinkerGraphStepStrategy extends AbstractTraversalStrategy {
}
@Override
- public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine engine) {
- if (engine.isComputer())
+ public void apply(final Traversal.Admin<?, ?> traversal) {
+ if (traversal.getEngine().isComputer())
return;
final Step<?, ?> startStep = traversal.getStartStep();