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 2024/11/15 21:53:51 UTC
(tinkerpop) 15/20: wip - added consistent getter naming
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch gvalue
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 84246d730c6a2970be3e1b5f6d96d763ceb7aad8
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Aug 27 07:57:48 2024 -0400
wip - added consistent getter naming
---
.../tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java | 6 +++++-
.../tinkerpop/gremlin/process/traversal/step/map/CombineStep.java | 4 ++++
.../tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java | 6 +++++-
.../gremlin/process/traversal/step/map/ConstantStep.java | 5 ++++-
.../gremlin/process/traversal/step/map/DifferenceStep.java | 6 +++++-
.../gremlin/process/traversal/step/map/DisjunctStep.java | 6 +++++-
.../gremlin/process/traversal/step/map/IntersectStep.java | 8 ++++++--
.../tinkerpop/gremlin/process/traversal/step/map/MergeStep.java | 6 +++++-
.../tinkerpop/gremlin/process/traversal/step/map/ProductStep.java | 6 +++++-
.../gremlin/process/traversal/step/sideEffect/InjectStep.java | 4 ++--
.../gremlin/sparql/process/traversal/strategy/SparqlStrategy.java | 3 +--
11 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
index f9cfda6399..33b3c80944 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CoinStep.java
@@ -58,7 +58,11 @@ public final class CoinStep<S> extends FilterStep<S> implements Seedable {
random.setSeed(seed);
}
- public GValue<Double> getProbability() {
+ public double getProbability() {
+ return probability.get();
+ }
+
+ public GValue<Double> getProbabilityGValue() {
return probability;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
index 587b7a7c72..67c120c03a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
@@ -69,6 +69,10 @@ public final class CombineStep<S, E> extends ScalarMapStep<S, List<?>> implement
return (null == valueTraversal) ? Collections.emptyList() : Collections.singletonList(valueTraversal);
}
+ public Object getParameter() {
+ return parameterItems.get();
+ }
+
public GValue<Object> getParameterItems() {
return parameterItems;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java
index 94457df007..e6bb27a2e7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java
@@ -71,7 +71,11 @@ public final class ConjoinStep<S> extends ScalarMapStep<S, String> implements Li
}
}
- public GValue<String> getDelimiter() {
+ public String getDelimiter() {
+ return this.delimiter.get();
+ }
+
+ public GValue<String> getDelimiterGValue() {
return this.delimiter;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
index 2145f7e966..3646b599b2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
@@ -41,7 +41,10 @@ public class ConstantStep<S, E> extends ScalarMapStep<S, E> {
this.constant = null == constant ? GValue.of(null) : constant;
}
- public GValue<E> getConstant() {
+ public E getConstant() {
+ return this.constant.get();
+ }
+ public GValue<E> getConstantGValue() {
return this.constant;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
index 87f44f8639..27922b984e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
@@ -53,7 +53,11 @@ public final class DifferenceStep<S, E> extends ScalarMapStep<S, Set<?>> impleme
return this.valueTraversal;
}
- public GValue<Object> getParameterItems() {
+ public Object getParameterItems() {
+ return parameterItems;
+ }
+
+ public GValue<Object> getParameterItemsGValue() {
return parameterItems;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
index fc890dd2a2..c82eac3f64 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
@@ -52,7 +52,11 @@ public final class DisjunctStep<S, E> extends ScalarMapStep<S, Set<?>> implement
return this.valueTraversal;
}
- public GValue<Object> getParameterItems() {
+ public Object getParameterItems() {
+ return parameterItems;
+ }
+
+ public GValue<Object> getParameterItemsGValue() {
return parameterItems;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
index 93e5885e18..3c37db29e0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
@@ -53,8 +53,12 @@ public final class IntersectStep<S, E> extends ScalarMapStep<S, Set<?>> implemen
return this.valueTraversal;
}
- public GValue<Object> getParameterItems() {
- return this.parameterItems;
+ public Object getParameterItems() {
+ return parameterItems;
+ }
+
+ public GValue<Object> getParameterItemsGValue() {
+ return parameterItems;
}
@Override
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
index e40d11c71b..2f86240a42 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
@@ -57,7 +57,11 @@ public final class MergeStep<S, E> extends ScalarMapStep<S, E> implements Traver
return valueTraversal;
}
- public GValue<Object> getParameterItems() {
+ public Object getParameterItems() {
+ return parameterItems;
+ }
+
+ public GValue<Object> getParameterItemsGValue() {
return parameterItems;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
index 4842a313bb..a07b204190 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
@@ -53,7 +53,11 @@ public final class ProductStep<S, E> extends ScalarMapStep<S, List<List<?>>> imp
return this.valueTraversal;
}
- public GValue<Object> getParameterItems() {
+ public Object getParameterItems() {
+ return parameterItems;
+ }
+
+ public GValue<Object> getParameterItemsGValue() {
return parameterItems;
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
index 4102cfdd57..0dae0ed01d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectStep.java
@@ -52,14 +52,14 @@ public final class InjectStep<S> extends StartStep<S> {
/**
* Get the injections of the step.
*/
- public GValue<S>[] getInjections() {
+ public GValue<S>[] getInjectionsGValue() {
return this.injections;
}
/**
* Gets the injections of the step but unwraps the {@link GValue}.
*/
- public S[] getInjectionsAsValues() {
+ public S[] getInjections() {
return (S[]) resolveToValues(this.injections);
}
}
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
index f4938fb219..5f791b41d5 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
@@ -23,7 +23,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinCompiler;
@@ -71,7 +70,7 @@ public class SparqlStrategy extends AbstractTraversalStrategy<TraversalStrategy.
// assumes that the traversal starts with the single inject step that holds the sparql query
if (traversal.getStartStep() instanceof InjectStep) {
final InjectStep stepWithSparql = (InjectStep) traversal.getStartStep();
- final Object[] injections = stepWithSparql.getInjectionsAsValues();
+ final Object[] injections = stepWithSparql.getInjections();
// further assumes that there is just one argument to that injection which is a string (i.e. sparql query)
if (injections.length == 1 && injections[0] instanceof String) {