tinkerpop git commit: Fixed typo CTR

2018-02-13 Thread rdale 
Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 395cdef87 -> d288c53bf


Fixed typo CTR


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

Branch: refs/heads/tp32
Commit: d288c53bf83bba5bdde32684838f54425568d689
Parents: 395cdef
Author: Robert Dale 
Authored: Tue Feb 13 13:12:54 2018 -0500
Committer: Robert Dale 
Committed: Tue Feb 13 13:12:54 2018 -0500

--
 docs/src/reference/gremlin-applications.asciidoc   | 2 +-
 .../apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java| 2 +-
 .../org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d288c53b/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 92bfef7..4e4f190 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -517,7 +517,7 @@ script = """
 <1> This configuration file specifies that results should be deserialized back 
into an `Object` in the console with
 the caveat being that the server and console both know how to serialize and 
deserialize the result to be returned.
 <2> There are now two configured remote connections.  The one marked by an 
asterisk is the one that was just created
-and denotes the current one that `:sumbit` will react to.
+and denotes the current one that `:submit` will react to.
 <3> When the script is executed again, the `class` is no longer shown to be a 
`java.lang.String`.  It is instead a `java.util.HashMap`.
 <4> The last result of a remote script is always stored in the reserved 
variable `result`, which allows access to
 the `Result` and by virtue of that, the `Map` itself.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d288c53b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
index 9571b2c..c1a8c91 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
@@ -71,7 +71,7 @@ public interface RemoteAcceptor extends Closeable {
  * set to {@code false}.
  * 
  * A {@code RemoteAcceptor} should only return {@code true} for this 
method if it expects that all activities it
- * supports are executed through the {@code :sumbit} command. If the users 
interaction with the remote requires
+ * supports are executed through the {@code :submit} command. If the users 
interaction with the remote requires
  * working with both local and remote evaluation at the same time, it is 
likely best to keep this method return
  * {@code false}. A good example of this type of plugin would be the Gephi 
Plugin which uses {@code :remote config}
  * to configure a local {@code TraversalSource} to be used and expects 
calls to {@code :submit} for the same body

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d288c53b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java
--
diff --git 
a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java
 
b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java
index 2bb8663..1d43d56 100644
--- 
a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java
+++ 
b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java
@@ -73,7 +73,7 @@ public interface RemoteAcceptor extends Closeable {
  * set to {@code false}.
  * 
  * A {@code RemoteAcceptor} should only return {@code true} for this 
method if it expects that all activities it
- * supports are executed through the {@code :sumbit} command. If the users 
interaction with the remote requires
+ * supports are executed through the {@code :submit} command. If the users 
interaction with the remote requires
  * working with both local and remote evaluation at the same time, it is 
likely best to keep

[2/2] tinkerpop git commit: Merge tp32

2018-02-13 Thread rdale 
Merge tp32


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

Branch: refs/heads/master
Commit: 5768bc1bc8592ec735797c3ac4bf11798b549165
Parents: 6098405 d288c53
Author: Robert Dale 
Authored: Tue Feb 13 13:14:17 2018 -0500
Committer: Robert Dale 
Committed: Tue Feb 13 13:14:17 2018 -0500

--
 docs/src/reference/gremlin-applications.asciidoc   | 2 +-
 .../apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5768bc1b/docs/src/reference/gremlin-applications.asciidoc
--

[1/2] tinkerpop git commit: Fixed typo CTR

2018-02-13 Thread rdale 
Repository: tinkerpop
Updated Branches:
  refs/heads/master 609840589 -> 5768bc1bc


Fixed typo CTR


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

Branch: refs/heads/master
Commit: d288c53bf83bba5bdde32684838f54425568d689
Parents: 395cdef
Author: Robert Dale 
Authored: Tue Feb 13 13:12:54 2018 -0500
Committer: Robert Dale 
Committed: Tue Feb 13 13:12:54 2018 -0500

--
 docs/src/reference/gremlin-applications.asciidoc   | 2 +-
 .../apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java| 2 +-
 .../org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d288c53b/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 92bfef7..4e4f190 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -517,7 +517,7 @@ script = """
 <1> This configuration file specifies that results should be deserialized back 
