This is an automated email from the ASF dual-hosted git repository. jorgebg pushed a commit to branch TINKERPOP-2089 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/TINKERPOP-2089 by this push: new 22e3560 TINKERPOP-2089 Minor fixes 22e3560 is described below commit 22e35606688f41278390cf6683db2740474b4250 Author: Jorge Bay Gondra <jorgebaygon...@gmail.com> AuthorDate: Mon May 13 14:30:16 2019 +0200 TINKERPOP-2089 Minor fixes --- gremlin-javascript/glv/GraphTraversalSource.template | 11 ++++++----- .../gremlin-javascript/lib/process/anonymous-traversal.js | 5 +++++ .../gremlin-javascript/lib/process/graph-traversal.js | 11 ++++++----- .../javascript/gremlin-javascript/lib/structure/graph.js | 7 ++++--- .../gremlin-javascript/test/integration/traversal-test.js | 13 ++++++------- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/gremlin-javascript/glv/GraphTraversalSource.template b/gremlin-javascript/glv/GraphTraversalSource.template index d96279a..9f94828 100644 --- a/gremlin-javascript/glv/GraphTraversalSource.template +++ b/gremlin-javascript/glv/GraphTraversalSource.template @@ -22,23 +22,25 @@ */ 'use strict'; -const Traversal = require('./traversal').Traversal; +const { Traversal } = require('./traversal'); const remote = require('../driver/remote-connection'); const utils = require('../utils'); const Bytecode = require('./bytecode'); -const TraversalStrategies = require('./traversal-strategy').TraversalStrategies; +const { TraversalStrategies } = require('./traversal-strategy'); /** * Represents the primary DSL of the Gremlin traversal machine. */ class GraphTraversalSource { + /** + * Creates a new instance of {@link GraphTraversalSource}. * @param {Graph} graph * @param {TraversalStrategies} traversalStrategies * @param {Bytecode} [bytecode] - * @param {Class} graphTraversalSourceClass - * @param {Class} graphTraversalClass + * @param {Function} [graphTraversalSourceClass] Optional {@link GraphTraversalSource} constructor. + * @param {Function} [graphTraversalClass] Optional {@link GraphTraversal} constructor. */ constructor(graph, traversalStrategies, bytecode, graphTraversalSourceClass, graphTraversalClass) { this.graph = graph; @@ -55,7 +57,6 @@ class GraphTraversalSource { withRemote(remoteConnection) { const traversalStrategy = new TraversalStrategies(this.traversalStrategies); traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection)); - var object = Object.create(this.constructor.prototype); return new this.graphTraversalSourceClass(this.graph, traversalStrategy, new Bytecode(this.bytecode), this.graphTraversalSourceClass, this.graphTraversalClass); } diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/anonymous-traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/anonymous-traversal.js index 3fbe7eb..ff30a4b 100644 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/anonymous-traversal.js +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/anonymous-traversal.js @@ -31,6 +31,10 @@ const Graph = require('../structure/graph').Graph; */ class AnonymousTraversalSource { + /** + * Creates a new instance of {@link AnonymousTraversalSource}. + * @param {Function} [traversalSourceClass] Optional {@code GraphTraversalSource} constructor. + */ constructor(traversalSourceClass) { this.traversalSourceClass = traversalSourceClass; } @@ -38,6 +42,7 @@ class AnonymousTraversalSource { /** * Constructs an {@code AnonymousTraversalSource} which will then be configured to spawn a * {@link GraphTraversalSource}. + * @param {Function} [traversalSourceClass] Optional {@code GraphTraversalSource} constructor. * @returns {AnonymousTraversalSource}. */ static traversal(traversalSourceClass) { diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js index 89285e3..34e06db 100644 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js @@ -22,23 +22,25 @@ */ 'use strict'; -const Traversal = require('./traversal').Traversal; +const { Traversal } = require('./traversal'); const remote = require('../driver/remote-connection'); const utils = require('../utils'); const Bytecode = require('./bytecode'); -const TraversalStrategies = require('./traversal-strategy').TraversalStrategies; +const { TraversalStrategies } = require('./traversal-strategy'); /** * Represents the primary DSL of the Gremlin traversal machine. */ class GraphTraversalSource { + /** + * Creates a new instance of {@link GraphTraversalSource}. * @param {Graph} graph * @param {TraversalStrategies} traversalStrategies * @param {Bytecode} [bytecode] - * @param {Class} graphTraversalSourceClass - * @param {Class} graphTraversalClass + * @param {Function} [graphTraversalSourceClass] Optional {@link GraphTraversalSource} constructor. + * @param {Function} [graphTraversalClass] Optional {@link GraphTraversal} constructor. */ constructor(graph, traversalStrategies, bytecode, graphTraversalSourceClass, graphTraversalClass) { this.graph = graph; @@ -55,7 +57,6 @@ class GraphTraversalSource { withRemote(remoteConnection) { const traversalStrategy = new TraversalStrategies(this.traversalStrategies); traversalStrategy.addStrategy(new remote.RemoteStrategy(remoteConnection)); - var object = Object.create(this.constructor.prototype); return new this.graphTraversalSourceClass(this.graph, traversalStrategy, new Bytecode(this.bytecode), this.graphTraversalSourceClass, this.graphTraversalClass); } diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.js index 8a5def1..cb0d29f 100644 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.js +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/graph.js @@ -23,17 +23,18 @@ 'use strict'; const gt = require('../process/graph-traversal'); -const TraversalStrategies = require('../process/traversal-strategy').TraversalStrategies; +const { TraversalStrategies } = require('../process/traversal-strategy'); class Graph { /** * Returns the graph traversal source. + * @param {Function} [traversalSourceClass] The constructor to use for the {@code GraphTraversalSource} instance. * @returns {GraphTraversalSource} * @deprecated As of release 3.3.5, replaced by the traversal() anonymous function. */ traversal(traversalSourceClass) { - const clazz = traversalSourceClass || gt.GraphTraversalSource; - return new clazz(this, new TraversalStrategies()); + const traversalSourceConstructor = traversalSourceClass || gt.GraphTraversalSource; + return new traversalSourceConstructor(this, new TraversalStrategies()); } toString() { diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js index 77aaa18..447d602 100644 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/integration/traversal-test.js @@ -23,11 +23,10 @@ 'use strict'; const assert = require('assert'); -const graphModule = require('../../lib/structure/graph'); -const Vertex = graphModule.Vertex; -const traversal = require('../../lib/process/anonymous-traversal').traversal; -const GraphTraversalSource = require('../../lib/process/graph-traversal').GraphTraversalSource; -const GraphTraversal = require('../../lib/process/graph-traversal').GraphTraversal; +const { Vertex } = require('../../lib/structure/graph'); +const { traversal } = require('../../lib/process/anonymous-traversal'); +const { GraphTraversalSource } = require('../../lib/process/graph-traversal'); +const { GraphTraversal } = require('../../lib/process/graph-traversal'); const utils = require('../../lib/utils'); const helper = require('../helper'); @@ -90,8 +89,8 @@ describe('Traversal', function () { }); describe('dsl', function() { it('should expose DSL methods', function() { - var g = traversal(SocialTraversalSource).withRemote(connection); - var t = g.person('marko').aged(29).values('name'); + const g = traversal(SocialTraversalSource).withRemote(connection); + const t = g.person('marko').aged(29).values('name'); return g.person('marko').aged(29).values('name').toList().then(function (list) { assert.ok(list); assert.strictEqual(list.length, 1);