Update traversal strategy interfaces

Id Validation strategy does not throw

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanGraphStepStrategy.java

@@ -21,7 +21,7 @@
 /**
  * @author Matthias Broecheler (me@matthiasb.com)
  */
-public class TitanGraphStepStrategy extends AbstractTraversalStrategy<TraversalStrategy> {
+public class TitanGraphStepStrategy extends AbstractTraversalStrategy<TraversalStrategy.OptimizationStrategy> implements TraversalStrategy.OptimizationStrategy {
 
     private static final TitanGraphStepStrategy INSTANCE = new TitanGraphStepStrategy();
 
@@ -69,12 +69,12 @@ public static TitanGraphStepStrategy instance() {
     }
 
     @Override
-    public Set<Class<? extends TraversalStrategy>> applyPrior() {
+    public Set<Class<? extends OptimizationStrategy>> applyPrior() {
         return TitanTraversalUtil.PRIORS;
     }
 
     @Override
-    public Set<Class<? extends TraversalStrategy>> applyPost() {
+    public Set<Class<? extends OptimizationStrategy>> applyPost() {
         return TitanTraversalUtil.POSTS;
     }
 

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanIdsValidationStrategy.java

@@ -16,54 +16,46 @@
 /**
  * Created by bryn on 06/05/15.
  */
-public class TitanIdsValidationStrategy extends AbstractTraversalStrategy<TraversalStrategy> {
+public class TitanIdsValidationStrategy extends AbstractTraversalStrategy<TraversalStrategy.DecorationStrategy> implements TraversalStrategy.DecorationStrategy {
 
 
     private static final TitanIdsValidationStrategy INSTANCE = new TitanIdsValidationStrategy();
 
-    static final Set<Class<? extends TraversalStrategy>> POST = ImmutableSet.<Class<? extends TraversalStrategy>>of(
-            TitanGraphStepStrategy.class);
+
 
     @Override
     public void apply(Traversal.Admin traversal) {
         TraversalHelper.getStepsOfClass(GraphStep.class, traversal).forEach(step -> {
             boolean elementFound = false;
             boolean idFound = false;
-            if(step.returnsVertices()) {
+            if (step.returnsVertices()) {
                 for (Object id : step.getIds()) {
-                    if (id instanceof Long || id instanceof String) {
+                    if (id instanceof Long) {
                         idFound = true;
-                    } else if(id instanceof Vertex) {
+                    } else if (id instanceof Vertex) {
                         elementFound = true;
-                    }
-                    else {
-                        throw Graph.Exceptions.idArgsMustBeEitherIdOrElement();
+                    } else {
+
                     }
                 }
             }
-            if(step.returnsEdges()) {
+            if (step.returnsEdges()) {
                 for (Object id : step.getIds()) {
-                    if (id instanceof RelationIdentifier || id instanceof String) {
+                    if (id instanceof RelationIdentifier) {
                         idFound = true;
-                    } else if(id instanceof Edge) {
+                    } else if (id instanceof Edge) {
                         elementFound = true;
-                    }
-                    else {
-                        throw Graph.Exceptions.idArgsMustBeEitherIdOrElement();
+                    } else {
+
                     }
                 }
             }
-            if(elementFound && idFound) {
+            if (elementFound && idFound) {
                 throw Graph.Exceptions.idArgsMustBeEitherIdOrElement();
             }
         });
     }
 
-    @Override
-    public Set<Class<? extends TraversalStrategy>> applyPost() {
-        return POST;
-    }
-
     public static TitanIdsValidationStrategy instance() {
             return INSTANCE;
     }

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanLocalQueryOptimizerStrategy.java

@@ -21,7 +21,7 @@
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  * @author Matthias Broecheler (http://matthiasb.com)
  */
-public class TitanLocalQueryOptimizerStrategy extends AbstractTraversalStrategy<TraversalStrategy> {
+public class TitanLocalQueryOptimizerStrategy extends AbstractTraversalStrategy<TraversalStrategy.OptimizationStrategy> implements TraversalStrategy.OptimizationStrategy{
 
     private static final TitanLocalQueryOptimizerStrategy INSTANCE = new TitanLocalQueryOptimizerStrategy();
 
@@ -138,12 +138,12 @@ public static TitanLocalQueryOptimizerStrategy instance() {
     }
 
     @Override
-    public Set<Class<? extends TraversalStrategy>> applyPrior() {
+    public Set<Class<? extends OptimizationStrategy>> applyPrior() {
         return TitanTraversalUtil.PRIORS;
     }
 
     @Override
-    public Set<Class<? extends TraversalStrategy>> applyPost() {
+    public Set<Class<? extends OptimizationStrategy>> applyPost() {
         return TitanTraversalUtil.POSTS;
     }
 

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanTraversalUtil.java

@@ -33,9 +33,9 @@
  */
 public class TitanTraversalUtil {
 
-    static final Set<Class<? extends TraversalStrategy>> POSTS = ImmutableSet.<Class<? extends TraversalStrategy>>of(
+    static final Set<Class<? extends TraversalStrategy.OptimizationStrategy>> POSTS = ImmutableSet.<Class<? extends TraversalStrategy.OptimizationStrategy>>of(
             );
-    static final Set<Class<? extends TraversalStrategy>> PRIORS = ImmutableSet.<Class<? extends TraversalStrategy>>of(
+    static final Set<Class<? extends TraversalStrategy.OptimizationStrategy>> PRIORS = ImmutableSet.<Class<? extends TraversalStrategy.OptimizationStrategy>>of(
             IdentityRemovalStrategy.class);
 
     public static TitanVertex getTitanVertex(Traverser<Vertex> traverser) {