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 20:11:08 UTC
[2/4] incubator-tinkerpop git commit: Reverse sense of Path.getSingle
Pop to align with tail(local) step
Reverse sense of Path.getSingle Pop to align with tail(local) step
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4939cf0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4939cf0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4939cf0a
Branch: refs/heads/master
Commit: 4939cf0a22c4fc44a4f86ed3e023fa30e4e872cc
Parents: e1e1a40
Author: mhfrantz <mf...@redsealnetworks.com>
Authored: Thu Jun 11 10:10:27 2015 -0700
Committer: mhfrantz <mf...@redsealnetworks.com>
Committed: Thu Jun 11 10:10:27 2015 -0700
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/traversal/Path.java | 4 ++--
.../gremlin/process/traversal/PathTest.java | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4939cf0a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Path.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Path.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Path.java
index 69632b8..05af228 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Path.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Path.java
@@ -119,7 +119,7 @@ public interface Path extends Cloneable {
/**
* Get the object most/least recently associated with the particular label of the path.
*
- * @param pop head for most recent, tail for least recent
+ * @param pop head for least recent, tail for most recent
* @param label the label of the path
* @param <A> the type of the object associated with the label
* @return the object associated with the label of the path
@@ -128,7 +128,7 @@ public interface Path extends Cloneable {
public default <A> A getSingle(final Pop pop, final String label) throws IllegalArgumentException {
final Object object = this.get(label);
if (object instanceof List) {
- return Pop.head == pop ? ((List<A>) object).get(((List) object).size() - 1) : ((List<A>) object).get(0);
+ return Pop.tail == pop ? ((List<A>) object).get(((List) object).size() - 1) : ((List<A>) object).get(0);
} else
return (A) object;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4939cf0a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/PathTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/PathTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/PathTest.java
index 02f0553..97a4f86 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/PathTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/PathTest.java
@@ -175,15 +175,15 @@ public class PathTest extends AbstractGremlinProcessTest {
path = path.extend("stephen", "a", "c");
path = path.extend("matthias", "c", "d");
assertEquals(3, path.size());
- assertEquals("marko", path.getSingle(Pop.tail, "a"));
- assertEquals("marko", path.getSingle(Pop.tail, "b"));
- assertEquals("stephen", path.getSingle(Pop.tail, "c"));
- assertEquals("matthias", path.getSingle(Pop.tail, "d"));
- ///
+ assertEquals("marko", path.getSingle(Pop.head, "a"));
assertEquals("marko", path.getSingle(Pop.head, "b"));
- assertEquals("stephen", path.getSingle(Pop.head, "a"));
- assertEquals("matthias", path.getSingle(Pop.head, "c"));
+ assertEquals("stephen", path.getSingle(Pop.head, "c"));
assertEquals("matthias", path.getSingle(Pop.head, "d"));
+ ///
+ assertEquals("marko", path.getSingle(Pop.tail, "b"));
+ assertEquals("stephen", path.getSingle(Pop.tail, "a"));
+ assertEquals("matthias", path.getSingle(Pop.tail, "c"));
+ assertEquals("matthias", path.getSingle(Pop.tail, "d"));
});
}
@@ -209,4 +209,4 @@ public class PathTest extends AbstractGremlinProcessTest {
assertEquals(0,path.getList("noExist").size());
});
}
-}
\ No newline at end of file
+}