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/06/11 21:05:24 UTC
incubator-tinkerpop git commit: better constructor arguments for
SelectXXXStep.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 93b55539a -> 635a03886
better constructor arguments for SelectXXXStep.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/635a0388
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/635a0388
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/635a0388
Branch: refs/heads/master
Commit: 635a03886ffc1f98b063a5889647bbd1cd66a713
Parents: 93b5553
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Jun 11 13:05:19 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jun 11 13:05:19 2015 -0600
----------------------------------------------------------------------
.../process/traversal/dsl/graph/GraphTraversal.java | 12 ++++++------
.../process/traversal/step/filter/WhereStep.java | 2 +-
.../process/traversal/step/map/SelectOneStep.java | 8 ++++++--
.../gremlin/process/traversal/step/map/SelectStep.java | 8 ++++++--
4 files changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/635a0388/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
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 09f5602..308fd89 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
@@ -469,11 +469,11 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
public default <E2> GraphTraversal<S, Map<String, E2>> select(final Scope scope, final Pop pop, final String... stepLabels) {
- return this.asAdmin().addStep(new SelectStep<>(this.asAdmin(), scope, Optional.ofNullable(pop), stepLabels));
+ return this.asAdmin().addStep(new SelectStep<>(this.asAdmin(), scope, pop, stepLabels));
}
public default <E2> GraphTraversal<S, Map<String, E2>> select(final Scope scope, final String... stepLabels) {
- return this.select(scope, null, stepLabels);
+ return this.asAdmin().addStep(new SelectStep<>(this.asAdmin(), scope, stepLabels));
}
public default <E2> GraphTraversal<S, Map<String, E2>> select(final Pop pop, final String... stepLabels) {
@@ -481,15 +481,15 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
public default <E2> GraphTraversal<S, Map<String, E2>> select(final String... stepLabels) {
- return this.select(Scope.global, null, stepLabels);
+ return this.select(Scope.global, stepLabels);
}
public default <E2> GraphTraversal<S, E2> select(final Scope scope, final Pop pop, final String stepLabel) {
- return this.asAdmin().addStep(new SelectOneStep(this.asAdmin(), scope, Optional.ofNullable(pop), stepLabel));
+ return this.asAdmin().addStep(new SelectOneStep(this.asAdmin(), scope, pop, stepLabel));
}
public default <E2> GraphTraversal<S, E2> select(final Scope scope, final String stepLabel) {
- return this.select(scope, null, stepLabel);
+ return this.asAdmin().addStep(new SelectOneStep(this.asAdmin(), scope, stepLabel));
}
public default <E2> GraphTraversal<S, E2> select(final Pop pop, final String stepLabel) {
@@ -497,7 +497,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
public default <E2> GraphTraversal<S, E2> select(final String stepLabel) {
- return this.select(Scope.global, null, stepLabel);
+ return this.select(Scope.global, stepLabel);
}
public default <E2> GraphTraversal<S, E2> unfold() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/635a0388/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
index 4cb7086..76f3bd4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereStep.java
@@ -60,7 +60,7 @@ public final class WhereStep<S> extends FilterStep<S> implements TraversalParent
if (startStep instanceof StartStep && !startStep.getLabels().isEmpty()) {
if (startStep.getLabels().size() > 1)
throw new IllegalArgumentException("The start step of a where()-traversal predicate can only have one label: " + startStep);
- TraversalHelper.replaceStep(whereTraversal.getStartStep(), new SelectOneStep<>(whereTraversal, scope, Optional.empty(), startStep.getLabels().iterator().next()), whereTraversal); // TODO: pop head or allow multi-results?
+ TraversalHelper.replaceStep(whereTraversal.getStartStep(), new SelectOneStep<>(whereTraversal, scope, startStep.getLabels().iterator().next()), whereTraversal); // TODO: pop head or allow multi-results?
}
//// END STEP
final Step<?, ?> endStep = whereTraversal.getEndStep();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/635a0388/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java
index 7a2193e..8d0ecd9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java
@@ -45,13 +45,17 @@ public final class SelectOneStep<S, E> extends MapStep<S, E> implements Traversa
private final String selectLabel;
private Traversal.Admin<S, E> selectTraversal = new IdentityTraversal<>();
- public SelectOneStep(final Traversal.Admin traversal, final Scope scope, final Optional<Pop> pop, final String selectLabel) {
+ public SelectOneStep(final Traversal.Admin traversal, final Scope scope, Pop pop, final String selectLabel) {
super(traversal);
this.scope = scope;
- this.pop = pop.orElse(null);
+ this.pop = pop;
this.selectLabel = selectLabel;
}
+ public SelectOneStep(final Traversal.Admin traversal, final Scope scope, final String selectLabel) {
+ this(traversal, scope, null, selectLabel);
+ }
+
@Override
protected E map(final Traverser.Admin<S> traverser) {
final Optional<S> optional = this.getOptionalScopeValueByKey(this.pop, this.selectLabel, traverser);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/635a0388/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
index 0c9bf8b..d9cc631 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
@@ -49,13 +49,17 @@ public final class SelectStep<S, E> extends MapStep<S, Map<String, E>> implement
private Scope scope;
private final List<String> selectLabels;
- public SelectStep(final Traversal.Admin traversal, final Scope scope, final Optional<Pop> pop, final String... selectLabels) {
+ public SelectStep(final Traversal.Admin traversal, final Scope scope, final Pop pop, final String... selectLabels) {
super(traversal);
this.scope = scope;
- this.pop = pop.orElse(null);
+ this.pop = pop;
this.selectLabels = Arrays.asList(selectLabels);
}
+ public SelectStep(final Traversal.Admin traversal, final Scope scope, final String... selectLabels) {
+ this(traversal, scope, null, selectLabels);
+ }
+
@Override
protected Map<String, E> map(final Traverser.Admin<S> traverser) {
final S start = traverser.get();