[tinkerpop] Git Push Summary

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/logs-shortened [deleted] 17fd85232

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

[spmallette]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: 38bcdb6c5abd81e203b7136f68aec043403bd3d3
Parents: 4d13ab1 10d9095
Author: Stephen Mallette 
Authored: Tue Mar 20 14:17:37 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 14:17:37 2018 -0400

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

tinkerpop git commit: Shorten logging by maven by hiding "Downloading..." messages

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 143a86bcc -> 10d909534


Shorten logging by maven by hiding "Downloading..." messages

Had to put maven in non-interactive release mode by adding --batch-mode or the 
change to the logging wouldn't take. Note that the logger that has been turned 
off hides those "Downloading..." messages that maven throws out there. CTR


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

Branch: refs/heads/tp32
Commit: 10d909534e52c50a14738f0b1791f0458fe1b5d5
Parents: 143a86b
Author: Stephen Mallette 
Authored: Tue Mar 20 12:52:35 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 14:17:25 2018 -0400

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/10d90953/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 9069cec..9c6a739 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,6 @@ before_install:
 
 jobs:
   include:
-- script: "mvn clean install -Dci"
+- script: "mvn clean install -Dci --batch-mode 
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
 - script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv 
&& mvn clean install -q -DskipTests && mvn verify -pl 
:gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet 
-DskipIntegrationTests=false"
 - script: "mvn clean install -q -DskipTests && mvn verify -pl 
:gremlin-javascript -DskipIntegrationTests=false"

[3/3] tinkerpop git commit: Merge branch 'tp33'

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 91a5301173ac3a5e6724d7349184b34d97a9b155
Parents: dfeefe6 38bcdb6
Author: Stephen Mallette 
Authored: Tue Mar 20 14:17:49 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 14:17:49 2018 -0400

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[1/2] tinkerpop git commit: Shorten logging by maven by hiding "Downloading..." messages

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 4d13ab188 -> 38bcdb6c5


Shorten logging by maven by hiding "Downloading..." messages

Had to put maven in non-interactive release mode by adding --batch-mode or the 
change to the logging wouldn't take. Note that the logger that has been turned 
off hides those "Downloading..." messages that maven throws out there. CTR


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

Branch: refs/heads/tp33
Commit: 10d909534e52c50a14738f0b1791f0458fe1b5d5
Parents: 143a86b
Author: Stephen Mallette 
Authored: Tue Mar 20 12:52:35 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 14:17:25 2018 -0400

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/10d90953/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 9069cec..9c6a739 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,6 @@ before_install:
 
 jobs:
   include:
-- script: "mvn clean install -Dci"
+- script: "mvn clean install -Dci --batch-mode 
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
 - script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv 
&& mvn clean install -q -DskipTests && mvn verify -pl 
:gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet 
-DskipIntegrationTests=false"
 - script: "mvn clean install -q -DskipTests && mvn verify -pl 
:gremlin-javascript -DskipIntegrationTests=false"

[1/3] tinkerpop git commit: Shorten logging by maven by hiding "Downloading..." messages

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master dfeefe609 -> 91a530117


Shorten logging by maven by hiding "Downloading..." messages

Had to put maven in non-interactive release mode by adding --batch-mode or the 
change to the logging wouldn't take. Note that the logger that has been turned 
off hides those "Downloading..." messages that maven throws out there. CTR


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

Branch: refs/heads/master
Commit: 10d909534e52c50a14738f0b1791f0458fe1b5d5
Parents: 143a86b
Author: Stephen Mallette 
Authored: Tue Mar 20 12:52:35 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 14:17:25 2018 -0400

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/10d90953/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 9069cec..9c6a739 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,6 @@ before_install:
 
 jobs:
   include:
-- script: "mvn clean install -Dci"
+- script: "mvn clean install -Dci --batch-mode 
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
 - script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv 
&& mvn clean install -q -DskipTests && mvn verify -pl 
:gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet 
-DskipIntegrationTests=false"
 - script: "mvn clean install -q -DskipTests && mvn verify -pl 
:gremlin-javascript -DskipIntegrationTests=false"

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

[spmallette]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/master
Commit: 38bcdb6c5abd81e203b7136f68aec043403bd3d3
Parents: 4d13ab1 10d9095
Author: Stephen Mallette 
Authored: Tue Mar 20 14:17:37 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 14:17:37 2018 -0400

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

tinkerpop git commit: Shorten logging by maven by hiding "Downloading..." messages [Forced Update!]

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/logs-shortened 2adb77684 -> 17fd85232 (forced update)


Shorten logging by maven by hiding "Downloading..." messages

Had to put maven in non-interactive release mode by adding --batch-mode or the 
change to the logging wouldn't take. Note that the logger that has been turned 
off hides those "Downloading..." messages that maven throws out there. CTR


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

Branch: refs/heads/logs-shortened
Commit: 17fd85232b273c1c845cdb8c0d4bf6168ebf3c35
Parents: b524225
Author: Stephen Mallette 
Authored: Tue Mar 20 12:52:35 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 13:53:44 2018 -0400

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17fd8523/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 9069cec..9c6a739 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,6 @@ before_install:
 
 jobs:
   include:
-- script: "mvn clean install -Dci"
+- script: "mvn clean install -Dci --batch-mode 
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
 - script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv 
&& mvn clean install -q -DskipTests && mvn verify -pl 
:gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet 
-DskipIntegrationTests=false"
 - script: "mvn clean install -q -DskipTests && mvn verify -pl 
:gremlin-javascript -DskipIntegrationTests=false"

tinkerpop git commit: Shorten logging by maven by hiding "Downloading..." messages CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/logs-shortened [created] 2adb77684


Shorten logging by maven by hiding "Downloading..." messages CTR


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

Branch: refs/heads/logs-shortened
Commit: 2adb77684a4ca1a9fdefce72435d9a81c9249faf
Parents: b524225
Author: Stephen Mallette 
Authored: Tue Mar 20 12:52:35 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 12:52:35 2018 -0400

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2adb7768/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 9069cec..c040c61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,6 @@ before_install:
 
 jobs:
   include:
-- script: "mvn clean install -Dci"
+- script: "mvn clean install -Dci 
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
 - script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv 
&& mvn clean install -q -DskipTests && mvn verify -pl 
:gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet 
-DskipIntegrationTests=false"
 - script: "mvn clean install -q -DskipTests && mvn verify -pl 
:gremlin-javascript -DskipIntegrationTests=false"

tinkerpop git commit: close resources - CTR

[rdale]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 b52422547 -> 143a86bcc


close resources - CTR


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

Branch: refs/heads/tp32
Commit: 143a86bcce5010cff2e7bb162b4ce73cb161961b
Parents: b524225
Author: Robert Dale 
Authored: Tue Mar 20 12:30:30 2018 -0400
Committer: Robert Dale 
Committed: Tue Mar 20 12:30:30 2018 -0400

--
 .../tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/143a86bc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
