tinkerpop git commit: updated yaml with GraphSON stuff, tweaks to websocket_remote_connection and String hack in TraversalOpProcessor.

[ok...@apache.org]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1278 7056b5ea9 -> 95e08c24d


updated yaml with GraphSON stuff, tweaks to websocket_remote_connection and String hack in TraversalOpProcessor.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/95e08c24
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/95e08c24
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/95e08c24

Branch: refs/heads/TINKERPOP-1278
Commit: 95e08c24dd0f0337a040d9cae91f8619dfa799c1
Parents: 7056b5e
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Aug 15 12:17:21 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Aug 15 12:17:21 2016 -0600

----------------------------------------------------------------------
 .../jython/gremlin_python/driver/websocket_remote_connection.py | 2 +-
 gremlin-server/conf/gremlin-server-modern.yaml                  | 1 +
 .../gremlin/server/op/traversal/TraversalOpProcessor.java       | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/95e08c24/gremlin-python/src/main/jython/gremlin_python/driver/websocket_remote_connection.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/websocket_remote_connection.py b/gremlin-python/src/main/jython/gremlin_python/driver/websocket_remote_connection.py
index 1ccd38d..b7eb964 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/websocket_remote_connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/websocket_remote_connection.py
@@ -158,7 +158,7 @@ class Response:
         self._processor = processor
         self._session = session
         self._username = username
-        self._password
+        self._password = password
 
     @gen.coroutine
     def receive(self):

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/95e08c24/gremlin-server/conf/gremlin-server-modern.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-modern.yaml b/gremlin-server/conf/gremlin-server-modern.yaml
index cec7f81..b4e1893 100644
--- a/gremlin-server/conf/gremlin-server-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-modern.yaml
@@ -33,6 +33,7 @@ serializers:
   - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }}       # application/vnd.gremlin-v1.0+gryo
   - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }}   # application/vnd.gremlin-v1.0+gryo-lite
   - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }}   # application/vnd.gremlin-v1.0+gryo-stringd
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
 metrics: {
   slf4jReporter: {enabled: true, interval: 180000}}
 strictTransactionManagement: false

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/95e08c24/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
index 9725b36..a8facbf 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
@@ -44,6 +44,7 @@ import org.apache.tinkerpop.gremlin.server.util.MetricManager;
 import org.apache.tinkerpop.gremlin.server.util.SideEffectIterator;
 import org.apache.tinkerpop.gremlin.server.util.TraversalIterator;
 import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
 import org.apache.tinkerpop.gremlin.util.function.ThrowingConsumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -307,11 +308,11 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
         }
     }
 
-    private void iterateBytecodeTraversal(final Context context) throws OpProcessorException {
+    private void iterateBytecodeTraversal(final Context context) throws OpProcessorException, Exception {
         final RequestMessage msg = context.getRequestMessage();
         logger.debug("Traversal request {} for in thread {}", msg.getRequestId(), Thread.currentThread().getName());
 
-        final Bytecode bytecode = (Bytecode) msg.getArgs().get(Tokens.ARGS_GREMLIN);
+        final Bytecode bytecode = GraphSONMapper.build().create().createMapper().readValue(msg.getArgs().get(Tokens.ARGS_GREMLIN).toString(), Bytecode.class);
 
         // earlier validation in selection of this op method should free us to cast this without worry
         final Map<String, String> aliases = (Map<String, String>) msg.optionalArgs(Tokens.ARGS_ALIASES).get();