CTR: Update CONCRETE_STEPS list for all step contracts

Author: Cole-Greer

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java

@@ -30,9 +30,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java

@@ -51,9 +51,9 @@
 import org.apache.tinkerpop.gremlin.process.traversal.step.Configuring;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStepPlaceholder;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStepPlaceholder;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeLocalStepPlaceholder;
 import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TailGlobalStepPlaceholder;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TailLocalStepPlaceholder;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.RangeLocalStepPlaceholder;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TailLocalStepPlaceholder;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStepPlaceholder;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStepPlaceholder;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.CallStepPlaceholder;

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/GValue.java

@@ -340,23 +340,6 @@ public static Object[] resolveToValues(final GValue<?>[] gvalues) {
         return values;
     }
 
-    /**
-     * Converts possible {@link GValue} objects argument array to their values to prevent them from leaking to the Graph API.
-     * Providers extending from this step should use this method to get actual values to prevent any {@link GValue}
-     * objects from leaking to the Graph API.
-     */
-    public static Object[] resolveToValues(final Object[] gvalues) {
-        final Object[] values = new Object[gvalues.length];
-        for (int i = 0; i < gvalues.length; i++) {
-            values[i] = gvalues[i] instanceof GValue ? ((GValue<?>) gvalues[i]).get() : gvalues[i];
-            if (values[i] instanceof GValueConstantTraversal) {
-                // TODO:: This seems out of place here, find a better home for this.
-                values[i] = ((GValueConstantTraversal<?, ?>) values[i]).getConstantTraversal();
-            }
-        }
-        return values;
-    }
-
     /**
      * Tests if any of the objects are GValues.
      */

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsStepContract.java

@@ -22,13 +22,19 @@
 import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 
+import java.util.List;
 import java.util.Set;
 
 /**
  * Defines the contract for steps containing a single {@link P}.
  */
 public interface IsStepContract<S> extends Step<S, S> {
 
+    /**
+     * Concrete implementations of this contract that can be referenced as TinkerPop implementations.
+     */
+    List<Class<? extends Step>> CONCRETE_STEPS = List.of(IsStep.class, IsStepPlaceholder.class);
+
     /**
      * Retrieves the step's predicate.
      *

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeGlobalStepContract.java

@@ -29,13 +29,19 @@
 import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
+import java.util.List;
 import java.util.NoSuchElementException;
 
 /**
  * Defines the contract for {@code range} related steps.
  */
 public interface RangeGlobalStepContract<S> extends Step<S, S>, FilteringBarrier<TraverserSet<S>>, Ranging, Bypassing {
 
+    /**
+     * Concrete implementations of this contract that can be referenced as TinkerPop implementations.
+     */
+    List<Class<? extends Step>> CONCRETE_STEPS = List.of(RangeGlobalStep.class, RangeGlobalStepPlaceholder.class);
+
     /**
      * Retrieves the lower bound of the range.
      *

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailGlobalStepContract.java

@@ -27,9 +27,16 @@
 import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 
+import java.util.List;
 import java.util.NoSuchElementException;
 
 public interface TailGlobalStepContract<S> extends Step<S, S>, Bypassing, FilteringBarrier<TraverserSet<S>> {
+
+    /**
+     * Concrete implementations of this contract that can be referenced as TinkerPop implementations.
+     */
+    List<Class<? extends Step>> CONCRETE_STEPS = List.of(TailGlobalStep.class, TailGlobalStepPlaceholder.class);
+
     Long getLimit();
 
     default GValue<Long> getLimitAsGValue() {

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStepContract.java

@@ -18,8 +18,6 @@
  */
 package org.apache.tinkerpop.gremlin.process.traversal.step.map;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import org.apache.tinkerpop.gremlin.process.traversal.Step;
@@ -40,7 +38,7 @@ public interface AddEdgeStepContract<S> extends AddElementStepContract<S, Edge>,
     /**
      * Concrete implementations of this contract that can be referenced as TinkerPop implementations.
      */
-    List<Class<? extends Step>> CONCRETE_STEPS = Collections.unmodifiableList(Arrays.asList(AddEdgeStep.class, AddEdgeStepPlaceholder.class));
+    List<Class<? extends Step>> CONCRETE_STEPS = List.of(AddEdgeStep.class, AddEdgeStepPlaceholder.class, AddEdgeStartStep.class, AddEdgeStartStepPlaceholder.class);
 
     /**
      * Gets the "from" vertex for the edge to be added. If the "from" vertex was added as a {@link Vertex}, ID, {@link GValue},

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddElementStepContract.java

@@ -20,14 +20,23 @@
 
 import org.apache.tinkerpop.gremlin.process.traversal.Step;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Configuring;
-import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
 import org.apache.tinkerpop.gremlin.process.traversal.step.PropertiesHolder;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Scoping;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 
 import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public interface AddElementStepContract<S, E> extends Step<S, E>, PropertiesHolder, TraversalParent, Scoping, Configuring {
+
+    /**
+     * Concrete implementations of this contract that can be referenced as TinkerPop implementations.
+     */
+    List<Class<? extends Step>> CONCRETE_STEPS = Stream.of(AddVertexStepContract.CONCRETE_STEPS, AddEdgeStepContract.CONCRETE_STEPS)
+            .flatMap(List::stream).collect(Collectors.toList());
+
     Object getLabel();
 
     default Object getLabelWithGValue() {

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexStepContract.java

@@ -23,7 +23,14 @@
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.event.Event;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 
+import java.util.List;
+
 public interface AddVertexStepContract<S> extends Step<S, Vertex>, AddElementStepContract<S, Vertex>, Writing<Event.VertexAddedEvent> {
 
+    /**
+     * Concrete implementations of this contract that can be referenced as TinkerPop implementations.
+     */
+    List<Class<? extends Step>> CONCRETE_STEPS = List.of(AddVertexStep.class, AddVertexStepPlaceholder.class, AddVertexStartStep.class, AddVertexStartStepPlaceholder.class);
+
     boolean hasUserProvidedLabel();
 }

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CallStepContract.java

@@ -25,9 +25,16 @@
 import org.apache.tinkerpop.gremlin.structure.service.Service;
 import org.apache.tinkerpop.gremlin.structure.service.ServiceRegistry;
 
+import java.util.List;
 import java.util.Map;
 
 public interface CallStepContract<S, E> extends Step<S, E>, Configuring, TraversalParent {
+
+    /**
+     * Concrete implementations of this contract that can be referenced as TinkerPop implementations.
+     */
+    List<Class<? extends Step>> CONCRETE_STEPS = List.of(CallStep.class, CallStepContract.class);
+
     Service<S, E> service();
 
     default Service<S, E> serviceGValueSafe() {