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

2018-10-05 Thread 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/02e0b8b3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02e0b8b3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02e0b8b3

Branch: refs/heads/master
Commit: 02e0b8b33c6698cefa62d03f237f5dbe0b1ab9e3
Parents: d9ccefc 21059b9
Author: Daniel Kuppitz 
Authored: Fri Oct 5 09:59:58 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Oct 5 09:59:58 2018 -0700

--
 .../gremlin/process/traversal/Compare.java  | 63 ++--
 .../gremlin/process/traversal/PTest.java| 10 +++-
 2 files changed, 27 insertions(+), 46 deletions(-)
--

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

2018-10-02 Thread 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/7148a4b4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7148a4b4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7148a4b4

Branch: refs/heads/master
Commit: 7148a4b4635a7d338e895640afeac492f26ffb67
Parents: 8b4f86f d0659bd
Author: Robert Dale 
Authored: Tue Oct 2 03:47:48 2018 -0400
Committer: Robert Dale 
Committed: Tue Oct 2 03:47:48 2018 -0400

--
 CHANGELOG.asciidoc |  1 +
 gremlin-driver/pom.xml | 14 ++
 gremlin-groovy/pom.xml | 21 +
 3 files changed, 36 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7148a4b4/gremlin-driver/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7148a4b4/gremlin-groovy/pom.xml
--

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

2018-09-27 Thread 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/2783134b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2783134b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2783134b

Branch: refs/heads/master
Commit: 2783134b23851882ead67fb3b6c8a75ce6214fbd
Parents: b78c688 d516c68
Author: Jorge Bay Gondra 
Authored: Thu Sep 27 13:00:08 2018 +0200
Committer: Jorge Bay Gondra 
Committed: Thu Sep 27 13:00:08 2018 +0200

--
 .../gremlin-javascript/lib/driver/driver-remote-connection.js  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2783134b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
--

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

2018-09-19 Thread 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/834be921
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/834be921
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/834be921

Branch: refs/heads/master
Commit: 834be921796ccc1aa5bcf7386c102d3ea896664a
Parents: 9f0dbd8 a494516
Author: Robert Dale 
Authored: Wed Sep 19 08:44:00 2018 -0400
Committer: Robert Dale 
Committed: Wed Sep 19 08:44:00 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 gremlin-python/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/834be921/gremlin-python/pom.xml
--

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

2018-09-14 Thread 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/2cc92195
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2cc92195
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2cc92195

Branch: refs/heads/master
Commit: 2cc9219541cc650ea3e29e7a968ed06426424806
Parents: e481ced 6787978
Author: Stephen Mallette 
Authored: Fri Sep 14 09:30:29 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 14 09:30:29 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-python/glv/TraversalSource.template | 40 
 .../jython/gremlin_python/process/traversal.py  | 40 
 .../driver/test_driver_remote_connection.py | 39 +++
 4 files changed, 120 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2cc92195/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
--

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

2018-08-13 Thread 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/5676e861
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5676e861
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5676e861

Branch: refs/heads/master
Commit: 5676e8612b66c43d55aa1d4baa93e5949b1cd5c9
Parents: 0bf76ac 180da8d
Author: Stephen Mallette 
Authored: Mon Aug 13 10:36:19 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Aug 13 10:36:19 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 .../tinkerpop/gremlin/process/traversal/step/ByModulating.java | 2 ++
 .../tinkerpop/gremlin/process/traversal/step/map/GroupStep.java| 2 ++
 3 files changed, 5 insertions(+)
--


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

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

2018-08-04 Thread 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/3e308f52
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3e308f52
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3e308f52

Branch: refs/heads/master
Commit: 3e308f5226e6254122f782cb55571e0103f9a9ff
Parents: b779a2a b98ff5e
Author: Robert Dale 
Authored: Sat Aug 4 16:44:41 2018 -0400
Committer: Robert Dale 
Committed: Sat Aug 4 16:44:41 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 gremlin-shaded/pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3e308f52/gremlin-shaded/pom.xml
--

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

2018-07-23 Thread 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/c3981000
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c3981000
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c3981000

Branch: refs/heads/master
Commit: c3981000234faf03f4ea4bc1da8086bc34fb3140
Parents: 05432a7 f9ad72a
Author: Daniel Kuppitz 
Authored: Mon Jul 23 10:01:23 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Jul 23 10:01:23 2018 -0700

--
 .gitignore  |  1 +
 CHANGELOG.asciidoc  |  1 +
 docker/hadoop/.gitignore|  1 +
 docker/hadoop/Dockerfile| 25 --
 .../traversal/step/branch/BranchStep.java   | 51 +---
 gremlin-test/features/branch/Choose.feature | 15 ++
 .../traversal/step/branch/ChooseTest.java   | 24 +
 7 files changed, 86 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c3981000/.gitignore