into an `Object` in the console with
 the caveat being that the server and console both know how to serialize and 
deserialize the result to be returned.
 <2> There are now two configured remote connections.  The one marked by an 
asterisk is the one that was just created
-and denotes the current one that `:sumbit` will react to.
+and denotes the current one that `:submit` will react to.
 <3> When the script is executed again, the `class` is no longer shown to be a 
`java.lang.String`.  It is instead a `java.util.HashMap`.
 <4> The last result of a remote script is always stored in the reserved 
variable `result`, which allows access to
 the `Result` and by virtue of that, the `Map` itself.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d288c53b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
index 9571b2c..c1a8c91 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java
@@ -71,7 +71,7 @@ public interface RemoteAcceptor extends Closeable {
  * set to {@code false}.
  * 
  * A {@code RemoteAcceptor} should only return {@code true} for this 
method if it expects that all activities it
- * supports are executed through the {@code :sumbit} command. If the users 
interaction with the remote requires
+ * supports are executed through the {@code :submit} command. If the users 
interaction with the remote requires
  * working with both local and remote evaluation at the same time, it is 
likely best to keep this method return
  * {@code false}. A good example of this type of plugin would be the Gephi 
Plugin which uses {@code :remote config}
  * to configure a local {@code TraversalSource} to be used and expects 
calls to {@code :submit} for the same body

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d288c53b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java
--
diff --git 
a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java
 
b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java
index 2bb8663..1d43d56 100644
--- 
a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java
+++ 
b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java
@@ -73,7 +73,7 @@ public interface RemoteAcceptor extends Closeable {
  * set to {@code false}.
  * 
  * A {@code RemoteAcceptor} should only return {@code true} for this 
method if it expects that all activities it
- * supports are executed through the {@code :sumbit} command. If the users 
interaction with the remote requires
+ * supports are executed through the {@code :submit} command. If the users 
interaction with the remote requires
  * working with both local and remote evaluation at the same time, it is 
likely best to

[2/2] tinkerpop git commit: Merge branch 'tp32'

2018-02-13 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 609840589df85097ec077f271d297b87816336b8
Parents: 91f6245 395cdef
Author: Stephen Mallette 
Authored: Tue Feb 13 10:56:08 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Feb 13 10:56:08 2018 -0500

--
 .../src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/60984058/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
--

tinkerpop git commit: Remove bad link in javadoc CTR

2018-02-13 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 8e0470ae8 -> 395cdef87


Remove bad link in javadoc CTR


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

Branch: refs/heads/tp32
Commit: 395cdef87c5912dd75750e1881a61fca0f3f8edc
Parents: 8e0470a
Author: Stephen Mallette 
Authored: Tue Feb 13 10:55:51 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Feb 13 10:55:51 2018 -0500

--
 .../src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/395cdef8/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
index 9fc2056..5c6e371 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
@@ -81,7 +81,7 @@ public @interface LoadGraphWith {
 
 /**
  * Loads a test graph which contains disconnected subgraphs 
specialized for testing purposes (e.g. a subgraph
- * with a self-loop). This graph is created with the {@link 
TestHelper#loadSinkGraph(Graph)} method.
+ * with a self-loop).
  */
 SINK;

[1/2] tinkerpop git commit: Remove bad link in javadoc CTR

2018-02-13 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/master 91f6245fd -> 609840589


Remove bad link in javadoc CTR


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

Branch: refs/heads/master
Commit: 395cdef87c5912dd75750e1881a61fca0f3f8edc
Parents: 8e0470a
Author: Stephen Mallette 
Authored: Tue Feb 13 10:55:51 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Feb 13 10:55:51 2018 -0500

--
 .../src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/395cdef8/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
index 9fc2056..5c6e371 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
@@ -81,7 +81,7 @@ public @interface LoadGraphWith {
 
 /**
  * Loads a test graph which contains disconnected subgraphs 
specialized for testing purposes (e.g. a subgraph
- * with a self-loop). This graph is created with the {@link 
TestHelper#loadSinkGraph(Graph)} method.
+ * with a self-loop).
  */
 SINK;

tinkerpop git commit: TINKERPOP-1738 Bump to jackson 2.9.4

2018-02-13 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1738-wip [created] 30005fdb2


TINKERPOP-1738 Bump to jackson 2.9.4


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

Branch: refs/heads/TINKERPOP-1738-wip
Commit: 30005fdb276a574d6fa43a6a96394363da13985b
Parents: 8e0470a
Author: Stephen Mallette 
Authored: Tue Feb 13 10:16:46 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Feb 13 10:16:46 2018 -0500

--
 .../io/graphson/GraphSONTypeSerializer.java | 94 ++--
 gremlin-shaded/pom.xml  |  2 +-
 2 files changed, 28 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/30005fdb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
index 78c670a..8b1ba25 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
@@ -39,6 +39,8 @@ import 
org.apache.tinkerpop.gremlin.util.function.HashMapSupplier;
 import org.apache.tinkerpop.gremlin.util.function.Lambda;
 import org.apache.tinkerpop.shaded.jackson.annotation.JsonTypeInfo;
 import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
 import org.apache.tinkerpop.shaded.jackson.databind.BeanProperty;
 import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
 import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
@@ -79,7 +81,7 @@ public class GraphSONTypeSerializer extends TypeSerializer {
 
 @Override
 public JsonTypeInfo.As getTypeInclusion() {
-return null;
+return JsonTypeInfo.As.WRAPPER_OBJECT;
 }
 
 @Override
@@ -93,79 +95,37 @@ public class GraphSONTypeSerializer extends TypeSerializer {
 }
 
 @Override
-public void writeTypePrefixForScalar(final Object o, final JsonGenerator 
jsonGenerator) throws IOException {
-if (canWriteTypeId()) {
-writeTypePrefix(jsonGenerator, 
getTypeIdResolver().idFromValueAndType(o, getClassFromObject(o)));
+public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, 
final WritableTypeId writableTypeId) throws IOException {
+if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
+if (canWriteTypeId()) {
+writeTypePrefix(jsonGenerator, 
getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, 
getClassFromObject(writableTypeId.forValue)));
+}
+} else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+jsonGenerator.writeStartObject();
+} else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
+jsonGenerator.writeStartArray();
+} else {
+throw new IllegalStateException("Could not write prefix");
 }
-}
-
-@Override
-public void writeTypePrefixForObject(final Object o, final JsonGenerator 
jsonGenerator) throws IOException {
-jsonGenerator.writeStartObject();
-// TODO: FULL_TYPES should be implemented here as : if 
(fullTypesModeEnabled()) writeTypePrefix(Map);
-}
-
-@Override
-public void writeTypePrefixForArray(final Object o, final JsonGenerator 
jsonGenerator) throws IOException {
-jsonGenerator.writeStartArray();
-// TODO: FULL_TYPES should be implemented here as : if 
(fullTypesModeEnabled()) writeTypePrefix(List);
-}
-
-@Override
-public void writeTypeSuffixForScalar(final Object o, final JsonGenerator 
jsonGenerator) throws IOException {
-if (canWriteTypeId()) {
-writeTypeSuffix(jsonGenerator);
-}
-}
-
-@Override
-public void writeTypeSuffixForObject(final Object o, final JsonGenerator 
jsonGenerator) throws IOException {
-jsonGenerator.writeEndObject();
-// TODO: FULL_TYPES should be implemented here as : if 
(fullTypesModeEnabled()) writeTypeSuffix(Map);
-}
-
-@Override
-public void writeTypeSuffixForArray(final Object o, final JsonGenerator 
jsonGenerator) throws IOException {
-