[tinkerpop] branch TINKERPOP-2206 updated: TINKERPOP-2206 Minor fixes

[jorgebg]

This is an automated email from the ASF dual-hosted git repository.

jorgebg pushed a commit to branch TINKERPOP-2206
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/TINKERPOP-2206 by this push:
     new c75a1d9  TINKERPOP-2206 Minor fixes
c75a1d9 is described below

commit c75a1d9f6565efb2948066d4d502e35e6cc7f1c6
Author: Jorge Bay Gondra <jorgebaygon...@gmail.com>
AuthorDate: Tue May 7 10:27:36 2019 +0200

    TINKERPOP-2206 Minor fixes
---
 gremlin-javascript/glv/TraversalSource.template        |  2 +-
 .../gremlin-javascript/lib/process/traversal.js        |  2 +-
 .../lib/structure/io/graph-serializer.js               | 18 +++++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/gremlin-javascript/glv/TraversalSource.template 
b/gremlin-javascript/glv/TraversalSource.template
index 63facdf..afacce8 100644
--- a/gremlin-javascript/glv/TraversalSource.template
+++ b/gremlin-javascript/glv/TraversalSource.template
@@ -159,7 +159,7 @@ class P {
   }
 
   static without(...args) {
-    if (args.length == 1 && Array.isArray(args[0])) {
+    if (args.length === 1 && Array.isArray(args[0])) {
       return new P("without", args[0], null);
     } else {
       return new P("without", args, null);
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
index 28a0a2b..bb763a2 100644
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
@@ -159,7 +159,7 @@ class P {
   }
 
   static without(...args) {
-    if (args.length == 1 && Array.isArray(args[0])) {
+    if (args.length === 1 && Array.isArray(args[0])) {
       return new P("without", args[0], null);
     } else {
       return new P("without", args, null);
diff --git 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
index 4ee036a..94386df 100644
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
@@ -50,29 +50,33 @@ class GraphSONWriter {
       }
       s.writer = this;
       // Insert custom serializers first
-      th
-      is._serializers.unshift(s);
+      this._serializers.unshift(s);
     });
   }
 
   adaptObject(value) {
     let s;
-    let o = value;
+
     for (let i = 0; i < this._serializers.length; i++) {
       const currentSerializer = this._serializers[i];
-      if (currentSerializer.canBeUsedFor && currentSerializer.canBeUsedFor(o)) 
{
+      if (currentSerializer.canBeUsedFor && 
currentSerializer.canBeUsedFor(value)) {
         s = currentSerializer;
         break;
       }
     }
+
     if (s) {
-      return s.serialize(o);
+      return s.serialize(value);
     }
+
     if (Array.isArray(value)) {
-      o = value.map(item => this.adaptObject(item));
+      // We need to handle arrays when there is no serializer
+      // for older versions of GraphSON
+      return value.map(item => this.adaptObject(item));
     }
+
     // Default (strings / objects / ...)
-    return o;
+    return value;
   }
 
   /**