--

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

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

2018-07-20 Thread 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/f9f0112f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f9f0112f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f9f0112f

Branch: refs/heads/master
Commit: f9f0112f2e0e1899223754a9f0cb1377836dd685
Parents: 398ab9c a7aed51
Author: Jorge Bay Gondra 
Authored: Fri Jul 20 10:27:20 2018 +0200
Committer: Jorge Bay Gondra 
Committed: Fri Jul 20 10:27:20 2018 +0200

--
 .../src/main/javascript/gremlin-javascript/index.js   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

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

2018-06-28 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CoreImports.java

gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java


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

Branch: refs/heads/master
Commit: ef888a1b5380f563d688bd04fae0ea052e11d041
Parents: 4f462c5 4160b04
Author: Stephen Mallette 
Authored: Thu Jun 28 10:08:51 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Jun 28 10:08:51 2018 -0400

--
 CHANGELOG.asciidoc  |  2 +
 docs/src/dev/provider/index.asciidoc| 13 +++
 .../reference/implementations-spark.asciidoc| 64 ++---
 docs/src/reference/the-graphcomputer.asciidoc   | 85 -
 .../upgrade/release-3.2.x-incubating.asciidoc   | 27 ++
 .../tinkerpop/gremlin/jsr223/CoreImports.java   |  2 +
 .../bulkdumping/BulkDumperVertexProgram.java|  3 +
 .../computer/bulkloading/BulkLoader.java|  2 +
 .../bulkloading/BulkLoaderVertexProgram.java|  2 +
 .../bulkloading/IncrementalBulkLoader.java  |  2 +
 .../computer/bulkloading/OneTimeBulkLoader.java |  2 +
 .../computer/clone/CloneVertexProgram.java  | 98 
 .../gremlin/process/remote/RemoteGraph.java |  4 +
 .../gremlin/process/ProcessComputerSuite.java   |  2 +
 .../computer/clone/CloneVertexProgramTest.java  | 98 
 15 files changed, 283 insertions(+), 123 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/docs/src/dev/provider/index.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/docs/src/reference/the-graphcomputer.asciidoc
--

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

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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
--

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

2018-06-27 Thread 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/84c3ff40
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/84c3ff40
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/84c3ff40

Branch: refs/heads/master
Commit: 84c3ff40e19b748886eabbb4f12c74f932d1383d
Parents: b87a555 160c1de
Author: Stephen Mallette 
Authored: Wed Jun 27 12:30:13 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 27 12:30:13 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../apache/tinkerpop/gremlin/console/Console.groovy | 16 +---
 2 files changed, 10 insertions(+), 7 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84c3ff40/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
--
diff --cc 
gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index 096d329,ad41d6c..d45b49a
--- 
a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ 
b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@@ -111,21 -127,30 +111,23 @@@ class Console 
  
  GremlinLoader.load()
  
- // check for available plugins.  if they are in the "active" plugins 
strategies then "activate" them
+ // check for available plugins on the path and track them by plugin 
class name
  def activePlugins = Mediator.readPluginState()
 -def pluginClass = mediator.useV3d3 ? 
org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin : GremlinPlugin
 -ServiceLoader.load(pluginClass, 
groovy.getInterp().getClassLoader()).each { plugin ->
 +ServiceLoader.load(GremlinPlugin, 
groovy.getInterp().getClassLoader()).each { plugin ->
  if (!mediator.availablePlugins.containsKey(plugin.class.name)) {
 -def pluggedIn
 -
 -if (Mediator.useV3d3) {
 -pluggedIn = new PluggedIn(new 
PluggedIn.GremlinPluginAdapter((org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin)
 plugin, groovy, io), groovy, io, false)
 -} else {
 -pluggedIn = new PluggedIn((GremlinPlugin) plugin, groovy, 
io, false)
 -}
 +def pluggedIn = new PluggedIn((GremlinPlugin) plugin, groovy, 
io, false)
  
  mediator.availablePlugins.put(plugin.class.name, pluggedIn)
+ }
+ }
  
- if (activePlugins.contains(plugin.class.name)) {
- pluggedIn.activate()
+ // if there are active plugins then initialize them in the order that 
they are listed
+ activePlugins.each { pluginName ->
+ def pluggedIn = mediator.availablePlugins[pluginName]
+ pluggedIn.activate()
  
- if (!io.quiet)
- 
io.out.println(Colorizer.render(Preferences.infoColor, "plugin activated: " + 
plugin.getName()))
- }
- }
+ if (!io.quiet)
+ io.out.println(Colorizer.render(Preferences.infoColor, 
"plugin activated: " + pluggedIn.getPlugin().getName()))
  }
  
  // remove any "uninstalled" plugins from plugin state as it means 
