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 0C46D200C81 for ; Fri, 26 May 2017 14:24:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0B0E1160BB8; Fri, 26 May 2017 12:24:17 +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 CD757160BE7 for ; Fri, 26 May 2017 14:24:15 +0200 (CEST) Received: (qmail 2345 invoked by uid 500); 26 May 2017 12:24:15 -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 2025 invoked by uid 99); 26 May 2017 12:24:14 -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; Fri, 26 May 2017 12:24:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D26AAE9638; Fri, 26 May 2017 12:24:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spmallette@apache.org To: commits@tinkerpop.apache.org Date: Fri, 26 May 2017 12:24:33 -0000 Message-Id: <68cd16c39c424a95b9b5f6396dfcde70@git.apache.org> In-Reply-To: <405ef61ac45642868d30ecd8317fcee9@git.apache.org> References: <405ef61ac45642868d30ecd8317fcee9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/38] tinkerpop git commit: TINKERPOP-786 Improved TraversalSource for testing purposes archived-at: Fri, 26 May 2017 12:24:17 -0000 TINKERPOP-786 Improved TraversalSource for testing purposes Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e661359a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e661359a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e661359a Branch: refs/heads/tp32 Commit: e661359a9a760bb398b590c9c1bffa8268463f78 Parents: b47b25c Author: Stephen Mallette Authored: Tue May 9 13:52:42 2017 -0400 Committer: Stephen Mallette Committed: Tue May 16 11:01:51 2017 -0400 ---------------------------------------------------------------------- .../dsl/SocialPackageTraversalSourceDsl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e661359a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/SocialPackageTraversalSourceDsl.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/SocialPackageTraversalSourceDsl.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/SocialPackageTraversalSourceDsl.java index 143a5c9..64859eb 100644 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/SocialPackageTraversalSourceDsl.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/SocialPackageTraversalSourceDsl.java @@ -44,11 +44,16 @@ public class SocialPackageTraversalSourceDsl extends GraphTraversalSource { super(graph); } - public GraphTraversal persons() { - final GraphTraversalSource clone = this.clone(); + public GraphTraversal persons(String... names) { + GraphTraversalSource clone = this.clone(); + clone.getBytecode().addStep(GraphTraversal.Symbols.V); - clone.getBytecode().addStep(GraphTraversal.Symbols.hasLabel, "person"); - final GraphTraversal.Admin traversal = new DefaultGraphTraversal<>(clone); - return TraversalHelper.addHasContainer(traversal.addStep(new GraphStep<>(traversal, Vertex.class, true)), new HasContainer(T.label.getAccessor(), P.eq("person"))); + GraphTraversal traversal = new DefaultGraphTraversal<>(clone); + traversal.asAdmin().addStep(new GraphStep<>(traversal.asAdmin(), Vertex.class, true)); + + traversal = traversal.hasLabel("person"); + if (names.length > 0) traversal = traversal.has("name", P.within(names)); + + return traversal; } }