Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 598E5200BD0 for ; Wed, 30 Nov 2016 17:53:18 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 583C8160B06; Wed, 30 Nov 2016 16:53:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E1056160B29 for ; Wed, 30 Nov 2016 17:53:16 +0100 (CET) Received: (qmail 78068 invoked by uid 500); 30 Nov 2016 16:53:16 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 77988 invoked by uid 99); 30 Nov 2016 16:53:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Nov 2016 16:53:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A38BEEABE2; Wed, 30 Nov 2016 16:53:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkuppitz@apache.org To: commits@tinkerpop.apache.org Date: Wed, 30 Nov 2016 16:53:20 -0000 Message-Id: <1fb4e6a8fe904a639314d84519e2aa0d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/8] tinkerpop git commit: only when passing includeTokens are the keys Object archived-at: Wed, 30 Nov 2016 16:53:18 -0000 only when passing includeTokens are the keys Object Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8f038aa0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8f038aa0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8f038aa0 Branch: refs/heads/master Commit: 8f038aa0888d544b8830521644de26bcf9701fdf Parents: 879003c Author: jpmoresmau Authored: Mon Nov 28 21:13:17 2016 +0100 Committer: jpmoresmau Committed: Mon Nov 28 21:13:17 2016 +0100 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 +- docs/src/upgrade/release-3.3.x.asciidoc | 6 ++-- .../traversal/dsl/graph/GraphTraversal.java | 2 +- .../gremlin/process/traversal/dsl/graph/__.java | 2 +- .../step/map/GroovyPageRankTest.groovy | 8 ++--- .../step/map/GroovyPeerPressureTest.groovy | 2 +- .../traversal/step/map/GroovyProgramTest.groovy | 2 +- .../step/map/GroovyValueMapTest.groovy | 6 ++-- .../process/computer/GraphComputerTest.java | 4 +-- .../traversal/step/map/PageRankTest.java | 32 ++++++++++---------- .../traversal/step/map/PeerPressureTest.java | 8 ++--- .../process/traversal/step/map/ProgramTest.java | 8 ++--- .../traversal/step/map/ValueMapTest.java | 24 +++++++-------- 13 files changed, 53 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 300d927..dc4e17d 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -46,7 +46,7 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) * Removed `tryRandomCommit()` from `AbstractGremlinTest`. * Changed `gremlin-benchmark` system property for the report location to `benchmarkReportDir` for consistency. * Added SysV and systemd init scripts. -* `valueMap` now returns a `Map` since keys could be `T.id` or `T.label`. +* `GraphTraversal.valueMap(includeTokens,propertyKeys...)` now returns a `Map` since keys could be `T.id` or `T.label`. TinkerPop 3.2.0 (Nine Inch Gremlins) ------------------------------------ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/docs/src/upgrade/release-3.3.x.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index 40a3104..7d42e6c 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -73,10 +73,10 @@ bin/gremlin.sh -e gremlin.groovy See: link:https://issues.apache.org/jira/browse/TINKERPOP-1283[TINKERPOP-1283] -ValueMap -^^^^^^^^ +GraphTraversal valueMap() Signature Updated +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -`valueMap` now returns a `Map` to account for the presence of `T.id` or `T.label` if you pass `true` to it. +`GraphTraversal.valueMap(includeTokens,propertyKeys...)` now returns a `Map` to account for the presence of `T.id` or `T.label` if you pass `true` to it. See: link:https://issues.apache.org/jira/browse/TINKERPOP-1283[TINKERPOP-1483] http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/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 9ab2e81..2ca0cb6 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 @@ -483,7 +483,7 @@ public interface GraphTraversal extends Traversal { * @param the value type of the returned properties * @return the traversal with an appended {@link PropertyMapStep}. */ - public default GraphTraversal> valueMap(final String... propertyKeys) { + public default GraphTraversal> valueMap(final String... propertyKeys) { this.asAdmin().getBytecode().addStep(Symbols.valueMap, propertyKeys); return this.asAdmin().addStep(new PropertyMapStep<>(this.asAdmin(), false, PropertyType.VALUE, propertyKeys)); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java index 1dbf51c..2ec0d0a 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java @@ -255,7 +255,7 @@ public class __ { /** * @see GraphTraversal#valueMap(String...) */ - public static GraphTraversal> valueMap(final String... propertyKeys) { + public static GraphTraversal> valueMap(final String... propertyKeys) { return __.start().valueMap(propertyKeys); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy index 276445d..13787cc 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy @@ -36,7 +36,7 @@ public abstract class GroovyPageRankTest { } @Override - public Traversal>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() { + public Traversal>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V.pageRank.by(outE('knows')).by('friendRank').valueMap('name','friendRank')") } @@ -51,7 +51,7 @@ public abstract class GroovyPageRankTest { } @Override - public Traversal>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() { + public Traversal>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').pageRank.by('pageRank').order.by('pageRank').valueMap('name', 'pageRank')") } @@ -61,7 +61,7 @@ public abstract class GroovyPageRankTest { } @Override - public Traversal>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() { + public Traversal>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V().hasLabel('software').has('name', 'ripple').pageRank(1.0).by(inE('created')).times(1).by('priors').in('created').union(identity(),both()).valueMap('name', 'priors')") } @@ -71,7 +71,7 @@ public abstract class GroovyPageRankTest { } @Override - public Traversal>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() { + public Traversal>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V.out('created').pageRank().by(bothE()).by('projectRank').times(0).valueMap('name','projectRank')") } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy index f111077..6ec0750 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy @@ -41,7 +41,7 @@ public abstract class GroovyPeerPressureTest { } @Override - public Traversal>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() { + public Traversal>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V.has('name', 'ripple').in('created').peerPressure.by(outE()).by('cluster').repeat(union(identity(), both())).times(2).dedup.valueMap('name', 'cluster')") } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy index d7bfe1e..7abe113 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy @@ -36,7 +36,7 @@ public abstract class GroovyProgramTest { } @Override - public Traversal>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() { + public Traversal>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').program(PageRankVertexProgram.build().property('rank').create(graph)).order.by('rank',incr).valueMap('name','rank')"); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy ---------------------------------------------------------------------- diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy index 61e19b4..bda27fd 100644 --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy @@ -29,17 +29,17 @@ public abstract class GroovyValueMapTest { public static class Traversals extends ValueMapTest { @Override - public Traversal> get_g_V_valueMap() { + public Traversal> get_g_V_valueMap() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V.valueMap"); } @Override - public Traversal> get_g_V_valueMapXname_ageX() { + public Traversal> get_g_V_valueMapXname_ageX() { new ScriptTraversal<>(g, "gremlin-groovy", "g.V.valueMap('name', 'age')") } @Override - public Traversal>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) { + public Traversal>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) { new ScriptTraversal<>(g, "gremlin-groovy", "g.V(v1Id).out('created').valueMap", "v1Id", v1Id) } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java index 8b8c720..58fbd9e 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java @@ -2360,7 +2360,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest { try { g.V().as("a").out("created").in("created").program(vp).dedup() - .valueMap("name", "coworkers").forEachRemaining((Map map) -> { + .valueMap("name", "coworkers").forEachRemaining((Map map) -> { final String name = (String) ((List) map.get("name")).get(0); final Map coworkers = (Map) ((List) map.get("coworkers")).get(0); @@ -2394,7 +2394,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest { try { g.V().as("a").out("created").in("created").program(vp).dedup() - .valueMap("name", "coworkers").forEachRemaining((Map map) -> { + .valueMap("name", "coworkers").forEachRemaining((Map map) -> { final String name = (String) ((List) map.get("name")).get(0); final Map coworkers = (Map) ((List) map.get("coworkers")).get(0); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java index bbd4329..57a3b3f 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java @@ -49,19 +49,19 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { public abstract Traversal get_g_V_pageRank(); - public abstract Traversal>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX(); + public abstract Traversal>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX(); public abstract Traversal get_g_V_pageRank_order_byXpageRank_decrX_name(); public abstract Traversal get_g_V_pageRank_order_byXpageRank_decrX_name_limitX2X(); - public abstract Traversal>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX(); + public abstract Traversal>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX(); - public abstract Traversal>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX(); + public abstract Traversal>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX(); public abstract Traversal> get_g_V_pageRank_byXpageRankX_asXaX_outXknowsX_pageRank_asXbX_selectXa_bX(); - public abstract Traversal>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX(); + public abstract Traversal>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX(); public abstract Traversal>> get_g_V_outXcreatedX_groupXmX_byXlabelX_pageRankX1X_byXpageRankX_byXinEX_timesX1X_inXcreatedX_groupXmX_byXpageRankX_capXmX(); @@ -82,9 +82,9 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) public void g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_valueMapXname_projectRankX() { - final Traversal>> traversal = get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX(); + final Traversal>> traversal = get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX(); printTraversalForm(traversal); - final List>> result = traversal.toList(); + final List>> result = traversal.toList(); assertEquals(4, result.size()); final Map map = new HashMap<>(); result.forEach(m -> map.put((String) m.get("name").get(0), (Double) m.get("projectRank").get(0))); @@ -115,11 +115,11 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) public void g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() { - final Traversal>> traversal = get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX(); + final Traversal>> traversal = get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX(); printTraversalForm(traversal); int counter = 0; while (traversal.hasNext()) { - final Map> map = traversal.next(); + final Map> map = traversal.next(); assertEquals(2, map.size()); assertEquals(1, map.get("name").size()); assertEquals(1, map.get("friendRank").size()); @@ -149,12 +149,12 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) public void g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() { - final Traversal>> traversal = get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX(); + final Traversal>> traversal = get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX(); printTraversalForm(traversal); int counter = 0; double lastPageRank = Double.MIN_VALUE; while (traversal.hasNext()) { - final Map> map = traversal.next(); + final Map> map = traversal.next(); assertEquals(2, map.size()); assertEquals(1, map.get("name").size()); assertEquals(1, map.get("pageRank").size()); @@ -189,11 +189,11 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) public void g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() { - final Traversal>> traversal = get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX(); + final Traversal>> traversal = get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX(); printTraversalForm(traversal); int counter = 0; while (traversal.hasNext()) { - final Map> map = traversal.next(); + final Map> map = traversal.next(); assertEquals(2, map.size()); String name = (String) map.get("name").get(0); double pageRank = (Double) map.get("priors").get(0); @@ -246,12 +246,12 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { } @Override - public Traversal>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() { + public Traversal>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() { return g.V().out("created").pageRank().by(__.bothE()).by("projectRank").times(0).valueMap("name", "projectRank"); } @Override - public Traversal>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() { + public Traversal>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() { return g.V().pageRank().by(__.outE("knows")).by("friendRank").valueMap("name", "friendRank"); } @@ -266,7 +266,7 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { } @Override - public Traversal>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() { + public Traversal>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() { return g.V().hasLabel("person").pageRank().by("pageRank").order().by("pageRank").valueMap("name", "pageRank"); } @@ -276,7 +276,7 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest { } @Override - public Traversal>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() { + public Traversal>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() { return g.V().hasLabel("software").has("name", "ripple").pageRank(1.0).by(__.inE("created")).times(1).by("priors").in("created").union(__.both(), __.identity()).valueMap("name", "priors"); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java index bde8ab9..5a2477c 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java @@ -47,7 +47,7 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest { public abstract Traversal> get_g_V_peerPressure_byXclusterX_byXoutEXknowsXX_pageRankX1X_byXrankX_byXoutEXknowsXX_timesX2X_group_byXclusterX_byXrank_sumX_limitX100X(); - public abstract Traversal>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX(); + public abstract Traversal>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX(); @Test @LoadGraphWith(MODERN) @@ -80,9 +80,9 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) public void g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() { - final Traversal>> traversal = get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX(); + final Traversal>> traversal = get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX(); printTraversalForm(traversal); - final List>> results = traversal.toList(); + final List>> results = traversal.toList(); assertEquals(6, results.size()); final Map clusters = new HashMap<>(); results.forEach(m -> clusters.put((String) m.get("name").get(0), m.get("cluster").get(0))); @@ -112,7 +112,7 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest { } @Override - public Traversal>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() { + public Traversal>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() { return g.V().has("name", "ripple").in("created").peerPressure().by(__.outE()).by("cluster").repeat(__.union(__.identity(), __.both())).times(2).dedup().valueMap("name", "cluster"); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java index f86a6ef..5f548da 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java @@ -70,7 +70,7 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest { public abstract Traversal get_g_V_programXpageRankX(); - public abstract Traversal>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX(); + public abstract Traversal>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX(); public abstract Traversal> get_g_V_outXcreatedX_aggregateXxX_byXlangX_groupCount_programXTestProgramX_asXaX_selectXa_xX(); @@ -91,12 +91,12 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) public void g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_decrX_valueMapXname_rankX() { - final Traversal>> traversal = get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX(); + final Traversal>> traversal = get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX(); printTraversalForm(traversal); int counter = 0; double lastRank = Double.MIN_VALUE; while (traversal.hasNext()) { - final Map> map = traversal.next(); + final Map> map = traversal.next(); assertEquals(2, map.size()); assertEquals(1, map.get("name").size()); assertEquals(1, map.get("rank").size()); @@ -147,7 +147,7 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest { } @Override - public Traversal>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() { + public Traversal>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() { return g.V().hasLabel("person").program(PageRankVertexProgram.build().property("rank").create(graph)).order().by("rank", Order.incr).valueMap("name", "rank"); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java index 14c7902..6ab0852 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java @@ -44,23 +44,23 @@ import static org.junit.Assert.*; @RunWith(GremlinProcessRunner.class) public abstract class ValueMapTest extends AbstractGremlinProcessTest { - public abstract Traversal> get_g_V_valueMap(); + public abstract Traversal> get_g_V_valueMap(); - public abstract Traversal> get_g_V_valueMapXname_ageX(); + public abstract Traversal> get_g_V_valueMapXname_ageX(); public abstract Traversal> get_g_V_valueMapToken(); - public abstract Traversal>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id); + public abstract Traversal>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id); @Test @LoadGraphWith(MODERN) public void g_V_valueMap() { - final Traversal> traversal = get_g_V_valueMap(); + final Traversal> traversal = get_g_V_valueMap(); printTraversalForm(traversal); int counter = 0; while (traversal.hasNext()) { counter++; - final Map values = traversal.next(); + final Map values = traversal.next(); final String name = (String) values.get("name").get(0); assertEquals(2, values.size()); if (name.equals("marko")) { @@ -85,12 +85,12 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) public void g_V_valueMapXname_ageX() { - final Traversal> traversal = get_g_V_valueMapXname_ageX(); + final Traversal> traversal = get_g_V_valueMapXname_ageX(); printTraversalForm(traversal); int counter = 0; while (traversal.hasNext()) { counter++; - final Map values = traversal.next(); + final Map values = traversal.next(); final String name = (String) values.get("name").get(0); if (name.equals("marko")) { assertEquals(29, values.get("age").get(0)); @@ -120,10 +120,10 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest { @Test @LoadGraphWith(MODERN) public void g_VX1X_outXcreatedX_valueMap() { - final Traversal>> traversal = get_g_VX1X_outXcreatedX_valueMap(convertToVertexId("marko")); + final Traversal>> traversal = get_g_VX1X_outXcreatedX_valueMap(convertToVertexId("marko")); printTraversalForm(traversal); assertTrue(traversal.hasNext()); - final Map> values = traversal.next(); + final Map> values = traversal.next(); assertFalse(traversal.hasNext()); assertEquals("lop", values.get("name").get(0)); assertEquals("java", values.get("lang").get(0)); @@ -157,17 +157,17 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest { public static class Traversals extends ValueMapTest { @Override - public Traversal> get_g_V_valueMap() { + public Traversal> get_g_V_valueMap() { return g.V().valueMap(); } @Override - public Traversal> get_g_V_valueMapXname_ageX() { + public Traversal> get_g_V_valueMapXname_ageX() { return g.V().valueMap("name", "age"); } @Override - public Traversal>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) { + public Traversal>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) { return g.V(v1Id).out("created").valueMap(); }