they were installed, activated, but not

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

2018-06-22 Thread 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/49730704
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/49730704
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/49730704

Branch: refs/heads/master
Commit: 49730704e3c840f089b674faece506d9a6ab3a69
Parents: 1309777 32aebb8
Author: Stephen Mallette 
Authored: Fri Jun 22 10:51:33 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Jun 22 10:51:33 2018 -0400

--
 docs/src/index.asciidoc  |   2 +-
 docs/static/images/practical-gremlin.png | Bin 0 -> 392179 bytes
 pom.xml  |  13 ++---
 3 files changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49730704/pom.xml
--

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

2018-06-04 Thread 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/edc0a46d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/edc0a46d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/edc0a46d

Branch: refs/heads/master
Commit: edc0a46d98904d190a6e17dde927ba80ec4773b8
Parents: 00f77fa 57ac99e
Author: Stephen Mallette 
Authored: Mon Jun 4 13:30:41 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:30:41 2018 -0400

--
 gremlin-console/src/main/docker/docker-entrypoint.sh | 0
 gremlin-server/src/main/docker/docker-entrypoint.sh  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
--

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

2018-05-31 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyChooseTest.groovy


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

Branch: refs/heads/master
Commit: 6c98a30364021138a2f244edbc88c3c40fc3d189
Parents: d258071 f411f1d
Author: Stephen Mallette 
Authored: Thu May 31 15:51:02 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 31 15:51:02 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../traversal/step/branch/BranchStep.java   | 42 +---
 .../step/util/ReducingBarrierStep.java  |  1 -
 .../Gherkin/GherkinTestRunner.cs|  6 ++-
 gremlin-test/features/branch/Choose.feature | 27 +
 .../traversal/step/branch/ChooseTest.java   | 35 
 6 files changed, 104 insertions(+), 8 deletions(-)
--


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

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

2018-05-22 Thread 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/d975e191
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d975e191
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d975e191

Branch: refs/heads/master
Commit: d975e1917272ea12c019b77f72953345fa59036f
Parents: 3891777 7c70013
Author: Daniel Kuppitz 
Authored: Tue May 22 08:44:12 2018 -0700
Committer: Daniel Kuppitz 
Committed: Tue May 22 08:44:12 2018 -0700

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-test/features/map/Select.feature| 20 
 .../process/traversal/step/map/SelectTest.java  | 15 
 .../optimization/TinkerGraphCountStrategy.java  |  2 +-
 .../TinkerGraphCountStrategyTest.java   | 25 
 5 files changed, 52 insertions(+), 11 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d975e191/gremlin-test/features/map/Select.feature
