renamed Path.getSubPath() to Path.subPath() as its in the fluent style of operations on Path.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/718a29bb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/718a29bb Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/718a29bb Branch: refs/heads/TINKERPOP-1625 Commit: 718a29bb6ff5a2f5294cd3629b616fb615bc3e15 Parents: 9155c46 Author: Marko A. Rodriguez <[email protected]> Authored: Thu Mar 16 10:07:30 2017 -0600 Committer: Marko A. Rodriguez <[email protected]> Committed: Thu Mar 16 10:07:30 2017 -0600 ---------------------------------------------------------------------- .../tinkerpop/gremlin/process/traversal/Path.java | 2 +- .../traversal/step/filter/PathFilterStep.java | 2 +- .../process/traversal/step/map/PathStep.java | 2 +- .../gremlin/process/traversal/PathTest.java | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/718a29bb/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 d231a52..3ad2613 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 @@ -247,7 +247,7 @@ public interface Path extends Cloneable, Iterable<Object> { * @param toLabel The label to end recording the sub-path to. * @return the isolated sub-path. */ - public default Path getSubPath(final String fromLabel, final String toLabel) { + public default Path subPath(final String fromLabel, final String toLabel) { if (null == fromLabel && null == toLabel) return this; else { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/718a29bb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/PathFilterStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/PathFilterStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/PathFilterStep.java index b9583fa..4fe5953 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/PathFilterStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/PathFilterStep.java @@ -55,7 +55,7 @@ public final class PathFilterStep<S> extends FilterStep<S> implements FromToModu @Override protected boolean filter(final Traverser.Admin<S> traverser) { - final Path path = traverser.path().getSubPath(this.fromLabel, this.toLabel); + final Path path = traverser.path().subPath(this.fromLabel, this.toLabel); if (this.traversalRing.isEmpty()) return path.isSimple() == this.isSimple; else { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/718a29bb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java index 6b030f9..2c96261 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java @@ -51,7 +51,7 @@ public final class PathStep<S> extends MapStep<S, Path> implements TraversalPare @Override protected Path map(final Traverser.Admin<S> traverser) { - final Path path = traverser.path().getSubPath(this.fromLabel, this.toLabel); + final Path path = traverser.path().subPath(this.fromLabel, this.toLabel); if (this.traversalRing.isEmpty()) return path; else { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/718a29bb/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/PathTest.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/PathTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/PathTest.java index 1f7ec85..590ce69 100644 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/PathTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/PathTest.java @@ -392,7 +392,7 @@ public class PathTest { assertEquals(4, path.objects().size()); assertEquals(4, path.labels().size()); /// - Path subPath = path.getSubPath("b", "c"); + Path subPath = path.subPath("b", "c"); assertEquals(2, subPath.size()); assertEquals(2, subPath.objects().size()); assertEquals(2, subPath.labels().size()); @@ -404,19 +404,19 @@ public class PathTest { assertTrue(subPath.labels().get(1).contains("x")); assertEquals(2, subPath.labels().get(1).size()); /// - subPath = path.getSubPath("b", "b"); + subPath = path.subPath("b", "b"); assertEquals(1, subPath.size()); assertEquals(1, subPath.objects().size()); assertEquals(1, subPath.labels().size()); assertEquals("stephen", subPath.objects().get(0)); /// - subPath = path.getSubPath("b", "b"); + subPath = path.subPath("b", "b"); assertEquals(1, subPath.size()); assertEquals(1, subPath.objects().size()); assertEquals(1, subPath.labels().size()); assertEquals("stephen", subPath.objects().get(0)); /// - subPath = path.getSubPath("c", "d"); + subPath = path.subPath("c", "d"); assertEquals(2, subPath.size()); assertEquals(2, subPath.objects().size()); assertEquals(2, subPath.labels().size()); @@ -428,27 +428,27 @@ public class PathTest { assertTrue(subPath.labels().get(1).contains("d")); assertEquals(1, subPath.labels().get(1).size()); /// - subPath = path.getSubPath("a","d"); + subPath = path.subPath("a","d"); assertEquals(4, subPath.size()); assertEquals(4, subPath.objects().size()); assertEquals(4, subPath.labels().size()); /// try { - subPath = path.getSubPath("d", "a"); + subPath = path.subPath("d", "a"); fail("Path labels must be ordered along path"); } catch (final IllegalArgumentException e) { assertTrue(true); } /// try { - subPath = path.getSubPath("a", "e"); + subPath = path.subPath("a", "e"); fail("End path label was not found"); } catch (final IllegalArgumentException e) { assertEquals(Path.Exceptions.couldNotLocalPathToLabel("e").getMessage(), e.getMessage()); } /// try { - subPath = path.getSubPath("e", "b"); + subPath = path.subPath("e", "b"); fail("Start path label was not found"); } catch (final IllegalArgumentException e) { assertEquals(Path.Exceptions.couldNotLocalPathFromLabel("e").getMessage(), e.getMessage());