index c996cae..89aa733 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
@@ -25,6 +25,7 @@ import java.nio.file.Files;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Default implementation of the {@link ScriptCustomizer} that can create the 
script list from a list of files or
@@ -38,8 +39,8 @@ public class DefaultScriptCustomizer implements 
ScriptCustomizer {
 
 public DefaultScriptCustomizer(final List files) {
 this(files.stream().map(f -> {
-try {
-return Files.lines(f.toPath(), 
StandardCharsets.UTF_8).collect(Collectors.toList());
+try (Stream lines = Files.lines(f.toPath(), 
StandardCharsets.UTF_8)) {
+return lines.collect(Collectors.toList());
 } catch (IOException ioe) {
 throw new IllegalStateException(ioe);
 }

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

[rdale]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: 4d13ab1882c9f248f0f62ddb47a8d0a338875162
Parents: 10dc80a 143a86b
Author: Robert Dale 
Authored: Tue Mar 20 12:31:05 2018 -0400
Committer: Robert Dale 
Committed: Tue Mar 20 12:31:05 2018 -0400

--
 .../tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--

[1/3] tinkerpop git commit: close resources - CTR

[rdale]

Repository: tinkerpop
Updated Branches:
  refs/heads/master fc18e3ebc -> dfeefe609


close resources - CTR


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

Branch: refs/heads/master
Commit: 143a86bcce5010cff2e7bb162b4ce73cb161961b
Parents: b524225
Author: Robert Dale 
Authored: Tue Mar 20 12:30:30 2018 -0400
Committer: Robert Dale 
Committed: Tue Mar 20 12:30:30 2018 -0400

--
 .../tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/143a86bc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
index c996cae..89aa733 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
@@ -25,6 +25,7 @@ import java.nio.file.Files;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Default implementation of the {@link ScriptCustomizer} that can create the 
script list from a list of files or
@@ -38,8 +39,8 @@ public class DefaultScriptCustomizer implements 
ScriptCustomizer {
 
 public DefaultScriptCustomizer(final List files) {
 this(files.stream().map(f -> {
-try {
-return Files.lines(f.toPath(), 
StandardCharsets.UTF_8).collect(Collectors.toList());
+try (Stream lines = Files.lines(f.toPath(), 
StandardCharsets.UTF_8)) {
+return lines.collect(Collectors.toList());
 } catch (IOException ioe) {
 throw new IllegalStateException(ioe);
 }

[1/2] tinkerpop git commit: close resources - CTR

[rdale]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 10dc80a1c -> 4d13ab188


close resources - CTR


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

Branch: refs/heads/tp33
Commit: 143a86bcce5010cff2e7bb162b4ce73cb161961b
Parents: b524225
Author: Robert Dale 
Authored: Tue Mar 20 12:30:30 2018 -0400
Committer: Robert Dale 
Committed: Tue Mar 20 12:30:30 2018 -0400

--
 .../tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/143a86bc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
index c996cae..89aa733 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java
@@ -25,6 +25,7 @@ import java.nio.file.Files;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Default implementation of the {@link ScriptCustomizer} that can create the 
script list from a list of files or
@@ -38,8 +39,8 @@ public class DefaultScriptCustomizer implements 
ScriptCustomizer {
 
 public DefaultScriptCustomizer(final List files) {
 this(files.stream().map(f -> {
-try {
-return Files.lines(f.toPath(), 
StandardCharsets.UTF_8).collect(Collectors.toList());
+try (Stream lines = Files.lines(f.toPath(), 
StandardCharsets.UTF_8)) {
+return lines.collect(Collectors.toList());
 } catch (IOException ioe) {
 throw new IllegalStateException(ioe);
 }

[3/3] tinkerpop git commit: Merge branch 'tp33'

[rdale]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: dfeefe609944acda784938e9ff539db244edbec3
Parents: fc18e3e 4d13ab1
Author: Robert Dale 
Authored: Tue Mar 20 12:31:16 2018 -0400
Committer: Robert Dale 
Committed: Tue Mar 20 12:31:16 2018 -0400

--
 .../tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--

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

[rdale]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/master
Commit: 4d13ab1882c9f248f0f62ddb47a8d0a338875162
Parents: 10dc80a 143a86b
Author: Robert Dale 
Authored: Tue Mar 20 12:31:05 2018 -0400
Committer: Robert Dale 
Committed: Tue Mar 20 12:31:05 2018 -0400

--
 .../tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--

[19/50] tinkerpop git commit: Merge branch 'TINKERPOP-1896' into tp32

[dkuppitz]

Merge branch 'TINKERPOP-1896' into tp32


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

Branch: refs/heads/TINKERPOP-1682
Commit: 1ea01ad2e0748d400cc89d92d2dbfe07dd2cb6be
Parents: 5cf1cba 01ef6c1
Author: Stephen Mallette 
Authored: Wed Mar 14 07:58:22 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Mar 14 07:58:22 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/GremlinJythonScriptEngine.java   |  7 +--
 .../gremlin/python/jsr223/JythonTranslator.java | 28 +
 .../gremlin/python/jsr223/PythonTranslator.java | 33 ++
 .../python/jsr223/JythonTranslatorTest.java | 63 
 5 files changed, 88 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1ea01ad2/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 97b90a5,a761003..94ee24f
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -30,8 -29,8 +30,9 @@@ image::https://raw.githubusercontent.co
  * Added the "Kitchen Sink" test data set.
  * Fixed deserialization of `P.not()` for GraphSON.
  * Bumped to Jackson 2.9.4.
 +* Improved performance of `JavaTranslator` by caching reflected methods 
required for traversal construction.
  * Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server 
that enables a "ping" and auto-close for seemingly dead clients.
+ * Fixed a bug where lambdas in `gremlin-python` would trigger a failure if 
steps using python-only symbols were present (such as `as_()`).
  * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
  * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.
  * Improved error messaging for failed serialization and deserialization of 
request/response messages.

[45/50] tinkerpop git commit: Registered ByModulatorOptimizationStrategy in GraphSON and Gryo serializers and added it to the core imports. Thanks @okram for pointing that out.

[dkuppitz]

Registered ByModulatorOptimizationStrategy in GraphSON and Gryo serializers and 
added it to the core imports. Thanks @okram for pointing that out.


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

Branch: refs/heads/TINKERPOP-1682
Commit: 796705d00ba8a09a6221c88635a031cf688f936c
Parents: b7c6304
Author: Daniel Kuppitz 
Authored: Thu Jul 6 19:31:28 2017 +0200
Committer: Daniel Kuppitz 
Committed: Mon Mar 19 12:28:38 2018 -0700

--
 .../apache/tinkerpop/gremlin/jsr223/CoreImports.java   |  4 +++-
 .../gremlin/structure/io/graphson/GraphSONModule.java  | 13 +
 .../gremlin/structure/io/gryo/GryoVersion.java |  7 +--
 3 files changed, 17 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/796705d0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
index 8839dcd..5d9bb0c 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
@@ -73,6 +73,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.Subgra
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategy;
@@ -225,13 +226,14 @@ public final class CoreImports {
 CLASS_IMPORTS.add(MatchAlgorithmStrategy.class);
 CLASS_IMPORTS.add(ProfileStrategy.class);
 CLASS_IMPORTS.add(AdjacentToIncidentStrategy.class);
+CLASS_IMPORTS.add(ByModulatorOptimizationStrategy.class);
+CLASS_IMPORTS.add(CountStrategy.class);
 CLASS_IMPORTS.add(FilterRankingStrategy.class);
 CLASS_IMPORTS.add(IdentityRemovalStrategy.class);
 CLASS_IMPORTS.add(IncidentToAdjacentStrategy.class);
 CLASS_IMPORTS.add(MatchPredicateStrategy.class);
 CLASS_IMPORTS.add(OrderLimitStrategy.class);
 CLASS_IMPORTS.add(PathProcessorStrategy.class);
-CLASS_IMPORTS.add(CountStrategy.class);
 CLASS_IMPORTS.add(ComputerVerificationStrategy.class);
 CLASS_IMPORTS.add(LambdaRestrictionStrategy.class);
 CLASS_IMPORTS.add(ReadOnlyStrategy.class);

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/796705d0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index 2e795a5..e1359cf 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -41,6 +41,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.Partit
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IdentityRemovalStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategy;
@@ -166,6 +167,8 @@ abstract 

[39/50] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

[dkuppitz]

Updated NOTICE for netty after version bump to 4.0.56 CTR


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

Branch: refs/heads/TINKERPOP-1682
Commit: 3aa733667dc9e8e934bdcba8165298987e8d3af8
Parents: eeea869
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:18 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:16:33 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index a6ffd91..91e622f 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index ef4d547..72c10cc 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project

[40/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33

Conflicts:
gremlin-console/src/main/static/NOTICE
gremlin-server/src/main/static/NOTICE


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

Branch: refs/heads/TINKERPOP-1682
Commit: 764e888f20e6b366b43b8b180dd05adc38b21663
Parents: ff881c1 3aa7336
Author: Stephen Mallette 
Authored: Mon Mar 19 09:17:03 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:17:03 2018 -0400

--

--

[30/50] tinkerpop git commit: TINKERPOP-1854 Add lambda properties to ILambda interface

[dkuppitz]

TINKERPOP-1854 Add lambda properties to ILambda interface


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

Branch: refs/heads/TINKERPOP-1682
Commit: 820adc44f3e2c3359f9f345f554d2b936642e7f0
Parents: 7fbb779
Author: Florian Hockmann 
Authored: Fri Mar 16 18:52:49 2018 +0100
Committer: Florian Hockmann 
Committed: Fri Mar 16 18:52:49 2018 +0100

--
 .../src/Gremlin.Net/Process/Traversal/Lambda.cs | 14 +++
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  2 +-
 .../Structure/IO/GraphSON/LambdaSerializer.cs   | 43 
 .../IO/GraphSON/StringBasedLambdaSerializer.cs  | 43 
 4 files changed, 58 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/820adc44/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
index 12eb016..c1a0e44 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
@@ -29,6 +29,20 @@ namespace Gremlin.Net.Process.Traversal
 public interface ILambda : IFunction, IBiFunction, IPredicate, 
IUnaryOperator, IBinaryOperator, IComparator,
 IConsumer, ISupplier
 {
+/// 
+/// Gets the lambda expression.
+/// 
+string LambdaExpression { get; }
+
+/// 
+/// Gets the language of this lambda.
+/// 
+string Language { get; }
+
+/// 
+/// Gets the arguments of this lambda.
+/// 
+object Arguments { get;  }
 }
 
 /// 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/820adc44/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
index 0ef2bde..7185868 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
@@ -60,7 +60,7 @@ namespace Gremlin.Net.Structure.IO.GraphSON
 {typeof(Property), new PropertySerializer()},
 {typeof(VertexProperty), new VertexPropertySerializer()},
 {typeof(AbstractTraversalStrategy), new 
TraversalStrategySerializer()},
-{typeof(ILambda), new StringBasedLambdaSerializer()}
+{typeof(ILambda), new LambdaSerializer()}
 };
 
 /// 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/820adc44/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/LambdaSerializer.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/LambdaSerializer.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/LambdaSerializer.cs
new file mode 100644
index 000..45e4632
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/LambdaSerializer.cs
@@ -0,0 +1,43 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System.Collections.Generic;
+using Gremlin.Net.Process.Traversal;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+internal class LambdaSerializer : IGraphSONSerializer
+{
+public Dictionary Dictify(dynamic objectData, 
GraphSONWriter writer)
+{
+ILambda lambda = objectData;
+var valueDict = new Dictionary
+{
+{"script", 

[33/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/TINKERPOP-1682
Commit: 2fd0f2558ddb37304628bdcf0637bb7a8ae5bf6a
Parents: b8eb8a0 eeea869
Author: Florian Hockmann 
Authored: Sun Mar 18 12:53:12 2018 +0100
Committer: Florian Hockmann 
Committed: Sun Mar 18 12:53:12 2018 +0100

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/gremlin-variants.asciidoc| 29 ++--
 .../upgrade/release-3.2.x-incubating.asciidoc   |  7 ++
 gremlin-dotnet/glv/generate.groovy  |  4 +-
 .../Process/Traversal/GraphTraversalSource.cs   | 52 +-
 .../Gremlin.Net/Process/Traversal/ISupplier.cs  | 32 +
 .../Process/Traversal/IUnaryOperator.cs | 33 +
 .../src/Gremlin.Net/Process/Traversal/Lambda.cs | 73 
 .../Process/Traversal/StringBasedLambda.cs  | 42 +++
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  3 +-
 .../Structure/IO/GraphSON/LambdaSerializer.cs   | 43 
 .../Gherkin/CommonSteps.cs  |  2 +-
 .../Gherkin/IgnoreException.cs  |  9 ---
 .../TraversalEvaluation/TraversalParser.cs  |  2 +-
 .../IO/GraphSON/GraphSONWriterTests.cs  | 13 
 15 files changed, 325 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2fd0f255/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2fd0f255/docs/src/reference/gremlin-variants.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2fd0f255/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2fd0f255/gremlin-dotnet/glv/generate.groovy
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2fd0f255/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2fd0f255/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2fd0f255/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 7e793ca,dd96474..4bb83ae
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@@ -234,14 -233,9 +234,14 @@@ namespace Gremlin.Net.IntegrationTest.G
  
  private static object ToLambda(string stringLambda, string graphName)
  {
- throw new IgnoreException(IgnoreReason.LambdaNotSupported);
+ return Lambda.Groovy(stringLambda);
  }
  
 +private static object ToT(string enumName, string graphName)
 +{
 +return Enum.Parse(typeof(T), 
TraversalParser.GetCsharpName(enumName));
 +}
 +
  private static object ToNumber(string stringNumber, string graphName)
  {
  return NumericParsers[stringNumber[stringNumber.Length - 1]](

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2fd0f255/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 56984d9,9aa5213..9bcb860
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -40,12 -40,6 +40,9 @@@ namespace Gremlin.Net.IntegrationTest.G
  string reasonSuffix = null;
  switch (reason)
  {
- case IgnoreReason.LambdaNotSupported:
- reasonSuffix = " because lambdas are not supported in 
Gremlin.NET (TINKERPOP-1854)";
- break;
 +case IgnoreReason.TraversalTDeserializationNotSupported:
 +reasonSuffix = " as deserialization of g:T on GraphSON3 
is not supported";
 +

[25/50] tinkerpop git commit: TINKERPOP-1919 Add Lambda support to Gremlin.Net

[dkuppitz]

TINKERPOP-1919 Add Lambda support to Gremlin.Net

This adds a Lambda class that can be used to construct Groovy or Python
lambdas. The Lambda class implements all interfaces that mirror Javas
functional interfaces like Function.


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

Branch: refs/heads/TINKERPOP-1682
Commit: 0cdaa3a2114670a34999aa56e0487a2e7ef998e1
Parents: 0bf9b2f
Author: Florian Hockmann 
Authored: Wed Mar 14 18:56:47 2018 +0100
Committer: Florian Hockmann 
Committed: Thu Mar 15 18:16:05 2018 +0100

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/gremlin-variants.asciidoc| 29 ++--
 .../upgrade/release-3.2.x-incubating.asciidoc   |  7 ++
 gremlin-dotnet/glv/generate.groovy  |  4 +-
 .../Process/Traversal/GraphTraversalSource.cs   | 52 +-
 .../Gremlin.Net/Process/Traversal/ISupplier.cs  | 32 +
 .../Process/Traversal/IUnaryOperator.cs | 33 +
 .../src/Gremlin.Net/Process/Traversal/Lambda.cs | 72 
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  3 +-
 .../Structure/IO/GraphSON/LambdaSerializer.cs   | 43 
 .../Gherkin/CommonSteps.cs  |  2 +-
 .../Gherkin/IgnoreException.cs  |  4 --
 .../TraversalEvaluation/TraversalParser.cs  |  2 +-
 .../IO/GraphSON/GraphSONWriterTests.cs  | 13 
 14 files changed, 282 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cdaa3a2/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 94ee24f..8fcbe1a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-2-8]]
 === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Added a `Lambda` class to Gremlin.Net that makes it possible to use Groovy 
and Python lambdas with Gremlin.Net.
 * Enums are now represented as classes in Gremlin.Net which allows to use them 
as arguments in more steps.
 * Bumped to Groovy 2.4.14.
 * Added `checkAdjacentVertices` option to `SubgraphStrategy`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cdaa3a2/docs/src/reference/gremlin-variants.asciidoc
--
diff --git a/docs/src/reference/gremlin-variants.asciidoc 
b/docs/src/reference/gremlin-variants.asciidoc
index ace8119..bf8c8b1 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -46,7 +46,7 @@ implementation of Gremlin and serves as the foundation by 
which all other Gremli
 === The Lambda Solution
 
 Supporting link:https://en.wikipedia.org/wiki/Anonymous_function[anonymous 
functions] across languages is difficult as
-most language do not support lambda introspection and thus, code analysis. In 
Gremlin-Java, Java8 lambdas can be leveraged.
+most languages do not support lambda introspection and thus, code analysis. In 
Gremlin-Java, Java8 lambdas can be leveraged.
 
 [source,java]
 g.V().out("knows").map(t -> t.get().value("name") + " is the friend name") <1>
@@ -281,7 +281,7 @@ re-construction machine-side.
 === The Lambda Solution
 
 Supporting link:https://en.wikipedia.org/wiki/Anonymous_function[anonymous 
functions] across languages is difficult as
-most language do not support lambda introspection and thus, code analysis. In 
Gremlin-Python,
+most languages do not support lambda introspection and thus, code analysis. In 
Gremlin-Python,
 a link:https://docs.python.org/2/reference/expressions.html#lambda[Python 
lambda] should be represented as a zero-arg callable
 that returns a string representation of a lambda. The default lambda language 
is `gremlin-python` and can be changed via
 `gremlin_python.statics.default_lambda_language`. When the lambda is 
represented in `Bytecode` its language is encoded
@@ -343,8 +343,10 @@ var g = graph.Traversal().WithRemote(new 
DriverRemoteConnection(new GremlinClien
 
 When a traversal from the `GraphTraversalSource` is iterated, the 
traversal’s `Bytecode` is sent over the wire via the registered
 `IRemoteConnection`. The bytecode is used to construct the equivalent 
traversal at the remote traversal source.
-Since Gremlin.Net currently doesn't support lambda expressions, all traversals 
can be translated to Gremlin-Java on the remote
-location (e.g. Gremlin Server).
+Moreover, typically the bytecode is analyzed to determine 

[44/50] tinkerpop git commit: Implemented `ByModulatorOptimizationStrategy` which replaces certain standard traversals w/ optimized traversals (e.g. `TokenTraversal`).

[dkuppitz]

Implemented `ByModulatorOptimizationStrategy` which replaces certain standard 
traversals w/ optimized traversals (e.g. `TokenTraversal`).


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

Branch: refs/heads/TINKERPOP-1682
Commit: 20dfe7e3b807fe33300528ea3362c88dd2f246c2
Parents: 94484e2
Author: Daniel Kuppitz 
Authored: Thu Jun 8 15:23:08 2017 +0200
Committer: Daniel Kuppitz 
Committed: Mon Mar 19 12:27:13 2018 -0700

--
 CHANGELOG.asciidoc  |   1 +
 .../process/traversal/TraversalStrategies.java  |   4 +-
 .../process/traversal/step/TraversalParent.java |   4 +
 .../traversal/step/filter/DedupGlobalStep.java  |   6 +
 .../traversal/step/filter/PathFilterStep.java   |  12 ++
 .../traversal/step/filter/SampleGlobalStep.java |   6 +
 .../step/filter/WherePredicateStep.java |  13 +-
 .../traversal/step/map/GroupCountStep.java  |   6 +
 .../process/traversal/step/map/GroupStep.java   |   8 ++
 .../traversal/step/map/OrderGlobalStep.java |  13 ++
 .../traversal/step/map/OrderLocalStep.java  |  13 ++
 .../process/traversal/step/map/PathStep.java|  12 ++
 .../process/traversal/step/map/ProjectStep.java |  12 ++
 .../traversal/step/map/SelectOneStep.java   |   7 +-
 .../process/traversal/step/map/SelectStep.java  |  13 +-
 .../process/traversal/step/map/TreeStep.java|  13 +-
 .../step/sideEffect/AggregateStep.java  |   6 +
 .../sideEffect/GroupCountSideEffectStep.java|   6 +
 .../step/sideEffect/GroupSideEffectStep.java|   8 ++
 .../step/sideEffect/SackValueStep.java  |   6 +
 .../traversal/step/sideEffect/StoreStep.java|   6 +
 .../step/sideEffect/TreeSideEffectStep.java |  12 ++
 .../ByModulatorOptimizationStrategy.java| 110 +++
 .../process/traversal/util/TraversalRing.java   |   4 +
 .../ByModulatorOptimizationStrategyTest.java| 136 +++
 .../optimization/PathProcessorStrategyTest.java |   2 +-
 .../util/TraversalExplanationTest.java  |   2 +-
 27 files changed, 434 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20dfe7e3/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7df3e9c..db9c1dc 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -112,6 +112,7 @@ This release also includes changes from <>.
 * Graphite and Ganglia are no longer packaged with the Gremlin Server 
distribution.
 * `TransactionException` is no longer a class of `AbstractTransaction` and it 
extends `RuntimeException`.
 * Included an ellipse on long property names that are truncated.
+* Added `ByModulatorOptimizationStrategy` which replaces certain standard 
traversals w/ optimized traversals (e.g. `TokenTraversal`).
 * Renamed `RangeByIsCountStrategy` to `CountStrategy`.
 * Added more specific typing to various `__` traversal steps. E.g. 
`out()` is `out()`.
 * Updated Docker build scripts to include Python dependencies (NOTE: users 
should remove any previously generated TinkerPop Docker images).

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20dfe7e3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index 972384c..2f21194 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@ -25,6 +25,7 @@ import 
org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.optimiza
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ConnectiveStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.ProfileStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.AdjacentToIncidentStrategy;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.ByModulatorOptimizationStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.FilterRankingStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.IncidentToAdjacentStrategy;
 import 

[47/50] tinkerpop git commit: Registered ByModulatorOptimizationStrategy with Gremlin-Python.

[dkuppitz]

Registered ByModulatorOptimizationStrategy with Gremlin-Python.


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

Branch: refs/heads/TINKERPOP-1682
Commit: bee60f449e6eace37422ea22c214819b49a40bd6
Parents: 796705d
Author: Daniel Kuppitz 
Authored: Wed Jul 12 18:51:06 2017 +0200
Committer: Daniel Kuppitz 
Committed: Mon Mar 19 12:28:38 2018 -0700

--
 .../main/jython/gremlin_python/process/strategies.py | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bee60f44/gremlin-python/src/main/jython/gremlin_python/process/strategies.py
--
diff --git 
a/gremlin-python/src/main/jython/gremlin_python/process/strategies.py 
b/gremlin-python/src/main/jython/gremlin_python/process/strategies.py
index f5ba9fb..42de9c3 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/strategies.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/strategies.py
@@ -109,6 +109,16 @@ class AdjacentToIncidentStrategy(TraversalStrategy):
 TraversalStrategy.__init__(self)
 
 
+class ByModulatorOptimizationStrategy(TraversalStrategy):
+def __init__(self):
+TraversalStrategy.__init__(self)
+
+
+class CountStrategy(TraversalStrategy):
+def __init__(self):
+TraversalStrategy.__init__(self)
+
+
 class FilterRankingStrategy(TraversalStrategy):
 def __init__(self):
 TraversalStrategy.__init__(self)
@@ -154,11 +164,6 @@ class PathRetractionStrategy(TraversalStrategy):
 TraversalStrategy.__init__(self)
 
 
-class CountStrategy(TraversalStrategy):
-def __init__(self):
-TraversalStrategy.__init__(self)
-
-
 class RepeatUnrollStrategy(TraversalStrategy):
 def __init__(self):
 TraversalStrategy.__init__(self)

[31/50] tinkerpop git commit: TINKERPOP-1854 Replace StartsWith check with an equality check

[dkuppitz]

TINKERPOP-1854 Replace StartsWith check with an equality check


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

Branch: refs/heads/TINKERPOP-1682
Commit: 4ebc68e89e0ba1606e06b42a32ec0bebe14fbdf5
Parents: 820adc4
Author: Florian Hockmann 
Authored: Sat Mar 17 16:24:09 2018 +0100
Committer: Florian Hockmann 
Committed: Sat Mar 17 16:24:09 2018 +0100

--
 .../Gherkin/TraversalEvaluation/TraversalParser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ebc68e8/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
index 7e1486c..e3f6a3f 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
@@ -398,7 +398,7 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 {
 return ParseNumber(text, ref i);
 }
-if (text.Length >= i + 3 && text.Substring(i, 3).StartsWith("__."))
+if (text.Length >= i + 3 && text.Substring(i, 3) == "__.")
 {
 var startIndex = i;
 var tokens = ParseTokens(text, ref i);

[28/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33

Conflicts:
data/tinkerpop-sink.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink.json


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

Branch: refs/heads/TINKERPOP-1682
Commit: 00b5a69f96f3378f93ab8a18226be55f099f569d
Parents: 4a838c0 d3d1ccf
Author: Stephen Mallette 
Authored: Thu Mar 15 18:44:00 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Mar 15 18:44:00 2018 -0400

--
 data/tinkerpop-sink.json   |   4 ++--
 data/tinkerpop-sink.kryo   | Bin 288 -> 234 bytes
 .../io/graphson/tinkerpop-sink-typed-v1d0.json |   4 ++--
 .../io/graphson/tinkerpop-sink-typed-v2d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v1d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v2d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v3d0.json |   4 ++--
 .../structure/io/gryo/tinkerpop-sink-v1d0.kryo | Bin 288 -> 234 bytes
 .../structure/io/gryo/tinkerpop-sink-v3d0.kryo | Bin 288 -> 234 bytes
 .../tinkergraph/structure/TinkerFactory.java   |  11 ---
 10 files changed, 16 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00b5a69f/data/tinkerpop-sink.json
--
diff --cc data/tinkerpop-sink.json
index c0844a3,420e089..7a27853
--- a/data/tinkerpop-sink.json
+++ b/data/tinkerpop-sink.json
@@@ -1,3 -1,3 +1,3 @@@
- 
{"id":{"@type":"g:Int32","@value":2000},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":5},"outV":{"@type":"g:Int32","@value":2000}}]},"outE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":4},"inV":{"@type":"g:Int32","@value":2001}},{"id":{"@type":"g:Int32","@value":5},"inV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"a"}]}}
- 
{"id":{"@type":"g:Int32","@value":2001},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":4},"outV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"b"}]}}
 
-{"id":2000,"label":"message","inE":{"link":[{"id":5,"outV":2000}]},"outE":{"link":[{"id":4,"inV":2001},{"id":5,"inV":2000}]},"properties":{"name":[{"id":2,"value":"a"}]}}
 
-{"id":2001,"label":"message","inE":{"link":[{"id":4,"outV":2000}]},"properties":{"name":[{"id":3,"value":"b"}]}}
 
-{"id":1000,"label":"loops","inE":{"self":[{"id":1,"outV":1000}]},"outE":{"self":[{"id":1,"inV":1000}]},"properties":{"name":[{"id":0,"value":"loop"}]}}
++{"id":{"@type":"g:Int32","@value":2000},"label":"message","inE":{"link":[{"id":{"@type":"g:Int32","@value":5},"outV":{"@type":"g:Int32","@value":2000}}]},"outE":{"link":[{"id":{"@type":"g:Int32","@value":4},"inV":{"@type":"g:Int32","@value":2001}},{"id":{"@type":"g:Int32","@value":5},"inV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"a"}]}}
++{"id":{"@type":"g:Int32","@value":2001},"label":"message","inE":{"link":[{"id":{"@type":"g:Int32","@value":4},"outV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"b"}]}}
 
+{"id":{"@type":"g:Int32","@value":1000},"label":"loops","inE":{"self":[{"id":{"@type":"g:Int32","@value":1},"outV":{"@type":"g:Int32","@value":1000}}]},"outE":{"self":[{"id":{"@type":"g:Int32","@value":1},"inV":{"@type":"g:Int32","@value":1000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"loop"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00b5a69f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
--
diff --cc 
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
index bc56489,000..2e83384
mode 100644,00..100644
--- 
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
+++ 
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
@@@ -1,3 -1,0 +1,3 @@@
- 

[32/50] tinkerpop git commit: Merge branch 'TINKERPOP-1854' into tp32

[dkuppitz]

Merge branch 'TINKERPOP-1854' into tp32


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

Branch: refs/heads/TINKERPOP-1682
Commit: eeea8696e1de69dd6c918feed6ac4fc531ea61dc
Parents: d3d1ccf 4ebc68e
Author: Florian Hockmann 
Authored: Sun Mar 18 12:27:55 2018 +0100
Committer: Florian Hockmann 
Committed: Sun Mar 18 12:27:55 2018 +0100

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/gremlin-variants.asciidoc| 29 ++--
 .../upgrade/release-3.2.x-incubating.asciidoc   |  7 ++
 gremlin-dotnet/glv/generate.groovy  |  4 +-
 .../Process/Traversal/GraphTraversalSource.cs   | 52 +-
 .../Gremlin.Net/Process/Traversal/ISupplier.cs  | 32 +
 .../Process/Traversal/IUnaryOperator.cs | 33 +
 .../src/Gremlin.Net/Process/Traversal/Lambda.cs | 73 
 .../Process/Traversal/StringBasedLambda.cs  | 42 +++
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  3 +-
 .../Structure/IO/GraphSON/LambdaSerializer.cs   | 43 
 .../Gherkin/CommonSteps.cs  |  2 +-
 .../Gherkin/IgnoreException.cs  |  4 --
 .../TraversalEvaluation/TraversalParser.cs  |  2 +-
 .../IO/GraphSON/GraphSONWriterTests.cs  | 13 
 15 files changed, 325 insertions(+), 15 deletions(-)
--

[24/50] tinkerpop git commit: Merge branch 'tp33' of https://git-wip-us.apache.org/repos/asf/tinkerpop into tp33

[dkuppitz]

Merge branch 'tp33' of https://git-wip-us.apache.org/repos/asf/tinkerpop into 
tp33


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

Branch: refs/heads/TINKERPOP-1682
Commit: 4a838c0f4ec01950118e44c51674be81c515ad4c
Parents: 89e722e 4274bd5
Author: Daniel Kuppitz 
Authored: Thu Mar 15 07:44:16 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Mar 15 07:44:16 2018 -0700

--
 .../Gherkin/GherkinTestRunner.cs  | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)
--

[35/50] tinkerpop git commit: Bind netty in spark to the project level version CTR

[dkuppitz]

Bind netty in spark to the project level version CTR


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

Branch: refs/heads/TINKERPOP-1682
Commit: 0c930c0bdc5807c8d82d858fe2756bba08bf6e0b
Parents: a5374b6
Author: Stephen Mallette 
Authored: Mon Mar 19 09:09:56 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:09:56 2018 -0400

--
 spark-gremlin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c930c0b/spark-gremlin/pom.xml
--
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 906b7d2..91d7b50 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -281,7 +281,7 @@
 
 io.netty
 netty-all
-4.0.29.Final
+${netty.version}
 
 
 io.netty

[27/50] tinkerpop git commit: Cleaned up the sink dataset a bit.

[dkuppitz]

Cleaned up the sink dataset a bit.

Introduced more consistent,general property/label names. CTR


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

Branch: refs/heads/TINKERPOP-1682
Commit: d3d1ccfa673765085e6299cfbf0c17ccd3318e88
Parents: 0bf9b2f
Author: Stephen Mallette 
Authored: Thu Mar 15 18:37:28 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Mar 15 18:37:28 2018 -0400

--
 data/tinkerpop-sink-typed.json |   4 ++--
 data/tinkerpop-sink-v2d0-typed.json|   4 ++--
 data/tinkerpop-sink-v2d0.json  |   4 ++--
 data/tinkerpop-sink.json   |   4 ++--
 data/tinkerpop-sink.kryo   | Bin 288 -> 234 bytes
 .../io/graphson/tinkerpop-sink-typed.json  |   4 ++--
 .../io/graphson/tinkerpop-sink-v2d0-typed.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v2d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink.json  |   4 ++--
 .../gremlin/structure/io/gryo/tinkerpop-sink.kryo  | Bin 288 -> 234 bytes
 .../tinkergraph/structure/TinkerFactory.java   |  11 ---
 11 files changed, 20 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3d1ccfa/data/tinkerpop-sink-typed.json
--
diff --git a/data/tinkerpop-sink-typed.json b/data/tinkerpop-sink-typed.json
index bc56489..2e83384 100644
--- a/data/tinkerpop-sink-typed.json
+++ b/data/tinkerpop-sink-typed.json
@@ -1,3 +1,3 @@
-{"@class":"java.util.HashMap","id":2000,"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":5,"outV":2000}]]},"outE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"inV":2001},{"@class":"java.util.HashMap","id":5,"inV":2000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"a"}]]}}
-{"@class":"java.util.HashMap","id":2001,"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"outV":2000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":"b"}]]}}
+{"@class":"java.util.HashMap","id":2000,"label":"message","inE":{"@class":"java.util.HashMap","link":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":5,"outV":2000}]]},"outE":{"@class":"java.util.HashMap","link":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"inV":2001},{"@class":"java.util.HashMap","id":5,"inV":2000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"a"}]]}}
+{"@class":"java.util.HashMap","id":2001,"label":"message","inE":{"@class":"java.util.HashMap","link":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"outV":2000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":"b"}]]}}
 
{"@class":"java.util.HashMap","id":1000,"label":"loops","inE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":1,"outV":1000}]]},"outE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":1,"inV":1000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",0],"value":"loop"}]]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3d1ccfa/data/tinkerpop-sink-v2d0-typed.json
--
diff --git a/data/tinkerpop-sink-v2d0-typed.json 
b/data/tinkerpop-sink-v2d0-typed.json
index c0844a3..7a27853 100644
--- a/data/tinkerpop-sink-v2d0-typed.json
+++ b/data/tinkerpop-sink-v2d0-typed.json
@@ -1,3 +1,3 @@
-{"id":{"@type":"g:Int32","@value":2000},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":5},"outV":{"@type":"g:Int32","@value":2000}}]},"outE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":4},"inV":{"@type":"g:Int32","@value":2001}},{"id":{"@type":"g:Int32","@value":5},"inV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"a"}]}}

[37/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/TINKERPOP-1682
Commit: 78fd019373c42f439bdfbd54a4770c0ce25f5244
Parents: 0c930c0 7023eac
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:39 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:14:39 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

[26/50] tinkerpop git commit: TINKERPOP-1854 Make Lambda implementation internal

[dkuppitz]

TINKERPOP-1854 Make Lambda implementation internal


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

Branch: refs/heads/TINKERPOP-1682
Commit: 7fbb779010f028c8f3df6935969d29afefe0fb0f
Parents: 0cdaa3a
Author: Florian Hockmann 
Authored: Thu Mar 15 18:26:40 2018 +0100
Committer: Florian Hockmann 
Committed: Thu Mar 15 18:26:40 2018 +0100

--
 docs/src/reference/gremlin-variants.asciidoc|  4 +-
 .../src/Gremlin.Net/Process/Traversal/Lambda.cs | 45 +++-
 .../Process/Traversal/StringBasedLambda.cs  | 42 ++
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  2 +-
 .../Structure/IO/GraphSON/LambdaSerializer.cs   | 43 ---
 .../IO/GraphSON/StringBasedLambdaSerializer.cs  | 43 +++
 6 files changed, 104 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fbb7790/docs/src/reference/gremlin-variants.asciidoc
--
diff --git a/docs/src/reference/gremlin-variants.asciidoc 
b/docs/src/reference/gremlin-variants.asciidoc
index bf8c8b1..c19160a 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -451,8 +451,8 @@ g.V().Out().Map(Lambda.Python("lambda x: 
len(x.get().value('name'))")).Sum<
 <1> `Lambda.Groovy()` can be used to create a Groovy lambda. 
 <2> `Lambda.Python()` can be used to create a Python lambda.
 
-The `Lambda` class implements interfaces like `IFunction` and `IPredicate` 
that mirror their Java counterparts which makes it possible
-to use lambdas with Gremlin.Net for the same steps as in Gremlin-Java.
+The `ILambda` interface returned by these two methods inherits interfaces like 
`IFunction` and `IPredicate` that mirror
+their Java counterparts which makes it possible to use lambdas with 
Gremlin.Net for the same steps as in Gremlin-Java.
 
 [[gremlin-javascript]]
 == Gremlin-JavaScript

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fbb7790/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
index 21849ef..12eb016 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
@@ -26,47 +26,34 @@ namespace Gremlin.Net.Process.Traversal
 /// 
 /// Represents a lambda.
 /// 
-public class Lambda : IFunction, IBiFunction, IPredicate, IUnaryOperator, 
IBinaryOperator, IComparator, IConsumer,
-ISupplier
+public interface ILambda : IFunction, IBiFunction, IPredicate, 
IUnaryOperator, IBinaryOperator, IComparator,
+IConsumer, ISupplier
 {
-private const int DefaultArgument = -1;
-
-private Lambda(string expression, string language)
-{
-LambdaExpression = expression;
-Language = language;
-}
-
-/// 
-/// Gets the lambda expression.
-/// 
-public string LambdaExpression { get; }
-
-/// 
-/// Gets the language of this lambda.
-/// 
-public string Language { get; }
-
-internal object Arguments => DefaultArgument;
+}
 
+/// 
+/// Provides methods to create lambdas.
+/// 
+public static class Lambda
+{
 /// 
-/// Creates a new Groovy .
+/// Creates a new Groovy lambda.
 /// 
 /// The lambda expression.
-/// The created .
-public static Lambda Groovy(string expression)
+/// The created lambda.
+public static ILambda Groovy(string expression)
 {
-return new Lambda(expression, "gremlin-groovy");
+return new StringBasedLambda(expression, "gremlin-groovy");
 }
 
 /// 
-/// Creates a new Python .
+/// Creates a new Python lambda.
 /// 
 /// The lambda expression.
-/// The created .
-public static Lambda Python(string expression)
+/// The created lambda.
+public static ILambda Python(string expression)
 {
-return new Lambda(expression, "gremlin-python");
+return new StringBasedLambda(expression, "gremlin-python");
 }
 }
 }
\ No newline at end of file

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

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: fc18e3ebc527db24327cbe0b3f0842e7c807c575
Parents: 8b17ab7 10dc80a
Author: Stephen Mallette 
Authored: Tue Mar 20 12:06:18 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 12:06:18 2018 -0400

--

--

tinkerpop git commit: This closes #821

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 aab821826 -> 10dc80a1c


This closes #821


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

Branch: refs/heads/tp33
Commit: 10dc80a1c22280631495bad9d674210312d537f4
Parents: aab8218
Author: Stephen Mallette 
Authored: Tue Mar 20 12:06:00 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 12:06:00 2018 -0400

--

--

[1/2] tinkerpop git commit: This closes #821

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 8b17ab7a8 -> fc18e3ebc


This closes #821


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

Branch: refs/heads/master
Commit: 10dc80a1c22280631495bad9d674210312d537f4
Parents: aab8218
Author: Stephen Mallette 
Authored: Tue Mar 20 12:06:00 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 12:06:00 2018 -0400

--

--

[2/2] tinkerpop git commit: Merge branch 'pr-821' into tp33

[spmallette]

Merge branch 'pr-821' into tp33


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

Branch: refs/heads/tp33
Commit: aab821826a005e7a50efe744ca5cb8f5f5d36d0d
Parents: c466efa d3dbd13
Author: Stephen Mallette 
Authored: Tue Mar 20 11:17:50 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 11:17:50 2018 -0400

--
 .../apache/tinkerpop/gremlin/server/GremlinServer.java | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--

[1/2] tinkerpop git commit: Support construct a GremlinServer instance from gremlin executor service

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 c466efad6 -> aab821826


Support construct a GremlinServer instance from gremlin executor service

This constructor is useful when Gremlin Server is being used in an embedded
style and there is a need to share thread pools with the hosting application.


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

Branch: refs/heads/tp33
Commit: d3dbd13777f91ec1cd94fc83d309300c6181d29a
Parents: 2fd0f25
Author: Jermy Li 
Authored: Thu Mar 8 19:10:48 2018 +0800
Committer: Jermy Li 
Committed: Mon Mar 19 20:16:58 2018 +0800

--
 .../apache/tinkerpop/gremlin/server/GremlinServer.java | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3dbd137/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
index 5b04ebe..55a1d84 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
@@ -81,6 +81,15 @@ public class GremlinServer {
  * Construct a Gremlin Server instance from {@link Settings}.
  */
 public GremlinServer(final Settings settings) {
+this(settings, null);
+}
+
+/**
+ * Construct a Gremlin Server instance from {@link Settings} and {@link 
ExecutorService}.
+ * This constructor is useful when Gremlin Server is being used in an 
embedded style
+ * and there is a need to share thread pools with the hosting application.
+ */
+public GremlinServer(final Settings settings, final ExecutorService 
gremlinExecutorService) {
 settings.optionalMetrics().ifPresent(GremlinServer::configureMetrics);
 this.settings = settings;
 provideDefaultForGremlinPoolSize(settings);
@@ -108,8 +117,8 @@ public class GremlinServer {
 workerGroup = new NioEventLoopGroup(settings.threadPoolWorker, 
threadFactoryWorker);
 }
 
-serverGremlinExecutor = new ServerGremlinExecutor(settings, null, 
workerGroup);
-gremlinExecutorService = 
serverGremlinExecutor.getGremlinExecutorService();
+serverGremlinExecutor = new ServerGremlinExecutor(settings, 
gremlinExecutorService, workerGroup);
+this.gremlinExecutorService = 
serverGremlinExecutor.getGremlinExecutorService();
 
 // initialize the OpLoader with configurations being passed to each 
OpProcessor implementation loaded
 OpLoader.init(settings);

[1/3] tinkerpop git commit: Support construct a GremlinServer instance from gremlin executor service

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master 754eb7945 -> 8b17ab7a8


Support construct a GremlinServer instance from gremlin executor service

This constructor is useful when Gremlin Server is being used in an embedded
style and there is a need to share thread pools with the hosting application.


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

Branch: refs/heads/master
Commit: d3dbd13777f91ec1cd94fc83d309300c6181d29a
Parents: 2fd0f25
Author: Jermy Li 
Authored: Thu Mar 8 19:10:48 2018 +0800
Committer: Jermy Li 
Committed: Mon Mar 19 20:16:58 2018 +0800

--
 .../apache/tinkerpop/gremlin/server/GremlinServer.java | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3dbd137/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
index 5b04ebe..55a1d84 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
@@ -81,6 +81,15 @@ public class GremlinServer {
  * Construct a Gremlin Server instance from {@link Settings}.
  */
 public GremlinServer(final Settings settings) {
+this(settings, null);
+}
+
+/**
+ * Construct a Gremlin Server instance from {@link Settings} and {@link 
ExecutorService}.
+ * This constructor is useful when Gremlin Server is being used in an 
embedded style
+ * and there is a need to share thread pools with the hosting application.
+ */
+public GremlinServer(final Settings settings, final ExecutorService 
gremlinExecutorService) {
 settings.optionalMetrics().ifPresent(GremlinServer::configureMetrics);
 this.settings = settings;
 provideDefaultForGremlinPoolSize(settings);
@@ -108,8 +117,8 @@ public class GremlinServer {
 workerGroup = new NioEventLoopGroup(settings.threadPoolWorker, 
threadFactoryWorker);
 }
 
-serverGremlinExecutor = new ServerGremlinExecutor(settings, null, 
workerGroup);
-gremlinExecutorService = 
serverGremlinExecutor.getGremlinExecutorService();
+serverGremlinExecutor = new ServerGremlinExecutor(settings, 
gremlinExecutorService, workerGroup);
+this.gremlinExecutorService = 
serverGremlinExecutor.getGremlinExecutorService();
 
 // initialize the OpLoader with configurations being passed to each 
OpProcessor implementation loaded
 OpLoader.init(settings);

[3/3] tinkerpop git commit: Merge branch 'tp33'

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 8b17ab7a8e85edaef18ad8ddec569738b73f90d5
Parents: 754eb79 aab8218
Author: Stephen Mallette 
Authored: Tue Mar 20 11:59:36 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 11:59:36 2018 -0400

--
 .../apache/tinkerpop/gremlin/server/GremlinServer.java | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--

[2/3] tinkerpop git commit: Merge branch 'pr-821' into tp33

[spmallette]

Merge branch 'pr-821' into tp33


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

Branch: refs/heads/master
Commit: aab821826a005e7a50efe744ca5cb8f5f5d36d0d
Parents: c466efa d3dbd13
Author: Stephen Mallette 
Authored: Tue Mar 20 11:17:50 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 11:17:50 2018 -0400

--
 .../apache/tinkerpop/gremlin/server/GremlinServer.java | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--

[10/50] tinkerpop git commit: TINKERPOP-1901 Describe improved Gremlin.Net tokens in upgrade docs

[dkuppitz]

TINKERPOP-1901 Describe improved Gremlin.Net tokens in upgrade docs


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

Branch: refs/heads/TINKERPOP-1682
Commit: df989dc40ab7cf834b6ed275c453c4bb220315bf
Parents: 4d5768b
Author: Florian Hockmann 
Authored: Tue Mar 13 19:26:00 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 13 19:26:00 2018 +0100

--
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df989dc4/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc 
b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 7d2a80c..0cb8ddc 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -42,6 +42,17 @@ by clients that might mysteriously disappear without 
properly closing their conn
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-1726[TINKERPOP-1726]
 
+ Gremlin.Net Tokens Improved
+
+The various Gremlin tokens (e.g. `T`, `Order`, `Operator`, etc.) that were 
implemented as Enums before in Gremlin.Net
+are now implemented as classes. This mainly allows them to implement 
interfaces which their Java counterparts already
+did. `T` for example now implements the new interface `IFunction` which simply 
mirrors its Java counterpart `Function`.
+Steps that expect objects for those interfaces as arguments now explicitly use 
the interface. Before, they used just
+`object` as the type for these arguments which made it hard for users to know 
what kind of `object` they can use.
+However, usage of these tokens themselves shouldn't change at all (e.g. `T.Id` 
is still `T.Id`).
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1901[TINKERPOP-1901]
+
 === Upgrading for Providers
 
  Graph System Providers

[13/50] tinkerpop git commit: CTR: Implemented `Traversal::invalidateTraverserRequirements`.

[dkuppitz]

CTR: Implemented `Traversal::invalidateTraverserRequirements`.

This was necessary to allow traversal-mutating strategies (e.g. 
`SubgraphStrategy`) to invalidate the already cached traverser requirements.


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

Branch: refs/heads/TINKERPOP-1682
Commit: bccff988dc713b9acdee9e9a3858e2c10b7de163
Parents: f9f3d4f
Author: Daniel Kuppitz 
Authored: Tue Mar 13 11:33:06 2018 -0700
Committer: Daniel Kuppitz 
Committed: Tue Mar 13 13:17:43 2018 -0700

--
 .../remote/traversal/AbstractRemoteTraversal.java|  5 +
 .../tinkerpop/gremlin/process/traversal/Traversal.java   |  7 +++
 .../traversal/lambda/AbstractLambdaTraversal.java|  7 +++
 .../traversal/strategy/decoration/SubgraphStrategy.java  | 11 ++-
 .../gremlin/process/traversal/util/DefaultTraversal.java |  5 +
 5 files changed, 34 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bccff988/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
index 0c6a7aa..480d1fc 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
@@ -88,6 +88,11 @@ public abstract class AbstractRemoteTraversal 
implements RemoteTraversal extends Iterator, 
Serializable, Cloneable, A
 public Set getTraverserRequirements();
 
 /**
+ * Invalidates the set of all {@link TraverserRequirement}s for this 
traversal.
+ */
+public default void invalidateTraverserRequirements() {
+
+};
+
+/**
  * Call the {@link Step#reset} method on every step in the traversal.
  */
 public default void reset() {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bccff988/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
index 8f910a0..84e1896 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
@@ -184,6 +184,13 @@ public abstract class AbstractLambdaTraversal 
implements Traversal.Adminhttp://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bccff988/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
 

[12/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/TINKERPOP-1682
Commit: 8cf71aea2439e76653894c779ba7f871a6c44248
Parents: f9f3d4f 5049339
Author: Florian Hockmann 
Authored: Tue Mar 13 21:02:58 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 13 21:02:58 2018 +0100

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/gremlin-variants.asciidoc|  2 +-
 .../upgrade/release-3.2.x-incubating.asciidoc   | 11 +
 gremlin-dotnet/glv/Enum.template|  9 +++-
 gremlin-dotnet/glv/generate.groovy  | 41 +++
 .../Gremlin.Net/Process/Traversal/Barrier.cs|  9 +++-
 .../Process/Traversal/Cardinality.cs| 13 +++--
 .../src/Gremlin.Net/Process/Traversal/Column.cs | 11 +++--
 .../Gremlin.Net/Process/Traversal/Direction.cs  | 13 +++--
 .../Process/Traversal/EnumWrapper.cs| 52 
 .../Process/Traversal/GraphSONVersion.cs| 13 +++--
 .../Process/Traversal/GraphTraversal.cs | 43 +---
 .../Process/Traversal/GraphTraversalSource.cs   | 14 --
 .../Process/Traversal/GryoVersion.cs| 11 +++--
 .../Process/Traversal/IBiFunction.cs| 33 +
 .../Process/Traversal/IBinaryOperator.cs| 34 +
 .../Process/Traversal/IComparator.cs| 32 
 .../Gremlin.Net/Process/Traversal/IConsumer.cs  | 33 +
 .../Gremlin.Net/Process/Traversal/IFunction.cs  | 32 
 .../Gremlin.Net/Process/Traversal/IPredicate.cs | 32 
 .../Gremlin.Net/Process/Traversal/Operator.cs   | 29 ++-
 .../src/Gremlin.Net/Process/Traversal/Order.cs  | 13 +++--
 .../src/Gremlin.Net/Process/Traversal/Pick.cs   | 11 +++--
 .../src/Gremlin.Net/Process/Traversal/Pop.cs| 15 --
 .../src/Gremlin.Net/Process/Traversal/Scope.cs  | 11 +++--
 .../src/Gremlin.Net/Process/Traversal/T.cs  | 15 --
 .../Process/Traversal/TraversalPredicate.cs |  2 +-
 .../src/Gremlin.Net/Process/Traversal/__.cs | 26 +-
 .../Structure/IO/GraphSON/EnumSerializer.cs |  5 +-
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  2 +-
 .../TraversalEnumParameter.cs   |  5 +-
 31 files changed, 454 insertions(+), 119 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/docs/src/reference/gremlin-variants.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/glv/generate.groovy
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
--
diff --cc gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
index 31187ac,0c92607..e55be6b
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
@@@ -26,11 -26,15 +26,16 @@@ namespace Gremlin.Net.Process.Traversa
  {
  #pragma warning disable 1591
  
- public enum GraphSONVersion
+ public class GraphSONVersion : EnumWrapper
  {
- V1_0,
-   V2_0,
-   V3_0
+ private GraphSONVersion(string enumValue)
+ : base("GraphSONVersion", enumValue)
+ {
+ }
+  
+ public static GraphSONVersion V1_0 => new GraphSONVersion("V1_0"); 
 -public static GraphSONVersion V2_0 => new GraphSONVersion("V2_0");
++public static GraphSONVersion V2_0 => new GraphSONVersion("V2_0"); 
++public static GraphSONVersion V3_0 => new GraphSONVersion("V3_0");
  }
  
  #pragma warning restore 1591

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs

[42/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs


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

Branch: refs/heads/TINKERPOP-1682
Commit: 94484e278481e0bb7add3400981993118d127fbe
Parents: 764e888 8c87fcf
Author: Stephen Mallette 
Authored: Mon Mar 19 10:55:23 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:55:23 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  4 +---
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 2dac7c4,6d38ccc..02bf546
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -38,14 -38,7 +38,12 @@@ namespace Gremlin.Net.IntegrationTest.G
  public class GherkinTestRunner
  {
  private static readonly IDictionary 
IgnoredScenarios =
 -new Dictionary();
 +new Dictionary
 +{
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- { 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
- {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray}
++{ 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported } // TINKERPOP-1866
 +};
  
  private static class Keywords
  {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 9bcb860,860c11d..9eb3021
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -40,14 -40,8 +40,11 @@@ namespace Gremlin.Net.IntegrationTest.G
  string reasonSuffix = null;
  switch (reason)
  {
 +case IgnoreReason.TraversalTDeserializationNotSupported:
 +reasonSuffix = " as deserialization of g:T on GraphSON3 
is not supported";
 +break;
- case IgnoreReason.PWithinWrapsArgumentsInArray:
- reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
- break;
- case IgnoreReason.PNotDeserializationProblem:
- reasonSuffix = " because P.Not() cannot be deserialized 
by Gremlin Server (TINKERPOP-1922)";
+ case IgnoreReason.NoReason:
+ reasonSuffix = "";
  break;
  }
  return $"Scenario ignored" + reasonSuffix;
@@@ -56,11 -50,6 +53,10 @@@
  
  public enum IgnoreReason
  {
 +/// 
 +/// Deserialization of g:T on GraphSON3 is not supported.
 +/// 
 +TraversalTDeserializationNotSupported,
- PWithinWrapsArgumentsInArray,
- PNotDeserializationProblem
+ NoReason
  }
  }

[17/50] tinkerpop git commit: TINKERPOP-1919 Add note about merged P classes to upgrade docs

[dkuppitz]

TINKERPOP-1919 Add note about merged P classes to upgrade docs


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

Branch: refs/heads/TINKERPOP-1682
Commit: 5cf1cba59cfb6818b371b1d605dac3b8d190157a
Parents: 359b08c
Author: Florian Hockmann 
Authored: Tue Mar 13 23:39:21 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 13 23:39:21 2018 +0100

--
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5cf1cba5/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc 
b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 0cb8ddc..0848843 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -53,6 +53,18 @@ However, usage of these tokens themselves shouldn't change 
at all (e.g. `T.Id` i
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-1901[TINKERPOP-1901]
 
+ Gremlin.Net: Traversal Predicate Classes Merged
+
+Gremlin.Net used two classes for traversal predicates: `P` and 
`TraversalPredicate`. Steps that worked with traversal
+predicates expected objects of type `TraversalPredicate`, but they were 
constructed from the `P` class
+(e.g. `P.Gt(1)` returned a `TraversalPredicate`). Merging these two classes 
into the `P` class should avoid unnecessary
+confusion. Most users should not notice this change as predicates can still be 
constructed exactly as before, e.g.,
+`P.Gt(1).And(P.Lt(3))` still works without any modifications.
+Only users that implemented their own predicates and used `TraversalPredicate` 
as the base class need to change their
+implementation to now use `P` as the new base class.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1919[TINKERPOP-1919]
+
 === Upgrading for Providers
 
  Graph System Providers

[23/50] tinkerpop git commit: CTR: Added comments to describe `Traversal::invalidateTraverserRequirements()`. Also added some test cases and made `IncidentToAdjacentStrategy` better by adding `invalid

[dkuppitz]

CTR: Added comments to describe `Traversal::invalidateTraverserRequirements()`.
Also added some test cases and made `IncidentToAdjacentStrategy` better by 
adding `invalidateTraverserRequirements()` in case the strategy replaces 
`bothE().otherV()` with `both()`.


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

Branch: refs/heads/TINKERPOP-1682
Commit: 89e722e0def599664f024c2d6dc5bb24440e2603
Parents: 0c6459d
Author: Daniel Kuppitz 
Authored: Thu Mar 15 07:40:41 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Mar 15 07:40:41 2018 -0700

--
 .../gremlin/process/traversal/Traversal.java|  5 +-
 .../strategy/decoration/SubgraphStrategy.java   |  3 +
 .../IncidentToAdjacentStrategy.java |  5 ++
 .../traversal/util/DefaultTraversal.java|  4 ++
 .../gremlin/process/ProcessComputerSuite.java   |  6 +-
 .../gremlin/process/ProcessStandardSuite.java   |  6 +-
 .../decoration/SubgraphStrategyProcessTest.java | 56 +--
 .../IncidentToAdjacentStrategyProcessTest.java  | 76 
 8 files changed, 151 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/89e722e0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
index 7a6ddce..8f3948c 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java
@@ -427,10 +427,13 @@ public interface Traversal extends Iterator, 
Serializable, Cloneable, A
 
 /**
  * Invalidates the set of all {@link TraverserRequirement}s for this 
traversal.
+ * This method should be used by strategies, which mutate the 
traversal and possibly change the
+ * traversal's requirements.
+ * Implementations should reset the internal requirements cache, if it 
exists.
  */
 public default void invalidateTraverserRequirements() {
 
-};
+}
 
 /**
  * Call the {@link Step#reset} method on every step in the traversal.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/89e722e0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index 7968363..ab9ceb8 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -193,6 +193,9 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy(traversal, this.vertexCriterion.clone()), someVStep, 
traversal);
 
+// if a both() step is replaced by bothE().filter.otherV(), 
the traversal relies on path information,
+// which isn't necessarily a traverser requirement at this 
point. To be sure, that the traversal will
+// track path information, the (possibly cached) traverser 
requirements need to be invalidated.
 invalidateTraverserRequirements |= addsPathRequirement;
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/89e722e0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
index 1c96cf8..4ca2465 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
+++ 

[29/50] tinkerpop git commit: CTR: Reverted most of the previous changes around the invalidation of traverser requirements. It turned out that `PathRetractionStrategy` was to blame for too early cachi

[dkuppitz]

CTR: Reverted most of the previous changes around the invalidation of traverser 
requirements. It turned out that `PathRetractionStrategy` was to blame for too 
early caching of requirements.
 The problem is that `PathRetractionStrategy` processes all child 
traversals before other strategies even had the chance to mutate them. So in 
order to fix the problem, I used the same
 anti-pattern (process all child traversals immediately) in the 2 
strategies that can potentially mutate the traversal in a way that its 
requirements change (`SubgraphStrategy` and
 `IncidentToAdjacentStrategy`).


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

Branch: refs/heads/TINKERPOP-1682
Commit: b8eb8a02f1675a1b22b86ccc54d22453c65f406f
Parents: 00b5a69
Author: Daniel Kuppitz 
Authored: Thu Mar 15 09:08:02 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Mar 16 00:22:14 2018 -0700

--
 .../step/map/TraversalVertexProgramStep.java|  3 +++
 .../traversal/AbstractRemoteTraversal.java  |  5 -
 .../gremlin/process/traversal/Traversal.java| 10 -
 .../lambda/AbstractLambdaTraversal.java |  7 ---
 .../strategy/decoration/SubgraphStrategy.java   | 22 +++-
 .../IncidentToAdjacentStrategy.java | 15 -
 .../traversal/util/DefaultTraversal.java|  9 
 .../decoration/SubgraphStrategyProcessTest.java |  4 +---
 .../IncidentToAdjacentStrategyProcessTest.java  |  7 +--
 9 files changed, 27 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8eb8a02/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
index a591a25..642ad00 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
@@ -24,11 +24,14 @@ import 
org.apache.tinkerpop.gremlin.process.computer.GraphFilter;
 import org.apache.tinkerpop.gremlin.process.computer.Memory;
 import 
org.apache.tinkerpop.gremlin.process.computer.traversal.MemoryTraversalSideEffects;
 import 
org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
+import 
org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
+import 
org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.finalization.ComputerFinalizationStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
 import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
 import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import 
org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
 import org.apache.tinkerpop.gremlin.process.traversal.util.PureTraversal;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8eb8a02/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
index 480d1fc..0c6a7aa 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
@@ -88,11 +88,6 @@ public abstract class AbstractRemoteTraversal 
implements RemoteTraversal

[18/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/TINKERPOP-1682
Commit: 9bd4d7fedf943f5f09d5e5a0f77e27efbc559e2e
Parents: 2d493fb 5cf1cba
Author: Florian Hockmann 
Authored: Tue Mar 13 23:50:48 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 13 23:50:48 2018 +0100

--
 CHANGELOG.asciidoc  |   1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   |  12 +++
 gremlin-dotnet/glv/P.template   |  62 ++-
 gremlin-dotnet/glv/generate.groovy  |   2 +-
 .../Process/Traversal/GraphTraversal.cs |  20 ++--
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 106 ++-
 .../Process/Traversal/TraversalPredicate.cs |  85 ---
 .../src/Gremlin.Net/Process/Traversal/__.cs |  20 ++--
 .../Structure/IO/GraphSON/GraphSONWriter.cs |   2 +-
 .../Structure/IO/GraphSON/PSerializer.cs|  45 
 .../IO/GraphSON/TraversalPredicateSerializer.cs |  45 
 .../Gherkin/GherkinTestRunner.cs|  18 +---
 .../Gherkin/IgnoreException.cs  |   5 -
 .../Gherkin/TraversalEvaluation/PParameter.cs   |  97 +
 .../TraversalEvaluationTests.cs |   2 +-
 .../TraversalEvaluation/TraversalParser.cs  |   2 +-
 .../TraversalPredicateParameter.cs  |  93 
 .../GraphSON/BytecodeGraphSONSerializerTests.cs |   2 +-
 .../IO/GraphSON/GraphSONWriterTests.cs  |   4 +-
 19 files changed, 323 insertions(+), 300 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bd4d7fe/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bd4d7fe/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bd4d7fe/gremlin-dotnet/glv/generate.groovy
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bd4d7fe/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bd4d7fe/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bd4d7fe/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bd4d7fe/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bd4d7fe/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index da455a8,fd226bf..56984d9
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -43,13 -43,6 +43,9 @@@ namespace Gremlin.Net.IntegrationTest.G
  case IgnoreReason.LambdaNotSupported:
  reasonSuffix = " because lambdas are not supported in 
Gremlin.NET (TINKERPOP-1854)";
  break;
 +case IgnoreReason.TraversalTDeserializationNotSupported:
 +reasonSuffix = " as deserialization of g:T on GraphSON3 
is not supported";
 +break;
- case IgnoreReason.PNotCreatedCorrectlyByGherkinRunner:
- reasonSuffix =
- " because the Gherkin runner can't call methods in 
TraversalPredicate class (TINKERPOP-1919)";
- break;
  case IgnoreReason.PWithinWrapsArgumentsInArray:
  reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
  break;
@@@ -63,17 -56,7 +59,16 @@@
  
  public enum IgnoreReason
  {
 +/// 
 +/// Lambdas are not supported on Gremlin.NET yet.
 +/// 
  LambdaNotSupported,
 +
 +/// 
 +/// Deserialization of g:T on 

[41/50] tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

[dkuppitz]

TINKERPOP-1920 Fixed P.within/without() handling for collections


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

Branch: refs/heads/TINKERPOP-1682
Commit: 8c87fcfb06cc09b36e6c91bda88b61ea8ab68379
Parents: 3aa7336
Author: Stephen Mallette 
Authored: Thu Mar 15 12:19:48 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:16:44 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  6 +-
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8fcbe1a..0ec6f6d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,6 +42,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
 * Bumped to Netty 4.0.56.Final.
+* Fixed .NET GraphSON serialization of `P.Within()` and `P.without()` when 
passing a `Collection` as an argument.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/glv/P.template
--
diff --git a/gremlin-dotnet/glv/P.template b/gremlin-dotnet/glv/P.template
index ad037c1..fd3b752 100644
--- a/gremlin-dotnet/glv/P.template
+++ b/gremlin-dotnet/glv/P.template
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -88,9 +94,18 @@ namespace Gremlin.Net.Process.Traversal
 <% } %><% pmethods.findAll{ it in ["within", "without"] }.each { method -> %>
 public static P <%= toCSharpMethodName.call(method) %>(params object[] 
args)
 {
-return new P("<%= method %>", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("<%= method %>", ToGenericArray(collection));
+else
+return new P("<%= method %>", args);
 }
 <% } %>
+
+private static T[] ToGenericArray(ICollection collection)
+{
+return collection?.ToArray() ?? new T[0];;
+}
+
 /// 
 public override string ToString()
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
index e3a1e76..e718bbe 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -148,12 +154,24 @@ namespace Gremlin.Net.Process.Traversal
 
 public static P Within(params object[] args)
 {
-return new P("within", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("within", ToGenericArray(collection));
+else
+return new P("within", args);
 }
 
 public static P Without(params object[] args)
 {
-return new P("without", args);
+if (args.Length == 1 && args[0] is ICollection 

[38/50] tinkerpop git commit: Fixed NOTICE after bump to netty 4.1.21.Final CTR

[dkuppitz]

Fixed NOTICE after bump to netty 4.1.21.Final CTR


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

Branch: refs/heads/TINKERPOP-1682
Commit: ff881c189e657a982f9dc635101a01fe8549bfdb
Parents: 78fd019
Author: Stephen Mallette 
Authored: Mon Mar 19 09:15:12 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:15:12 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ff881c18/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index 91e622f..fed03e1 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.56
+Netty 4.1.21
 
-Copyright 2011 The Netty Project
+Copyright 2014 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ff881c18/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index 72c10cc..f50caec 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.56
+Netty 4.1.21
 
-Copyright 2011 The Netty Project
+Copyright 2014 The Netty Project

[14/50] tinkerpop git commit: Ignore one more test due to T deserialization problem CTR

[dkuppitz]

Ignore one more test due to T deserialization problem CTR


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

Branch: refs/heads/TINKERPOP-1682
Commit: c22ab901ea391116cf906b7af37379429a1336af
Parents: 8cf71ae
Author: Florian Hockmann 
Authored: Tue Mar 13 21:27:51 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 13 21:27:51 2018 +0100

--
 .../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c22ab901/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index bc82043..28723c9 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -42,6 +42,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
 { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
+{ "g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
 {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
 {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
 {

[16/50] tinkerpop git commit: Merge branch 'tp33' of https://git-wip-us.apache.org/repos/asf/tinkerpop into tp33

[dkuppitz]

Merge branch 'tp33' of https://git-wip-us.apache.org/repos/asf/tinkerpop into 
tp33


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

Branch: refs/heads/TINKERPOP-1682
Commit: 2d493fb3cfb6dd89f84327677cd949cd8969c782
Parents: bccff98 c22ab90
Author: Daniel Kuppitz 
Authored: Tue Mar 13 14:56:27 2018 -0700
Committer: Daniel Kuppitz 
Committed: Tue Mar 13 14:56:27 2018 -0700

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/gremlin-variants.asciidoc|  2 +-
 .../upgrade/release-3.2.x-incubating.asciidoc   | 11 +
 gremlin-dotnet/glv/Enum.template|  9 +++-
 gremlin-dotnet/glv/generate.groovy  | 41 +++
 .../Gremlin.Net/Process/Traversal/Barrier.cs|  9 +++-
 .../Process/Traversal/Cardinality.cs| 13 +++--
 .../src/Gremlin.Net/Process/Traversal/Column.cs | 11 +++--
 .../Gremlin.Net/Process/Traversal/Direction.cs  | 13 +++--
 .../Process/Traversal/EnumWrapper.cs| 52 
 .../Process/Traversal/GraphSONVersion.cs| 13 +++--
 .../Process/Traversal/GraphTraversal.cs | 43 +---
 .../Process/Traversal/GraphTraversalSource.cs   | 14 --
 .../Process/Traversal/GryoVersion.cs| 11 +++--
 .../Process/Traversal/IBiFunction.cs| 33 +
 .../Process/Traversal/IBinaryOperator.cs| 34 +
 .../Process/Traversal/IComparator.cs| 32 
 .../Gremlin.Net/Process/Traversal/IConsumer.cs  | 33 +
 .../Gremlin.Net/Process/Traversal/IFunction.cs  | 32 
 .../Gremlin.Net/Process/Traversal/IPredicate.cs | 32 
 .../Gremlin.Net/Process/Traversal/Operator.cs   | 29 ++-
 .../src/Gremlin.Net/Process/Traversal/Order.cs  | 13 +++--
 .../src/Gremlin.Net/Process/Traversal/Pick.cs   | 11 +++--
 .../src/Gremlin.Net/Process/Traversal/Pop.cs| 15 --
 .../src/Gremlin.Net/Process/Traversal/Scope.cs  | 11 +++--
 .../src/Gremlin.Net/Process/Traversal/T.cs  | 15 --
 .../Process/Traversal/TraversalPredicate.cs |  2 +-
 .../src/Gremlin.Net/Process/Traversal/__.cs | 26 +-
 .../Structure/IO/GraphSON/EnumSerializer.cs |  5 +-
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  2 +-
 .../Gherkin/GherkinTestRunner.cs|  1 +
 .../TraversalEnumParameter.cs   |  5 +-
 32 files changed, 455 insertions(+), 119 deletions(-)
--

[03/50] tinkerpop git commit: Merge branch 'TINKERPOP-1911' into tp32

[dkuppitz]

Merge branch 'TINKERPOP-1911' into tp32

Conflicts:
CHANGELOG.asciidoc


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

Branch: refs/heads/TINKERPOP-1682
Commit: d3be13b4cbc463a652bf94c1b56fb7050abed20d
Parents: f80a542 d9db27f
Author: Stephen Mallette 
Authored: Mon Mar 12 12:12:59 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 12:12:59 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3be13b4/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 66fbbb2,54e5347..a31bdf2
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,7 -27,7 +28,8 @@@ image::https://raw.githubusercontent.co
  * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
  * Added the "Kitchen Sink" test data set.
  * Fixed deserialization of `P.not()` for GraphSON.
 +* Bumped to Jackson 2.9.4.
+ * Improved performance of `JavaTranslator` by caching reflected methods 
required for traversal construction.
  * Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server 
that enables a "ping" and auto-close for seemingly dead clients.
  * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
  * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.

[43/50] tinkerpop git commit: Reordered TraversalStategies

[dkuppitz]

Reordered TraversalStategies


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

Branch: refs/heads/TINKERPOP-1682
Commit: 13597f47dbce8877c696ed17478f7c09c1116782
Parents: 20dfe7e
Author: Daniel Kuppitz 
Authored: Thu Jun 15 02:07:36 2017 +0200
Committer: Daniel Kuppitz 
Committed: Mon Mar 19 12:27:13 2018 -0700

--
 .../tinkerpop/gremlin/process/traversal/TraversalStrategies.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/13597f47/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index 2f21194..a366104 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@ -209,6 +209,7 @@ public interface TraversalStrategies extends Serializable, 
Cloneable {
 InlineFilterStrategy.instance(),
 IncidentToAdjacentStrategy.instance(),
 AdjacentToIncidentStrategy.instance(),
+ByModulatorOptimizationStrategy.instance(),
 FilterRankingStrategy.instance(),
 MatchPredicateStrategy.instance(),
 RepeatUnrollStrategy.instance(),
@@ -216,8 +217,7 @@ public interface TraversalStrategies extends Serializable, 
Cloneable {
 PathRetractionStrategy.instance(),
 LazyBarrierStrategy.instance(),
 ProfileStrategy.instance(),
-StandardVerificationStrategy.instance(),
-ByModulatorOptimizationStrategy.instance());
+StandardVerificationStrategy.instance());
 GRAPH_CACHE.put(Graph.class, graphStrategies);
 GRAPH_CACHE.put(EmptyGraph.class, new 
DefaultTraversalStrategies());
 

[11/50] tinkerpop git commit: Merge branch 'TINKERPOP-1901' into tp32

[dkuppitz]

Merge branch 'TINKERPOP-1901' into tp32


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

Branch: refs/heads/TINKERPOP-1682
Commit: 504933975d2fbbeb61aa724f38aa8b7c888f63ea
Parents: f02f94f df989dc
Author: Florian Hockmann 
Authored: Tue Mar 13 19:27:58 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 13 19:27:58 2018 +0100

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/gremlin-variants.asciidoc|  2 +-
 .../upgrade/release-3.2.x-incubating.asciidoc   | 11 +++
 gremlin-dotnet/glv/Enum.template|  9 +-
 gremlin-dotnet/glv/generate.groovy  | 41 -
 .../Gremlin.Net/Process/Traversal/Barrier.cs|  9 +-
 .../Process/Traversal/Cardinality.cs| 13 ++-
 .../src/Gremlin.Net/Process/Traversal/Column.cs | 11 ++-
 .../Gremlin.Net/Process/Traversal/Direction.cs  | 13 ++-
 .../Process/Traversal/EnumWrapper.cs| 52 +++
 .../Process/Traversal/GraphSONVersion.cs| 11 ++-
 .../Process/Traversal/GraphTraversal.cs | 45 ++
 .../Process/Traversal/GraphTraversalSource.cs   | 14 ++-
 .../Process/Traversal/GryoVersion.cs|  9 +-
 .../Process/Traversal/IBiFunction.cs| 33 +++
 .../Process/Traversal/IBinaryOperator.cs| 34 
 .../Process/Traversal/IComparator.cs| 32 +++
 .../Gremlin.Net/Process/Traversal/IConsumer.cs  | 33 +++
 .../Gremlin.Net/Process/Traversal/IFunction.cs  | 32 +++
 .../Gremlin.Net/Process/Traversal/IPredicate.cs | 32 +++
 .../Process/Traversal/NamingConversions.cs  | 91 
 .../Gremlin.Net/Process/Traversal/Operator.cs   | 29 ---
 .../src/Gremlin.Net/Process/Traversal/Order.cs  | 21 +++--
 .../src/Gremlin.Net/Process/Traversal/Pick.cs   | 11 ++-
 .../src/Gremlin.Net/Process/Traversal/Pop.cs| 13 ++-
 .../src/Gremlin.Net/Process/Traversal/Scope.cs  | 11 ++-
 .../src/Gremlin.Net/Process/Traversal/T.cs  | 15 ++--
 .../Process/Traversal/TraversalPredicate.cs |  2 +-
 .../src/Gremlin.Net/Process/Traversal/__.cs | 28 +++---
 .../Structure/IO/GraphSON/EnumSerializer.cs |  5 +-
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  2 +-
 .../TraversalEnumParameter.cs   |  5 +-
 32 files changed, 457 insertions(+), 213 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/50493397/CHANGELOG.asciidoc
--

[06/50] tinkerpop git commit: TINKERPOP-1892 Fix ignoring of test scenarios in Gremlin.Net CTR

[dkuppitz]

TINKERPOP-1892 Fix ignoring of test scenarios in Gremlin.Net CTR

Without this fix, all following scenarios after one ignored scenario
in the same feature weren't parsed at all. This also revealed another
failing scenario that needed to be ignored for now.


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

Branch: refs/heads/TINKERPOP-1682
Commit: b25b9767547b2956f224cbe6fb55c756d5df612e
Parents: d3be13b
Author: Florian Hockmann 
Authored: Mon Mar 12 20:08:21 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 20:08:21 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs  |  6 +-
 .../Gherkin/IgnoreException.cs| 10 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 9d0f15d..d906357 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -57,6 +57,10 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.PNotCreatedCorrectlyByGherkinRunner
+},
+{
+
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
+IgnoreReason.PNotDeserializationProblem
 }
 };
 
@@ -107,7 +111,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 if (IgnoredScenarios.TryGetValue(scenario.Name, out var 
reason))
 {
 failedSteps.Add(scenario.Steps.First(), new 
IgnoreException(reason));
-break;
+continue;
 }
 StepBlock? currentStep = null;
 StepDefinition stepDefinition = null;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b25b9767/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index c8cb29a..dae2ced 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -47,12 +47,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 reasonSuffix =
 " because the Gherkin runner can't call methods in 
TraversalPredicate class (TINKERPOP-1919)";
 break;
-case IgnoreReason.NumericalValuesHaveWrongTypes:
-reasonSuffix = " because the asserts currently fail due to 
type mismatches (TINKERPOP-1918)";
-break;
 case IgnoreReason.PWithinWrapsArgumentsInArray:
 reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
 break;
+case IgnoreReason.PNotDeserializationProblem:
+reasonSuffix = " because P.Not() cannot be deserialized by 
Gremlin Server (TINKERPOP-1922)";
+break;
 }
 return $"Scenario ignored" + reasonSuffix;
 }
@@ -62,7 +62,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 LambdaNotSupported,
 PNotCreatedCorrectlyByGherkinRunner,
-NumericalValuesHaveWrongTypes,
-PWithinWrapsArgumentsInArray
+PWithinWrapsArgumentsInArray,
+PNotDeserializationProblem
 }
 }
\ No newline at end of file

[02/50] tinkerpop git commit: TINKERPOP-1898 Specifically tested SubgraphStrategy for jython evaluation

[dkuppitz]

TINKERPOP-1898 Specifically tested SubgraphStrategy for jython evaluation


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

Branch: refs/heads/TINKERPOP-1682
Commit: c677a21d3fde73c496145915c66e7963c5290f69
Parents: f3172bc
Author: Stephen Mallette 
Authored: Fri Mar 9 10:17:09 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 12 11:56:16 2018 -0400

--
 .../tinkerpop/gremlin/python/jsr223/JythonTranslator.java   | 2 +-
 .../gremlin/python/jsr223/JythonTranslatorTest.java | 9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c677a21d/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
--
diff --git 
a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
 
b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
index 3d7d9fe..e043278 100644
--- 
a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
+++ 
b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java
@@ -80,6 +80,6 @@ public final class JythonTranslator extends PythonTranslator {
 if (proxy.getConfiguration().isEmpty())
 return proxy.getStrategyClass().getCanonicalName() + ".instance()";
 else
-return proxy.getStrategyClass().getCanonicalName() + ".create(new 
org.apache.commons.configuration.MapConfiguration(" + 
convertToString(ConfigurationConverter.getMap(proxy.getConfiguration())) + "))";
+return proxy.getStrategyClass().getCanonicalName() + 
".create(org.apache.commons.configuration.MapConfiguration(" + 
convertToString(ConfigurationConverter.getMap(proxy.getConfiguration())) + "))";
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c677a21d/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
--
diff --git 
a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
 
b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
index e35898b..343819c 100644
--- 
a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
+++ 
b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
@@ -23,6 +23,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
 import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -33,6 +34,7 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
+import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
@@ -111,9 +113,10 @@ public class JythonTranslatorTest {
 // present
 GraphTraversalSource g = TinkerFactory.createModern().traversal();
 g = g.withStrategies(new TranslationStrategy(g, 
JythonTranslator.of("g")));
-final List o = g.withStrategies(ReadOnlyStrategy.instance()).
-V().has("name").map(Lambda.function("lambda x: 
type(x.get())")).toList();
+final List o = g.withStrategies(ReadOnlyStrategy.instance(),
+
SubgraphStrategy.build().checkAdjacentVertices(false).vertices(hasLabel("person")).create()).
+ V().has("name").map(Lambda.function("lambda 
x: type(x.get())")).toList();
 
-assertEquals(6, o.size());
+assertEquals(4, o.size());
 }
 }

[36/50] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

[dkuppitz]

Updated NOTICE for netty after version bump to 4.0.56 CTR


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

Branch: refs/heads/TINKERPOP-1682
Commit: 7023eacc880021a58fd8cc71aa84f926b57bd191
Parents: d3d1ccf
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:18 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:14:18 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7023eacc/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index a6ffd91..91e622f 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7023eacc/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index ef4d547..72c10cc 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project

[20/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java


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

Branch: refs/heads/TINKERPOP-1682
Commit: 0c6459d992f7c643e433e3482d676c7096288438
Parents: 9bd4d7f 1ea01ad
Author: Stephen Mallette 
Authored: Wed Mar 14 08:14:54 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Mar 14 08:14:54 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/GremlinJythonScriptEngine.java   |  7 +--
 .../gremlin/python/jsr223/JythonTranslator.java | 28 +
 .../gremlin/python/jsr223/PythonTranslator.java | 35 ++-
 .../python/jsr223/JythonTranslatorTest.java | 63 
 5 files changed, 89 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c6459d9/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index bbae529,94ee24f..a5aac3d
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -283,9 -32,9 +283,10 @@@ image::https://raw.githubusercontent.co
  * Bumped to Jackson 2.9.4.
  * Improved performance of `JavaTranslator` by caching reflected methods 
required for traversal construction.
  * Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server 
that enables a "ping" and auto-close for seemingly dead clients.
+ * Fixed a bug where lambdas in `gremlin-python` would trigger a failure if 
steps using python-only symbols were present (such as `as_()`).
  * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
  * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.
 +* `ReferenceElement` avoids `UnsupportedOperationException` handling in 
construction thus improving performance.
  * Improved error messaging for failed serialization and deserialization of 
request/response messages.
  * Fixed handling of `Direction.BOTH` in `Messenger` implementations to pass 
the message to the opposite side of the `StarGraph`.
  * Removed hardcoded expectation in metrics serialization test suite as 
different providers may have different outputs.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c6459d9/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c6459d9/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
--
diff --cc 
gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
index 568ca03,d8c73f0..b453cd7
--- 
a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
+++ 
b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
@@@ -107,14 -110,15 +108,14 @@@ public class PythonTranslator implement
  for (final Bytecode.Instruction instruction : 
bytecode.getInstructions()) {
  final String methodName = instruction.getOperator();
  final Object[] arguments = instruction.getArguments();
 -if (IS_TESTING &&
 -
instruction.getOperator().equals(TraversalSource.Symbols.withStrategies) &&
 -
instruction.getArguments()[0].toString().contains("TranslationStrategy"))
 -continue;
 -else if (0 == arguments.length)
 +if (0 == arguments.length)
- 
traversalScript.append(".").append(SymbolHelper.toPython(methodName)).append("()");
- else if (methodName.equals("range") && 2 == arguments.length && 
((Number) arguments[0]).intValue() != 0) {
+ 
traversalScript.append(".").append(resolveSymbol(methodName)).append("()");
+ else if (methodName.equals("range") && 2 == arguments.length)
 -
traversalScript.append("[").append(arguments[0]).append(":").append(arguments[1]).append("]");
 +if (((Number) arguments[0]).longValue() + 1 == ((Number) 
arguments[1]).longValue())
 +
traversalScript.append("[").append(arguments[0]).append("]");
 +else
 +
traversalScript.append("[").append(arguments[0]).append(":").append(arguments[1]).append("]");
- } else if 

[22/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/TINKERPOP-1682
Commit: 4274bd5cf7028ab49356243d677ba6b23f4b911b
Parents: 0c6459d 0bf9b2f
Author: Stephen Mallette 
Authored: Thu Mar 15 10:34:49 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Mar 15 10:34:49 2018 -0400

--
 .../Gherkin/GherkinTestRunner.cs  | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4274bd5c/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index f5e6d3f,e15a492..2dac7c4
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -40,23 -40,8 +40,11 @@@ namespace Gremlin.Net.IntegrationTest.G
  private static readonly IDictionary 
IgnoredScenarios =
  new Dictionary
  {
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
 +{ 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
  {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
- {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
- {
- 
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
- IgnoreReason.PNotDeserializationProblem
- },
- {
- 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
- IgnoreReason.PNotDeserializationProblem
- },
- {
- 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
- IgnoreReason.PNotDeserializationProblem
- }
+ {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray}
  };
  
  private static class Keywords

[48/50] tinkerpop git commit: replaced TraversalRing's setTraversal() with replaceTraversal()

[dkuppitz]

replaced TraversalRing's setTraversal() with replaceTraversal()


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

Branch: refs/heads/TINKERPOP-1682
Commit: 84df874049c128cc4d899b101370fb598024aa82
Parents: 4dcd6b2
Author: Daniel Kuppitz 
Authored: Fri Jun 23 16:05:30 2017 +0200
Committer: Daniel Kuppitz 
Committed: Mon Mar 19 12:28:38 2018 -0700

--
 .../process/traversal/step/filter/PathFilterStep.java| 11 +++
 .../traversal/step/filter/WherePredicateStep.java| 11 +++
 .../gremlin/process/traversal/step/map/PathStep.java | 11 +++
 .../gremlin/process/traversal/step/map/ProjectStep.java  | 11 +++
 .../gremlin/process/traversal/step/map/SelectStep.java   | 11 +++
 .../gremlin/process/traversal/step/map/TreeStep.java | 11 +++
 .../traversal/step/sideEffect/TreeSideEffectStep.java| 11 +++
 .../gremlin/process/traversal/util/TraversalRing.java| 10 --
 8 files changed, 29 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84df8740/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/PathFilterStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/PathFilterStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/PathFilterStep.java
index 80355ea..6b77a36 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/PathFilterStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/PathFilterStep.java
@@ -110,14 +110,9 @@ public final class PathFilterStep extends FilterStep 
implements FromToModu
 
 @Override
 public void replaceLocalChild(final Traversal.Admin oldTraversal, 
final Traversal.Admin newTraversal) {
-int i = 0;
-for (final Traversal.Admin traversal : 
this.traversalRing.getTraversals()) {
-if (null != traversal && traversal.equals(oldTraversal)) {
-this.traversalRing.setTraversal(i, 
this.integrateChild(newTraversal));
-break;
-}
-i++;
-}
+this.traversalRing.replaceTraversal(
+(Traversal.Admin) oldTraversal,
+(Traversal.Admin) newTraversal);
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84df8740/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java
index b9cf110..59ad435 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java
@@ -166,13 +166,8 @@ public final class WherePredicateStep extends 
FilterStep implements Scopin
 
 @Override
 public void replaceLocalChild(final Traversal.Admin oldTraversal, 
final Traversal.Admin newTraversal) {
-int i = 0;
-for (final Traversal.Admin traversal : 
this.traversalRing.getTraversals()) {
-if (null != traversal && traversal.equals(oldTraversal)) {
-this.traversalRing.setTraversal(i, 
this.integrateChild(newTraversal));
-break;
-}
-i++;
-}
+this.traversalRing.replaceTraversal(
+(Traversal.Admin) oldTraversal,
+(Traversal.Admin) newTraversal);
 }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84df8740/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java
index 80642c7..05f 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java
+++ 

[07/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/TINKERPOP-1682
Commit: 510231adbe77bf58d65f8f999e4a8b081e9d7894
Parents: 097ad01 b25b976
Author: Florian Hockmann 
Authored: Mon Mar 12 20:08:44 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Mar 12 20:08:44 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs  |  6 +-
 .../Gherkin/IgnoreException.cs| 10 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/510231ad/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/510231ad/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 337a6c9,dae2ced..da455a8
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -63,18 -60,9 +63,18 @@@ namespace Gremlin.Net.IntegrationTest.G
  
  public enum IgnoreReason
  {
 +/// 
 +/// Lambdas are not supported on Gremlin.NET yet.
 +/// 
  LambdaNotSupported,
 +
 +/// 
 +/// Deserialization of g:T on GraphSON3 is not supported.
 +/// 
 +TraversalTDeserializationNotSupported,
 +
  PNotCreatedCorrectlyByGherkinRunner,
- NumericalValuesHaveWrongTypes,
- PWithinWrapsArgumentsInArray
+ PWithinWrapsArgumentsInArray,
+ PNotDeserializationProblem
  }
  }

[49/50] tinkerpop git commit: Made sure that the barrier step and the reducing operator are reevaluated when the value traversal is being replaced.

[dkuppitz]

Made sure that the barrier step and the reducing operator are reevaluated when 
the value traversal is being replaced.


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

Branch: refs/heads/TINKERPOP-1682
Commit: b7c6304cd0563a24cf892a613adb907e527c1643
Parents: 84df874
Author: Daniel Kuppitz 
Authored: Fri Jun 23 23:43:13 2017 +0200
Committer: Daniel Kuppitz 
Committed: Mon Mar 19 12:28:38 2018 -0700

--
 .../process/traversal/step/map/GroupStep.java | 12 
 .../step/sideEffect/GroupSideEffectStep.java  | 18 +++---
 2 files changed, 19 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b7c6304c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
index 521debc..4d795f9 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java
@@ -63,15 +63,19 @@ public final class GroupStep extends 
ReducingBarrierStep>
 this.setSeedSupplier(HashMapSupplier.instance());
 }
 
+private void setValueTraversal(final Traversal.Admin kvTraversal) {
+this.valueTraversal = 
this.integrateChild(convertValueTraversal(kvTraversal));
+this.barrierStep = 
TraversalHelper.getFirstStepOfAssignableClass(Barrier.class, 
this.valueTraversal).orElse(null);
+this.setReducingBiOperator(new GroupBiOperator<>(null == 
this.barrierStep ? Operator.assign : 
this.barrierStep.getMemoryComputeKey().getReducer()));
+}
+
 @Override
 public void modulateBy(final Traversal.Admin kvTraversal) {
 if ('k' == this.state) {
 this.keyTraversal = this.integrateChild(kvTraversal);
 this.state = 'v';
 } else if ('v' == this.state) {
-this.valueTraversal = 
this.integrateChild(convertValueTraversal(kvTraversal));
-this.barrierStep = 
TraversalHelper.getFirstStepOfAssignableClass(Barrier.class, 
this.valueTraversal).orElse(null);
-this.setReducingBiOperator(new GroupBiOperator<>(null == 
this.barrierStep ? Operator.assign : 
this.barrierStep.getMemoryComputeKey().getReducer()));
+this.setValueTraversal(kvTraversal);
 this.state = 'x';
 } else {
 throw new IllegalStateException("The key and value traversals for 
group()-step have already been set: " + this);
@@ -83,7 +87,7 @@ public final class GroupStep extends 
ReducingBarrierStep>
 if (null != this.keyTraversal && 
this.keyTraversal.equals(oldTraversal))
 this.keyTraversal = this.integrateChild(newTraversal);
 else if (null != this.valueTraversal && 
this.valueTraversal.equals(oldTraversal))
-this.valueTraversal = this.integrateChild(newTraversal);
+this.setValueTraversal(newTraversal);
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b7c6304c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
index 35f3cd7..ee73fec 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
@@ -62,18 +62,22 @@ public final class GroupSideEffectStep extends 
SideEffectStep implem
 this.barrierStep.getMemoryComputeKey().getReducer()));
 }
 
+private void setValueTraversal(final Traversal.Admin valueTraversal) 
{
+this.valueTraversal = 
this.integrateChild(GroupStep.convertValueTraversal(valueTraversal));
+this.barrierStep = 
TraversalHelper.getFirstStepOfAssignableClass(Barrier.class, 
this.valueTraversal).orElse(null);
+

[46/50] tinkerpop git commit: Added new tests as suggested by @okram.

[dkuppitz]

Added new tests as suggested by @okram.


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

Branch: refs/heads/TINKERPOP-1682
Commit: 4dcd6b2cf8fc6c69876b26cc3207ad802fa23e05
Parents: 13597f4
Author: Daniel Kuppitz 
Authored: Mon Jun 19 18:24:39 2017 +0200
Committer: Daniel Kuppitz 
Committed: Mon Mar 19 12:28:38 2018 -0700

--
 CHANGELOG.asciidoc  |  2 +-
 .../process/traversal/step/map/OrderTest.java   | 42 
 .../traversal/step/sideEffect/GroupTest.java| 40 +++
 3 files changed, 83 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4dcd6b2c/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index db9c1dc..8092d0c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -110,8 +110,8 @@ This release also includes changes from <>.
 * Removed access to previously deprecated `CoreGremlinPlugin#INSTANCE` field.
 * `gremlin.sh` and `gremln.bat` no longer support the option to pass a script 
as an argument for execution mode without using the `-i` option.
 * Graphite and Ganglia are no longer packaged with the Gremlin Server 
distribution.
-* `TransactionException` is no longer a class of `AbstractTransaction` and it 
extends `RuntimeException`.
 * Included an ellipse on long property names that are truncated.
+* Added `TraversalParent.replaceTraversal()` which can replace a direct child 
traversal.
 * Added `ByModulatorOptimizationStrategy` which replaces certain standard 
traversals w/ optimized traversals (e.g. `TokenTraversal`).
 * Renamed `RangeByIsCountStrategy` to `CountStrategy`.
 * Added more specific typing to various `__` traversal steps. E.g. 
`out()` is `out()`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4dcd6b2c/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
--
diff --git 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index bbf63ef..a44ac5a 100644
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@ -29,6 +29,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
 import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Property;
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.junit.Test;
@@ -100,6 +101,10 @@ public abstract class OrderTest extends 
AbstractGremlinProcessTest {
 
 public abstract Traversal> 
get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX();
 
+public abstract Traversal get_g_V_order_byXlabelX();
+
+public abstract Traversal get_g_V_order_byXlabel_decrX();
+
 @Test
 @LoadGraphWith(MODERN)
 public void g_V_name_order() {
@@ -400,6 +405,21 @@ public abstract class OrderTest extends 
AbstractGremlinProcessTest {
 entry = iterator.next();
 assertEquals("marko", entry.getKey());
 assertEquals(1.9, entry.getValue().doubleValue(), 0.0001);
+
+public void g_V_order_byXlabelX() {
+final Traversal traversal = get_g_V_order_byXlabelX();
+printTraversalForm(traversal);
+for (int i = 0; i < 4; i++) {
+assertTrue(traversal.hasNext());
+final Vertex v = traversal.next();
+assertEquals("person", v.label());
+}
+for (int i = 0; i < 2; i++) {
+assertTrue(traversal.hasNext());
+final Vertex v = traversal.next();
+assertEquals("software", v.label());
+}
+assertFalse(traversal.hasNext());
 }
 
 @Test
@@ -420,6 +440,20 @@ public abstract class OrderTest extends 
AbstractGremlinProcessTest {
 entry = traversal.next();
 assertEquals("vadas", entry.getKey());
 assertEquals(0.0, entry.getValue().doubleValue(), 

[05/50] tinkerpop git commit: TINKERPOP-1896 Cleaned up changelog around TINKERPOP-1898/1895

[dkuppitz]

TINKERPOP-1896 Cleaned up changelog around TINKERPOP-1898/1895


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

Branch: refs/heads/TINKERPOP-1682
Commit: 01ef6c110cc323643653c716fbb85fcf433dc418
Parents: c82d06e
Author: Stephen Mallette 
Authored: Mon Mar 12 12:19:18 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 12:19:18 2018 -0400

--
 CHANGELOG.asciidoc | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/01ef6c11/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 350fce8..a761003 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -31,7 +31,6 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Bumped to Jackson 2.9.4.
 * Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server that 
enables a "ping" and auto-close for seemingly dead clients.
 * Fixed a bug where lambdas in `gremlin-python` would trigger a failure if 
steps using python-only symbols were present (such as `as_()`).
-* Fixed a bug where lambdas in `gremlin-python` would trigger a failure if 
`withStrategies()` was evaluated.
 * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.
 * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.
 * Improved error messaging for failed serialization and deserialization of 
request/response messages.

[08/50] tinkerpop git commit: Minor code refactoring in JavaTranslator CTR

[dkuppitz]

Minor code refactoring in JavaTranslator CTR


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

Branch: refs/heads/TINKERPOP-1682
Commit: f02f94fd067799e5f532086a762c35abd3a11a93
Parents: b25b976
Author: Stephen Mallette 
Authored: Tue Mar 13 08:40:10 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 13 08:40:10 2018 -0400

--
 .../apache/tinkerpop/gremlin/jsr223/JavaTranslator.java   | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f02f94fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
index df12055..3e0e6da 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
@@ -190,7 +190,7 @@ public final class JavaTranslator 
returnType, final String methodName, final Object... arguments) {
 // populate method cache for fast access to methods in subsequent calls
 final Map methodCache = 
GLOBAL_METHOD_CACHE.getOrDefault(delegate.getClass(), new HashMap<>());
 if (methodCache.isEmpty()) buildMethodCache(delegate, methodCache);
@@ -222,7 +222,7 @@ public final class JavaTranslator list = methodCache.get(method.getName());
-if (null == list) {
-list = new ArrayList<>();
-methodCache.put(method.getName(), list);
-}
+final List list = 
methodCache.computeIfAbsent(method.getName(), k -> new ArrayList<>());
 list.add(method);
 }
 }

[21/50] tinkerpop git commit: TINKERPOP-1922 P.Not() serialization is no longer an issue

[dkuppitz]

TINKERPOP-1922 P.Not() serialization is no longer an issue

Resolved on a different issue - likely TINKERPOP-1894 CTR


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

Branch: refs/heads/TINKERPOP-1682
Commit: 0bf9b2f718f7db8344845d8fb5327ea16f1e9414
Parents: 1ea01ad
Author: Stephen Mallette 
Authored: Thu Mar 15 10:33:45 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Mar 15 10:33:45 2018 -0400

--
 .../Gherkin/GherkinTestRunner.cs  | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bf9b2f7/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index c3819fe..e15a492 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -41,19 +41,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 new Dictionary
 {
 {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
-{"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
-{
-
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
-IgnoreReason.PNotDeserializationProblem
-},
-{
-
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
-IgnoreReason.PNotDeserializationProblem
-},
-{
-
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
-IgnoreReason.PNotDeserializationProblem
-}
+{"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray}
 };
 
 private static class Keywords

[09/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/TINKERPOP-1682
Commit: f9f3d4fc8a65ddbd73dea51cc692d841e2766852
Parents: 510231a f02f94f
Author: Stephen Mallette 
Authored: Tue Mar 13 08:40:46 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 13 08:40:46 2018 -0400

--
 .../apache/tinkerpop/gremlin/jsr223/JavaTranslator.java   | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9f3d4fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
--

[01/50] tinkerpop git commit: TINKERPOP-1898 Can't seem to fix this in a consistent way given jython evaluation [Forced Update!]

[dkuppitz]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1682 d5a6193d2 -> b6ee03043 (forced update)


TINKERPOP-1898 Can't seem to fix this in a consistent way given jython 
evaluation

Jython seems to have problems with varargs that are not easily resolved. 
Nothing I've tried works consistently. Sometimes it works and other times not.


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

Branch: refs/heads/TINKERPOP-1682
Commit: c82d06e05cfcc05607dd2d84c0c2d1475f0a0ddf
Parents: c677a21
Author: Stephen Mallette 
Authored: Mon Mar 12 11:53:57 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 11:56:16 2018 -0400

--
 .../tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c82d06e0/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
--
diff --git 
a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
 
b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
index 343819c..3165df3 100644
--- 
a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
+++ 
b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
@@ -29,6 +29,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.Read
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
 import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -108,6 +109,7 @@ public class JythonTranslatorTest {
 }
 
 @Test
+@Ignore("TINKERPOP-1898 - ultimately seems to be a problem with jython and 
varargs - doesn't act consistently")
 public void shouldTranslateToJythonWhenUsingLambdasAndStrategies() throws 
Exception {
 // the jython translation kicks in when you add a lambda so ensure 
that it translates when strategies are
 // present

[04/50] tinkerpop git commit: Merge branch 'tp32' into tp33

[dkuppitz]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/TINKERPOP-1682
Commit: 097ad015ee0595b290824543ebded7558f623a8c
Parents: 7f06a18 d3be13b
Author: Stephen Mallette 
Authored: Mon Mar 12 12:13:10 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 12:13:10 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/097ad015/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/097ad015/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
index 0806c6d,df12055..2df8db5
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
@@@ -50,10 -50,13 +50,11 @@@ import java.util.concurrent.ConcurrentH
   */
  public final class JavaTranslator> implements Translator.StepTranslator {
  
 -private static final boolean IS_TESTING = 
Boolean.valueOf(System.getProperty("is.testing", "false"));
 -
  private final S traversalSource;
- private final Class anonymousTraversal;
+ private final Class anonymousTraversal;
  private static final Map> 
GLOBAL_METHOD_CACHE = new ConcurrentHashMap<>();
- 
+ private final Map> localMethodCache = new 
ConcurrentHashMap<>();
+ private final Method anonymousTraversalStart;
  
  private JavaTranslator(final S traversalSource) {
  this.traversalSource = traversalSource;

[2/2] tinkerpop git commit: TINKERPOP-1866 Add a deserializer for g:T to Gremlin.Net

[florianhockmann]

TINKERPOP-1866 Add a deserializer for g:T to Gremlin.Net


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

Branch: refs/heads/TINKERPOP-1866
Commit: 8c23ffe79b800792a78282ec7b49a4830a915840
Parents: f1e8430
Author: Florian Hockmann 
Authored: Tue Mar 20 15:45:11 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 20 15:45:11 2018 +0100

--
 .../Process/Traversal/EnumWrapper.cs| 31 ++-
 .../Structure/IO/GraphSON/GraphSONReader.cs |  1 +
 .../Structure/IO/GraphSON/TDeserializer.cs  | 42 
 .../Gherkin/CommonSteps.cs  |  4 +-
 .../Gherkin/GherkinTestRunner.cs|  4 --
 .../IO/GraphSON/GraphSONReaderTests.cs  | 12 ++
 6 files changed, 88 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c23ffe7/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs
index 66b8c5a..20a0348 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs
@@ -21,12 +21,14 @@
 
 #endregion
 
+using System;
+
 namespace Gremlin.Net.Process.Traversal
 {
 /// 
 /// Represents an enum.
 /// 
-public abstract class EnumWrapper
+public abstract class EnumWrapper : IEquatable
 {
 /// 
 /// Gets the name of the enum.
@@ -48,5 +50,32 @@ namespace Gremlin.Net.Process.Traversal
 EnumName = enumName;
 EnumValue = enumValue;
 }
+
+/// 
+public bool Equals(EnumWrapper other)
+{
+if (ReferenceEquals(null, other)) return false;
+if (ReferenceEquals(this, other)) return true;
+return string.Equals(EnumName, other.EnumName) && 
string.Equals(EnumValue, other.EnumValue);
+}
+
+/// 
+public override bool Equals(object obj)
+{
+if (ReferenceEquals(null, obj)) return false;
+if (ReferenceEquals(this, obj)) return true;
+if (obj.GetType() != this.GetType()) return false;
+return Equals((EnumWrapper) obj);
+}
+
+/// 
+public override int GetHashCode()
+{
+unchecked
+{
+return ((EnumName != null ? EnumName.GetHashCode() : 0) * 397) 
^
+   (EnumValue != null ? EnumValue.GetHashCode() : 0);
+}
+}
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c23ffe7/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
index fbec67d..94fcd8d 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
@@ -52,6 +52,7 @@ namespace Gremlin.Net.Structure.IO.GraphSON
 {"g:Property", new PropertyDeserializer()},
 {"g:VertexProperty", new VertexPropertyDeserializer()},
 {"g:Path", new PathDeserializer()},
+{"g:T", new TDeserializer()},
 {"gx:BigDecimal", new DecimalConverter()}
 };
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c23ffe7/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
new file mode 100644
index 000..e79783c
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
@@ -0,0 +1,42 @@
+#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License 

[1/2] tinkerpop git commit: TINKERPOP-1865 Run Gremlin.Net tests with GraphSON 3.0

[florianhockmann]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1866 [created] 8c23ffe79


TINKERPOP-1865 Run Gremlin.Net tests with GraphSON 3.0

This required the rewrite of the GetEdges() function for the Gherkin
test runner. Additionally, 3 tests had to be ignored: 1 has the
T deserialization problem and 2 get data returned from the server that
doesn't match the expected data.


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

Branch: refs/heads/TINKERPOP-1866
Commit: f1e8430ba4cba233262ba7e28577928447df6fab
Parents: 4c64bc0
Author: Florian Hockmann 
Authored: Sun Mar 18 17:19:45 2018 +0100
Committer: Florian Hockmann 
Committed: Tue Mar 20 15:08:00 2018 +0100

--
 .../test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1e8430b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
index 02ee132..c49d4a7 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
@@ -30,6 +30,7 @@ using 
Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection;
 using Gremlin.Net.Process.Remote;
 using Gremlin.Net.Process.Traversal;
 using Gremlin.Net.Structure;
+using static Gremlin.Net.Process.Traversal.__;
 
 namespace Gremlin.Net.IntegrationTest.Gherkin
 {

[3/3] tinkerpop git commit: Added more info to GraphSON serialization errors CTR

[spmallette]

Added more info to GraphSON serialization errors CTR


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

Branch: refs/heads/tp33
Commit: c466efad63b273aa0ca0c78e409eeeade5075c04
Parents: 9bd4fd4
Author: Stephen Mallette 
Authored: Tue Mar 20 08:02:01 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 08:02:01 2018 -0400

--
 .../structure/io/graphson/GraphSONTypeSerializerV3d0.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c466efad/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
index ae1df47..4f4 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
@@ -83,7 +83,7 @@ public class GraphSONTypeSerializerV3d0 extends 
AbstractGraphSONTypeSerializer {
 jsonGenerator.writeStartArray();
 }
 } else {
-throw new IllegalStateException("Could not write prefix");
+throw new IllegalStateException("Could not write prefix: shape[" + 
writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
 }
 
 return writableTypeId;
@@ -110,7 +110,7 @@ public class GraphSONTypeSerializerV3d0 extends 
AbstractGraphSONTypeSerializer {
 jsonGenerator.writeEndArray();
 }
 } else {
-throw new IllegalStateException("Could not write suffix");
+throw new IllegalStateException("Could not write suffix: shape[" + 
writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
 }
 
 return writableTypeId;

[1/3] tinkerpop git commit: Included more info in GraphSON error messaging CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 94484e278 -> c466efad6


Included more info in GraphSON error messaging CTR


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

Branch: refs/heads/tp33
Commit: b52422547f39aea8c58ad1d6b5fb55c26947f7d6
Parents: 8c87fcf
Author: Stephen Mallette 
Authored: Tue Mar 20 07:59:32 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 07:59:32 2018 -0400

--
 .../gremlin/structure/io/graphson/GraphSONTypeSerializer.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5242254/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 8b1ba25..53ccc0b 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
@@ -105,7 +105,7 @@ public class GraphSONTypeSerializer extends TypeSerializer {
 } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
 jsonGenerator.writeStartArray();
 } else {
-throw new IllegalStateException("Could not write prefix");
+throw new IllegalStateException("Could not write prefix: shape[" + 
writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
 }
 
 return writableTypeId;
@@ -122,7 +122,7 @@ public class GraphSONTypeSerializer extends TypeSerializer {
 } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
 jsonGenerator.writeEndArray();
 } else {
-throw new IllegalStateException("Could not write suffix");
+throw new IllegalStateException("Could not write suffix: shape[" + 
writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
 }
 
 return writableTypeId;

[1/4] tinkerpop git commit: Included more info in GraphSON error messaging CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master a9c0e0b36 -> 754eb7945


Included more info in GraphSON error messaging CTR


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

Branch: refs/heads/master
Commit: b52422547f39aea8c58ad1d6b5fb55c26947f7d6
Parents: 8c87fcf
Author: Stephen Mallette 
Authored: Tue Mar 20 07:59:32 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 07:59:32 2018 -0400

--
 .../gremlin/structure/io/graphson/GraphSONTypeSerializer.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5242254/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 8b1ba25..53ccc0b 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
@@ -105,7 +105,7 @@ public class GraphSONTypeSerializer extends TypeSerializer {
 } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
 jsonGenerator.writeStartArray();
 } else {
-throw new IllegalStateException("Could not write prefix");
+throw new IllegalStateException("Could not write prefix: shape[" + 
writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
 }
 
 return writableTypeId;
@@ -122,7 +122,7 @@ public class GraphSONTypeSerializer extends TypeSerializer {
 } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
 jsonGenerator.writeEndArray();
 } else {
-throw new IllegalStateException("Could not write suffix");
+throw new IllegalStateException("Could not write suffix: shape[" + 
writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
 }
 
 return writableTypeId;

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

[spmallette]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/master
Commit: 9bd4fd4c07ca03218623824800ac2a127ad03311
Parents: 94484e2 b524225
Author: Stephen Mallette 
Authored: Tue Mar 20 08:00:32 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 08:00:32 2018 -0400

--
 .../structure/io/graphson/GraphSONTypeSerializerV2d0.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bd4fd4c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
index f0d437f,000..a335baf
mode 100644,00..100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
@@@ -1,150 -1,0 +1,150 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
 +package org.apache.tinkerpop.gremlin.structure.io.graphson;
 +
 +import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 +import org.apache.tinkerpop.gremlin.process.traversal.Order;
 +import org.apache.tinkerpop.gremlin.process.traversal.Path;
 +import org.apache.tinkerpop.gremlin.process.traversal.Pop;
 +import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
 +import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
 +import org.apache.tinkerpop.gremlin.structure.Column;
 +import org.apache.tinkerpop.gremlin.structure.Direction;
 +import org.apache.tinkerpop.gremlin.structure.Edge;
 +import org.apache.tinkerpop.gremlin.structure.Property;
 +import org.apache.tinkerpop.gremlin.structure.T;
 +import org.apache.tinkerpop.gremlin.structure.Vertex;
 +import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 +import org.apache.tinkerpop.gremlin.util.function.Lambda;
 +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.jsontype.TypeIdResolver;
 +
 +import java.io.IOException;
 +import java.net.InetAddress;
 +import java.nio.ByteBuffer;
 +
 +/**
 + * GraphSON 2.0 {@code TypeSerializer}.
 + *
 + * @author Kevin Gallardo (https://kgdo.me)
 + * @author Stephen Mallette (http://stephen.genoprime.com)
 + */
 +public class GraphSONTypeSerializerV2d0 extends 
AbstractGraphSONTypeSerializer {
 +
 +GraphSONTypeSerializerV2d0(final TypeIdResolver idRes, final String 
propertyName, final TypeInfo typeInfo,
 +   final String valuePropertyName) {
 +super(idRes, propertyName, typeInfo, valuePropertyName);
 +}
 +
 +@Override
 +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) {
 + 

tinkerpop git commit: Included more info in GraphSON error messaging CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 8c87fcfb0 -> b52422547


Included more info in GraphSON error messaging CTR


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

Branch: refs/heads/tp32
Commit: b52422547f39aea8c58ad1d6b5fb55c26947f7d6
Parents: 8c87fcf
Author: Stephen Mallette 
Authored: Tue Mar 20 07:59:32 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 07:59:32 2018 -0400

--
 .../gremlin/structure/io/graphson/GraphSONTypeSerializer.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b5242254/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 8b1ba25..53ccc0b 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
@@ -105,7 +105,7 @@ public class GraphSONTypeSerializer extends TypeSerializer {
 } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
 jsonGenerator.writeStartArray();
 } else {
-throw new IllegalStateException("Could not write prefix");
+throw new IllegalStateException("Could not write prefix: shape[" + 
writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
 }
 
 return writableTypeId;
@@ -122,7 +122,7 @@ public class GraphSONTypeSerializer extends TypeSerializer {
 } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
 jsonGenerator.writeEndArray();
 } else {
-throw new IllegalStateException("Could not write suffix");
+throw new IllegalStateException("Could not write suffix: shape[" + 
writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
 }
 
 return writableTypeId;

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

[spmallette]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: 9bd4fd4c07ca03218623824800ac2a127ad03311
Parents: 94484e2 b524225
Author: Stephen Mallette 
Authored: Tue Mar 20 08:00:32 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 08:00:32 2018 -0400

--
 .../structure/io/graphson/GraphSONTypeSerializerV2d0.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bd4fd4c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
index f0d437f,000..a335baf
mode 100644,00..100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
@@@ -1,150 -1,0 +1,150 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
 +package org.apache.tinkerpop.gremlin.structure.io.graphson;
 +
 +import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 +import org.apache.tinkerpop.gremlin.process.traversal.Order;
 +import org.apache.tinkerpop.gremlin.process.traversal.Path;
 +import org.apache.tinkerpop.gremlin.process.traversal.Pop;
 +import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
 +import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
 +import org.apache.tinkerpop.gremlin.structure.Column;
 +import org.apache.tinkerpop.gremlin.structure.Direction;
 +import org.apache.tinkerpop.gremlin.structure.Edge;
 +import org.apache.tinkerpop.gremlin.structure.Property;
 +import org.apache.tinkerpop.gremlin.structure.T;
 +import org.apache.tinkerpop.gremlin.structure.Vertex;
 +import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 +import org.apache.tinkerpop.gremlin.util.function.Lambda;
 +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.jsontype.TypeIdResolver;
 +
 +import java.io.IOException;
 +import java.net.InetAddress;
 +import java.nio.ByteBuffer;
 +
 +/**
 + * GraphSON 2.0 {@code TypeSerializer}.
 + *
 + * @author Kevin Gallardo (https://kgdo.me)
 + * @author Stephen Mallette (http://stephen.genoprime.com)
 + */
 +public class GraphSONTypeSerializerV2d0 extends 
AbstractGraphSONTypeSerializer {
 +
 +GraphSONTypeSerializerV2d0(final TypeIdResolver idRes, final String 
propertyName, final TypeInfo typeInfo,
 +   final String valuePropertyName) {
 +super(idRes, propertyName, typeInfo, valuePropertyName);
 +}
 +
 +@Override
 +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) {
 +   

[3/4] tinkerpop git commit: Added more info to GraphSON serialization errors CTR

[spmallette]

Added more info to GraphSON serialization errors CTR


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

Branch: refs/heads/master
Commit: c466efad63b273aa0ca0c78e409eeeade5075c04
Parents: 9bd4fd4
Author: Stephen Mallette 
Authored: Tue Mar 20 08:02:01 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 08:02:01 2018 -0400

--
 .../structure/io/graphson/GraphSONTypeSerializerV3d0.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c466efad/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
index ae1df47..4f4 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
@@ -83,7 +83,7 @@ public class GraphSONTypeSerializerV3d0 extends 
AbstractGraphSONTypeSerializer {
 jsonGenerator.writeStartArray();
 }
 } else {
-throw new IllegalStateException("Could not write prefix");
+throw new IllegalStateException("Could not write prefix: shape[" + 
writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
 }
 
 return writableTypeId;
@@ -110,7 +110,7 @@ public class GraphSONTypeSerializerV3d0 extends 
AbstractGraphSONTypeSerializer {
 jsonGenerator.writeEndArray();
 }
 } else {
-throw new IllegalStateException("Could not write suffix");
+throw new IllegalStateException("Could not write suffix: shape[" + 
writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
 }
 
 return writableTypeId;

[4/4] tinkerpop git commit: Merge branch 'tp33'

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 754eb794565fc935672dad2437e9286b38a7a90e
Parents: a9c0e0b c466efa
Author: Stephen Mallette 
Authored: Tue Mar 20 08:02:22 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 08:02:22 2018 -0400

--
 .../structure/io/graphson/GraphSONTypeSerializerV2d0.java| 4 ++--
 .../structure/io/graphson/GraphSONTypeSerializerV3d0.java| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

svn commit: r1827294 - /tinkerpop/site/index.html

[spmallette]

Author: spmallette
Date: Tue Mar 20 11:00:41 2018
New Revision: 1827294

URL: http://svn.apache.org/viewvc?rev=1827294=rev
Log:
Deploy TinkerPop homepage

Modified:
tinkerpop/site/index.html

Modified: tinkerpop/site/index.html
URL: 
http://svn.apache.org/viewvc/tinkerpop/site/index.html?rev=1827294=1827293=1827294=diff
==
--- tinkerpop/site/index.html (original)
+++ tinkerpop/site/index.html Tue Mar 20 11:00:41 2018
@@ -383,6 +383,7 @@ limitations under the License.
  Query Languages
  [learn 
more]
  
+https://github.com/opencypher/cypher-for-gremlin;>cypher-for-gremlin 
- A Cypher to Gremlin traversal transpiler.
 http://syncleus.com/Ferma/;>Ferma (java/dsl) - An 
ORM / OGM for Apache TinkerPop.
 https://github.com/davebshow/goblin;>Goblin 
(python/dsl) - Goblin OGM for the TinkerPop 3 Gremlin Server.
 http://tinkerpop.apache.org/docs/current/reference/#gremlin-DotNet;>Gremlin.Net
 (.NET - C#/variant) - Gremlin hosted in C# for use with any .NET-based VM.
@@ -395,8 +396,8 @@ limitations under the License.
 https://github.com/davebshow/ipython-gremlin;>ipython-gremlin 
(python/variant) - Gremlin in IPython and Jupyter.
 http://ogre.clojurewerkz.org/;>ogre 
(clojure/variant) - A Clojure language wrapper for TinkerPop3.
 http://bayofmany.github.io/;>Peapod (java/dsl) - 
An object-graph-wrapper.
-https://github.com/LITMUS-Benchmark-Suite/sparql-to-gremlin;>sparql-gremlin
 (sparql/distinct) - A SPARQL to Gremlin traversal compiler.
-https://github.com/twilmes/sql-gremlin;>sql-gremlin (sql/distinct) - 
An SQL to Gremlin traversal compiler.
+https://github.com/LITMUS-Benchmark-Suite/sparql-to-gremlin;>sparql-gremlin
 (sparql/distinct) - A SPARQL to Gremlin traversal transpiler.
+https://github.com/twilmes/sql-gremlin;>sql-gremlin (sql/distinct) - 
An SQL to Gremlin traversal transpiler.
  
  
  Language Drivers

[05/12] tinkerpop git commit: Fixed NOTICE after bump to netty 4.1.21.Final CTR

[jorgebg]

Fixed NOTICE after bump to netty 4.1.21.Final CTR


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

Branch: refs/heads/TINKERPOP-1865
Commit: ff881c189e657a982f9dc635101a01fe8549bfdb
Parents: 78fd019
Author: Stephen Mallette 
Authored: Mon Mar 19 09:15:12 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:15:12 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ff881c18/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index 91e622f..fed03e1 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.56
+Netty 4.1.21
 
-Copyright 2011 The Netty Project
+Copyright 2014 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ff881c18/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index 72c10cc..f50caec 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.56
+Netty 4.1.21
 
-Copyright 2011 The Netty Project
+Copyright 2014 The Netty Project

[07/12] tinkerpop git commit: Merge branch 'tp32' into tp33

[jorgebg]

Merge branch 'tp32' into tp33

Conflicts:
gremlin-console/src/main/static/NOTICE
gremlin-server/src/main/static/NOTICE


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

Branch: refs/heads/TINKERPOP-1865
Commit: 764e888f20e6b366b43b8b180dd05adc38b21663
Parents: ff881c1 3aa7336
Author: Stephen Mallette 
Authored: Mon Mar 19 09:17:03 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:17:03 2018 -0400

--

--

[09/12] tinkerpop git commit: Merge branch 'tp32' into tp33

[jorgebg]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs


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

Branch: refs/heads/TINKERPOP-1865
Commit: 94484e278481e0bb7add3400981993118d127fbe
Parents: 764e888 8c87fcf
Author: Stephen Mallette 
Authored: Mon Mar 19 10:55:23 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:55:23 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  4 +---
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 2dac7c4,6d38ccc..02bf546
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -38,14 -38,7 +38,12 @@@ namespace Gremlin.Net.IntegrationTest.G
  public class GherkinTestRunner
  {
  private static readonly IDictionary 
IgnoredScenarios =
 -new Dictionary();
 +new Dictionary
 +{
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- { 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
- {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray}
++{ 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported } // TINKERPOP-1866
 +};
  
  private static class Keywords
  {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 9bcb860,860c11d..9eb3021
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -40,14 -40,8 +40,11 @@@ namespace Gremlin.Net.IntegrationTest.G
  string reasonSuffix = null;
  switch (reason)
  {
 +case IgnoreReason.TraversalTDeserializationNotSupported:
 +reasonSuffix = " as deserialization of g:T on GraphSON3 
is not supported";
 +break;
- case IgnoreReason.PWithinWrapsArgumentsInArray:
- reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
- break;
- case IgnoreReason.PNotDeserializationProblem:
- reasonSuffix = " because P.Not() cannot be deserialized 
by Gremlin Server (TINKERPOP-1922)";
+ case IgnoreReason.NoReason:
+ reasonSuffix = "";
  break;
  }
  return $"Scenario ignored" + reasonSuffix;
@@@ -56,11 -50,6 +53,10 @@@
  
  public enum IgnoreReason
  {
 +/// 
 +/// Deserialization of g:T on GraphSON3 is not supported.
 +/// 
 +TraversalTDeserializationNotSupported,
- PWithinWrapsArgumentsInArray,
- PNotDeserializationProblem
+ NoReason
  }
  }

[02/12] tinkerpop git commit: Bind netty in spark to the project level version CTR

[jorgebg]

Bind netty in spark to the project level version CTR


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

Branch: refs/heads/TINKERPOP-1865
Commit: 0c930c0bdc5807c8d82d858fe2756bba08bf6e0b
Parents: a5374b6
Author: Stephen Mallette 
Authored: Mon Mar 19 09:09:56 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:09:56 2018 -0400

--
 spark-gremlin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c930c0b/spark-gremlin/pom.xml
--
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 906b7d2..91d7b50 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -281,7 +281,7 @@
 
 io.netty
 netty-all
-4.0.29.Final
+${netty.version}
 
 
 io.netty

[11/12] tinkerpop git commit: TINKERPOP-1865 Use lambda to retrieve edges for gherkin scenarios

[jorgebg]

TINKERPOP-1865 Use lambda to retrieve edges for gherkin scenarios


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

Branch: refs/heads/TINKERPOP-1865
Commit: 7b9488d981593066b3be454bec6ee34de9e6cf36
Parents: bf84eed
Author: Jorge Bay Gondra 
Authored: Tue Mar 20 09:34:12 2018 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Mar 20 09:37:28 2018 +0100

--
 .../Gherkin/ScenarioData.cs | 24 ++--
 1 file changed, 7 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7b9488d9/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
index 5aa6a12..02ee132 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
@@ -30,7 +30,6 @@ using 
Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection;
 using Gremlin.Net.Process.Remote;
 using Gremlin.Net.Process.Traversal;
 using Gremlin.Net.Structure;
-using static Gremlin.Net.Process.Traversal.__;
 
 namespace Gremlin.Net.IntegrationTest.Gherkin
 {
@@ -119,12 +118,13 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 try
 {
-var edgeByEdgeRepr = new Dictionary();
-foreach (var edge in g.E().ToList())
-{
-edgeByEdgeRepr[GetEdgeKey(g, edge)] = edge;
-}
-return edgeByEdgeRepr;
+IFunction lambda = Lambda.Groovy(
+"it.outVertex().value('name') + '-' + it.label() + '->' + 
it.inVertex().value('name')");
+
+return g.E().Group()
+.By(lambda)
+.By(__.Tail())
+.Next();
 }
 catch (ResponseException)
 {
@@ -132,16 +132,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 return EmptyEdges;
 }
 }
-
-private static string GetEdgeKey(GraphTraversalSource g, Edge edge)
-{
-var edgeRepr = g.E(edge.Id).Project("o", "l", "i")
-.By(OutV().Values("name"))
-.By(Label())
-.By(InV().Values("name"))
-.Next();
-return edgeRepr["o"] + "-" + edgeRepr["l"] + "->" + edgeRepr["i"];
-}
 }
 
 internal class ScenarioDataPerGraph

[03/12] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

[jorgebg]

Updated NOTICE for netty after version bump to 4.0.56 CTR


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

Branch: refs/heads/TINKERPOP-1865
Commit: 7023eacc880021a58fd8cc71aa84f926b57bd191
Parents: d3d1ccf
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:18 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:14:18 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7023eacc/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index a6ffd91..91e622f 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7023eacc/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index ef4d547..72c10cc 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project

[06/12] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

[jorgebg]

Updated NOTICE for netty after version bump to 4.0.56 CTR


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

Branch: refs/heads/TINKERPOP-1865
Commit: 3aa733667dc9e8e934bdcba8165298987e8d3af8
Parents: eeea869
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:18 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:16:33 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index a6ffd91..91e622f 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index ef4d547..72c10cc 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project

[04/12] tinkerpop git commit: Merge branch 'tp32' into tp33

[jorgebg]

Merge branch 'tp32' into tp33


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

Branch: refs/heads/TINKERPOP-1865
Commit: 78fd019373c42f439bdfbd54a4770c0ce25f5244
Parents: 0c930c0 7023eac
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:39 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:14:39 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

[12/12] tinkerpop git commit: TINKERPOP-1865 Test fixes

[jorgebg]

TINKERPOP-1865 Test fixes


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

Branch: refs/heads/TINKERPOP-1865
Commit: 4c64bc039bfdb88021015a2dc594e4171b3ca1ee
Parents: 7b9488d
Author: Jorge Bay Gondra 
Authored: Tue Mar 20 10:09:33 2018 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Mar 20 10:18:02 2018 +0100

--
 .../test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs | 5 +++--
 .../Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs| 5 +
 .../test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs | 3 +--
 gremlin-test/features/map/Order.feature | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c64bc03/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 4bb83ae..9322da3 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -252,8 +252,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 if (value.Type == JTokenType.Object)
 {
-IDictionary jsonMap = (JObject)value; 
-return jsonMap.ToDictionary(kv => kv.Key, kv => 
ParseMapValue(kv.Value, graphName));
+IDictionary jsonMap = (JObject)value;
+return jsonMap.ToDictionary(kv => ParseMapValue(kv.Key, 
graphName),
+kv => ParseMapValue(kv.Value, graphName));
 }
 if (value.Type == JTokenType.Array)
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c64bc03/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index e2194e0..52646a7 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -44,10 +44,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
 { "g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
 
{"g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX",
 IgnoreReason.TraversalTDeserializationNotSupported},
-{"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
-{"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
-
{"g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX",
 IgnoreReason.ReceivedDataDoesntMatchExpected},
-
{"g_V_storeXaX_byXoutEXcreatedX_countX_out_out_storeXaX_byXinEXcreatedX_weight_sumX",
 IgnoreReason.PWithinWrapsArgumentsInArray}
+
{"g_V_storeXaX_byXoutEXcreatedX_countX_out_out_storeXaX_byXinEXcreatedX_weight_sumX",
 IgnoreReason.ReceivedDataDoesntMatchExpected}
 };
 
 private static class Keywords

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c64bc03/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index f343cc3..711fc20 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -60,8 +60,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 /// Deserialization of g:T on GraphSON3 is not supported.
 /// 
 TraversalTDeserializationNotSupported,
-PWithinWrapsArgumentsInArray,
-ReceivedDataDoesntMatchExpected
+ReceivedDataDoesntMatchExpected,
 NoReason
 

[01/12] tinkerpop git commit: Moved JavaTranslator benchmark to gremlin-tools CTR [Forced Update!]

[jorgebg]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1865 0cca806ff -> 4c64bc039 (forced update)


Moved JavaTranslator benchmark to gremlin-tools CTR


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

Branch: refs/heads/TINKERPOP-1865
Commit: a5374b6611c966cf63c57f328d3f03b484bf6517
Parents: 2fd0f25
Author: Stephen Mallette 
Authored: Mon Mar 19 08:08:53 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 08:09:25 2018 -0400

--
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 2 files changed, 76 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5374b66/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
--
diff --git 
a/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
 
b/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
deleted file mode 100644
index d33b574..000
--- 
a/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.jsr223;
-
-import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
-import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
-import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.values;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@State(Scope.Thread)
-public class JavaTranslatorBenchmark extends AbstractBenchmarkBase {
-
-private final Graph graph = EmptyGraph.instance();
-private final GraphTraversalSource g = graph.traversal();
-private final JavaTranslator> translator = JavaTranslator.of(g);
-
-@Benchmark
-public GraphTraversal.Admin testTranslationShort() {
-return translator.translate(g.V().asAdmin().getBytecode());
-}
-
-@Benchmark
-public GraphTraversal.Admin testTranslationMedium() {
-return 
translator.translate(g.V().out().in("link").out().in("link").asAdmin().getBytecode());
-}
-
-@Benchmark
-public GraphTraversal.Admin testTranslationLong() {
-return translator.translate(g.V().match(
-as("a").has("song", "name", "HERE COMES SUNSHINE"),
-as("a").map(inE("followedBy").values("weight").mean()).as("b"),
-as("a").inE("followedBy").as("c"),
-
as("c").filter(values("weight").where(P.gte("b"))).outV().as("d")).
-select("d").by("name").asAdmin().getBytecode());
-}
-
- 

[08/12] tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

[jorgebg]

TINKERPOP-1920 Fixed P.within/without() handling for collections


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

Branch: refs/heads/TINKERPOP-1865
Commit: 8c87fcfb06cc09b36e6c91bda88b61ea8ab68379
Parents: 3aa7336
Author: Stephen Mallette 
Authored: Thu Mar 15 12:19:48 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:16:44 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  6 +-
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8fcbe1a..0ec6f6d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,6 +42,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
 * Bumped to Netty 4.0.56.Final.
+* Fixed .NET GraphSON serialization of `P.Within()` and `P.without()` when 
passing a `Collection` as an argument.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/glv/P.template
--
diff --git a/gremlin-dotnet/glv/P.template b/gremlin-dotnet/glv/P.template
index ad037c1..fd3b752 100644
--- a/gremlin-dotnet/glv/P.template
+++ b/gremlin-dotnet/glv/P.template
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -88,9 +94,18 @@ namespace Gremlin.Net.Process.Traversal
 <% } %><% pmethods.findAll{ it in ["within", "without"] }.each { method -> %>
 public static P <%= toCSharpMethodName.call(method) %>(params object[] 
args)
 {
-return new P("<%= method %>", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("<%= method %>", ToGenericArray(collection));
+else
+return new P("<%= method %>", args);
 }
 <% } %>
+
+private static T[] ToGenericArray(ICollection collection)
+{
+return collection?.ToArray() ?? new T[0];;
+}
+
 /// 
 public override string ToString()
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
index e3a1e76..e718bbe 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -148,12 +154,24 @@ namespace Gremlin.Net.Process.Traversal
 
 public static P Within(params object[] args)
 {
-return new P("within", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("within", ToGenericArray(collection));
+else
+return new P("within", args);
 }
 
 public static P Without(params object[] args)
 {
-return new P("without", args);
+if (args.Length == 1 && args[0] is ICollection 

[10/12] tinkerpop git commit: TINKERPOP-1865 Run Gremlin.Net tests with GraphSON 3.0

[jorgebg]

TINKERPOP-1865 Run Gremlin.Net tests with GraphSON 3.0

This required the rewrite of the GetEdges() function for the Gherkin
test runner. Additionally, 3 tests had to be ignored: 1 has the
T deserialization problem and 2 get data returned from the server that
doesn't match the expected data.


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

Branch: refs/heads/TINKERPOP-1865
Commit: bf84eed4e04c144c310b850a469b317ea46099b8
Parents: 94484e2
Author: Florian Hockmann 
Authored: Sun Mar 18 17:19:45 2018 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Mar 20 09:37:27 2018 +0100

--
 .../Gherkin/GherkinTestRunner.cs|  7 -
 .../Gherkin/IgnoreException.cs  |  5 
 .../Gherkin/ScenarioData.cs | 30 +---
 .../RemoteConnectionFactory.cs  |  6 ++--
 4 files changed, 27 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf84eed4/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 02bf546..e2194e0 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -42,7 +42,12 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 {
 { "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
 { "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
-{ "g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported } // TINKERPOP-1866
+{ "g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
+
{"g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX",
 IgnoreReason.TraversalTDeserializationNotSupported},
+{"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+{"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
+
{"g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX",
 IgnoreReason.ReceivedDataDoesntMatchExpected},
+
{"g_V_storeXaX_byXoutEXcreatedX_countX_out_out_storeXaX_byXinEXcreatedX_weight_sumX",
 IgnoreReason.PWithinWrapsArgumentsInArray}
 };
 
 private static class Keywords

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf84eed4/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 9eb3021..f343cc3 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -46,6 +46,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 case IgnoreReason.NoReason:
 reasonSuffix = "";
 break;
+case IgnoreReason.ReceivedDataDoesntMatchExpected:
+reasonSuffix = " because received data from server doesn't 
match expected data.";
+break;
 }
 return $"Scenario ignored" + reasonSuffix;
 }
@@ -57,6 +60,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 /// Deserialization of g:T on GraphSON3 is not supported.
 /// 
 TraversalTDeserializationNotSupported,
+PWithinWrapsArgumentsInArray,
+ReceivedDataDoesntMatchExpected
 NoReason
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf84eed4/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/ScenarioData.cs