--
diff --cc gremlin-test/features/map/Select.feature
index 341a378,1e45a0e..788eda7
--- a/gremlin-test/features/map/Select.feature
+++ b/gremlin-test/features/map/Select.feature
@@@ -516,46 -516,22 +516,66 @@@ Feature: Step - select(
| d[2].l |
| d[2].l |
  
 +  Scenario: 
g_V_asXaX_groupXmX_by_byXbothE_countX_barrier_selectXmX_selectXselectXaXX
 +Given the modern graph
 +And the traversal of
 +  """
 +  
g.V().as("a").group("m").by().by(__.bothE().count()).barrier().select("m").select(__.select("a"))
 +  """
 +When iterated to list
 +Then the result should be unordered
 +  | result |
 +  | d[3].l |
 +  | d[1].l |
 +  | d[3].l |
 +  | d[3].l |
 +  | d[1].l |
 +  | d[1].l |
 +
 +  Scenario: 
g_V_asXaX_groupXmX_by_byXbothE_countX_barrier_selectXmX_selectXselectXaXX_byXmathX_plus_XX
 +Given the modern graph
 +And the traversal of
 +  """
 +  
g.V().as("a").group("m").by().by(__.bothE().count()).barrier().select("m").select(__.select("a")).by(__.math("_+_"))
 +  """
 +When iterated to list
 +Then the result should be unordered
 +  | result |
 +  | d[6].d |
 +  | d[2].d |
 +  | d[6].d |
 +  | d[6].d |
 +  | d[2].d |
 +  | d[2].d |
 +
 +  Scenario: g_V_asXaX_outXknowsX_asXaX_selectXall_constantXaXX
 +Given the modern graph
 +And the traversal of
 +  """
 +  g.V().as("a").out("knows").as("a").select(Pop.all, __.constant("a"))
 +  """
 +When iterated to list
 +Then the result should be unordered
 +  | result |
 +  | l[v[marko],v[vadas]] |
 +  | l[v[marko],v[josh]] |
++
+   Scenario: g_V_selectXaX
+ Given the modern graph
+ And the traversal of
+   """
+   g.V().select("a")
+   """
+ When iterated to list
+ Then the result should be empty
+ 
+   Scenario: g_V_selectXaX_count
+ Given the modern graph
+ And the traversal of
+   """
+   g.V().select("a").count()
+   """
+ When iterated to list
+ Then the result should be unordered
+   | result |
+   | d[0].l |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d975e191/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
--
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index 72a1872,3d778e4..20eee0f
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@@ -83,12 -83,8 +83,14 @@@ public abstract class SelectTest extend
  
  public abstract Traversal 
get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_chooseXselectXaX__selectXaX__selectXbXX();
  
 +public abstract Traversal 
get_g_V_asXaX_groupXmX_by_byXbothE_countX_barrier_selectXmX_selectXselectXaXX();
 +
 +public abstract Traversal 
get_g_V_asXaX_groupXmX_by_byXbothE_countX_barrier_selectXmX_selectXselectXaXX_byXmathX_plus_XX();
 +
 +public abstract Traversal 
get_g_V_asXaX_outXknowsX_asXaX_selectXall_constantXaXX();
 +
+ public abstract Traversal get_g_V_selectXaX_count();
+ 
  // below are original back()-tests
  
  public abstract Traversal 
get_g_VX1X_asXhereX_out_selectXhereX(final Object v1Id);
@@@ -349,31 -348,12

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

2018-05-18 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java


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

Branch: refs/heads/master
Commit: 558e8147e34d3a2fc616bb520899b7d4a1b65d24
Parents: bf6ff4d e398373
Author: Stephen Mallette 
Authored: Fri May 18 18:55:13 2018 -0400
Committer: Stephen Mallette 
Committed: Fri May 18 18:55:13 2018 -0400

--
 CHANGELOG.asciidoc   |  2 +-
 .../gremlin/groovy/jsr223/GroovyTranslator.java  |  6 +-
 .../gremlin/groovy/jsr223/GroovyTranslatorTest.java  | 15 +--
 3 files changed, 19 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/558e8147/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/558e8147/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
--
diff --cc 
gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
index c58f6e7,000..ea832f4
mode 100644,00..100644
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
@@@ -1,134 -1,0 +1,145 @@@
 +/*
 + *  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.groovy.jsr223;
 +
 +import org.apache.commons.configuration.MapConfiguration;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 +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;
 +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
 +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
 +import org.apache.tinkerpop.gremlin.util.function.Lambda;
 +import org.junit.Test;
 +
 +import javax.script.Bindings;
 +import javax.script.SimpleBindings;
 +import java.util.ArrayList;
 +import java.util.Arrays;
++import java.util.Collections;
 +import java.util.HashMap;
 +import java.util.LinkedHashMap;
 +import java.util.List;
++import java.util.function.Function;
 +
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
 +
 +/**
 + * @author Marko A. Rodriguez (http://markorodriguez.com)
 + */
 +public class GroovyTranslatorTest {
 +
 +@Test
 +public void shouldHandleStrategies() throws Exception {
 +final TinkerGraph graph = TinkerFactory.createModern();
 +GraphTraversalSource g = graph.traversal();
 +g = g.withStrategies(SubgraphStrategy.create(new MapConfiguration(new 
HashMap() {{
 +put(SubgraphStrategy.VERTICES, __.has("name", "marko"));
 +}})));
 +final Bindings bindings = new

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

2018-05-15 Thread 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/b04e0240
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b04e0240
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b04e0240

Branch: refs/heads/master
Commit: b04e02406d8b29fc3967a5aa6842e72e82d90817
Parents: 5171afd 699a5aa
Author: Stephen Mallette 
Authored: Tue May 15 15:42:18 2018 -0400
Committer: Stephen Mallette 
Committed: Tue May 15 15:42:18 2018 -0400

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

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

2018-05-02 Thread 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/8275e459
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8275e459
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8275e459

Branch: refs/heads/master
Commit: 8275e45981751cdcd80d066f5d68751e7e1c7096
Parents: 99845d4 8671622
Author: Jorge Bay Gondra 
Authored: Wed May 2 08:50:01 2018 -0400
Committer: Jorge Bay Gondra 
Committed: Wed May 2 08:50:01 2018 -0400

--
 .../main/javascript/gremlin-javascript/index.js | 20 +++-
 .../test/unit/exports-test.js   |  2 ++
 2 files changed, 13 insertions(+), 9 deletions(-)
--

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

2018-04-27 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java


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

Branch: refs/heads/master
Commit: 71bc37fdfe00bb8c6b75d8bf81834713abf8cd22
Parents: a38d68f 5fea198
Author: Stephen Mallette 
Authored: Fri Apr 27 08:35:55 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 27 08:35:55 2018 -0400

--
 docs/src/recipes/olap-spark-yarn.asciidoc   | 20 
 .../gremlin/process/traversal/Order.java|  9 -
 2 files changed, 16 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71bc37fd/docs/src/recipes/olap-spark-yarn.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71bc37fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
index 847cc57,c9111f0..0b88bba
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
@@@ -67,7 -66,82 +67,14 @@@ public enum Order implements Comparator
  public Order reversed() {
  return incr;
  }
- }, shuffle {
+ },
+ 
+ /**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#keys}.
 - */
 -@Deprecated
 -keyIncr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.naturalOrder().compare(((Map.Entry) 
first).getKey(), ((Map.Entry) second).getKey());
 -}
 -
 -@Override
 -public Order reversed() {
 -return keyDecr;
 -}
 -},
 -
 -/**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#values}.
 - */
 -@Deprecated
 -valueIncr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.naturalOrder().compare(((Map.Entry) 
first).getValue(), ((Map.Entry) second).getValue());
 -}
 -
 -@Override
 -public Order reversed() {
 -return valueDecr;
 -}
 -},
 -
 -/**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#keys}.
 - */
 -@Deprecated
 -keyDecr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.reverseOrder().compare(((Map.Entry) 
first).getKey(), ((Map.Entry) second).getKey());
 -}
 -
 -@Override
 -public Order reversed() {
 -return keyIncr;
 -}
 -},
 -
 -/**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#values}.
 - */
 -@Deprecated
 -valueDecr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.reverseOrder().compare(((Map.Entry) 
first).getValue(), ((Map.Entry) second).getValue());
 -}
 -
 -@Override
 -public Order reversed() {
 -return valueIncr;
 -}
 -},
 -
 -/**
+  * Order in a random fashion.
+  *
+  * @since 3.0.0-incubating
+  */
+ shuffle {
  @Override
  public int compare(final Object first, final Object second) {
  return RANDOM.nextBoolean() ? -1 : 1;

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

2018-04-26 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java


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

Branch: refs/heads/master
Commit: c253e768b489cb78c0d90d85c6a933ff59e7d908
Parents: 4eeb178 a4c5a21
Author: Stephen Mallette 
Authored: Thu Apr 26 11:02:04 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Apr 26 11:02:04 2018 -0400

--
 .../gremlin/process/traversal/Compare.java  | 12 
 .../gremlin/process/traversal/Contains.java |  4 ++
 .../gremlin/process/traversal/Operator.java | 73 ++-
 .../gremlin/process/traversal/Order.java| 17 -
 .../tinkerpop/gremlin/process/traversal/P.java  | 76 
 .../gremlin/process/traversal/Pop.java  | 10 ++-
 .../gremlin/process/traversal/Scope.java| 19 +++--
 .../gremlin/process/traversal/OrderTest.java| 76 
 8 files changed, 277 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c253e768/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c253e768/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
index dfd8bf2,3710396..847cc57
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
@@@ -19,12 -19,14 +19,15 @@@
  package org.apache.tinkerpop.gremlin.process.traversal;
  
  import java.util.Comparator;
 -import java.util.Map;
  import java.util.Random;
  
 +import org.apache.tinkerpop.gremlin.util.NumberHelper;
 +
  /**
+  * Provides {@code Comparator} instances for ordering traversers.
+  *
   * @author Marko A. Rodriguez (http://markorodriguez.com)
+  * @author Stephen Mallette (http://stephen.genoprime.com)
   */
  public enum Order implements Comparator {
  

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c253e768/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
index d40fe60,b2fe2b9..45bbf2e
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
@@@ -39,10 -39,8 +43,12 @@@ public enum Pop 
  last,
  /**
   * Get all the items and return them as a list.
+  *
+  * @since 3.0.0-incubating
   */
 -all
 +all,
 +/**
 + * Get the items as either a list (for multiple) or an object (for 
singles).
 + */
 +mixed
  }

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

2018-04-25 Thread 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/cfac5690
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cfac5690
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cfac5690

Branch: refs/heads/master
Commit: cfac56909777030f110474b97b62e06d3c343c93
Parents: b5b9e1a 0d6f8fc
Author: Stephen Mallette 
Authored: Wed Apr 25 08:21:57 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 08:21:57 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../process/traversal/TraversalStrategies.java  | 36 +++-
 2 files changed, 29 insertions(+), 8 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfac5690/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
--

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

2018-04-25 Thread 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/b5b9e1af
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b5b9e1af
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b5b9e1af

Branch: refs/heads/master
Commit: b5b9e1af8f5da51d396e69877a9d03c061b35f12
Parents: 9d5b722 f4dbaff
Author: Stephen Mallette 
Authored: Wed Apr 25 07:45:04 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 07:45:04 2018 -0400

--
 .../tinkerpop/gremlin/process/traversal/TraversalEngine.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

2018-04-25 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddVertexTest.groovy
gremlin-test/features/map/AddVertex.feature

gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java


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

Branch: refs/heads/master
Commit: 9d5b72290bddfbc0b987297626427e2cfedd86d5
Parents: 012eba6 44c4073
Author: Stephen Mallette 
Authored: Wed Apr 25 07:27:29 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 07:27:29 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../process/traversal/step/util/Parameters.java | 30 +++-
 gremlin-test/features/map/AddVertex.feature | 26 +
 .../traversal/step/map/AddVertexTest.java   | 20 +++--
 4 files changed, 62 insertions(+), 15 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9d5b7229/gremlin-test/features/map/AddVertex.feature
--
diff --cc gremlin-test/features/map/AddVertex.feature
index e58040c,996521b..5d324f3
--- a/gremlin-test/features/map/AddVertex.feature
+++ b/gremlin-test/features/map/AddVertex.feature
@@@ -309,54 -309,29 +309,80 @@@ Feature: Step - addV(
| m[{"temp": ["test"], "name": ["lop"]}] |
| m[{"temp": ["test"], "name": ["ripple"]}] |
  
+   Scenario: g_withSideEffectXa_nameX_addV_propertyXselectXaX_markoX_name
+ Given the empty graph
+ And the graph initializer of
+   """
+   g.addV("person").property(T.id, 1).property("name", 
"marko").property("age", 29).as("marko").
+ addV("person").property(T.id, 2).property("name", 
"vadas").property("age", 27).as("vadas").
+ addV("software").property(T.id, 3).property("name", 
"lop").property("lang", "java").as("lop").
+ addV("person").property(T.id, 
4).property("name","josh").property("age", 32).as("josh").
+ addV("software").property(T.id, 5).property("name", 
"ripple").property("lang", "java").as("ripple").
+ addV("person").property(T.id, 6).property("name", 
"peter").property("age", 35).as('peter').
+ addE("knows").from("marko").to("vadas").property(T.id, 
7).property("weight", 0.5).
+ addE("knows").from("marko").to("josh").property(T.id, 
8).property("weight", 1.0).
+ addE("created").from("marko").to("lop").property(T.id, 
9).property("weight", 0.4).
+ addE("created").from("josh").to("ripple").property(T.id, 
10).property("weight", 1.0).
+ addE("created").from("josh").to("lop").property(T.id, 
11).property("weight", 0.4).
+ addE("created").from("peter").to("lop").property(T.id, 
12).property("weight", 0.2)
+   """
+ And the traversal of
+   """
+   g.withSideEffect("a", "name").addV().property(__.select("a"), 
"marko").values("name")
+   """
+ When iterated to list
+ Then the result should be unordered
+   | result |
+   | marko |
 -And the graph should return 2 for count of "g.V().has(\"name\",\"marko\")"
++And the graph should return 2 for count of "g.V().has(\"name\",\"marko\")"
 +  Scenario: 
g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX
 +Given the empty graph
 +And the graph initializer of
 +  """
 +  g.addV("person").property(T.id, 1).property("name", 
"marko").property("age", 29).as("marko").
 +addV("person").property(T.id, 2).property("name", 
"vadas").property("age", 27).as("vadas").
 +addV("software").property(T.id, 3).property("name", 
"lop").property("lang", "java").as("lop").
 +addV("person").property(T.id, 
4).property("name","josh").property("age", 32).as("josh").
 +addV("software").property(T.id, 5).property("name", 
"ripple").property("lang", "java").as("ripple").
 +addV("person").property(T.id, 6).property("name", 
"peter").property("age", 35).as('peter').
 +addE("knows").from("marko").to("vadas").property(T.id, 
7).property("weight", 0.5).
 +addE("knows").from("marko").to("josh").property(T.id, 
8).property("weight", 1.0).
 +addE("created").from("marko").to("lop").property(T.id, 
9).property("weight", 0.4).
 +addE("created").from("josh").to("ripple").property(T.id,

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

2018-04-25 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java


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

Branch: refs/heads/master
Commit: 012eba661fcc5b4bbd27751417e8e51ebdbddcf3
Parents: 8005cb3 42ce7a5
Author: Stephen Mallette 
Authored: Wed Apr 25 06:54:24 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 06:54:24 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   | 24 
 .../jsr223/GremlinGroovyScriptEngineTest.java   | 11 +
 pom.xml |  2 +-
 4 files changed, 37 insertions(+), 1 deletion(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/012eba66/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
--
diff --cc 
gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
index d481cbb,54e997f..3e1d153
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
@@@ -22,6 -22,12 +22,9 @@@ import groovy.lang.Closure
  import groovy.lang.MissingPropertyException;
  import org.apache.commons.lang.exception.ExceptionUtils;
  import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 -import org.apache.tinkerpop.gremlin.groovy.CompilerCustomizerProvider;
 -import org.apache.tinkerpop.gremlin.groovy.NoImportCustomizerProvider;
 -import 
org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.InterpreterModeCustomizerProvider;
+ import org.apache.tinkerpop.gremlin.structure.Vertex;
+ import org.apache.tinkerpop.gremlin.util.function.Lambda;
+ import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
  import org.javatuples.Pair;
  import org.junit.Test;
  import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/012eba66/pom.xml
--

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

2018-04-24 Thread 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/ffaca891
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ffaca891
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ffaca891

Branch: refs/heads/master
Commit: ffaca8915e3df4952c02c922045a224176e07037
Parents: ead5659 c155818
Author: Jorge Bay Gondra 
Authored: Tue Apr 24 10:39:31 2018 +0200
Committer: Jorge Bay Gondra 
Committed: Tue Apr 24 10:39:31 2018 +0200

--
 docs/src/reference/gremlin-variants.asciidoc | 47 +--
 1 file changed, 36 insertions(+), 11 deletions(-)
--


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

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

2018-04-20 Thread 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/b8b46b06
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b8b46b06
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b8b46b06

Branch: refs/heads/tp33
Commit: b8b46b06a26c58395ef2d878c2c2ed0665c0e788
Parents: 4705c04 6b259f7
Author: Stephen Mallette 
Authored: Fri Apr 20 19:03:42 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 19:03:42 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../io/graphson/TraversalSerializersV2d0.java   | 35 +---
 2 files changed, 24 insertions(+), 12 deletions(-)
--


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

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

2018-04-19 Thread 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/cd1844ca
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cd1844ca
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cd1844ca

Branch: refs/heads/master
Commit: cd1844cad93778e68f8f3a29491ffe896f2ba407
Parents: 028aba4 b99c56a
Author: Stephen Mallette 
Authored: Thu Apr 19 07:16:19 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Apr 19 07:16:19 2018 -0400

--
 docs/src/reference/gremlin-variants.asciidoc |   8 
 docs/static/images/gremlin-js.png| Bin 0 -> 78981 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)
--


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

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

2018-04-18 Thread 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/028aba45
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/028aba45
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/028aba45

Branch: refs/heads/master
Commit: 028aba45cd268ba675711866e3633125dc74ef19
Parents: 358f99b 4dcee1a
Author: Stephen Mallette 
Authored: Wed Apr 18 18:50:22 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 18 18:50:22 2018 -0400

--
 .../process/traversal/step/util/Parameters.java | 16 ++--
 .../driver/remote/DriverRemoteTraversal.java|  6 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)
--

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

2018-04-16 Thread 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/d63638b8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d63638b8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d63638b8

Branch: refs/heads/master
Commit: d63638b83f8cfeb4b07410c741ea4f3918e84575
Parents: 01c8954 a7c8ea1
Author: Stephen Mallette 
Authored: Mon Apr 16 07:49:03 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 16 07:49:03 2018 -0400

--
 CHANGELOG.asciidoc | 5 +
 gremlin-console/pom.xml| 1 -
 gremlin-console/src/main/static/NOTICE | 6 --
 gremlin-server/pom.xml | 1 -
 pom.xml| 5 +
 5 files changed, 10 insertions(+), 8 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/gremlin-console/src/main/static/NOTICE
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/pom.xml
--

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

2018-04-03 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-dsl/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-dotnet/pom.xml
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
gremlin-dotnet/src/pom.xml
gremlin-dotnet/test/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-javascript/pom.xml
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml


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

Branch: refs/heads/master
Commit: 6b172738e72aa4d337d7b3562404e741cb7e8666
Parents: d40d60a 004e721
Author: Stephen Mallette 
Authored: Tue Apr 3 13:05:37 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Apr 3 13:05:37 2018 -0400

--
 CHANGELOG.asciidoc  | 51 +++-
 .../upgrade/release-3.2.x-incubating.asciidoc   |  2 +-
 .../src/Gremlin.Net/Gremlin.Net.csproj  |  4 +-
 3 files changed, 53 insertions(+), 4 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b172738/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--

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

2018-03-21 Thread 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/0f29e7e8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0f29e7e8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0f29e7e8

Branch: refs/heads/master
Commit: 0f29e7e8fedfa860fbf663e7398bbaf05e4d30e2
Parents: 38bcdb6 6323f49
Author: Stephen Mallette 
Authored: Tue Mar 20 15:25:39 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 15:25:39 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/RemoteStrategy.java | 27 +++-
 .../process/traversal/TraversalStrategies.java  | 22 
 3 files changed, 38 insertions(+), 12 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0f29e7e8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
--

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

2018-03-12 Thread 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/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/master
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;

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

2018-03-12 Thread 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/d62e50e5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d62e50e5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d62e50e5

Branch: refs/heads/master
Commit: d62e50e5c13fcfe6fcd7958727500816c382a200
Parents: 3797c7d f80a542
Author: Stephen Mallette 
Authored: Mon Mar 12 10:04:28 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:04:28 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d62e50e5/pom.xml
--
diff --cc pom.xml
index a29ccf0,da50996..cf1e039
--- a/pom.xml
+++ b/pom.xml
@@@ -146,10 -147,10 +146,10 @@@ limitations under the License
  2.10.4
  1.1
  3.0.2
- 4.0.53.Final
+ 4.0.56.Final
  1.7.21
  1.15
 -1.6.1
 +2.2.0
  
  UTF-8
  
UTF-8

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

2018-03-09 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java


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

Branch: refs/heads/master
Commit: 02e47ff9634b15f99ef331e80a227ddd3617ae2e
Parents: 4c75266 552820a
Author: Stephen Mallette 
Authored: Fri Mar 9 11:05:37 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 11:05:37 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 .../groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java  | 2 +-
 .../groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java| 2 +-
 .../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java   | 2 +-
 .../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java   | 2 +-
 pom.xml| 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/pom.xml
--

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

2018-03-08 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java

gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java


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

Branch: refs/heads/master
Commit: a3624f7e2f23d290ac2ad475f88716f98eeb8b7c
Parents: dd3a54e 7bff988
Author: Stephen Mallette 
Authored: Thu Mar 8 08:08:40 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 8 08:08:40 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../AbstractGraphSONTypeSerializer.java | 80 +---
 .../io/graphson/GraphSONTypeSerializerV2d0.java | 38 ++
 .../io/graphson/GraphSONTypeSerializerV3d0.java | 72 +++---
 .../GraphSONMapperPartialEmbeddedTypeTest.java  | 33 
 gremlin-shaded/pom.xml  |  2 +-
 6 files changed, 120 insertions(+), 106 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a3624f7e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java
index 6eb65e1,000..fa90b2c
mode 100644,00..100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java
@@@ -1,173 -1,0 +1,99 @@@
 +/*
 + * 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.shaded.jackson.annotation.JsonTypeInfo;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
++import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
++import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
 +import org.apache.tinkerpop.shaded.jackson.databind.BeanProperty;
 +import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
 +import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
 +
 +import java.io.IOException;
 +import java.util.HashMap;
 +import java.util.Map;
 +
 +/**
 + * Extension of the Jackson's default TypeSerializer. An instance of this 
object will be passed to the serializers
 + * on which they can safely call the utility methods to serialize types and 
making it compatible with the version
 + * 2.0+ of GraphSON.
 + *
 + * @author Kevin Gallardo (https://kgdo.me)
 + * @author Stephen Mallette (http://stephen.genoprime.com)
 + */
 +public abstract class AbstractGraphSONTypeSerializer extends TypeSerializer {
 +
 +protected final TypeIdResolver idRes;
 +protected final String propertyName;
 +protected final TypeInfo typeInfo;
 +protected final String valuePropertyName;
 +protected final Map classMap = new HashMap<>();
 +
 +AbstractGraphSONTypeSerializer(final TypeIdResolver idRes, final String 
propertyName, final TypeInfo typeInfo,
 +   final String valuePropertyName) {
 +this.idRes = idRes;
 +this.propertyName = propertyName;
 +this.typeInfo = typeInfo;
 +this.valuePropertyName = valuePropertyName;
 +}
 +
 +
 +@Override
 +public TypeSerializer forProperty(final BeanProperty beanProperty) {
 +return this;
 +}
 +
 +@Override

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

2018-02-28 Thread 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/e1d7f80b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1d7f80b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e1d7f80b

Branch: refs/heads/master
Commit: e1d7f80ba01b7ad186f23979d98c69cb559a24c1
Parents: 032124a d520516
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:37 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:37 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


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