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/29 21:21:07 UTC
incubator-tinkerpop git commit: renamed getOptionalScopeValue() to
getNullableScopeValue() as its an internal method an no need to return
Optional as its just 'yet more objects.'
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 75ae7bdac -> cd334a0e1
renamed getOptionalScopeValue() to getNullableScopeValue() as its an internal method an no need to return Optional as its just 'yet more objects.'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cd334a0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cd334a0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cd334a0e
Branch: refs/heads/master
Commit: cd334a0e12f43271b4c42193f4d2a71292c1926d
Parents: 75ae7bd
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jun 29 13:21:07 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jun 29 13:21:14 2015 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/Scoping.java | 13 ++++++-------
.../process/traversal/step/map/SelectOneStep.java | 5 ++---
.../gremlin/process/traversal/step/map/SelectStep.java | 9 ++++-----
.../gremlin/tinkergraph/structure/TinkerGraphTest.java | 2 +-
4 files changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cd334a0e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java
index 2db96c5..1ad9f43 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java
@@ -28,7 +28,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequire
import java.util.EnumSet;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
/**
@@ -55,22 +54,22 @@ public interface Scoping {
if (path.hasLabel(key))
return null == pop ? path.get(key) : path.get(pop, key);
///
- throw new IllegalArgumentException("Neither the sideEffects, map, or path has a " + key + "-key: " + this);
+ throw new IllegalArgumentException("Neither the sideEffects, map, nor path has a " + key + "-key: " + this);
}
- public default <S> Optional<S> getOptionalScopeValue(final Pop pop, final String key, final Traverser.Admin<?> traverser) {
+ public default <S> S getNullableScopeValue(final Pop pop, final String key, final Traverser.Admin<?> traverser) {
if (traverser.getSideEffects().get(key).isPresent())
- return Optional.of(traverser.getSideEffects().<S>get(key).get());
+ return traverser.getSideEffects().<S>get(key).get();
///
final Object object = traverser.get();
if (object instanceof Map && ((Map<String, S>) object).containsKey(key))
- return Optional.of(((Map<String, S>) object).get(key));
+ return ((Map<String, S>) object).get(key);
///
final Path path = traverser.path();
if (path.hasLabel(key))
- return Optional.of(null == pop ? path.get(key) : path.get(pop, key));
+ return null == pop ? path.get(key) : path.get(pop, key);
///
- return Optional.empty();
+ return null;
}
public Set<String> getScopeKeys();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cd334a0e/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 cc9631b..313d4f8 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
@@ -31,7 +31,6 @@ import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import java.util.Collections;
import java.util.List;
-import java.util.Optional;
import java.util.Set;
/**
@@ -55,8 +54,8 @@ public final class SelectOneStep<S, E> extends MapStep<S, E> implements Traversa
@Override
protected E map(final Traverser.Admin<S> traverser) {
- final Optional<S> optional = this.getOptionalScopeValue(this.pop, this.selectKey, traverser);
- return optional.isPresent() ? TraversalUtil.applyNullable(optional.get(), this.selectTraversal) : null;
+ final E end = this.getNullableScopeValue(this.pop, this.selectKey, traverser);
+ return null != end ? TraversalUtil.applyNullable((S) end, this.selectTraversal) : null;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cd334a0e/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 70d2ee9..9983b7a 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
@@ -36,7 +36,6 @@ import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
/**
@@ -72,9 +71,9 @@ public final class SelectStep<S, E> extends MapStep<S, Map<String, E>> implement
}
} else {
for (final String selectKey : this.selectKeys) {
- final Optional<E> optional = this.getOptionalScopeValue(this.pop, selectKey, traverser);
- if (optional.isPresent())
- bindings.put(selectKey, TraversalUtil.apply(optional.get(), this.traversalRing.next()));
+ final E end = this.getNullableScopeValue(this.pop, selectKey, traverser);
+ if (null != end)
+ bindings.put(selectKey, TraversalUtil.apply(end, this.traversalRing.next()));
else {
this.traversalRing.reset();
return null;
@@ -110,7 +109,7 @@ public final class SelectStep<S, E> extends MapStep<S, Map<String, E>> implement
for (final String selectLabel : this.selectKeys) {
result ^= selectLabel.hashCode();
}
- if(null != this.pop)
+ if (null != this.pop)
result ^= this.pop.hashCode();
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cd334a0e/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 0f1b05e..a923467 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -184,7 +184,7 @@ public class TinkerGraphTest {
traversals.forEach(traversal -> {
System.out.println("pre-strategy: " + traversal.get());
System.out.println("post-strategy: " + traversal.get().iterate());
- System.out.println(TimeUtil.clockWithResult(50, () -> traversal.get().count().next()));
+ System.out.println(TimeUtil.clockWithResult(50, () -> traversal.get().toList()));
});
}