This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch GValue-refinement
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 83c4ca497847c952f436ce7767f2aca094d10a3b
Author: Cole-Greer <cole.gr...@improving.com>
AuthorDate: Tue Sep 9 15:49:03 2025 -0700
rename PropertiesHolder
---
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 4 ++--
.../step/{PropertyAdding.java => PropertiesHolder.java} | 4 ++--
.../traversal/step/map/AddEdgeStartStepPlaceholder.java | 4 ++--
.../process/traversal/step/map/AddElementStepContract.java | 4 ++--
.../gremlin/process/traversal/step/map/MergeStepContract.java | 4 ++--
.../traversal/step/sideEffect/AddPropertyStepContract.java | 4 ++--
.../traversal/strategy/decoration/PartitionStrategy.java | 11 +++--------
.../verification/ReservedKeysVerificationStrategy.java | 6 +++---
8 files changed, 18 insertions(+), 23 deletions(-)
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 b7d50b6680..e775c4fa9a 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
@@ -62,7 +62,7 @@ import
org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeEdgeStepPlac
import org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeStep;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeStepContract;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeVertexStepPlaceholder;
-import org.apache.tinkerpop.gremlin.process.traversal.step.PropertyAdding;
+import org.apache.tinkerpop.gremlin.process.traversal.step.PropertiesHolder;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStepPlaceholder;
import
org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AddPropertyStepPlaceholder;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStepContract;
@@ -3874,7 +3874,7 @@ public interface GraphTraversal<S, E> extends
Traversal<S, E> {
if ((endStep instanceof AddEdgeStepContract) ||
((endStep instanceof AddVertexStepContract) &&
keyValues.length == 0 &&
(key instanceof T || (key instanceof String && null ==
cardinality) || key instanceof Traversal))) {
- ((PropertyAdding) endStep).addProperty(key, value);
+ ((PropertiesHolder) endStep).addProperty(key, value);
} else {
final AddPropertyStepContract<Element> addPropertyStep = new
AddPropertyStepPlaceholder<>(this.asAdmin(), cardinality, key, value);
this.asAdmin().addStep(addPropertyStep);
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/PropertyAdding.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/PropertiesHolder.java
similarity index 90%
rename from
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/PropertyAdding.java
rename to
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/PropertiesHolder.java
index 13cedd23b6..9267ec0f74 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/PropertyAdding.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/PropertiesHolder.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tinkerpop.gremlin.process.traversal.step; //TODO:: relocate
class
+package org.apache.tinkerpop.gremlin.process.traversal.step;
import java.util.List;
import java.util.Map;
-public interface PropertyAdding {
+public interface PropertiesHolder {
void addProperty(Object key, Object value);
Map<Object, List<Object>> getProperties();
boolean removeProperty(Object k);
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStartStepPlaceholder.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStartStepPlaceholder.java
index e742af4286..7921117efb 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStartStepPlaceholder.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStartStepPlaceholder.java
@@ -23,14 +23,14 @@ import
org.apache.tinkerpop.gremlin.process.traversal.lambda.ConstantTraversal;
import
org.apache.tinkerpop.gremlin.process.traversal.lambda.GValueConstantTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
import org.apache.tinkerpop.gremlin.process.traversal.step.GValueHolder;
-import org.apache.tinkerpop.gremlin.process.traversal.step.PropertyAdding;
+import org.apache.tinkerpop.gremlin.process.traversal.step.PropertiesHolder;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.event.Event;
import org.apache.tinkerpop.gremlin.structure.Edge;
import java.util.Collection;
public class AddEdgeStartStepPlaceholder extends
AbstractAddElementStepPlaceholder<Edge, Edge, Event.EdgeAddedEvent>
- implements AddEdgeStepContract<Edge>, GValueHolder<Edge, Edge>,
PropertyAdding {
+ implements AddEdgeStepContract<Edge>, GValueHolder<Edge, Edge>,
PropertiesHolder {
private Traversal.Admin<?,?> from;
private Traversal.Admin<?,?> to;
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddElementStepContract.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddElementStepContract.java
index 5fa5a552ba..7468a5ae69 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddElementStepContract.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddElementStepContract.java
@@ -20,13 +20,13 @@ package
org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.step.GValue;
-import org.apache.tinkerpop.gremlin.process.traversal.step.PropertyAdding;
+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;
-public interface AddElementStepContract<S, E> extends Step<S, E>,
PropertyAdding, TraversalParent, Scoping {
+public interface AddElementStepContract<S, E> extends Step<S, E>,
PropertiesHolder, TraversalParent, Scoping {
Object getLabel();
default GValue<?> getLabelAsGValue(){
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStepContract.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStepContract.java
index d0f3f7b420..7ec5a40a87 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStepContract.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStepContract.java
@@ -21,7 +21,7 @@ package
org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.process.traversal.Merge;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.Deleting;
-import org.apache.tinkerpop.gremlin.process.traversal.step.PropertyAdding;
+import org.apache.tinkerpop.gremlin.process.traversal.step.PropertiesHolder;
import
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.Writing;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.event.Event;
@@ -30,7 +30,7 @@ import
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequire
import java.util.Map;
import java.util.Set;
-public interface MergeStepContract<S, E, C> extends Writing<Event>,
Deleting<Event>, TraversalOptionParent<Merge, S, C>, PropertyAdding {
+public interface MergeStepContract<S, E, C> extends Writing<Event>,
Deleting<Event>, TraversalOptionParent<Merge, S, C>, PropertiesHolder {
Traversal.Admin<S, Map> getMergeTraversal();
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStepContract.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStepContract.java
index 804e1a95b3..6fa32b7a7f 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStepContract.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AddPropertyStepContract.java
@@ -23,13 +23,13 @@ import
org.apache.tinkerpop.gremlin.process.traversal.step.Deleting;
import org.apache.tinkerpop.gremlin.process.traversal.step.Scoping;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.Writing;
-import org.apache.tinkerpop.gremlin.process.traversal.step.PropertyAdding;
+import org.apache.tinkerpop.gremlin.process.traversal.step.PropertiesHolder;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.event.Event;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import java.util.HashSet;
-public interface AddPropertyStepContract<S> extends Step<S, S>,
TraversalParent, Scoping, PropertyAdding,
Writing<Event.ElementPropertyChangedEvent>,
Deleting<Event.ElementPropertyChangedEvent> {
+public interface AddPropertyStepContract<S> extends Step<S, S>,
TraversalParent, Scoping, PropertiesHolder,
Writing<Event.ElementPropertyChangedEvent>,
Deleting<Event.ElementPropertyChangedEvent> {
VertexProperty.Cardinality getCardinality();
@Override
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java
index bac524d955..7a640420d3 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/PartitionStrategy.java
@@ -28,17 +28,12 @@ import
org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
-import
org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStartStepPlaceholder;
-import
org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStartStep;
-import
org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStartStepPlaceholder;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStep;
-import
org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStepPlaceholder;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeOtherVertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaMapStep;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeStepContract;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.PropertyAdding;
+import org.apache.tinkerpop.gremlin.process.traversal.step.PropertiesHolder;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep;
import
org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStepContract;
import
org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AddPropertyStepPlaceholder;
@@ -238,7 +233,7 @@ public final class PartitionStrategy extends
AbstractTraversalStrategy<Traversal
// ends up being a Vertex or not. AddPropertyStep currently
chooses to simply not bother
// to use the additional "property mutations" if the Element being
mutated is a Edge or
// VertexProperty
- ((PropertyAdding) step).addProperty(partitionKey, writePartition);
+ ((PropertiesHolder) step).addProperty(partitionKey,
writePartition);
if (vertexFeatures.isPresent()) {
// GraphTraversal folds g.addV().property('k','v') to just
AddVertexStep/AddVertexStartStep so this
@@ -260,7 +255,7 @@ public final class PartitionStrategy extends
AbstractTraversalStrategy<Traversal
// need to remove the property from the
AddVertex/StartStep because it's now being
// added via the AddPropertyStep
- ((PropertyAdding) step).removeProperty(k);
+ ((PropertiesHolder) step).removeProperty(k);
TraversalHelper.insertAfterStep(addPropertyStep, step, traversal);
});
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategy.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategy.java
index 201b37a96a..acead17808 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategy.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategy.java
@@ -21,7 +21,7 @@ package
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification;
import org.apache.commons.configuration2.Configuration;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.PropertyAdding;
+import org.apache.tinkerpop.gremlin.process.traversal.step.PropertiesHolder;
import java.util.Arrays;
import java.util.LinkedHashSet;
@@ -53,8 +53,8 @@ public class ReservedKeysVerificationStrategy extends
AbstractWarningVerificatio
@Override
void verify(final Traversal.Admin<?, ?> traversal) throws
VerificationException {
for (final Step<?, ?> step : traversal.getSteps()) {
- if (step instanceof PropertyAdding) {
- final PropertyAdding propertySettingStep = (PropertyAdding)
step;
+ if (step instanceof PropertiesHolder) {
+ final PropertiesHolder propertySettingStep =
(PropertiesHolder) step;
final Map<Object, List<Object>> properties =
propertySettingStep.getProperties();
for (String key : reservedKeys) {
if (properties.containsKey(key)) {
